Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(app): intertx not using initialized controller #1701

Merged
merged 3 commits into from
Dec 20, 2022
Merged

fix(app): intertx not using initialized controller #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5126e90
fix(app): intertx not using initialized controller
ryanchristo Dec 20, 2022
61b9c54
fix query account example
ryanchristo Dec 20, 2022
4c42a4f
fix register account example
ryanchristo Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,6 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
app.ScopedIBCTransferKeeper,
)

app.InterTxKeeper = intertxkeeper.NewKeeper(
appCodec,
app.ICAControllerKeeper,
app.ScopedInterTxKeeper,
)

app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper(
appCodec,
keys[icacontrollertypes.StoreKey],
Expand All @@ -415,6 +409,12 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
app.MsgServiceRouter(),
)

app.InterTxKeeper = intertxkeeper.NewKeeper(
appCodec,
app.ICAControllerKeeper,
app.ScopedInterTxKeeper,
)

// Create IBC stacks to add to IBC router
ibcTransferModule := ibctransfer.NewIBCModule(app.IBCTransferKeeper)
ibcTransferStack := ibcfee.NewIBCMiddleware(ibcTransferModule, app.IBCFeeKeeper)
Expand Down
2 changes: 1 addition & 1 deletion x/intertx/client/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func getInterchainAccountCmd() *cobra.Command {
Use: "ica [owner-account] [connection-id]",
Short: "query the interchain account address",
Long: "query the interchain account address associated with the owner address and connection id.",
Example: "regen q intertx ica regen1drn830y2l24pne08t7k7p7z6zms3x8p8zc3u0h channel-5",
Example: "regen q intertx ica regen1drn830y2l24pne08t7k7p7z6zms3x8p8zc3u0h connection-0",
Args: cobra.ExactArgs(2),
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientTxContext(cmd)
Expand Down
4 changes: 2 additions & 2 deletions x/intertx/client/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ func getRegisterAccountCmd() *cobra.Command {
Short: "register an interchain account",
Long: "register an interchain account for the chain corresponding to the connection-id.",
Example: `
regen tx intertx register --connection-id channel-10
regen tx intertx register --connection-id channel-10 --version '{"version":"ics27-1","tx_type":"sdk_multi_msg","encoding":"proto3","host_connection_id":"connection-0","controller_connection_id":"connection-0","address":"regen14zs2x38lmkw4eqvl3lpml5l8crzaxn6mpvh79z"}'
regen tx intertx register --connection-id connection-0
regen tx intertx register --connection-id connection-0 --version '{"version":"ics27-1","tx_type":"sdk_multi_msg","encoding":"proto3","host_connection_id":"connection-0","controller_connection_id":"connection-0","address":"regen14zs2x38lmkw4eqvl3lpml5l8crzaxn6mpvh79z"}'
`,
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientTxContext(cmd)
Expand Down