From 25be8cf320c4adad4f0fdaf29de64405bdbd72cf Mon Sep 17 00:00:00 2001 From: minhngoc270499 Date: Wed, 3 Apr 2024 16:13:53 +0700 Subject: [PATCH] fix: rebase fail --- app/app.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/app.go b/app/app.go index cf9843e1..a7009f05 100644 --- a/app/app.go +++ b/app/app.go @@ -205,7 +205,7 @@ var maccPerms = map[string][]string{ tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner}, alliancemoduletypes.ModuleName: {authtypes.Minter, authtypes.Burner}, alliancemoduletypes.RewardsPoolName: nil, - feeabstypes.ModuleName: nil, + feeabstypes.ModuleName: nil, } var ( @@ -619,7 +619,7 @@ func NewEveApp( app.GetSubspace(feeabstypes.ModuleName), &app.StakingKeeper, app.AccountKeeper, - app.BankKeeper, + app.BankKeeper.BaseKeeper, app.TransferKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.PortKeeper, @@ -658,8 +658,8 @@ func NewEveApp( AddRoute(ibctransfertypes.ModuleName, transferStack). AddRoute(wasmtypes.ModuleName, wasmStack). AddRoute(icacontrollertypes.SubModuleName, icaControllerStack). - AddRoute(icahosttypes.SubModuleName, icaHostStack) - AddRoute(feeabstypes.ModuleName, feeabsIBCModule) + AddRoute(icahosttypes.SubModuleName, icaHostStack). + AddRoute(feeabstypes.ModuleName, feeabsIBCModule) app.IBCKeeper.SetRouter(ibcRouter) app.IBCHooksKeeper = ibchookskeeper.NewKeeper(