refactor(cmd/testnetify): add multi-account support

Signed-off-by: Artur Troian <troian@users.noreply.github.com>

Author: troian

app/export.go

@@ -187,7 +187,10 @@ func (app *AkashApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs
 
 	_ = iter.Close()
 
-	_, _ = app.Keepers.Cosmos.Staking.ApplyAndReturnValidatorSetUpdates(ctx)
+	_, err := app.Keepers.Cosmos.Staking.ApplyAndReturnValidatorSetUpdates(ctx)
+	if err != nil {
+		panic(err)
+	}
 
 	/* Handle slashing state. */
 

app/testnet.go

@@ -23,9 +23,12 @@ type TestnetValidator struct {
 	OperatorAddress   sdk.ValAddress
 	ConsensusAddress  sdk.ConsAddress
 	ConsensusPubKey   *types.Any
+	Status            stakingtypes.BondStatus
 	Moniker           string
 	Commission        stakingtypes.Commission
 	MinSelfDelegation sdk.Int
+	Tokens            sdk.Int
+	DelegatorShares   sdk.Dec
 }
 
 type TestnetUpgrade struct {
@@ -42,8 +45,13 @@ type TestnetGovConfig struct {
 	} `json:"voting_params,omitempty"`
 }
 
+type TestnetAccount struct {
+	Address  sdk.AccAddress `json:"address"`
+	Balances []sdk.Coin     `json:"balances"`
+}
+
 type TestnetConfig struct {
-	Accounts   []sdk.AccAddress
+	Accounts   []TestnetAccount
 	Validators []TestnetValidator
 	Gov        TestnetGovConfig
 	Upgrade    TestnetUpgrade
@@ -137,27 +145,21 @@ func InitAkashAppForTestnet(
 			OperatorAddress: val.OperatorAddress.String(),
 			ConsensusPubkey: val.ConsensusPubKey,
 			Jailed:          false,
-			Status:          stakingtypes.Bonded,
-			Tokens:          sdk.NewInt(900000000000000),
-			DelegatorShares: sdk.MustNewDecFromStr("10000000"),
+			Status:          val.Status,
+			Tokens:          val.Tokens,
+			DelegatorShares: val.DelegatorShares,
 			Description: stakingtypes.Description{
-				Moniker: "Testnet Validator",
-			},
-			Commission: stakingtypes.Commission{
-				CommissionRates: stakingtypes.CommissionRates{
-					Rate:          sdk.MustNewDecFromStr("0.05"),
-					MaxRate:       sdk.MustNewDecFromStr("0.1"),
-					MaxChangeRate: sdk.MustNewDecFromStr("0.05"),
-				},
+				Moniker: val.Moniker,
 			},
-			MinSelfDelegation: sdk.OneInt(),
+			Commission:        val.Commission,
+			MinSelfDelegation: val.MinSelfDelegation,
 		}
 
 		// Add our validator to power and last validators store
 		app.Keepers.Cosmos.Staking.SetValidator(ctx, newVal)
 		err = app.Keepers.Cosmos.Staking.SetValidatorByConsAddr(ctx, newVal)
 		if err != nil {
-			return nil
+			panic(err)
 		}
 
 		app.Keepers.Cosmos.Staking.SetValidatorByPowerIndex(ctx, newVal)
@@ -189,7 +191,10 @@ func InitAkashAppForTestnet(
 			Tombstoned:  false,
 		}
 
-		_, _ = app.Keepers.Cosmos.Staking.ApplyAndReturnValidatorSetUpdates(ctx)
+		_, err = app.Keepers.Cosmos.Staking.ApplyAndReturnValidatorSetUpdates(ctx)
+		if err != nil {
+			panic(err)
+		}
 
 		app.Keepers.Cosmos.Slashing.SetValidatorSigningInfo(ctx, newConsAddr, newValidatorSigningInfo)
 	}
@@ -208,19 +213,25 @@ func InitAkashAppForTestnet(
 	// BANK
 	//
 
-	defaultCoins := sdk.NewCoins(
-		sdk.NewInt64Coin("uakt", 1000000000000),
-		sdk.NewInt64Coin("ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84", 1000000000000), // axlUSDC
-	)
-
 	for _, account := range tcfg.Accounts {
-		err := app.Keepers.Cosmos.Bank.MintCoins(ctx, minttypes.ModuleName, defaultCoins)
+		var coins sdk.Coins
+
+		if len(account.Balances) > 0 {
+			coins = sdk.NewCoins(account.Balances...)
+		} else {
+			coins = sdk.NewCoins(
+				sdk.NewInt64Coin("uakt", 1000000000000),
+				sdk.NewInt64Coin("ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84", 1000000000000), // axlUSDC
+			)
+		}
+
+		err := app.Keepers.Cosmos.Bank.MintCoins(ctx, minttypes.ModuleName, coins)
 		if err != nil {
-			return nil
+			panic(err)
 		}
-		err = app.Keepers.Cosmos.Bank.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, account, defaultCoins)
+		err = app.Keepers.Cosmos.Bank.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, account.Address, coins)
 		if err != nil {
-			return nil
+			panic(err)
 		}
 	}
 

