Update x/ibc

x/ibc/20-transfer/handler_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/bank"
 	connectionexported "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/exported"
 	connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
 	channelexported "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
@@ -22,7 +23,6 @@ import (
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	ibctypes "github.com/cosmos/cosmos-sdk/x/ibc/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
-	"github.com/cosmos/cosmos-sdk/x/supply"
 )
 
 // define constants used for testing
@@ -111,7 +111,7 @@ func (suite *HandlerTestSuite) TestHandleMsgTransfer() {
 	suite.Require().Nil(res, "%+v", res) // incorrect denom prefix
 
 	msg = transfer.NewMsgTransfer(testPort1, testChannel1, 10, testPrefixedCoins1, testAddr1, testAddr2)
-	suite.chainA.App.SupplyKeeper.SetSupply(ctx, supply.NewSupply(testPrefixedCoins1))
+	suite.chainA.App.BankKeeper.SetSupply(ctx, bank.NewSupply(testPrefixedCoins1))
 	_ = suite.chainA.App.BankKeeper.SetBalances(ctx, testAddr1, testPrefixedCoins1)
 
 	res, err = handler(ctx, msg)

x/ibc/20-transfer/keeper/keeper.go

@@ -8,13 +8,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
 	"github.com/cosmos/cosmos-sdk/x/capability"
 	channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel"
 	channelexported "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
 	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/20-transfer/types"
 	ibctypes "github.com/cosmos/cosmos-sdk/x/ibc/types"
-	supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported"
 )
 
 // DefaultPacketTimeout is the default packet timeout relative to the current block height
@@ -30,20 +30,18 @@ type Keeper struct {
 	channelKeeper types.ChannelKeeper
 	portKeeper    types.PortKeeper
 	bankKeeper    types.BankKeeper
-	supplyKeeper  types.SupplyKeeper
 	scopedKeeper  capability.ScopedKeeper
 }
 
 // NewKeeper creates a new IBC transfer Keeper instance
 func NewKeeper(
 	cdc *codec.Codec, key sdk.StoreKey,
 	channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper,
-	bankKeeper types.BankKeeper, supplyKeeper types.SupplyKeeper,
-	scopedKeeper capability.ScopedKeeper,
+	bankKeeper types.BankKeeper, scopedKeeper capability.ScopedKeeper,
 ) Keeper {
 
 	// ensure ibc transfer module account is set
-	if addr := supplyKeeper.GetModuleAddress(types.GetModuleAccountName()); addr == nil {
+	if addr := bankKeeper.GetModuleAddress(types.GetModuleAccountName()); addr == nil {
 		panic("the IBC transfer module account has not been set")
 	}
 
@@ -53,7 +51,6 @@ func NewKeeper(
 		channelKeeper: channelKeeper,
 		portKeeper:    portKeeper,
 		bankKeeper:    bankKeeper,
-		supplyKeeper:  supplyKeeper,
 		scopedKeeper:  scopedKeeper,
 	}
 }
@@ -64,8 +61,8 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
 }
 
 // GetTransferAccount returns the ICS20 - transfers ModuleAccount
