fix: linter errors, minor improvements samples

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2024-08-07 09:14:03 +02:00
parent 26814fecd6
commit a632ebe7b5
No known key found for this signature in database
GPG Key ID: FA5EE906EB55316A
4 changed files with 17 additions and 7 deletions

View File

@ -96,7 +96,7 @@ func AttestMachine(network *network.Network, name string, mnemonic string, num i
return err
}
machine := moduleobject.Machine(name, pubKey, prvKey, addr.String())
machine := moduleobject.Machine(name, pubKey, prvKey, addr.String(), mnemonic)
attestMsg := machinetypes.NewMsgAttestMachine(addr.String(), &machine)
_, err = lib.BroadcastTxWithFileLock(addr, attestMsg)
if err != nil {

View File

@ -16,11 +16,19 @@ import (
"github.com/cosmos/go-bip39"
)
func ExtendedKeyPair(cfg chaincfg.Params) (string, string) {
func ExtendedKeyPair(cfg chaincfg.Params, mnemonics ...string) (string, string) {
seed, err := bip39.NewSeedWithErrorChecking(sample.Mnemonic, keyring.DefaultBIP39Passphrase)
if err != nil {
panic(err)
}
if len(mnemonics) == 1 {
seed, err = bip39.NewSeedWithErrorChecking(mnemonics[0], keyring.DefaultBIP39Passphrase)
if err != nil {
panic(err)
}
}
xprivKey, err := hdkeychain.NewMaster(seed, &cfg)
if err != nil {
panic(err)
@ -34,10 +42,10 @@ func ExtendedKeyPair(cfg chaincfg.Params) (string, string) {
// Machine creates a new machine object
// TODO: make address deterministic for test cases
func Machine(name, pubKey string, prvKey string, address string) machinetypes.Machine {
func Machine(name, pubKey string, prvKey string, address string, mnemonics ...string) machinetypes.Machine {
metadata := Metadata()
_, liquidPubKey := ExtendedKeyPair(config.LiquidNetParams)
_, planetmintPubKey := ExtendedKeyPair(config.PlmntNetParams)
_, liquidPubKey := ExtendedKeyPair(config.LiquidNetParams, mnemonics...)
_, planetmintPubKey := ExtendedKeyPair(config.PlmntNetParams, mnemonics...)
prvKeyBytes, _ := hex.DecodeString(prvKey)
sk := &secp256k1.PrivKey{Key: prvKeyBytes}

View File

@ -1,6 +1,7 @@
package types
import (
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
)
@ -40,7 +41,7 @@ func (msg *MsgBurnConsumption) GetSignBytes() []byte {
func (msg *MsgBurnConsumption) ValidateBasic() error {
_, err := sdk.AccAddressFromBech32(msg.Creator)
if err != nil {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
}
return nil
}

View File

@ -1,6 +1,7 @@
package types
import (
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
)
@ -40,7 +41,7 @@ func (msg *MsgMintProduction) GetSignBytes() []byte {
func (msg *MsgMintProduction) ValidateBasic() error {
_, err := sdk.AccAddressFromBech32(msg.Creator)
if err != nil {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
}
return nil
}