@@ -137,6 +137,7 @@ import (
137
137
"github.com/spf13/cast"
138
138
139
139
"github.com/CosmWasm/wasmd/client/docs"
140
+
140
141
"github.com/CosmWasm/wasmd/x/wasm"
141
142
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
142
143
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
@@ -178,6 +179,10 @@ import (
178
179
erc20keeper "github.com/evmos/ethermint/x/erc20/keeper"
179
180
erc20types "github.com/evmos/ethermint/x/erc20/types"
180
181
182
+ "github.com/CosmWasm/wasmd/x/txfees"
183
+ txfeeskeeper "github.com/CosmWasm/wasmd/x/txfees/keeper"
184
+ txfeestypes "github.com/CosmWasm/wasmd/x/txfees/types"
185
+
181
186
"github.com/CosmosContracts/juno/v18/x/globalfee"
182
187
globalfeekeeper "github.com/CosmosContracts/juno/v18/x/globalfee/keeper"
183
188
globalfeetypes "github.com/CosmosContracts/juno/v18/x/globalfee/types"
@@ -302,6 +307,7 @@ type WasmApp struct {
302
307
Erc20Keeper erc20keeper.Keeper
303
308
FeeMarketKeeper feemarketkeeper.Keeper
304
309
GlobalFeeKeeper globalfeekeeper.Keeper
310
+ TxFeesKeeper txfeeskeeper.Keeper
305
311
306
312
// Middleware wrapper
307
313
Ics20WasmHooks * ibchooks.WasmHooks
@@ -428,7 +434,7 @@ func NewWasmApp(
428
434
capabilitytypes .StoreKey , ibcexported .StoreKey , ibctransfertypes .StoreKey , ibcfeetypes .StoreKey ,
429
435
wasmtypes .StoreKey , icahosttypes .StoreKey ,
430
436
icacontrollertypes .StoreKey , clocktypes .StoreKey , globalfeetypes .StoreKey , ibchookstypes .StoreKey , packetforwardtypes .StoreKey , tokenfactorytypes .StoreKey ,
431
- evmtypes .StoreKey , feemarkettypes .StoreKey , erc20types .StoreKey ,
437
+ evmtypes .StoreKey , feemarkettypes .StoreKey , erc20types .StoreKey , txfeestypes . StoreKey ,
432
438
)
433
439
434
440
tkeys := storetypes .NewTransientStoreKeys (paramstypes .TStoreKey , evmtypes .TransientKey , feemarkettypes .TransientKey )
@@ -822,6 +828,13 @@ func NewWasmApp(
822
828
AuthorityAddr ,
823
829
)
824
830
831
+ app .TxFeesKeeper = txfeeskeeper .NewKeeper (
832
+ appCodec ,
833
+ runtime .NewKVStoreService (keys [txfeestypes .StoreKey ]),
834
+ & app .WasmKeeper ,
835
+ AuthorityAddr ,
836
+ )
837
+
825
838
app .TokenFactoryKeeper = tokenfactorykeeper .NewKeeper (
826
839
keys [tokenfactorytypes .StoreKey ],
827
840
app .GetSubspace (tokenfactorytypes .ModuleName ),
@@ -924,6 +937,7 @@ func NewWasmApp(
924
937
evm .NewAppModule (app .EvmKeeper , app .AccountKeeper , evmSs ),
925
938
feemarket .NewAppModule (app .FeeMarketKeeper , feeMarketSs ),
926
939
erc20 .NewAppModule (app .Erc20Keeper , app .AccountKeeper , app .GetSubspace (erc20types .ModuleName )),
940
+ txfees .NewAppModule (app .TxFeesKeeper ),
927
941
)
928
942
929
943
// BasicModuleManager defines the module BasicManager is in charge of setting up basic,
@@ -948,6 +962,7 @@ func NewWasmApp(
948
962
feemarkettypes .ModuleName : feemarket.AppModuleBasic {},
949
963
erc20types .ModuleName : erc20.AppModuleBasic {},
950
964
globalfee .ModuleName : globalfee.AppModuleBasic {},
965
+ txfeestypes .ModuleName : txfees.AppModuleBasic {},
951
966
})
952
967
app .BasicModuleManager .RegisterLegacyAminoCodec (legacyAmino )
953
968
app .BasicModuleManager .RegisterInterfaces (interfaceRegistry )
@@ -987,6 +1002,7 @@ func NewWasmApp(
987
1002
feemarkettypes .ModuleName ,
988
1003
evmtypes .ModuleName ,
989
1004
erc20types .ModuleName ,
1005
+ txfeestypes .ModuleName ,
990
1006
)
991
1007
992
1008
app .ModuleManager .SetOrderEndBlockers (
@@ -1011,6 +1027,7 @@ func NewWasmApp(
1011
1027
feemarkettypes .ModuleName ,
1012
1028
evmtypes .ModuleName ,
1013
1029
erc20types .ModuleName ,
1030
+ txfeestypes .ModuleName ,
1014
1031
)
1015
1032
1016
1033
// NOTE: The genutils module must occur after staking so that pools are
@@ -1047,6 +1064,7 @@ func NewWasmApp(
1047
1064
feemarkettypes .ModuleName ,
1048
1065
evmtypes .ModuleName ,
1049
1066
erc20types .ModuleName ,
1067
+ txfeestypes .ModuleName ,
1050
1068
}
1051
1069
app .ModuleManager .SetOrderInitGenesis (genesisModuleOrder ... )
1052
1070
app .ModuleManager .SetOrderExportGenesis (genesisModuleOrder ... )
@@ -1180,6 +1198,7 @@ func (app *WasmApp) setAnteHandler(txConfig client.TxConfig, wasmConfig wasmtype
1180
1198
FeeMarketKeeper : app .FeeMarketKeeper ,
1181
1199
WasmConfig : & wasmConfig ,
1182
1200
WasmKeeper : & app .WasmKeeper ,
1201
+ TxFeesKeeper : app .TxFeesKeeper ,
1183
1202
ContractKeeper : app .ContractKeeper ,
1184
1203
TXCounterStoreService : runtime .NewKVStoreService (txCounterStoreKey ),
1185
1204
CircuitKeeper : & app .CircuitKeeper ,
0 commit comments