fix: rebase fail

eve-network · Apr 3, 2024 · 25be8cf · 25be8cf
1 parent bd90d11
commit 25be8cf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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(