fix build and address first review

simapp/app.go

@@ -180,7 +180,7 @@ func NewSimApp(
 	app.CapabilityKeeper = capability.NewKeeper(
 		app.cdc, keys[capability.StoreKey], memKeys[capability.MemStoreKey],
 	)
-	scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule("ibc")
+	scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibc.ModuleName)
 
 	// add keepers
 	app.AccountKeeper = auth.NewAccountKeeper(

x/ibc/04-channel/handler.go

@@ -8,9 +8,9 @@ import (
 
 // HandleMsgChannelOpenInit defines the sdk.Handler for MsgChannelOpenInit
 func HandleMsgChannelOpenInit(ctx sdk.Context, k keeper.Keeper, msg types.MsgChannelOpenInit) (*sdk.Result, error) {
-	err := k.ChanOpenInit(
+	_, err := k.ChanOpenInit(
 		ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID,
-		msg.Channel.Counterparty, msg.Channel.Version,
+		msg.PortCap, msg.Channel.Counterparty, msg.Channel.Version,
 	)
 	if err != nil {
 		return nil, err
@@ -39,8 +39,8 @@ func HandleMsgChannelOpenInit(ctx sdk.Context, k keeper.Keeper, msg types.MsgCha
 
 // HandleMsgChannelOpenTry defines the sdk.Handler for MsgChannelOpenTry
 func HandleMsgChannelOpenTry(ctx sdk.Context, k keeper.Keeper, msg types.MsgChannelOpenTry) (*sdk.Result, error) {
-	err := k.ChanOpenTry(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID,
-		msg.Channel.Counterparty, msg.Channel.Version, msg.CounterpartyVersion, msg.ProofInit, msg.ProofHeight,
+	_, err := k.ChanOpenTry(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID,
+		msg.PortCap, msg.Channel.Counterparty, msg.Channel.Version, msg.CounterpartyVersion, msg.ProofInit, msg.ProofHeight,
 	)
 	if err != nil {
 		return nil, err
@@ -70,7 +70,7 @@ func HandleMsgChannelOpenTry(ctx sdk.Context, k keeper.Keeper, msg types.MsgChan
 // HandleMsgChannelOpenAck defines the sdk.Handler for MsgChannelOpenAck
 func HandleMsgChannelOpenAck(ctx sdk.Context, k keeper.Keeper, msg types.MsgChannelOpenAck) (*sdk.Result, error) {
 	err := k.ChanOpenAck(
-		ctx, msg.PortID, msg.ChannelID, msg.CounterpartyVersion, msg.ProofTry, msg.ProofHeight,
+		ctx, msg.PortID, msg.ChannelID, msg.ChannelCap, msg.CounterpartyVersion, msg.ProofTry, msg.ProofHeight,
 	)
 	if err != nil {
 		return nil, err
@@ -96,7 +96,7 @@ func HandleMsgChannelOpenAck(ctx sdk.Context, k keeper.Keeper, msg types.MsgChan
 
 // HandleMsgChannelOpenConfirm defines the sdk.Handler for MsgChannelOpenConfirm
 func HandleMsgChannelOpenConfirm(ctx sdk.Context, k keeper.Keeper, msg types.MsgChannelOpenConfirm) (*sdk.Result, error) {
-	err := k.ChanOpenConfirm(ctx, msg.PortID, msg.ChannelID, msg.ProofAck, msg.ProofHeight)
+	err := k.ChanOpenConfirm(ctx, msg.PortID, msg.ChannelID, msg.ChannelCap, msg.ProofAck, msg.ProofHeight)
 	if err != nil {
 		return nil, err
 	}
@@ -121,7 +121,7 @@ func HandleMsgChannelOpenConfirm(ctx sdk.Context, k keeper.Keeper, msg types.Msg
 
 // HandleMsgChannelCloseInit defines the sdk.Handler for MsgChannelCloseInit
 func HandleMsgChannelCloseInit(ctx sdk.Context, k keeper.Keeper, msg types.MsgChannelCloseInit) (*sdk.Result, error) {
-	err := k.ChanCloseInit(ctx, msg.PortID, msg.ChannelID)
+	err := k.ChanCloseInit(ctx, msg.PortID, msg.ChannelID, msg.ChannelCap)
 	if err != nil {
 		return nil, err
 	}
@@ -146,7 +146,7 @@ func HandleMsgChannelCloseInit(ctx sdk.Context, k keeper.Keeper, msg types.MsgCh
 
 // HandleMsgChannelCloseConfirm defines the sdk.Handler for MsgChannelCloseConfirm
 func HandleMsgChannelCloseConfirm(ctx sdk.Context, k keeper.Keeper, msg types.MsgChannelCloseConfirm) (*sdk.Result, error) {
-	err := k.ChanCloseConfirm(ctx, msg.PortID, msg.ChannelID, msg.ProofInit, msg.ProofHeight)
+	err := k.ChanCloseConfirm(ctx, msg.PortID, msg.ChannelID, msg.ChannelCap, msg.ProofInit, msg.ProofHeight)
 	if err != nil {
 		return nil, err
 	}

x/ibc/04-channel/keeper/handshake.go

@@ -11,6 +11,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
 	"github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	commitmentexported "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/exported"
+	ibctypes "github.com/cosmos/cosmos-sdk/x/ibc/types"
 )
 
 // CounterpartyHops returns the connection hops of the counterparty channel.
@@ -65,11 +66,10 @@ func (k Keeper) ChanOpenInit(
 	channel := types.NewChannel(exported.INIT, order, counterparty, connectionHops, version)
 	k.SetChannel(ctx, portID, channelID, channel)
 
-	capKey, err := k.scopedKeeper.NewCapability(ctx, channelID)
+	capKey, err := k.scopedKeeper.NewCapability(ctx, ibctypes.ChannelCapabilityPath(portID, channelID))
 	if err != nil {
 		return nil, sdkerrors.Wrap(types.ErrInvalidChannelCapability, err.Error())
 	}
-	k.SetChannelCapability(ctx, portID, channelID, capKey)
 	k.SetNextSequenceSend(ctx, portID, channelID, 1)
 	k.SetNextSequenceRecv(ctx, portID, channelID, 1)
 
@@ -146,11 +146,10 @@ func (k Keeper) ChanOpenTry(
 
 	k.SetChannel(ctx, portID, channelID, channel)
 
-	capKey, err := k.scopedKeeper.NewCapability(ctx, channelID)
+	capKey, err := k.scopedKeeper.NewCapability(ctx, ibctypes.ChannelCapabilityPath(portID, channelID))
 	if err != nil {
 		return nil, sdkerrors.Wrap(types.ErrInvalidChannelCapability, err.Error())
 	}
-	k.SetChannelCapability(ctx, portID, channelID, capKey)
 	k.SetNextSequenceSend(ctx, portID, channelID, 1)
 	k.SetNextSequenceRecv(ctx, portID, channelID, 1)
 
@@ -163,7 +162,7 @@ func (k Keeper) ChanOpenAck(
 	ctx sdk.Context,
 	portID,
 	channelID string,
-	portCap capability.Capability,
+	chanCap capability.Capability,
 	counterpartyVersion string,
 	proofTry commitmentexported.Proof,
 	proofHeight uint64,
@@ -180,12 +179,8 @@ func (k Keeper) ChanOpenAck(
 		)
 	}
 
-	if _, ok := k.GetChannelCapability(ctx, portID, channelID); !ok {
-		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "channel capability not found")
-	}
-
-	if !k.portKeeper.Authenticate(ctx, portCap, portID) {
-		return sdkerrors.Wrap(porttypes.ErrInvalidPort, "caller does not own port capability")
+	if !k.scopedKeeper.AuthenticateCapability(ctx, chanCap, ibctypes.ChannelCapabilityPath(portID, channelID)) {
+		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "caller does not own capability for channel")
 	}
 
 	connectionEnd, found := k.connectionKeeper.GetConnection(ctx, channel.ConnectionHops[0])
@@ -234,7 +229,7 @@ func (k Keeper) ChanOpenConfirm(
 	ctx sdk.Context,
 	portID,
 	channelID string,
-	portCap capability.Capability,
+	chanCap capability.Capability,
 	proofAck commitmentexported.Proof,
 	proofHeight uint64,
 ) error {
@@ -250,12 +245,8 @@ func (k Keeper) ChanOpenConfirm(
 		)
 	}
 
-	if _, ok := k.GetChannelCapability(ctx, portID, channelID); !ok {
-		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "channel capability not found")
-	}
-
-	if !k.portKeeper.Authenticate(ctx, portCap, portID) {
-		return sdkerrors.Wrap(porttypes.ErrInvalidPort, "caller does not own port capability")
+	if !k.scopedKeeper.AuthenticateCapability(ctx, chanCap, ibctypes.ChannelCapabilityPath(portID, channelID)) {
+		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "caller does not own capability for channel")
 	}
 
 	connectionEnd, found := k.connectionKeeper.GetConnection(ctx, channel.ConnectionHops[0])
@@ -307,14 +298,10 @@ func (k Keeper) ChanCloseInit(
 	ctx sdk.Context,
 	portID,
 	channelID string,
-	portCap capability.Capability,
+	chanCap capability.Capability,
 ) error {
-	if _, ok := k.GetChannelCapability(ctx, portID, channelID); !ok {
-		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "channel capability not found")
-	}
-
-	if !k.portKeeper.Authenticate(ctx, portCap, portID) {
-		return sdkerrors.Wrap(porttypes.ErrInvalidPort, "caller does not own port capability")
+	if !k.scopedKeeper.AuthenticateCapability(ctx, chanCap, ibctypes.ChannelCapabilityPath(portID, channelID)) {
+		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "caller does not own capability for channel")
 	}
 
 	channel, found := k.GetChannel(ctx, portID, channelID)
@@ -350,16 +337,12 @@ func (k Keeper) ChanCloseConfirm(
 	ctx sdk.Context,
 	portID,
 	channelID string,
-	portCap capability.Capability,
+	chanCap capability.Capability,
 	proofInit commitmentexported.Proof,
 	proofHeight uint64,
 ) error {
-	if _, ok := k.GetChannelCapability(ctx, portID, channelID); !ok {
-		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "channel capability not found")
-	}
-
-	if !k.portKeeper.Authenticate(ctx, portCap, portID) {
-		return sdkerrors.Wrap(porttypes.ErrInvalidPort, "caller does not own port capability")
+	if !k.scopedKeeper.AuthenticateCapability(ctx, chanCap, ibctypes.ChannelCapabilityPath(portID, channelID)) {
+		return sdkerrors.Wrap(types.ErrChannelCapabilityNotFound, "caller does not own capability for channel")
 	}
 
 	channel, found := k.GetChannel(ctx, portID, channelID)

x/ibc/04-channel/keeper/keeper.go

@@ -64,27 +64,6 @@ func (k Keeper) SetChannel(ctx sdk.Context, portID, channelID string, channel ty
 	store.Set(ibctypes.KeyChannel(portID, channelID), bz)
 }
 
-// GetChannelCapability gets a channel's capability key from the store
-func (k Keeper) GetChannelCapability(ctx sdk.Context, portID, channelID string) (capability.Capability, bool) {
-	store := ctx.KVStore(k.storeKey)
-	bz := store.Get(ibctypes.KeyChannelCapabilityPath(portID, channelID))
-	if bz == nil {
-		return nil, false
-	}
-
-	var capKey capability.Capability
-	k.cdc.MustUnmarshalBinaryLengthPrefixed(bz, &capKey)
-
-	return capKey, true
-}
-
-// SetChannelCapability sets a channel's capability key to the store
-func (k Keeper) SetChannelCapability(ctx sdk.Context, portID, channelID string, key capability.Capability) {
-	store := ctx.KVStore(k.storeKey)
-	bz := k.cdc.MustMarshalBinaryLengthPrefixed(key)
-	store.Set(ibctypes.KeyChannelCapabilityPath(portID, channelID), bz)
-}
-
 // GetNextSequenceSend gets a channel's next send sequence from the store
 func (k Keeper) GetNextSequenceSend(ctx sdk.Context, portID, channelID string) (uint64, bool) {
 	store := ctx.KVStore(k.storeKey)

x/ibc/04-channel/types/expected_keepers.go

@@ -69,5 +69,5 @@ type ConnectionKeeper interface {
 
 // PortKeeper expected account IBC port keeper
 type PortKeeper interface {
-	Authenticate(ctx, key capability.Capability, portID string) bool
+	Authenticate(ctx sdk.Context, key capability.Capability, portID string) bool
 }

x/ibc/04-channel/types/msgs.go

@@ -5,7 +5,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/cosmos/cosmos-sdk/x/capability"
 	"github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
+	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
 	commitmentexported "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/exported"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
@@ -15,10 +17,11 @@ import (
 var _ sdk.Msg = MsgChannelOpenInit{}
 
 type MsgChannelOpenInit struct {
-	PortID    string         `json:"port_id"`
-	ChannelID string         `json:"channel_id"`
-	Channel   Channel        `json:"channel"`
-	Signer    sdk.AccAddress `json:"signer"`
+	PortID    string                `json:"port_id"`
+	ChannelID string                `json:"channel_id"`
+	PortCap   capability.Capability `json:"port_capability"`
+	Channel   Channel               `json:"channel"`
+	Signer    sdk.AccAddress        `json:"signer"`
 }
 
 // NewMsgChannelOpenInit creates a new MsgChannelCloseInit MsgChannelOpenInit
@@ -54,6 +57,9 @@ func (msg MsgChannelOpenInit) ValidateBasic() error {
 	if err := host.DefaultChannelIdentifierValidator(msg.ChannelID); err != nil {
 		return sdkerrors.Wrap(err, "invalid channel ID")
 	}
+	if msg.PortCap == nil {
+		return sdkerrors.Wrap(porttypes.ErrInvalidPort, "port capability is nil")
+	}
 	// Signer can be empty
 	return msg.Channel.ValidateBasic()
 }
@@ -73,6 +79,7 @@ var _ sdk.Msg = MsgChannelOpenTry{}
 type MsgChannelOpenTry struct {
 	PortID              string                   `json:"port_id"`
 	ChannelID           string                   `json:"channel_id"`
+	PortCap             capability.Capability    `json:"port_capability"`
 	Channel             Channel                  `json:"channel"`
 	CounterpartyVersion string                   `json:"counterparty_version"`
 	ProofInit           commitmentexported.Proof `json:"proof_init"`
@@ -120,6 +127,9 @@ func (msg MsgChannelOpenTry) ValidateBasic() error {
 	if strings.TrimSpace(msg.CounterpartyVersion) == "" {
 		return sdkerrors.Wrap(ErrInvalidCounterparty, "counterparty version cannot be blank")
 	}
+	if msg.PortCap == nil {
+		return sdkerrors.Wrap(porttypes.ErrInvalidPort, "port capability is nil")
+	}
 	if msg.ProofInit == nil {
 		return sdkerrors.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof")
 	}
@@ -148,6 +158,7 @@ var _ sdk.Msg = MsgChannelOpenAck{}
 type MsgChannelOpenAck struct {
 	PortID              string                   `json:"port_id"`
 	ChannelID           string                   `json:"channel_id"`
+	ChannelCap          capability.Capability    `json:"channel_capability"`
 	CounterpartyVersion string                   `json:"counterparty_version"`
 	ProofTry            commitmentexported.Proof `json:"proof_try"`
 	ProofHeight         uint64                   `json:"proof_height"`
@@ -190,6 +201,9 @@ func (msg MsgChannelOpenAck) ValidateBasic() error {
 	if strings.TrimSpace(msg.CounterpartyVersion) == "" {
 		return sdkerrors.Wrap(ErrInvalidCounterparty, "counterparty version cannot be blank")
 	}
+	if msg.ChannelCap == nil {
+		return sdkerrors.Wrap(ErrInvalidChannelCapability, "channel capability is nil")
+	}
 	if msg.ProofTry == nil {
 		return sdkerrors.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof")
 	}
@@ -218,6 +232,7 @@ var _ sdk.Msg = MsgChannelOpenConfirm{}
 type MsgChannelOpenConfirm struct {
 	PortID      string                   `json:"port_id"`
 	ChannelID   string                   `json:"channel_id"`
+	ChannelCap  capability.Capability    `json:"channel_capability"`
 	ProofAck    commitmentexported.Proof `json:"proof_ack"`
 	ProofHeight uint64                   `json:"proof_height"`
 	Signer      sdk.AccAddress           `json:"signer"`
@@ -255,6 +270,9 @@ func (msg MsgChannelOpenConfirm) ValidateBasic() error {
 	if err := host.DefaultChannelIdentifierValidator(msg.ChannelID); err != nil {
 		return sdkerrors.Wrap(err, "invalid channel ID")
 	}
+	if msg.ChannelCap == nil {
+		return sdkerrors.Wrap(ErrInvalidChannelCapability, "channel capability is nil")
+	}
 	if msg.ProofAck == nil {
 		return sdkerrors.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof")
 	}
@@ -281,9 +299,10 @@ func (msg MsgChannelOpenConfirm) GetSigners() []sdk.AccAddress {
 var _ sdk.Msg = MsgChannelCloseInit{}
 
 type MsgChannelCloseInit struct {
-	PortID    string         `json:"port_id"`
-	ChannelID string         `json:"channel_id"`
-	Signer    sdk.AccAddress `json:"signer"`
+	PortID     string                `json:"port_id"`
+	ChannelID  string                `json:"channel_id"`
+	ChannelCap capability.Capability `json:"channel_capability"`
+	Signer     sdk.AccAddress        `json:"signer"`
 }
 
 // NewMsgChannelCloseInit creates a new MsgChannelCloseInit instance
@@ -313,6 +332,10 @@ func (msg MsgChannelCloseInit) ValidateBasic() error {
 	if err := host.DefaultChannelIdentifierValidator(msg.ChannelID); err != nil {
 		return sdkerrors.Wrap(err, "invalid channel ID")
 	}
+	if msg.ChannelCap == nil {
+		return sdkerrors.Wrap(ErrInvalidChannelCapability, "channel capability is nil")
+	}
+
 	// Signer can be empty
 	return nil
 }
@@ -332,6 +355,7 @@ var _ sdk.Msg = MsgChannelCloseConfirm{}
 type MsgChannelCloseConfirm struct {
 	PortID      string                   `json:"port_id"`
 	ChannelID   string                   `json:"channel_id"`
+	ChannelCap  capability.Capability    `json:"channel_capability"`
 	ProofInit   commitmentexported.Proof `json:"proof_init"`
 	ProofHeight uint64                   `json:"proof_height"`
 	Signer      sdk.AccAddress           `json:"signer"`
@@ -369,6 +393,9 @@ func (msg MsgChannelCloseConfirm) ValidateBasic() error {
 	if err := host.DefaultChannelIdentifierValidator(msg.ChannelID); err != nil {
 		return sdkerrors.Wrap(err, "invalid channel ID")
 	}
+	if msg.ChannelCap == nil {
+		return sdkerrors.Wrap(ErrInvalidChannelCapability, "channel capability is nil")
+	}
 	if msg.ProofInit == nil {
 		return sdkerrors.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof")
 	}