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

WIP: Fixing IBC issues. #770

Merged
merged 1 commit into from
Aug 12, 2024
Merged

WIP: Fixing IBC issues. #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions app/keepers/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package keepers

import (
"fmt"
"github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller"
"os"

"cosmossdk.io/log"
Expand Down Expand Up @@ -446,7 +447,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
govKeeper.SetLegacyRouter(govRouter)
appKeepers.GovKeeper = *govKeeper.SetHooks(
govtypes.NewMultiGovHooks(
// register the governance hooks
// register the governance hooks
),
)

Expand All @@ -464,7 +465,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
// Set epoch hooks
appKeepers.EpochsKeeper.SetHooks(
epochsmoduletypes.NewMultiEpochHooks(
// appKeepers.QOsmosisKeeper.EpochHooks(),
// appKeepers.QOsmosisKeeper.EpochHooks(),
),
)

Expand Down Expand Up @@ -495,7 +496,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
})

wasmOpts = append(wasmOpts, queryPlugins)

wasmKeeper := wasmkeeper.NewKeeper(
appCodec,
runtime.NewKVStoreService(appKeepers.keys[wasmtypes.StoreKey]),
Expand Down Expand Up @@ -565,7 +566,8 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
AddRoute(icahosttypes.SubModuleName, icahost.NewIBCModule(*appKeepers.ICAHostKeeper)).
AddRoute(ibctransfertypes.ModuleName, appKeepers.TransferStack).
AddRoute(wasmtypes.ModuleName, wasm.NewIBCHandler(appKeepers.WasmKeeper,
appKeepers.IBCKeeper.ChannelKeeper, appKeepers.IBCKeeper.ChannelKeeper))
appKeepers.IBCKeeper.ChannelKeeper, appKeepers.IBCKeeper.ChannelKeeper)).
AddRoute(icacontrollertypes.SubModuleName, controller.NewIBCMiddleware(nil, appKeepers.ICAControllerKeeper))

appKeepers.IBCKeeper.SetRouter(ibcRouter)
}
Expand Down
1 change: 1 addition & 0 deletions app/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ func appModules(
evidence.NewAppModule(app.EvidenceKeeper),
feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
ibc.NewAppModule(app.IBCKeeper),
ibctm.NewAppModule(),
params.NewAppModule(app.ParamsKeeper),
wasm.NewAppModule(appCodec, app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)),
ica.NewAppModule(&app.ICAControllerKeeper, app.ICAHostKeeper),
Expand Down
1 change: 1 addition & 0 deletions app/upgrades/v3/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ func CreateUpgradeHandler(
}
// fee market params
// TODO: change values from default after discussion
// TODO : do not do default as it will take stake as default fee denom
err = keepers.FeeMarketKeeper.SetParams(ctx, feemarkettypes.DefaultParams())
if err != nil {
panic(err)
Expand Down
Loading