-func (k Keeper) GetTransferAccount(ctx sdk.Context) supplyexported.ModuleAccountI {
-	return k.supplyKeeper.GetModuleAccount(ctx, types.GetModuleAccountName())
+func (k Keeper) GetTransferAccount(ctx sdk.Context) bankexported.ModuleAccountI {
+	return k.bankKeeper.GetModuleAccount(ctx, types.GetModuleAccountName())
 }
 
 // PacketExecuted defines a wrapper function for the channel Keeper's function

x/ibc/20-transfer/keeper/relay.go

@@ -105,14 +105,14 @@ func (k Keeper) createOutgoingPacket(
 		}
 
 		// transfer the coins to the module account and burn them
-		if err := k.supplyKeeper.SendCoinsFromAccountToModule(
+		if err := k.bankKeeper.SendCoinsFromAccountToModule(
 			ctx, sender, types.GetModuleAccountName(), amount,
 		); err != nil {
 			return err
 		}
 
 		// burn vouchers from the sender's balance if the source is from another chain
-		if err := k.supplyKeeper.BurnCoins(
+		if err := k.bankKeeper.BurnCoins(
 			ctx, types.GetModuleAccountName(), amount,
 		); err != nil {
 			// NOTE: should not happen as the module account was
@@ -151,14 +151,14 @@ func (k Keeper) OnRecvPacket(ctx sdk.Context, packet channel.Packet, data types.
 
 	if source {
 		// mint new tokens if the source of the transfer is the same chain
-		if err := k.supplyKeeper.MintCoins(
+		if err := k.bankKeeper.MintCoins(
 			ctx, types.GetModuleAccountName(), data.Amount,
 		); err != nil {
 			return err
 		}
 
 		// send to receiver
-		return k.supplyKeeper.SendCoinsFromModuleToAccount(
+		return k.bankKeeper.SendCoinsFromModuleToAccount(
 			ctx, types.GetModuleAccountName(), data.Receiver, data.Amount,
 		)
 	}
@@ -219,11 +219,11 @@ func (k Keeper) refundPacketAmount(ctx sdk.Context, packet channel.Packet, data
 	}
 
 	// mint vouchers back to sender
-	if err := k.supplyKeeper.MintCoins(
+	if err := k.bankKeeper.MintCoins(
 		ctx, types.GetModuleAccountName(), data.Amount,
 	); err != nil {
 		return err
 	}
 
-	return k.supplyKeeper.SendCoinsFromModuleToAccount(ctx, types.GetModuleAccountName(), data.Sender, data.Amount)
+	return k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.GetModuleAccountName(), data.Sender, data.Amount)
 }

x/ibc/20-transfer/keeper/relay_test.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/bank"
 	connectionexported "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/exported"
 	channelexported "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/20-transfer/types"
 	ibctypes "github.com/cosmos/cosmos-sdk/x/ibc/types"
-	"github.com/cosmos/cosmos-sdk/x/supply"
 )
 
 func (suite *KeeperTestSuite) TestSendTransfer() {
@@ -33,7 +33,7 @@ func (suite *KeeperTestSuite) TestSendTransfer() {
 			}, true, true},
 		{"successful transfer from external chain", prefixCoins,
 			func() {
-				suite.chainA.App.SupplyKeeper.SetSupply(suite.chainA.GetContext(), supply.NewSupply(prefixCoins))
+				suite.chainA.App.BankKeeper.SetSupply(suite.chainA.GetContext(), bank.NewSupply(prefixCoins))
 				_, err := suite.chainA.App.BankKeeper.AddCoins(suite.chainA.GetContext(), testAddr1, prefixCoins)
 				suite.Require().NoError(err)
 				suite.chainA.CreateClient(suite.chainB)

x/ibc/20-transfer/types/expected_keepers.go

@@ -2,17 +2,24 @@ package types
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
 	"github.com/cosmos/cosmos-sdk/x/capability"
 	clientexported "github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported"
 	connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection"
 	channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel"
 	channelexported "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
-	supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported"
 )
 
 // BankKeeper defines the expected bank keeper
 type BankKeeper interface {
 	SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error
+
+	GetModuleAddress(name string) sdk.AccAddress
+	GetModuleAccount(ctx sdk.Context, name string) bankexported.ModuleAccountI
+	MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
+	BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
+	SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
+	SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 }
 
 // ChannelKeeper defines the expected IBC channel keeper
@@ -41,10 +48,4 @@ type PortKeeper interface {
 
 // SupplyKeeper expected supply keeper
 type SupplyKeeper interface {
-	GetModuleAddress(name string) sdk.AccAddress
-	GetModuleAccount(ctx sdk.Context, name string) supplyexported.ModuleAccountI
-	MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
-	BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
-	SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
-	SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 }

x/staking/types/expected_keepers.go

@@ -3,7 +3,7 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
-	supplyexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
+	bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
 	stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported"
 )
 
@@ -27,13 +27,13 @@ type BankKeeper interface {
 	LockedCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
 	SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
 
-	GetSupply(ctx sdk.Context) supplyexported.SupplyI
+	GetSupply(ctx sdk.Context) bankexported.SupplyI
 
 	GetModuleAddress(name string) sdk.AccAddress
-	GetModuleAccount(ctx sdk.Context, moduleName string) supplyexported.ModuleAccountI
+	GetModuleAccount(ctx sdk.Context, moduleName string) bankexported.ModuleAccountI
 
 	// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
-	SetModuleAccount(sdk.Context, supplyexported.ModuleAccountI)
+	SetModuleAccount(sdk.Context, bankexported.ModuleAccountI)
 
 	SendCoinsFromModuleToModule(ctx sdk.Context, senderPool, recipientPool string, amt sdk.Coins) error
 	UndelegateCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error