Bind Transfer Port on InitChain

simapp/app.go

@@ -247,7 +247,8 @@ func NewSimApp(
 	// Create Transfer Keepers
 	app.TransferKeeper = transfer.NewKeeper(
 		app.cdc, keys[transfer.StoreKey],
-		app.IBCKeeper.ChannelKeeper, app.BankKeeper, app.SupplyKeeper,
+		app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
+		app.BankKeeper, app.SupplyKeeper,
 		scopedTransferKeeper,
 	)
 	transferModule := transfer.NewAppModule(app.TransferKeeper)
@@ -289,6 +290,7 @@ func NewSimApp(
 		auth.ModuleName, distr.ModuleName, staking.ModuleName, bank.ModuleName,
 		slashing.ModuleName, gov.ModuleName, mint.ModuleName, supply.ModuleName,
 		crisis.ModuleName, ibc.ModuleName, genutil.ModuleName, evidence.ModuleName,
+		transfer.ModuleName,
 	)
 
 	app.mm.RegisterInvariants(&app.CrisisKeeper)

types/module/module.go

@@ -260,10 +260,6 @@ func (m *Manager) RegisterRoutes(router sdk.Router, queryRouter sdk.QueryRouter)
 func (m *Manager) InitGenesis(ctx sdk.Context, cdc codec.JSONMarshaler, genesisData map[string]json.RawMessage) abci.ResponseInitChain {
 	var validatorUpdates []abci.ValidatorUpdate
 	for _, moduleName := range m.OrderInitGenesis {
-		if genesisData[moduleName] == nil {
-			continue
-		}
-
 		moduleValUpdates := m.Modules[moduleName].InitGenesis(ctx, cdc, genesisData[moduleName])
 
 		// use these validator updates if provided, the module manager assumes

x/ibc/20-transfer/genesis.go

@@ -9,6 +9,12 @@ import (
 
 // InitGenesis sets distribution information for genesis
 func InitGenesis(ctx sdk.Context, keeper Keeper) {
+	// transfer module binds to the transfer port on InitChain
+	// and claims the returned capability
+	err := keeper.BindPort(ctx, types.PortID)
+	if err != nil {
+		panic(fmt.Sprintf("could not claim port capability: %v", err))
+	}
 	// check if the module account exists
 	moduleAcc := keeper.GetTransferAccount(ctx)
 	if moduleAcc == nil {

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

@@ -11,6 +11,7 @@ import (
 	"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"
@@ -26,16 +27,19 @@ type Keeper struct {
 	storeKey sdk.StoreKey
 	cdc      *codec.Codec
 
-	channelKeeper types.ChannelKeeper
-	bankKeeper    types.BankKeeper
-	supplyKeeper  types.SupplyKeeper
-	scopedKeeper  capability.ScopedKeeper
+	clientKeeper     types.ClientKeeper
+	connectionKeeper types.ConnectionKeeper
+	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,
+	channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper,
 	bankKeeper types.BankKeeper, supplyKeeper types.SupplyKeeper,
 	scopedKeeper capability.ScopedKeeper,
 ) Keeper {
@@ -49,6 +53,7 @@ func NewKeeper(
 		storeKey:      key,
 		cdc:           cdc,
 		channelKeeper: channelKeeper,
+		portKeeper:    portKeeper,
 		bankKeeper:    bankKeeper,
 		supplyKeeper:  supplyKeeper,
 		scopedKeeper:  scopedKeeper,
@@ -82,6 +87,13 @@ func (k Keeper) ChanCloseInit(ctx sdk.Context, portID, channelID string) error {
 	return k.channelKeeper.ChanCloseInit(ctx, portID, channelID, chanCap)
 }
 
+// BindPort defines a wrapper function for the ort Keeper's function in
+// order to expose it to module's InitGenesis function
+func (k Keeper) BindPort(ctx sdk.Context, portID string) error {
+	cap := k.portKeeper.BindPort(ctx, portID)
+	return k.ClaimCapability(ctx, cap, porttypes.PortPath(portID))
+}
+
 // TimeoutExecuted defines a wrapper function for the channel Keeper's function
 // in order to expose it to the ICS20 transfer handler.
 func (k Keeper) TimeoutExecuted(ctx sdk.Context, packet channelexported.PacketI) error {

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

@@ -35,6 +35,11 @@ type ConnectionKeeper interface {
 	GetConnection(ctx sdk.Context, connectionID string) (connection connection.ConnectionEnd, found bool)
 }
 
+// PortKeeper defines the expected IBC port keeper
+type PortKeeper interface {
+	BindPort(ctx sdk.Context, portID string) *capability.Capability
+}
+
 // SupplyKeeper expected supply keeper
 type SupplyKeeper interface {
 	GetModuleAddress(name string) sdk.AccAddress