cmd/akash/cmd/testnetify/config.go

@@ -43,23 +43,24 @@ type ConsAddress struct {
 type TestnetValidator struct {
 	Moniker           string                  `json:"moniker"`
 	Operator          AccAddress              `json:"operator"`
-	Bonded            bool                    `json:"bonded"`
+	Status            stakingtypes.BondStatus `json:"status"`
 	Commission        stakingtypes.Commission `json:"commission"`
 	MinSelfDelegation sdk.Int                 `json:"min_self_delegation"`
 	Home              string                  `json:"home"`
-
-	privValidator    *pvm.FilePV
-	pubKey           crypto.PubKey
-	validatorAddress crypto.Address
-	consAddress      sdk.ConsAddress
+	Tokens            *sdk.Int                `json:"tokens"`
+	DelegatorShares   *sdk.Dec                `json:"delegator_shares"`
+	privValidator     *pvm.FilePV
+	pubKey            crypto.PubKey
+	validatorAddress  crypto.Address
+	consAddress       sdk.ConsAddress
 }
 
 type TestnetValidators []TestnetValidator
 
 type TestnetConfig struct {
 	ChainID    string                 `json:"chain_id"`
 	Validators TestnetValidators      `json:"validators"`
-	Accounts   []sdk.AccAddress       `json:"accounts"`
+	Accounts   []akash.TestnetAccount `json:"accounts"`
 	Gov        akash.TestnetGovConfig `json:"gov"`
 	upgrade    akash.TestnetUpgrade
 }

cmd/akash/cmd/testnetify/testnetify.go

@@ -2,6 +2,7 @@ package testnetify
 
 import (
 	"bufio"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -13,6 +14,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 
@@ -114,6 +116,29 @@ you want to test the upgrade handler itself.
 				return err
 			}
 
+			for i, acc := range cfg.Accounts {
+				if len(acc.Balances) > 0 {
+					cfg.Accounts[i].Balances = sdk.NewCoins(acc.Balances...)
+				} else {
+					cfg.Accounts[i].Balances = sdk.NewCoins(
+						sdk.NewInt64Coin("uakt", 1000000000000),
+						sdk.NewInt64Coin("ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84", 1000000000000), // axlUSDC
+					)
+				}
+			}
+
+			for i, val := range cfg.Validators {
+				if val.Tokens == nil {
+					tk := sdk.NewInt(900000000000000)
+					cfg.Validators[i].Tokens = &tk
+				}
+
+				if val.DelegatorShares == nil {
+					shares := sdk.MustNewDecFromStr("10000000")
+					cfg.Validators[i].DelegatorShares = &shares
+				}
+			}
+
 			sctx.Logger.Info(fmt.Sprintf("loaded config from %s", cfgFilePath))
 
 			if name, _ := cmd.Flags().GetString(KeyTestnetTriggerUpgrade); name != "" {
@@ -296,7 +321,7 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type
 		return nil, node.ErrSaveGenesisDocHash{Err: err}
 	}
 
-	state, stateStore, _, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider, "")
+	state, stateStore, _, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider, hex.EncodeToString(updatedChecksum))
 	if err != nil {
 		return nil, err
 	}
@@ -346,6 +371,9 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type
 			Moniker:           val.Moniker,
 			Commission:        val.Commission,
 			MinSelfDelegation: val.MinSelfDelegation,
+			Tokens:            *val.Tokens,
+			DelegatorShares:   *val.DelegatorShares,
+			Status:            val.Status,
 		})
 
 		tcfg.Validators[i].privValidator = privValidator
@@ -450,12 +478,12 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type
 		newValidators = append(newValidators, &cmttypes.Validator{
 			Address:     val.validatorAddress,
 			PubKey:      val.pubKey,
-			VotingPower: 900000000000000,
+			VotingPower: val.Tokens.Int64(),
 		})
 	}
 
 	// Replace all valSets in state to be the valSet with just our validator.
-	// and set the very first validator as proposer
+	// and set the very first validator as a proposer
 	newValSet := &cmttypes.ValidatorSet{
 		Validators: newValidators,
 		Proposer:   newValidators[0],