Skip to content

Commit 771c7c5

Browse files
catShaarkmergify[bot]
authored andcommitted
use controller module address instead of module name for NewMsgChannelOpenInit (#2568)
## Description In controller keeper's `registerInterchainAccount` we execute a `MsgChannelOpenInit` to set up an ica channel. Currently, we have [`icatypes.ModuleName`](https://github.com/cosmos/ibc-go/blob/95cec44c9fb10a2e84a327cdd98c7d588f091f42/modules/apps/27-interchain-accounts/controller/keeper/account.go#L63) as the msg signer. This is not good because the [`ValidateBasic()`](https://github.com/cosmos/ibc-go/blob/692790402a033c1d9647c1e1eded5351332283bf/modules/core/04-channel/types/msgs.go#L34) of `MsgChannelOpenInit` has check if msg signer is bech32 or not. ref #2566 closes: #2559 --- Before we can merge this PR, please make sure that all the following items have been checked off. If any of the checklist items are not applicable, please leave them but write a little note why. - [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work. - [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md). - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing) - [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`) - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code). - [ ] Added a relevant changelog entry to the `Unreleased` section in `CHANGELOG.md` - [ ] Re-reviewed `Files changed` in the Github PR explorer - [ ] Review `Codecov Report` in the comment section below once CI passes (cherry picked from commit 6105db4) # Conflicts: # modules/apps/27-interchain-accounts/controller/keeper/account.go
1 parent bdec253 commit 771c7c5

File tree

1 file changed

+5
-0
lines changed
  • modules/apps/27-interchain-accounts/controller/keeper

1 file changed

+5
-0
lines changed

modules/apps/27-interchain-accounts/controller/keeper/account.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package keeper
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
6+
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
67

78
icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"
89
channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
@@ -36,6 +37,7 @@ func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, connectionID, owner s
3637
}
3738
}
3839

40+
<<<<<<< HEAD
3941
connectionEnd, err := k.channelKeeper.GetConnection(ctx, connectionID)
4042
if err != nil {
4143
return err
@@ -57,6 +59,9 @@ func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, connectionID, owner s
5759
}
5860

5961
msg := channeltypes.NewMsgChannelOpenInit(portID, string(versionBytes), channeltypes.ORDERED, []string{connectionID}, icatypes.PortID, icatypes.ModuleName)
62+
=======
63+
msg := channeltypes.NewMsgChannelOpenInit(portID, version, channeltypes.ORDERED, []string{connectionID}, icatypes.HostPortID, authtypes.NewModuleAddress(icatypes.ModuleName).String())
64+
>>>>>>> 6105db4 (use controller module address instead of module name for NewMsgChannelOpenInit (#2568))
6065
handler := k.msgRouter.Handler(msg)
6166

6267
res, err := handler(ctx, msg)

0 commit comments

Comments
 (0)