@@ -34,8 +34,6 @@ import (
3434 govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
3535 "github.com/cosmos/cosmos-sdk/x/mint"
3636 minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
37- "github.com/cosmos/cosmos-sdk/x/params"
38- paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
3937 "github.com/cosmos/cosmos-sdk/x/protocolpool"
4038 protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
4139 "github.com/cosmos/cosmos-sdk/x/slashing"
@@ -56,6 +54,7 @@ import (
5654 ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
5755 ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
5856 "github.com/persistenceOne/persistenceCore/v17/x/halving"
57+ halvingtypes "github.com/persistenceOne/persistenceCore/v17/x/halving/types"
5958 "github.com/persistenceOne/persistenceCore/v17/x/liquidstake"
6059 liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
6160)
@@ -89,30 +88,29 @@ func appModules(
8988 genutil .NewAppModule (
9089 app .AccountKeeper , app .StakingKeeper , app , txCfg ,
9190 ),
92- auth .NewAppModule (appCodec , * app .AccountKeeper , authsimulation .RandomGenesisAccounts , app . GetSubspace ( authtypes . ModuleName ) ),
91+ auth .NewAppModule (appCodec , * app .AccountKeeper , authsimulation .RandomGenesisAccounts , nil ),
9392 vesting .NewAppModule (* app .AccountKeeper , app .BankKeeper ),
94- bank .NewAppModule (appCodec , * app .BankKeeper , app .AccountKeeper , app . GetSubspace ( banktypes . ModuleName ) ),
95- gov .NewAppModule (appCodec , app .GovKeeper , app .AccountKeeper , app .BankKeeper , app . GetSubspace ( govtypes . ModuleName ) ),
96- mint .NewAppModule (appCodec , * app .MintKeeper , app .AccountKeeper , nil , app . GetSubspace ( minttypes . ModuleName ) ), // nil -> SDK's default inflation function.
97- slashing .NewAppModule (appCodec , * app .SlashingKeeper , app .AccountKeeper , app .BankKeeper , * app .StakingKeeper , app . GetSubspace ( slashingtypes . ModuleName ) , app .interfaceRegistry ),
98- distribution .NewAppModule (appCodec , * app .DistributionKeeper , app .AccountKeeper , app .BankKeeper , * app .StakingKeeper , app . GetSubspace ( distributiontypes . ModuleName ) ),
99- staking .NewAppModule (appCodec , app .StakingKeeper , app .AccountKeeper , app .BankKeeper , app . GetSubspace ( stakingtypes . ModuleName ) ),
93+ bank .NewAppModule (appCodec , * app .BankKeeper , app .AccountKeeper , nil ),
94+ gov .NewAppModule (appCodec , app .GovKeeper , app .AccountKeeper , app .BankKeeper , nil ),
95+ mint .NewAppModule (appCodec , * app .MintKeeper , app .AccountKeeper , nil , nil ), // nil -> SDK's default inflation function.
96+ slashing .NewAppModule (appCodec , * app .SlashingKeeper , app .AccountKeeper , app .BankKeeper , * app .StakingKeeper , nil , app .interfaceRegistry ),
97+ distribution .NewAppModule (appCodec , * app .DistributionKeeper , app .AccountKeeper , app .BankKeeper , * app .StakingKeeper , nil ),
98+ staking .NewAppModule (appCodec , app .StakingKeeper , app .AccountKeeper , app .BankKeeper , nil ),
10099 upgrade .NewAppModule (app .UpgradeKeeper , app .AccountKeeper .AddressCodec ()),
101100 evidence .NewAppModule (* app .EvidenceKeeper ),
102101 feegrantmodule .NewAppModule (appCodec , app .AccountKeeper , app .BankKeeper , * app .FeegrantKeeper , app .interfaceRegistry ),
103102 authzmodule .NewAppModule (appCodec , * app .AuthzKeeper , app .AccountKeeper , app .BankKeeper , app .interfaceRegistry ),
104103 ibc .NewAppModule (app .IBCKeeper ),
105- packetforward .NewAppModule (app .PacketForwardKeeper , app .GetSubspace (packetforwardtypes .ModuleName )),
106- params .NewAppModule (* app .ParamsKeeper ),
104+ packetforward .NewAppModule (app .PacketForwardKeeper , nil ),
107105 halving .NewAppModule (appCodec , * app .HalvingKeeper ),
108106 ibctransfer .NewAppModule (* app .TransferKeeper ),
109107 ibchooks .NewAppModule (* app .AccountKeeper ),
110108 ica .NewAppModule (app .ICAControllerKeeper , app .ICAHostKeeper ),
111- wasm .NewAppModule (appCodec , app .WasmKeeper , app .StakingKeeper , app .AccountKeeper , app .BankKeeper , app .MsgServiceRouter (), app . GetSubspace ( wasm . ModuleName ) ),
109+ wasm .NewAppModule (appCodec , app .WasmKeeper , app .StakingKeeper , app .AccountKeeper , app .BankKeeper , app .MsgServiceRouter (), nil ),
112110 epochs .NewAppModule (* app .EpochsKeeper ),
113111 liquid .NewAppModule (appCodec , app .LiquidKeeper , app .AccountKeeper , app .BankKeeper , app .StakingKeeper ),
114112 liquidstake .NewAppModule (* app .LiquidStakeKeeper ),
115- crisis .NewAppModule (app .CrisisKeeper , false , app . GetSubspace ( crisistypes . ModuleName ) ), // skipGenesisInvariants: false, always be last to make sure that it checks for all invariants and not only part of them
113+ crisis .NewAppModule (app .CrisisKeeper , false , nil ), // skipGenesisInvariants: false, always be last to make sure that it checks for all invariants and not only part of them
116114 ibctm .NewAppModule (app .TMLightClientModule ),
117115 protocolpool .NewAppModule (* app .ProtocolPoolKeeper , app .AccountKeeper , app .BankKeeper ),
118116 }
@@ -123,7 +121,7 @@ func overrideSimulationModules(
123121 appCodec codec.Codec ,
124122) map [string ]module.AppModuleSimulation {
125123 return map [string ]module.AppModuleSimulation {
126- authtypes .ModuleName : auth .NewAppModule (appCodec , * app .AccountKeeper , authsimulation .RandomGenesisAccounts , app . GetSubspace ( authtypes . ModuleName ) ),
124+ authtypes .ModuleName : auth .NewAppModule (appCodec , * app .AccountKeeper , authsimulation .RandomGenesisAccounts , nil ),
127125 }
128126}
129127
@@ -154,10 +152,9 @@ func orderBeginBlockers() []string {
154152 evidencetypes .ModuleName ,
155153 authz .ModuleName ,
156154 feegrant .ModuleName ,
157- paramstypes .ModuleName ,
158155 vestingtypes .ModuleName ,
159156 consensusparamtypes .ModuleName ,
160- halving .ModuleName ,
157+ halvingtypes .ModuleName ,
161158 ibchookstypes .ModuleName ,
162159 packetforwardtypes .ModuleName ,
163160 wasmtypes .ModuleName ,
@@ -183,11 +180,10 @@ func orderEndBlockers() []string {
183180 minttypes .ModuleName ,
184181 genutiltypes .ModuleName ,
185182 evidencetypes .ModuleName ,
186- paramstypes .ModuleName ,
187183 upgradetypes .ModuleName ,
188184 vestingtypes .ModuleName ,
189185 consensusparamtypes .ModuleName ,
190- halving .ModuleName ,
186+ halvingtypes .ModuleName ,
191187 ibchookstypes .ModuleName ,
192188 packetforwardtypes .ModuleName ,
193189 wasmtypes .ModuleName ,
@@ -221,10 +217,9 @@ func orderInitGenesis() []string {
221217 feegrant .ModuleName ,
222218 authz .ModuleName ,
223219 genutiltypes .ModuleName ,
224- paramstypes .ModuleName ,
225220 upgradetypes .ModuleName ,
226221 vestingtypes .ModuleName ,
227- halving .ModuleName ,
222+ halvingtypes .ModuleName ,
228223 ibchookstypes .ModuleName ,
229224 packetforwardtypes .ModuleName ,
230225 wasmtypes .ModuleName ,
@@ -256,7 +251,7 @@ func orderExportGenesis() []string {
256251 icatypes .ModuleName ,
257252 upgradetypes .ModuleName ,
258253 vestingtypes .ModuleName ,
259- halving .ModuleName ,
254+ halvingtypes .ModuleName ,
260255 ibchookstypes .ModuleName ,
261256 packetforwardtypes .ModuleName ,
262257 epochstypes .ModuleName ,
0 commit comments