move balances from axelarnet module account to nexus

app/app.go

@@ -596,6 +596,8 @@ func initAppModules(keepers *KeeperCache, bApp *bam.BaseApp, encodingConfig axel
 			GetKeeper[stakingkeeper.Keeper](keepers),
 			GetKeeper[axelarnetKeeper.Keeper](keepers),
 			GetKeeper[rewardKeeper.Keeper](keepers),
+			GetKeeper[bankkeeper.BaseKeeper](keepers),
+			GetKeeper[authkeeper.AccountKeeper](keepers),
 		),
 		evm.NewAppModule(
 			GetKeeper[evmKeeper.BaseKeeper](keepers),

x/axelarnet/types/expected_keepers.go

@@ -102,6 +102,8 @@ type BankKeeper interface {
 	IsSendEnabledCoins(ctx sdk.Context, coins ...sdk.Coin) error
 	BlockedAddr(addr sdk.AccAddress) bool
 	SpendableBalance(ctx sdk.Context, address sdk.AccAddress, denom string) sdk.Coin
+	SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error
+	GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
 }
 
 // IBCTransferKeeper provides functionality to manage IBC transfers

x/nexus/keeper/lockable_coin_test.go

@@ -4,6 +4,12 @@ import (
 	"fmt"
 	"testing"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	ibctypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/tendermint/tendermint/libs/log"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+
 	"github.com/axelarnetwork/axelar-core/testutils/fake"
 	"github.com/axelarnetwork/axelar-core/testutils/rand"
 	axelarnet "github.com/axelarnetwork/axelar-core/x/axelarnet/exported"
@@ -13,11 +19,6 @@ import (
 	"github.com/axelarnetwork/axelar-core/x/nexus/types/mock"
 	"github.com/axelarnetwork/utils/funcs"
 	. "github.com/axelarnetwork/utils/test"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	ibctypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 )
 
 func TestLockableCoin(t *testing.T) {

x/nexus/keeper/migrate.go

@@ -3,23 +3,23 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	axelarnettypes "github.com/axelarnetwork/axelar-core/x/axelarnet/types"
 	"github.com/axelarnetwork/axelar-core/x/nexus/types"
 )
 
-// Migrate6to7 returns the handler that performs in-place store migrations
-func Migrate6to7(k Keeper) func(ctx sdk.Context) error {
+// Migrate7to8 returns the handler that performs in-place store migrations
+func Migrate7to8(_ Keeper, bank types.BankKeeper, account types.AccountKeeper) func(ctx sdk.Context) error {
 	return func(ctx sdk.Context) error {
-		addModuleParamGateway(ctx, k)
-		addModuleParamEndBlockerLimit(ctx, k)
+		if err := sendCoinsFromAxelarnetToNexus(ctx, bank, account); err != nil {
+			return err
+		}
 
 		return nil
 	}
 }
 
-func addModuleParamGateway(ctx sdk.Context, k Keeper) {
-	k.params.Set(ctx, types.KeyGateway, types.DefaultParams().Gateway)
-}
+func sendCoinsFromAxelarnetToNexus(ctx sdk.Context, bank types.BankKeeper, account types.AccountKeeper) error {
+	balances := bank.GetAllBalances(ctx, account.GetModuleAddress(axelarnettypes.ModuleName))
 
-func addModuleParamEndBlockerLimit(ctx sdk.Context, k Keeper) {
-	k.params.Set(ctx, types.KeyEndBlockerLimit, types.DefaultParams().EndBlockerLimit)
+	return bank.SendCoinsFromModuleToModule(ctx, axelarnettypes.ModuleName, types.ModuleName, balances)
 }

x/nexus/keeper/migrate_test.go

@@ -11,55 +11,50 @@ import (
 
 	"github.com/axelarnetwork/axelar-core/app"
 	"github.com/axelarnetwork/axelar-core/testutils/fake"
+	"github.com/axelarnetwork/axelar-core/testutils/rand"
+	axelarnettypes "github.com/axelarnetwork/axelar-core/x/axelarnet/types"
 	"github.com/axelarnetwork/axelar-core/x/nexus/keeper"
 	"github.com/axelarnetwork/axelar-core/x/nexus/types"
-	. "github.com/axelarnetwork/utils/test"
+	"github.com/axelarnetwork/axelar-core/x/nexus/types/mock"
 )
 
-func TestMigrate6to7(t *testing.T) {
+func TestMigrate7to8(t *testing.T) {
 	encCfg := app.MakeEncodingConfig()
 	subspace := params.NewSubspace(encCfg.Codec, encCfg.Amino, sdk.NewKVStoreKey("nexusKey"), sdk.NewKVStoreKey("tNexusKey"), "nexus")
 	k := keeper.NewKeeper(encCfg.Codec, sdk.NewKVStoreKey("nexus"), subspace)
 	ctx := sdk.NewContext(fake.NewMultiStore(), tmproto.Header{}, false, log.TestingLogger())
 
-	Given("subspace is setup with params before migration", func() {
-		subspace.Set(ctx, types.KeyChainActivationThreshold, types.DefaultParams().ChainActivationThreshold)
-		subspace.Set(ctx, types.KeyChainMaintainerMissingVoteThreshold, types.DefaultParams().ChainMaintainerMissingVoteThreshold)
-		subspace.Set(ctx, types.KeyChainMaintainerIncorrectVoteThreshold, types.DefaultParams().ChainMaintainerIncorrectVoteThreshold)
-		subspace.Set(ctx, types.KeyChainMaintainerCheckWindow, types.DefaultParams().ChainMaintainerCheckWindow)
-	}).
-		When("", func() {}).
-		Then("the migration should add the new param with the default value", func(t *testing.T) {
-			actualGateway := sdk.AccAddress{}
-			actualEndBlockerLimit := uint64(0)
-
-			assert.PanicsWithError(t, "UnmarshalJSON cannot decode empty bytes", func() {
-				subspace.Get(ctx, types.KeyGateway, &actualGateway)
-			})
-			assert.PanicsWithError(t, "UnmarshalJSON cannot decode empty bytes", func() {
-				subspace.Get(ctx, types.KeyEndBlockerLimit, &actualEndBlockerLimit)
-			})
-			assert.PanicsWithError(t, "UnmarshalJSON cannot decode empty bytes", func() {
-				k.GetParams(ctx)
-			})
-
-			keeper.Migrate6to7(k)(ctx)
-
-			assert.NotPanics(t, func() {
-				subspace.Get(ctx, types.KeyGateway, &actualGateway)
-			})
-			assert.NotPanics(t, func() {
-				subspace.Get(ctx, types.KeyEndBlockerLimit, &actualEndBlockerLimit)
-			})
-			assert.NotPanics(t, func() {
-				k.GetParams(ctx)
-			})
-
-			assert.Equal(t, types.DefaultParams().Gateway, actualGateway)
-			assert.Equal(t, types.DefaultParams().Gateway, k.GetParams(ctx).Gateway)
-			assert.Equal(t, types.DefaultParams().EndBlockerLimit, actualEndBlockerLimit)
-			assert.Equal(t, types.DefaultParams().EndBlockerLimit, k.GetParams(ctx).EndBlockerLimit)
-		}).
-		Run(t)
-
+	t.Run("sendCoinsFromAxelarnetToNexus", func(t *testing.T) {
+		bank := &mock.BankKeeperMock{}
+		account := &mock.AccountKeeperMock{}
+		balances := sdk.NewCoins(rand.Coin(), rand.Coin(), rand.Coin())
+		axelarnetModuleAccount := rand.AccAddr()
+		nexusModuleAccount := rand.AccAddr()
+
+		account.GetModuleAddressFunc = func(name string) sdk.AccAddress {
+			switch name {
+			case axelarnettypes.ModuleName:
+				return axelarnetModuleAccount
+			case types.ModuleName:
+				return nexusModuleAccount
+			default:
+				return sdk.AccAddress{}
+			}
+		}
+		bank.GetAllBalancesFunc = func(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins {
+			if addr.Equals(axelarnetModuleAccount) {
+				return balances
+			}
+			return sdk.NewCoins()
+		}
+		bank.SendCoinsFromModuleToModuleFunc = func(ctx sdk.Context, sender, recipient string, coins sdk.Coins) error { return nil }
+
+		err := keeper.Migrate7to8(k, bank, account)(ctx)
+
+		assert.NoError(t, err)
+		assert.Len(t, bank.SendCoinsFromModuleToModuleCalls(), 1)
+		assert.Equal(t, axelarnettypes.ModuleName, bank.SendCoinsFromModuleToModuleCalls()[0].SenderModule)
+		assert.Equal(t, types.ModuleName, bank.SendCoinsFromModuleToModuleCalls()[0].RecipientModule)
+		assert.Equal(t, balances, bank.SendCoinsFromModuleToModuleCalls()[0].Amt)
+	})
 }

x/nexus/module.go

@@ -89,10 +89,12 @@ type AppModule struct {
 	staking     types.StakingKeeper
 	axelarnet   types.AxelarnetKeeper
 	reward      types.RewardKeeper
+	bank        types.BankKeeper
+	account     types.AccountKeeper
 }
 
 // NewAppModule creates a new AppModule object
-func NewAppModule(k keeper.Keeper, snapshotter types.Snapshotter, slashing types.SlashingKeeper, staking types.StakingKeeper, axelarnet types.AxelarnetKeeper, reward types.RewardKeeper) AppModule {
+func NewAppModule(k keeper.Keeper, snapshotter types.Snapshotter, slashing types.SlashingKeeper, staking types.StakingKeeper, axelarnet types.AxelarnetKeeper, reward types.RewardKeeper, bank types.BankKeeper, account types.AccountKeeper) AppModule {
 	return AppModule{
 		AppModuleBasic: AppModuleBasic{},
 		keeper:         k,
@@ -101,6 +103,8 @@ func NewAppModule(k keeper.Keeper, snapshotter types.Snapshotter, slashing types
 		staking:        staking,
 		axelarnet:      axelarnet,
 		reward:         reward,
+		bank:           bank,
+		account:        account,
 	}
 }
 
@@ -116,7 +120,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServiceServer(grpc.ServerWithSDKErrors{Server: cfg.MsgServer(), Err: types.ErrNexus, Logger: am.keeper.Logger}, msgServer)
 	types.RegisterQueryServiceServer(cfg.QueryServer(), keeper.NewGRPCQuerier(am.keeper, am.axelarnet))
 
-	err := cfg.RegisterMigration(types.ModuleName, 6, keeper.Migrate6to7(am.keeper))
+	err := cfg.RegisterMigration(types.ModuleName, 7, keeper.Migrate7to8(am.keeper, am.bank, am.account))
 	if err != nil {
 		panic(err)
 	}
@@ -167,4 +171,4 @@ func (am AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier {
 }
 
 // ConsensusVersion implements AppModule/ConsensusVersion.
-func (AppModule) ConsensusVersion() uint64 { return 7 }
+func (AppModule) ConsensusVersion() uint64 { return 8 }

x/nexus/types/expected_keepers.go

@@ -111,6 +111,8 @@ type BankKeeper interface {
 	SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error
 	SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 	SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
+	SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error
+	GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
 	BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
 	MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
 }