Skip to content

Commit 84fc479

Browse files
mergify[bot]catShaarkdamiannolan
authored andcommittedJul 31, 2023
use controller module address instead of module name for NewMsgChannelOpenInit (backport cosmos#2568) (cosmos#2611)
* use controller module address instead of module name for NewMsgChannelOpenInit (cosmos#2568) 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 cosmos#2566 closes: cosmos#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) * resolving conflicts Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com> Co-authored-by: Damian Nolan <damiannolan@gmail.com>
1 parent 518a9dd commit 84fc479

File tree

1 file changed

+2
-1
lines changed
  • modules/apps/27-interchain-accounts/controller/keeper

1 file changed

+2
-1
lines changed
 

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package keeper
33
import (
44
sdk "github.com/Finschia/finschia-sdk/types"
55
sdkerrors "github.com/Finschia/finschia-sdk/types/errors"
6+
authtypes "github.com/Finschia/finschia-sdk/x/auth/types"
67

78
icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types"
89
channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
@@ -38,7 +39,7 @@ func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, connectionID, owner,
3839
}
3940
}
4041

41-
msg := channeltypes.NewMsgChannelOpenInit(portID, version, channeltypes.ORDERED, []string{connectionID}, icatypes.PortID, icatypes.ModuleName)
42+
msg := channeltypes.NewMsgChannelOpenInit(portID, version, channeltypes.ORDERED, []string{connectionID}, icatypes.PortID, authtypes.NewModuleAddress(icatypes.ModuleName).String())
4243
handler := k.msgRouter.Handler(msg)
4344

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

0 commit comments

Comments
 (0)