From aa66712f5088a854d47c0db0a25f1a70b0cac65d Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 4 Sep 2024 20:11:40 -0300 Subject: [PATCH] proper order of init once again --- app/app.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/app.go b/app/app.go index 40e329e4f..e6411abe0 100644 --- a/app/app.go +++ b/app/app.go @@ -600,6 +600,9 @@ func New( appCodec, keys[ibchost.StoreKey], app.GetSubspace(ibchost.ModuleName), &app.ConsumerKeeper, app.UpgradeKeeper, scopedIBCKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) + app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName)) + app.WireICS20PreWasmKeeper(appCodec) + app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper( appCodec, keys[icacontrollertypes.StoreKey], app.GetSubspace(icacontrollertypes.SubModuleName), app.RateLimitingICS4Wrapper, // may be replaced with middleware such as ics29 feerefunder @@ -647,8 +650,6 @@ func New( app.GlobalFeeKeeper = globalfeekeeper.NewKeeper(appCodec, keys[globalfeetypes.StoreKey], authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) - transferModule := transferSudo.NewAppModule(app.TransferKeeper) - // Create evidence Keeper for to register the IBC light client misbehaviour evidence route evidenceKeeper := evidencekeeper.NewKeeper( appCodec, runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), &app.ConsumerKeeper, app.SlashingKeeper, @@ -872,9 +873,7 @@ func New( ibcRateLimitmodule := ibcratelimitmodule.NewAppModule(*app.RateLimitingICS4Wrapper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName)) - app.WireICS20PreWasmKeeper(appCodec) - + transferModule := transferSudo.NewAppModule(app.TransferKeeper) app.ContractKeeper = wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper) app.RateLimitingICS4Wrapper.ContractKeeper = app.ContractKeeper @@ -1683,7 +1682,7 @@ func (app *App) WireICS20PreWasmKeeper( appCodec, app.keys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName), - app.RateLimitingICS4Wrapper, // essentially still app.IBCKeeper.ChannelKeeper under the hood because no hook overrides + app.RateLimitingICS4Wrapper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.PortKeeper, app.AccountKeeper, @@ -1694,8 +1693,6 @@ func (app *App) WireICS20PreWasmKeeper( authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) - app.PFMKeeper.SetTransferKeeper(app.TransferKeeper.Keeper) - // PFMKeeper must be created before TransferKeeper app.PFMKeeper = pfmkeeper.NewKeeper( appCodec, @@ -1707,6 +1704,9 @@ func (app *App) WireICS20PreWasmKeeper( app.HooksICS4Wrapper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) + + app.PFMKeeper.SetTransferKeeper(app.TransferKeeper.Keeper) + // app.RawIcs20TransferAppModule = transfer.NewAppModule(*appKeepers.TransferKeeper) ?? // Packet Forward Middleware