refactor(nexus)!: refactor to move coin locking unlocking logic from …

…axelarnet to nexus (#2186)

Co-authored-by: Haiyi Zhong <[email protected]>

app/app.go

@@ -304,7 +304,6 @@ func NewAxelarApp(
 			*GetKeeper[axelarnetKeeper.IBCKeeper](keepers),
 			GetKeeper[nexusKeeper.Keeper](keepers),
 			axelarbankkeeper.NewBankKeeper(GetKeeper[bankkeeper.BaseKeeper](keepers)),
-			GetKeeper[authkeeper.AccountKeeper](keepers),
 			logger,
 		),
 	)
@@ -440,12 +439,10 @@ func initMessageRouter(keepers *KeeperCache) nexusTypes.MessageRouter {
 	messageRouter := nexusTypes.NewMessageRouter().
 		AddRoute(evmTypes.ModuleName, evmKeeper.NewMessageRoute()).
 		AddRoute(axelarnetTypes.ModuleName, axelarnetKeeper.NewMessageRoute(
-			*GetKeeper[axelarnetKeeper.Keeper](keepers),
 			GetKeeper[axelarnetKeeper.IBCKeeper](keepers),
 			GetKeeper[feegrantkeeper.Keeper](keepers),
 			axelarbankkeeper.NewBankKeeper(GetKeeper[bankkeeper.BaseKeeper](keepers)),
 			GetKeeper[nexusKeeper.Keeper](keepers),
-			GetKeeper[authkeeper.AccountKeeper](keepers),
 			GetKeeper[stakingkeeper.Keeper](keepers),
 		))
 
@@ -599,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),
@@ -718,10 +717,10 @@ func InitModuleAccountPermissions() map[string][]string {
 		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
 		govtypes.ModuleName:            {authtypes.Burner},
 		ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
-		axelarnetTypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
+		axelarnetTypes.ModuleName:      nil,
 		rewardTypes.ModuleName:         {authtypes.Minter},
 		wasm.ModuleName:                {authtypes.Burner},
-		nexusTypes.ModuleName:          nil,
+		nexusTypes.ModuleName:          {authtypes.Minter, authtypes.Burner},
 	}
 }
 

app/keepers.go

@@ -444,11 +444,11 @@ func initBankKeeper(appCodec codec.Codec, keys map[string]*sdk.KVStoreKey, keepe
 		GetKeeper[authkeeper.AccountKeeper](keepers),
 		keepers.getSubspace(banktypes.ModuleName),
 		maps.Filter(moduleAccountAddrs(moduleAccPerms), func(addr string, _ bool) bool {
-			// we do not rely on internal balance tracking for invariance checks in the axelarnet module
+			// we do not rely on internal balance tracking for invariance checks in the nexus module
 			// (https://github.com/cosmos/cosmos-sdk/issues/12825 for more details on the purpose of the blocked list),
-			// but the module address must be able to use ibc transfers,
+			// but the nexus module account must be able to send or receive coins to mint/burn them for cross-chain transfers,
 			// so we exclude this address from the blocked list
-			return addr != authtypes.NewModuleAddress(axelarnetTypes.ModuleName).String()
+			return addr != authtypes.NewModuleAddress(nexusTypes.ModuleName).String()
 		}),
 	)
 	return &bankK

x/ante/check_refund_test.go

@@ -31,6 +31,7 @@ import (
 	evm "github.com/axelarnetwork/axelar-core/x/evm/types"
 	multisig "github.com/axelarnetwork/axelar-core/x/multisig/types"
 	"github.com/axelarnetwork/axelar-core/x/nexus/exported"
+	nexustypes "github.com/axelarnetwork/axelar-core/x/nexus/types"
 	rewardtypes "github.com/axelarnetwork/axelar-core/x/reward/types"
 	snapshotkeeper "github.com/axelarnetwork/axelar-core/x/snapshot/keeper"
 	snapshottypes "github.com/axelarnetwork/axelar-core/x/snapshot/types"
@@ -200,8 +201,8 @@ func prepareAnteHandler(ctx sdk.Context, sender sdk.AccAddress, encConfig params
 	bankKeeper := app.GetKeeper[bankkeeper.BaseKeeper](axelarApp.Keepers)
 	bankKeeper.SetParams(ctx, banktypes.DefaultParams())
 	balance := sdk.NewCoins(sdk.NewInt64Coin("stake", 1e10))
-	funcs.MustNoErr(bankKeeper.MintCoins(ctx, axelarnet.ModuleName, balance))
-	funcs.MustNoErr(bankKeeper.SendCoinsFromModuleToAccount(ctx, axelarnet.ModuleName, sender, balance))
+	funcs.MustNoErr(bankKeeper.MintCoins(ctx, nexustypes.ModuleName, balance))
+	funcs.MustNoErr(bankKeeper.SendCoinsFromModuleToAccount(ctx, nexustypes.ModuleName, sender, balance))
 
 	stakingKeeper := app.GetKeeper[stakingkeeper.Keeper](axelarApp.Keepers)
 	stakingKeeper.SetParams(ctx, stakingtypes.DefaultParams())

x/axelarnet/abci_test.go

@@ -23,7 +23,6 @@ import (
 	"github.com/axelarnetwork/axelar-core/x/axelarnet/keeper"
 	"github.com/axelarnetwork/axelar-core/x/axelarnet/types"
 	"github.com/axelarnetwork/axelar-core/x/axelarnet/types/mock"
-	"github.com/axelarnetwork/axelar-core/x/axelarnet/types/testutils"
 	axelartestutils "github.com/axelarnetwork/axelar-core/x/axelarnet/types/testutils"
 	nexus "github.com/axelarnetwork/axelar-core/x/nexus/exported"
 	"github.com/axelarnetwork/utils/math"
@@ -108,7 +107,7 @@ func TestEndBlocker(t *testing.T) {
 					return false
 				}
 
-				transfer := testutils.RandomIBCTransfer()
+				transfer := axelartestutils.RandomIBCTransfer()
 				bz, _ := transfer.Marshal()
 				if err := value.Unmarshal(bz); err != nil {
 					panic(err)

x/axelarnet/handler.go

@@ -20,8 +20,8 @@ import (
 )
 
 // NewHandler returns the handler of the Cosmos module
-func NewHandler(k keeper.Keeper, n types.Nexus, b types.BankKeeper, a types.AccountKeeper, ibcK keeper.IBCKeeper) sdk.Handler {
-	server := keeper.NewMsgServerImpl(k, n, b, a, ibcK)
+func NewHandler(k keeper.Keeper, n types.Nexus, b types.BankKeeper, ibcK keeper.IBCKeeper) sdk.Handler {
+	server := keeper.NewMsgServerImpl(k, n, b, ibcK)
 	h := func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		ctx = ctx.WithEventManager(sdk.NewEventManager())
 		switch msg := msg.(type) {