add account keygen to init

cmd/zetae2e/init.go

@@ -16,7 +16,7 @@ func NewInitCmd() *cobra.Command {
 	var InitCmd = &cobra.Command{
 		Use:   "init",
 		Short: "initialize config file for e2e tests",
-		Run:   initConfig,
+		RunE:  initConfig,
 	}
 
 	InitCmd.Flags().StringVar(&initConf.RPCs.EVM, "ethURL", "http://eth:8545", "--ethURL http://eth:8545")
@@ -33,9 +33,14 @@ func NewInitCmd() *cobra.Command {
 	return InitCmd
 }
 
-func initConfig(_ *cobra.Command, _ []string) {
-	err := config.WriteConfig(configFile, initConf)
+func initConfig(_ *cobra.Command, _ []string) error {
+	err := initConf.GenerateKeys()
 	if err != nil {
-		fmt.Printf("error writing config file: %s", err.Error())
+		return fmt.Errorf("generating keys: %w", err)
 	}
+	err = config.WriteConfig(configFile, initConf)
+	if err != nil {
+		return fmt.Errorf("writing config: %w", err)
+	}
+	return nil
 }

e2e/config/config.go

@@ -7,7 +7,9 @@ import (
 	"os"
 
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/cosmos/cosmos-sdk/types/bech32"
 	ethcommon "github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
 	"gopkg.in/yaml.v2"
 )
@@ -24,8 +26,9 @@ type Config struct {
 
 // Account contains configuration for an account
 type Account struct {
-	RawEVMAddress string `yaml:"evm_address"`
-	RawPrivateKey string `yaml:"private_key"`
+	RawBech32Address string `yaml:"bech32_address"`
+	RawEVMAddress    string `yaml:"evm_address"`
+	RawPrivateKey    string `yaml:"private_key"`
 }
 
 // Accounts are the required accounts to run any e2e test
@@ -198,6 +201,44 @@ func (c Config) Validate() error {
 	return nil
 }
 
+// GenerateKeys generates new key pairs for all accounts
+func (c *Config) GenerateKeys() error {
+	var err error
+	c.Accounts.Deployer, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	c.AdditionalAccounts.UserERC20, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	c.AdditionalAccounts.UserZetaTest, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	c.AdditionalAccounts.UserZEVMMPTest, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	c.AdditionalAccounts.UserBitcoin, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	c.AdditionalAccounts.UserEther, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	c.AdditionalAccounts.UserMisc, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	c.AdditionalAccounts.UserAdmin, err = generateAccount()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (a Account) EVMAddress() ethcommon.Address {
 	return ethcommon.HexToAddress(a.RawEVMAddress)
 }
@@ -247,3 +288,24 @@ func (bnt BitcoinNetworkType) GetParams() (chaincfg.Params, error) {
 		return chaincfg.Params{}, fmt.Errorf("invalid bitcoin params %s", bnt)
 	}
 }
+
+func generateAccount() (Account, error) {
+	privateKey, err := crypto.GenerateKey()
+	if err != nil {
+		return Account{}, fmt.Errorf("generating private key: %w", err)
+	}
+	// encode private key and strip 0x prefix
+	encodedPrivateKey := hexutil.Encode(crypto.FromECDSA(privateKey))[2:]
+
+	evmAddress := crypto.PubkeyToAddress(privateKey.PublicKey)
+	bech32Address, err := bech32.ConvertAndEncode("zeta", evmAddress.Bytes())
+	if err != nil {
+		return Account{}, fmt.Errorf("bech32 convert and encode: %w", err)
+	}
+
+	return Account{
+		RawEVMAddress:    evmAddress.String(),
+		RawPrivateKey:    encodedPrivateKey,
+		RawBech32Address: bech32Address,
+	}, nil
+}

e2e/config/config_test.go

@@ -10,12 +10,21 @@ import (
 // TestAdditionalAccountsSlicesSynced ensures than if any new accounts are added the
 // AccountsSlice() function is updated
 func TestConfigAdditionalAccountsSliceSynced(t *testing.T) {
-	accountsType := reflect.TypeOf(AdditionalAccounts{})
-	numberOfAccounts := accountsType.NumField()
+	additionalAccountsType := reflect.TypeOf(AdditionalAccounts{})
+	numberOfAdditionalAccounts := additionalAccountsType.NumField()
 
-	require.Greater(t, numberOfAccounts, 0)
+	require.Greater(t, numberOfAdditionalAccounts, 0)
 
-	require.Len(t, Config{}.AdditionalAccounts.AsSlice(), numberOfAccounts)
+	conf := Config{}
+	err := conf.GenerateKeys()
+	require.NoError(t, err)
+
+	additionalAccountsSlice := conf.AdditionalAccounts.AsSlice()
+	require.Len(t, additionalAccountsSlice, numberOfAdditionalAccounts)
+
+	for _, account := range additionalAccountsSlice {
+		require.NoError(t, account.Validate())
+	}
 }
 
 func TestConfigInvalidAccount(t *testing.T) {