From 499e96cf07354c206a7abd8b5c7ea8f77bbe770e Mon Sep 17 00:00:00 2001 From: David Terpay Date: Mon, 11 Sep 2023 15:52:23 -0400 Subject: [PATCH] back port fix --- tests/app/export.go | 16 ++++++++++++---- tests/app/testappd/cmd/root.go | 9 ++++----- tests/app/testappd/cmd/testnet.go | 17 ++++++++++++----- x/builder/keeper/msg_server_test.go | 4 ++-- x/builder/rewards/proposer_provider.go | 2 +- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/tests/app/export.go b/tests/app/export.go index 13f8b965..e0c75398 100644 --- a/tests/app/export.go +++ b/tests/app/export.go @@ -78,7 +78,11 @@ func (app *TestApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ // withdraw all validator commission err := app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { - _, _ = app.DistrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator()) + valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator()) + if err != nil { + panic(err) + } + _, _ = app.DistrKeeper.WithdrawValidatorCommission(ctx, valBz) return false }) if err != nil { @@ -113,9 +117,13 @@ func (app *TestApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ ctx = ctx.WithBlockHeight(0) // reinitialize all validators - app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + err = app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator()) + if err != nil { + panic(err) + } // donate any unwithdrawn outstanding reward fraction tokens to the community pool - scraps, err := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator()) + scraps, err := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valBz) if err != nil { panic(err) } @@ -128,7 +136,7 @@ func (app *TestApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ panic(err) } - if err := app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator()); err != nil { + if err := app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valBz); err != nil { panic(err) } return false diff --git a/tests/app/testappd/cmd/root.go b/tests/app/testappd/cmd/root.go index b3164534..8b86281f 100644 --- a/tests/app/testappd/cmd/root.go +++ b/tests/app/testappd/cmd/root.go @@ -14,7 +14,6 @@ import ( "cosmossdk.io/depinject" "cosmossdk.io/log" confixcmd "cosmossdk.io/tools/confix/cmd" - "github.com/skip-mev/block-sdk/tests/app" "github.com/cosmos/cosmos-sdk/client" @@ -199,8 +198,8 @@ lru_size = 0` func initRootCmd( rootCmd *cobra.Command, txConfig client.TxConfig, - _ codectypes.InterfaceRegistry, - _ codec.Codec, + interfaceRegistry codectypes.InterfaceRegistry, + appCodec codec.Codec, basicManager module.BasicManager, ) { cfg := sdk.GetConfig() @@ -219,11 +218,11 @@ func initRootCmd( // add keybase, auxiliary RPC, query, genesis, and tx child commands rootCmd.AddCommand( - rpc.StatusCommand(), + server.StatusCommand(), genesisCommand(txConfig, basicManager), queryCommand(), txCommand(), - keys.Commands(app.DefaultNodeHome), + keys.Commands(), ) } diff --git a/tests/app/testappd/cmd/testnet.go b/tests/app/testappd/cmd/testnet.go index 196016b8..cb21912c 100644 --- a/tests/app/testappd/cmd/testnet.go +++ b/tests/app/testappd/cmd/testnet.go @@ -24,6 +24,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" + "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/server" srvconfig "github.com/cosmos/cosmos-sdk/server/config" "github.com/cosmos/cosmos-sdk/testutil" @@ -145,7 +146,7 @@ Example: args.numValidators, _ = cmd.Flags().GetInt(flagNumValidators) args.algo, _ = cmd.Flags().GetString(flags.FlagKeyType) - return initTestnetFiles(clientCtx, cmd, config, mbm, genBalIterator, args) + return initTestnetFiles(clientCtx, cmd, config, mbm, genBalIterator, clientCtx.TxConfig.SigningContext().ValidatorAddressCodec(), args) }, } @@ -205,6 +206,7 @@ func initTestnetFiles( nodeConfig *cmtconfig.Config, mbm module.BasicManager, genBalIterator banktypes.GenesisBalancesIterator, + valAddrCodec runtime.ValidatorAddressCodec, args initArgs, ) error { if args.chainID == "" { @@ -297,9 +299,13 @@ func initTestnetFiles( genBalances = append(genBalances, banktypes.Balance{Address: addr.String(), Coins: coins.Sort()}) genAccounts = append(genAccounts, authtypes.NewBaseAccount(addr, nil, 0, 0)) + valStr, err := valAddrCodec.BytesToString(sdk.ValAddress(addr)) + if err != nil { + return err + } valTokens := sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction) createValMsg, err := stakingtypes.NewMsgCreateValidator( - sdk.ValAddress(addr), + valStr, valPubKeys[i], sdk.NewCoin(sdk.DefaultBondDenom, valTokens), stakingtypes.NewDescription(nodeDirName, "", "", "", ""), @@ -346,7 +352,7 @@ func initTestnetFiles( err := collectGenFiles( clientCtx, nodeConfig, args.chainID, nodeIDs, valPubKeys, args.numValidators, - args.outputDir, args.nodeDirPrefix, args.nodeDaemonHome, genBalIterator, + args.outputDir, args.nodeDirPrefix, args.nodeDaemonHome, genBalIterator, valAddrCodec, ) if err != nil { return err @@ -403,7 +409,7 @@ func initGenFiles( func collectGenFiles( clientCtx client.Context, nodeConfig *cmtconfig.Config, chainID string, nodeIDs []string, valPubKeys []cryptotypes.PubKey, numValidators int, - outputDir, nodeDirPrefix, nodeDaemonHome string, genBalIterator banktypes.GenesisBalancesIterator, + outputDir, nodeDirPrefix, nodeDaemonHome string, genBalIterator banktypes.GenesisBalancesIterator, valAddrCodec runtime.ValidatorAddressCodec, ) error { var appState json.RawMessage genTime := cmttime.Now() @@ -424,7 +430,8 @@ func collectGenFiles( return err } - nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, appGenesis, genBalIterator, genutiltypes.DefaultMessageValidator) + nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, appGenesis, genBalIterator, genutiltypes.DefaultMessageValidator, + valAddrCodec) if err != nil { return err } diff --git a/x/builder/keeper/msg_server_test.go b/x/builder/keeper/msg_server_test.go index 97e8a820..396dc89b 100644 --- a/x/builder/keeper/msg_server_test.go +++ b/x/builder/keeper/msg_server_test.go @@ -101,11 +101,11 @@ func (suite *KeeperTestSuite) TestMsgAuctionBid() { suite.bankKeeper.EXPECT(). SendCoins(suite.ctx, bidder.Address, proposerOperator.Address, sdk.NewCoins(sdk.NewInt64Coin("stake", 1024))). - Return(nil) + Return(nil).AnyTimes() suite.bankKeeper.EXPECT(). SendCoins(suite.ctx, bidder.Address, escrow.Address, sdk.NewCoins(sdk.NewInt64Coin("stake", 2392))). - Return(nil) + Return(nil).AnyTimes() }, expectErr: false, }, diff --git a/x/builder/rewards/proposer_provider.go b/x/builder/rewards/proposer_provider.go index dc326325..dc1b1ac2 100644 --- a/x/builder/rewards/proposer_provider.go +++ b/x/builder/rewards/proposer_provider.go @@ -37,5 +37,5 @@ func (p *ProposerRewardsAddressProvider) GetRewardsAddress(ctx sdk.Context) (sdk return nil, err } - return sdk.AccAddress(prevProposer.GetOperator()), nil + return sdk.AccAddressFromBech32(prevProposer.GetOperator()) }