address comments

x/axelarnet/keeper/migrate.go

@@ -6,6 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/axelarnetwork/axelar-core/x/axelarnet/types"
+	nexus "github.com/axelarnetwork/axelar-core/x/nexus/types"
 )
 
 // Migrate6to7 returns the handler that performs in-place store migrations from version 6 to 7
@@ -14,17 +15,25 @@ func Migrate6to7(k Keeper, bankK types.BankKeeper, accountK types.AccountKeeper,
 	return func(ctx sdk.Context) error {
 		// Failed IBC transfers are held in Axelarnet module account for later retry.
 		// This migration escrows tokens back to escrow accounts so that we can use the same code path for retry.
-		moduleAccount := accountK.GetModuleAddress(types.ModuleName)
+		axelarnetModuleAccount := accountK.GetModuleAddress(types.ModuleName)
+		nexusModuleAccount := accountK.GetModuleAddress(nexus.ModuleName)
 
-		balances := bankK.SpendableCoins(ctx, moduleAccount)
+		balances := bankK.SpendableCoins(ctx, axelarnetModuleAccount)
 		for _, coin := range balances {
 			asset, err := nexusK.NewLockableAsset(ctx, ibcK, bankK, coin)
 			if err != nil {
 				k.Logger(ctx).Info(fmt.Sprintf("coin %s is not a lockable asset", coin), "error", err)
 				continue
 			}
 
-			err = asset.LockFrom(ctx, moduleAccount)
+			// Transfer coins from the Axelarnet module account to the Nexus module account for subsequent locking,
+			// as the Axelarnet module account is now restricted from sending coins.
+			err = bankK.SendCoinsFromModuleToModule(ctx, axelarnetModuleAccount.String(), nexusModuleAccount.String(), sdk.NewCoins(asset.GetAsset()))
+			if err != nil {
+				return err
+			}
+
+			err = asset.LockFrom(ctx, nexusModuleAccount)
 			if err != nil {
 				return err
 			}

x/axelarnet/keeper/migrate_test.go

@@ -35,7 +35,11 @@ func TestMigrate6to7(t *testing.T) {
 	ctx := sdk.NewContext(fake.NewMultiStore(), tmproto.Header{}, false, log.TestingLogger())
 
 	Given("keeper setup before migration", func() {
-		bank = &mock.BankKeeperMock{}
+		bank = &mock.BankKeeperMock{
+			SendCoinsFromModuleToModuleFunc: func(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error {
+				return nil
+			},
+		}
 		account = &mock.AccountKeeperMock{
 			GetModuleAddressFunc: func(_ string) sdk.AccAddress {
 				return rand.AccAddr()