@@ -19,9 +19,12 @@ import (
1919
2020 dbm "github.com/cosmos/cosmos-db"
2121 "github.com/cosmos/gogoproto/proto"
22+ ibcwasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm"
2223 ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
23- ibctesting "github.com/cosmos/ibc-go/v8/testing"
24- providertypes "github.com/cosmos/interchain-security/v6/x/ccv/provider/types"
24+ ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
25+ ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
26+ ibctesting "github.com/cosmos/ibc-go/v10/testing"
27+ providertypes "github.com/cosmos/interchain-security/v7/x/ccv/provider/types"
2528
2629 autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
2730 reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
@@ -63,7 +66,7 @@ import (
6366 govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
6467 govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
6568
66- wasm "github.com/CosmWasm/wasmd/x/wasm"
69+ "github.com/CosmWasm/wasmd/x/wasm"
6770 wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
6871 wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
6972
@@ -194,9 +197,18 @@ func NewGaiaApp(
194197 wasmOpts ,
195198 )
196199
200+ // Create IBC Tendermint Light Client Stack
201+ clientKeeper := app .AppKeepers .IBCKeeper .ClientKeeper
202+ tmLightClientModule := ibctm .NewLightClientModule (appCodec , clientKeeper .GetStoreProvider ())
203+ clientKeeper .AddRoute (ibctm .ModuleName , & tmLightClientModule )
204+
205+ // Create WASM Light Client Stack
206+ wasmLightClientModule := ibcwasm .NewLightClientModule (app .WasmClientKeeper , clientKeeper .GetStoreProvider ())
207+ clientKeeper .AddRoute (ibcwasmtypes .ModuleName , & wasmLightClientModule )
208+
197209 // NOTE: Any module instantiated in the module manager that is later modified
198210 // must be passed by reference here.
199- app .mm = module .NewManager (appModules (app , appCodec , txConfig , skipGenesisInvariants )... )
211+ app .mm = module .NewManager (appModules (app , appCodec , txConfig , skipGenesisInvariants , tmLightClientModule )... )
200212 app .ModuleBasics = newBasicManagerFromManager (app )
201213
202214 enabledSignModes := append ([]sigtypes.SignMode (nil ), authtx .DefaultSignModes ... )
@@ -223,7 +235,6 @@ func NewGaiaApp(
223235 // there is nothing left over in the validator fee pool, so as to keep the
224236 // CanWithdrawInvariant invariant.
225237 // NOTE: staking module is required if HistoricalEntries param > 0
226- // NOTE: capability module's beginblocker must come before any modules using capabilities (e.g. IBC)
227238 // Tell the app's module manager how to set the order of BeginBlockers, which are run at the beginning of every block.
228239 app .mm .SetOrderBeginBlockers (orderBeginBlockers ()... )
229240
@@ -232,9 +243,6 @@ func NewGaiaApp(
232243 // NOTE: The genutils module must occur after staking so that pools are
233244 // properly initialized with tokens from genesis accounts.
234245 // NOTE: The genutils module must also occur after auth so that it can access the params from auth.
235- // NOTE: Capability module must occur first so that it can initialize any capabilities
236- // so that other modules that want to create or claim capabilities afterwards in InitChain
237- // can do so safely.
238246 app .mm .SetOrderInitGenesis (orderInitBlockers ()... )
239247
240248 // Uncomment if you want to set a custom migration order here.
@@ -355,7 +363,7 @@ func NewGaiaApp(
355363 tmos .Exit (fmt .Sprintf ("WasmKeeper failed initialize pinned codes %s" , err ))
356364 }
357365
358- if err := ibcwasmkeeper .InitializePinnedCodes (ctx ); err != nil {
366+ if err := app . WasmClientKeeper .InitializePinnedCodes (ctx ); err != nil {
359367 panic (fmt .Sprintf ("wasmlckeeper failed initialize pinned codes %s" , err ))
360368 }
361369 }
0 commit comments