refactor(cmd/testnetify): improve multi-validator test environment

Signed-off-by: Artur Troian <[email protected]>

Author: troian

app/export.go

@@ -254,7 +254,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

@@ -26,13 +26,20 @@ import (
 	utypes "pkg.akt.dev/node/upgrades/types"
 )
 
+type TestnetDelegation struct {
+	Address sdk.AccAddress `json:"address"`
+	Amount  sdk.Coin       `json:"amount"`
+}
+
 type TestnetValidator struct {
 	OperatorAddress   sdk.Address
 	ConsensusAddress  sdk.ConsAddress
 	ConsensusPubKey   *types.Any
+	Status            stakingtypes.BondStatus
 	Moniker           string
 	Commission        stakingtypes.Commission
 	MinSelfDelegation sdkmath.Int
+	Delegations       []TestnetDelegation
 }
 
 type TestnetGov struct {
@@ -44,8 +51,13 @@ type TestnetUpgrade struct {
 	Name string
 }
 
+type TestnetAccount struct {
+	Address  sdk.AccAddress `json:"address"`
+	Balances []sdk.Coin     `json:"balances"`
+}
+
 type TestnetConfig struct {
-	Accounts   []sdk.AccAddress
+	Accounts   []TestnetAccount
 	Validators []TestnetValidator
 	Gov        TestnetGov
 	Upgrade    TestnetUpgrade
@@ -81,14 +93,14 @@ func InitAkashAppForTestnet(
 	stakingStore := ctx.KVStore(stakingKey)
 	iterator, err := app.Keepers.Cosmos.Staking.ValidatorsPowerStoreIterator(ctx)
 	if err != nil {
-		return nil
+		panic(err.Error())
 	}
 	for ; iterator.Valid(); iterator.Next() {
 		stakingStore.Delete(iterator.Key())
 	}
 	_ = iterator.Close()
 
-	// Remove all validators from last validators store
+	// Remove all validators from the last validators store
 	iterator, err = app.Keepers.Cosmos.Staking.LastValidatorsIterator(ctx)
 	if err != nil {
 		return nil
@@ -98,7 +110,7 @@ func InitAkashAppForTestnet(
 	}
 	_ = iterator.Close()
 
-	// Remove all validators from validator store
+	// Remove all validators from the validator store
 	iterator = storetypes.KVStorePrefixIterator(stakingStore, stakingtypes.ValidatorsKey)
 	for ; iterator.Valid(); iterator.Next() {
 		stakingStore.Delete(iterator.Key())
@@ -112,14 +124,29 @@ func InitAkashAppForTestnet(
 	}
 	_ = iterator.Close()
 
+	// BANK
+	//
+
+	// Fund localakash accounts
+	for _, account := range tcfg.Accounts {
+		err := app.Keepers.Cosmos.Bank.MintCoins(ctx, minttypes.ModuleName, account.Balances)
+		if err != nil {
+			panic(err.Error())
+		}
+		err = app.Keepers.Cosmos.Bank.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, account.Address, account.Balances)
+		if err != nil {
+			panic(err.Error())
+		}
+	}
+
 	for _, val := range tcfg.Validators {
 		_, bz, err := bech32.DecodeAndConvert(val.OperatorAddress.String())
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		bech32Addr, err := bech32.ConvertAndEncode("akashvaloper", bz)
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 
 		// Create Validator struct for our new validator.
@@ -128,41 +155,35 @@ func InitAkashAppForTestnet(
 			ConsensusPubkey: val.ConsensusPubKey,
 			Jailed:          false,
 			Status:          stakingtypes.Bonded,
-			Tokens:          sdkmath.NewInt(900000000000000),
-			DelegatorShares: sdkmath.LegacyMustNewDecFromStr("10000000"),
+			Tokens:          sdkmath.NewInt(0),
+			DelegatorShares: sdkmath.LegacyMustNewDecFromStr("0"),
 			Description: stakingtypes.Description{
-				Moniker: "Testnet Validator",
-			},
-			Commission: stakingtypes.Commission{
-				CommissionRates: stakingtypes.CommissionRates{
-					Rate:          sdkmath.LegacyMustNewDecFromStr("0.05"),
-					MaxRate:       sdkmath.LegacyMustNewDecFromStr("0.1"),
-					MaxChangeRate: sdkmath.LegacyMustNewDecFromStr("0.05"),
-				},
+				Moniker: val.Moniker,
 			},
-			MinSelfDelegation: sdkmath.OneInt(),
+			Commission:        val.Commission,
+			MinSelfDelegation: val.MinSelfDelegation,
 		}
 
 		// Add our validator to power and last validators store
 		err = app.Keepers.Cosmos.Staking.SetValidator(ctx, newVal)
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		err = app.Keepers.Cosmos.Staking.SetValidatorByConsAddr(ctx, newVal)
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		err = app.Keepers.Cosmos.Staking.SetValidatorByPowerIndex(ctx, newVal)
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		valAddr, err := sdk.ValAddressFromBech32(newVal.GetOperator())
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		err = app.Keepers.Cosmos.Staking.SetLastValidatorPower(ctx, valAddr, 0)
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		if err := app.Keepers.Cosmos.Staking.Hooks().AfterValidatorCreated(ctx, valAddr); err != nil {
 			panic(err)
@@ -174,23 +195,23 @@ func InitAkashAppForTestnet(
 		// Initialize records for this validator across all distribution stores
 		valAddr, err = sdk.ValAddressFromBech32(newVal.GetOperator())
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		err = app.Keepers.Cosmos.Distr.SetValidatorHistoricalRewards(ctx, valAddr, 0, distrtypes.NewValidatorHistoricalRewards(sdk.DecCoins{}, 1))
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		err = app.Keepers.Cosmos.Distr.SetValidatorCurrentRewards(ctx, valAddr, distrtypes.NewValidatorCurrentRewards(sdk.DecCoins{}, 1))
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		err = app.Keepers.Cosmos.Distr.SetValidatorAccumulatedCommission(ctx, valAddr, distrtypes.InitialValidatorAccumulatedCommission())
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 		err = app.Keepers.Cosmos.Distr.SetValidatorOutstandingRewards(ctx, valAddr, distrtypes.ValidatorOutstandingRewards{Rewards: sdk.DecCoins{}})
 		if err != nil {
-			return nil
+			panic(err.Error())
 		}
 
 		// SLASHING
@@ -205,7 +226,19 @@ func InitAkashAppForTestnet(
 		}
 		err = app.Keepers.Cosmos.Slashing.SetValidatorSigningInfo(ctx, newConsAddr, newValidatorSigningInfo)
 		if err != nil {
-			return nil
+			panic(err.Error())
+		}
+
+		for _, del := range val.Delegations {
+			vl, err := app.Keepers.Cosmos.Staking.GetValidator(ctx, valAddr)
+			if err != nil {
+				panic(err.Error())
+			}
+
+			_, err = app.Keepers.Cosmos.Staking.Delegate(ctx, del.Address, del.Amount.Amount, stakingtypes.Unbonded, vl, true)
+			if err != nil {
+				panic(err)
+			}
 		}
 	}
 	//
@@ -217,7 +250,7 @@ func InitAkashAppForTestnet(
 
 	govParams, err := app.Keepers.Cosmos.Gov.Params.Get(ctx)
 	if err != nil {
-		return nil
+		panic(err.Error())
 	}
 	govParams.ExpeditedVotingPeriod = &tcfg.Gov.ExpeditedVotePeriod
 	govParams.VotingPeriod = &tcfg.Gov.VotePeriod
@@ -226,27 +259,7 @@ func InitAkashAppForTestnet(
 
 	err = app.Keepers.Cosmos.Gov.Params.Set(ctx, govParams)
 	if err != nil {
-		return nil
-	}
-
-	// BANK
-	//
-
-	defaultCoins := sdk.NewCoins(
-		sdk.NewInt64Coin("uakt", 1000000000000),
-		sdk.NewInt64Coin("ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84", 1000000000000), // axlUSDC
-	)
-
-	// Fund localakash accounts
-	for _, account := range tcfg.Accounts {
-		err := app.Keepers.Cosmos.Bank.MintCoins(ctx, minttypes.ModuleName, defaultCoins)
-		if err != nil {
-			return nil
-		}
-		err = app.Keepers.Cosmos.Bank.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, account, defaultCoins)
-		if err != nil {
-			return nil
-		}
+		panic(err.Error())
 	}
 
 	// UPGRADE

cmd/akash/cmd/testnetify/config.go

@@ -42,12 +42,13 @@ type ConsAddress struct {
 }
 
 type TestnetValidator struct {
-	Moniker           string                  `json:"moniker"`
-	Operator          AccAddress              `json:"operator"`
-	Bonded            bool                    `json:"bonded"`
-	Commission        stakingtypes.Commission `json:"commission"`
-	MinSelfDelegation sdkmath.Int             `json:"min_self_delegation"`
-	Home              string                  `json:"home"`
+	Moniker           string                    `json:"moniker"`
+	Operator          AccAddress                `json:"operator"`
+	Status            stakingtypes.BondStatus   `json:"status"`
+	Commission        stakingtypes.Commission   `json:"commission"`
+	MinSelfDelegation sdkmath.Int               `json:"min_self_delegation"`
+	Home              string                    `json:"home"`
+	Delegations       []akash.TestnetDelegation `json:"delegations"`
 
 	privValidator    *pvm.FilePV
 	pubKey           crypto.PubKey
@@ -58,10 +59,10 @@ type TestnetValidator struct {
 type TestnetValidators []TestnetValidator
 
 type TestnetConfig struct {
-	ChainID    string            `json:"chain_id"`
-	Validators TestnetValidators `json:"validators"`
-	Accounts   []sdk.AccAddress  `json:"accounts"`
-	Gov        akash.TestnetGov  `json:"gov"`
+	ChainID    string                 `json:"chain_id"`
+	Validators TestnetValidators      `json:"validators"`
+	Accounts   []akash.TestnetAccount `json:"accounts"`
+	Gov        akash.TestnetGov       `json:"gov"`
 	upgrade    akash.TestnetUpgrade
 }
 

cmd/akash/cmd/testnetify/testnetify.go

@@ -3,6 +3,7 @@ package testnetify
 import (
 	"bufio"
 	"context"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -34,6 +35,7 @@ import (
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	"github.com/cosmos/cosmos-sdk/server/types"
 	"github.com/cosmos/cosmos-sdk/telemetry"
+	sdktypes "github.com/cosmos/cosmos-sdk/types"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 
 	cflags "pkg.akt.dev/go/cli/flags"
@@ -111,6 +113,17 @@ 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 = sdktypes.NewCoins(acc.Balances...)
+				} else {
+					cfg.Accounts[i].Balances = sdktypes.NewCoins(
+						sdktypes.NewInt64Coin("uakt", 10000000000000),
+						sdktypes.NewInt64Coin("ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84", 1000000000000), // axlUSDC
+					)
+				}
+			}
+
 			sctx.Logger.Info(fmt.Sprintf("loaded config from %s", cfgFilePath))
 
 			if name, _ := cmd.Flags().GetString(cflags.KeyTestnetTriggerUpgrade); name != "" {
@@ -328,7 +341,7 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type
 		DiscardABCIResponses: config.Storage.DiscardABCIResponses,
 	})
 
-	state, genDoc, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider, "")
+	state, genDoc, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider, hex.EncodeToString(updatedChecksum))
 	if err != nil {
 		return nil, err
 	}
@@ -375,9 +388,11 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type
 			OperatorAddress:   val.Operator,
 			ConsensusAddress:  pubKey.Address().Bytes(),
 			ConsensusPubKey:   consensusPubkey,
+			Status:            val.Status,
 			Moniker:           val.Moniker,
 			Commission:        val.Commission,
 			MinSelfDelegation: val.MinSelfDelegation,
+			Delegations:       val.Delegations,
 		})
 
 		tcfg.Validators[i].privValidator = privValidator
@@ -480,10 +495,16 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type
 			Signature:        voteProto.Signature,
 		})
 
+		var vp int64
+
+		for _, del := range val.Delegations {
+			vp += del.Amount.Amount.Quo(sdktypes.DefaultPowerReduction).Int64()
+		}
+
 		newValidators = append(newValidators, &cmttypes.Validator{
 			Address:     val.validatorAddress,
 			PubKey:      val.pubKey,
-			VotingPower: 900000000000000,
+			VotingPower: vp,
 		})
 	}