Skip to content

Commit 3a972a9

Browse files
authored
Merge branch 'main' into dependabot/go_modules/cosmossdk.io/collections-1.3.1
2 parents 7218971 + 690f110 commit 3a972a9

File tree

18 files changed

+63
-172
lines changed

18 files changed

+63
-172
lines changed

app/app.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import (
5858
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
5959
txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
6060
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
61-
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
6261
"github.com/spf13/cast"
6362

6463
"github.com/persistenceOne/persistenceCore/v17/app/constants"
@@ -390,11 +389,6 @@ func (app *Application) ModuleAccountAddrs() map[string]bool {
390389
return modAccAddrs
391390
}
392391

393-
func (app *Application) GetSubspace(moduleName string) paramstypes.Subspace {
394-
subspace, _ := app.ParamsKeeper.GetSubspace(moduleName)
395-
return subspace
396-
}
397-
398392
func (app *Application) ModuleManager() *module.Manager {
399393
return app.moduleManager
400394
}

app/encoding.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/cosmos/cosmos-sdk/std"
1212
"github.com/cosmos/cosmos-sdk/types/module"
1313
grouptypes "github.com/cosmos/cosmos-sdk/x/group"
14+
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
1415
interchainquerytypes "github.com/persistenceOne/persistence-sdk/v7/x/interchainquery/types"
1516
liquidstakeibctypes "github.com/persistenceOne/persistence-sdk/v7/x/liquidstakeibc/types"
1617
lscosmostypes "github.com/persistenceOne/persistence-sdk/v7/x/lscosmos/types"
@@ -72,6 +73,9 @@ func AppendModuleInterfaces(interfaceRegistry codectypes.InterfaceRegistry, mbm
7273

7374
// skip-pob - testnet
7475
pobtypes.RegisterInterfaces(interfaceRegistry)
76+
77+
// params types proposals
78+
paramstypes.RegisterInterfaces(interfaceRegistry)
7579
}
7680

7781
func AppendModuleLegacyCodecs(amino *codec.LegacyAmino, mbm module.BasicManager) {
@@ -104,4 +108,8 @@ func AppendModuleLegacyCodecs(amino *codec.LegacyAmino, mbm module.BasicManager)
104108

105109
// skip-pob - testnet
106110
pobtypes.RegisterLegacyAminoCodec(amino)
111+
112+
// params types proposals
113+
paramstypes.RegisterLegacyAminoCodec(amino)
114+
107115
}

app/export.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package app
22

33
import (
4-
storetypes "cosmossdk.io/store/types"
54
"fmt"
65
stdlog "log"
76

7+
storetypes "cosmossdk.io/store/types"
88
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
99
"github.com/cosmos/cosmos-sdk/codec"
1010
servertypes "github.com/cosmos/cosmos-sdk/server/types"

app/keepers/keepers.go

Lines changed: 9 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,9 @@ import (
3636
epochstypes "github.com/cosmos/cosmos-sdk/x/epochs/types"
3737
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
3838
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
39-
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
4039
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
4140
mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
4241
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
43-
"github.com/cosmos/cosmos-sdk/x/params"
44-
paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
45-
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
46-
paramsproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
4742
protocolpoolkeeper "github.com/cosmos/cosmos-sdk/x/protocolpool/keeper"
4843
protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
4944
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
@@ -68,13 +63,11 @@ import (
6863
ibctransfer "github.com/cosmos/ibc-go/v10/modules/apps/transfer"
6964
ibctransferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper"
7065
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
71-
ibcclienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types"
72-
ibcconnectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types"
7366
ibctypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types"
7467
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
7568
ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
7669
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
77-
"github.com/persistenceOne/persistenceCore/v17/x/halving"
70+
halvingkeeper "github.com/persistenceOne/persistenceCore/v17/x/halving/keeper"
7871
halvingtypes "github.com/persistenceOne/persistenceCore/v17/x/halving/types"
7972
liquidstakekeeper "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/keeper"
8073
liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
@@ -99,14 +92,13 @@ type AppKeepers struct {
9992
ProtocolPoolKeeper *protocolpoolkeeper.Keeper
10093
UpgradeKeeper *upgradekeeper.Keeper
10194
CrisisKeeper *crisiskeeper.Keeper
102-
ParamsKeeper *paramskeeper.Keeper
10395
IBCKeeper *ibckeeper.Keeper
10496
ICAHostKeeper *icahostkeeper.Keeper
10597
EvidenceKeeper *evidencekeeper.Keeper
10698
TransferKeeper *ibctransferkeeper.Keeper
10799
FeegrantKeeper *feegrantkeeper.Keeper
108100
AuthzKeeper *authzkeeper.Keeper
109-
HalvingKeeper *halving.Keeper
101+
HalvingKeeper *halvingkeeper.Keeper
110102
WasmKeeper *wasmkeeper.Keeper
111103
EpochsKeeper *epochskeeper.Keeper
112104
ICAControllerKeeper *icacontrollerkeeper.Keeper
@@ -143,14 +135,6 @@ func NewAppKeeper(
143135
panic(err)
144136
}
145137

146-
paramsKeeper := initParamsKeeper(
147-
appCodec,
148-
legacyAmino,
149-
appKeepers.keys[paramstypes.StoreKey],
150-
appKeepers.tkeys[paramstypes.TStoreKey],
151-
)
152-
appKeepers.ParamsKeeper = &paramsKeeper
153-
154138
consensusKeeper := consensusparamskeeper.NewKeeper(
155139
appCodec,
156140
runtime.NewKVStoreService(appKeepers.keys[consensusparamstypes.StoreKey]),
@@ -275,10 +259,9 @@ func NewAppKeeper(
275259
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
276260
)
277261

278-
halvingKeeper := halving.NewKeeper(
262+
halvingKeeper := halvingkeeper.NewKeeper(
279263
appCodec,
280-
runtime.NewKVStoreService(appKeepers.keys[halving.StoreKey]),
281-
appKeepers.GetSubspace(halving.DefaultParamspace),
264+
runtime.NewKVStoreService(appKeepers.keys[halvingtypes.StoreKey]),
282265
*appKeepers.MintKeeper,
283266
*appKeepers.AccountKeeper,
284267
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
@@ -308,7 +291,7 @@ func NewAppKeeper(
308291
appKeepers.IBCKeeper = ibckeeper.NewKeeper(
309292
appCodec,
310293
runtime.NewKVStoreService(appKeepers.keys[ibcexported.StoreKey]),
311-
appKeepers.GetSubspace(ibcexported.ModuleName),
294+
nil,
312295
appKeepers.UpgradeKeeper,
313296
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
314297
)
@@ -326,7 +309,7 @@ func NewAppKeeper(
326309
transferKeeper := ibctransferkeeper.NewKeeper(
327310
appCodec,
328311
runtime.NewKVStoreService(appKeepers.keys[ibctransfertypes.StoreKey]),
329-
appKeepers.GetSubspace(ibctransfertypes.ModuleName),
312+
nil,
330313
// The ICS4Wrapper is replaced by the callback stack later in the code
331314
// so that sending can be overridden by the middleware
332315
appKeepers.IBCKeeper.ChannelKeeper, // ICS4Wrapper, replaced by the stack
@@ -342,7 +325,7 @@ func NewAppKeeper(
342325
icaHostKeeper := icahostkeeper.NewKeeper(
343326
appCodec,
344327
runtime.NewKVStoreService(appKeepers.keys[icahosttypes.StoreKey]),
345-
appKeepers.GetSubspace(icahosttypes.SubModuleName),
328+
nil,
346329
appKeepers.IBCKeeper.ChannelKeeper, // use as ics4Wrapper in middleware stack
347330
appKeepers.IBCKeeper.ChannelKeeper,
348331
appKeepers.AccountKeeper,
@@ -356,7 +339,7 @@ func NewAppKeeper(
356339
icaControllerKeeper := icacontrollerkeeper.NewKeeper(
357340
appCodec,
358341
runtime.NewKVStoreService(appKeepers.keys[icacontrollertypes.StoreKey]),
359-
appKeepers.GetSubspace(icacontrollertypes.SubModuleName),
342+
nil,
360343
appKeepers.IBCKeeper.ChannelKeeper, // use ics29 fee as ics4Wrapper in middleware stack
361344
appKeepers.IBCKeeper.ChannelKeeper,
362345
bApp.MsgServiceRouter(),
@@ -474,8 +457,7 @@ func NewAppKeeper(
474457

475458
govRouter := govv1beta1.NewRouter()
476459
govRouter.
477-
AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler).
478-
AddRoute(paramsproposal.RouterKey, params.NewParamChangeProposalHandler(*appKeepers.ParamsKeeper)) // this is kept for the modules that are yet to migrate from legacy x/params.
460+
AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler)
479461

480462
govConfig := govtypes.DefaultConfig()
481463
govConfig.MaxMetadataLen = 5000
@@ -503,34 +485,3 @@ func NewAppKeeper(
503485

504486
return appKeepers
505487
}
506-
507-
// GetSubspace returns a param subspace for a given module name.
508-
func (appKeepers *AppKeepers) GetSubspace(moduleName string) paramstypes.Subspace {
509-
subspace, _ := appKeepers.ParamsKeeper.GetSubspace(moduleName)
510-
return subspace
511-
}
512-
513-
// initParamsKeeper init params keeper and its subspaces.
514-
func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper {
515-
paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey)
516-
517-
keyTable := ibcclienttypes.ParamKeyTable()
518-
keyTable.RegisterParamSet(&ibcconnectiontypes.Params{})
519-
paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable())
520-
paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable())
521-
paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable())
522-
paramsKeeper.Subspace(minttypes.ModuleName)
523-
paramsKeeper.Subspace(distributiontypes.ModuleName).WithKeyTable(distributiontypes.ParamKeyTable())
524-
paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable())
525-
paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable())
526-
paramsKeeper.Subspace(halvingtypes.DefaultParamspace) // keeper handles keytable for this one
527-
paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable())
528-
paramsKeeper.Subspace(ibctransfertypes.ModuleName).WithKeyTable(ibctransfertypes.ParamKeyTable())
529-
paramsKeeper.Subspace(ibcexported.ModuleName).WithKeyTable(keyTable)
530-
paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable())
531-
paramsKeeper.Subspace(wasmtypes.ModuleName)
532-
paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable())
533-
paramsKeeper.Subspace(packetforwardtypes.ModuleName)
534-
535-
return paramsKeeper
536-
}

app/keepers/keys.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
epochstypes "github.com/cosmos/cosmos-sdk/x/epochs/types"
1616
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
1717
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
18-
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
1918
protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
2019
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
2120
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -26,7 +25,7 @@ import (
2625
icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
2726
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
2827
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
29-
"github.com/persistenceOne/persistenceCore/v17/x/halving"
28+
halvingtypes "github.com/persistenceOne/persistenceCore/v17/x/halving/types"
3029
liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
3130
)
3231

@@ -44,7 +43,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
4443
evidencetypes.StoreKey,
4544
feegrant.StoreKey,
4645
govtypes.StoreKey,
47-
halving.StoreKey,
46+
halvingtypes.StoreKey,
4847
ibcexported.StoreKey,
4948
ibchookstypes.StoreKey,
5049
ibctransfertypes.StoreKey,
@@ -53,7 +52,6 @@ func (appKeepers *AppKeepers) GenerateKeys() {
5352
liquidtypes.StoreKey,
5453
liquidstaketypes.StoreKey,
5554
minttypes.StoreKey,
56-
paramstypes.StoreKey,
5755
packetforwardtypes.StoreKey,
5856
slashingtypes.StoreKey,
5957
stakingtypes.StoreKey,
@@ -63,7 +61,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
6361
)
6462

6563
// Define transient store keys
66-
appKeepers.tkeys = storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
64+
appKeepers.tkeys = storetypes.NewTransientStoreKeys()
6765

6866
// MemKeys are for information that is stored only in RAM.
6967
}

app/modules.go

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -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,

app/upgrades/testnet/v17.0.0-rc0/constants.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package v17_0_0_rc0
22

33
import (
44
store "cosmossdk.io/store/types"
5+
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
6+
57
"github.com/persistenceOne/persistenceCore/v17/app/upgrades"
68
)
79

@@ -15,6 +17,6 @@ var Upgrade = upgrades.Upgrade{
1517
CreateUpgradeHandler: CreateUpgradeHandler,
1618
StoreUpgrades: store.StoreUpgrades{
1719
Added: []string{},
18-
Deleted: []string{},
20+
Deleted: []string{paramstypes.StoreKey},
1921
},
2022
}

0 commit comments

Comments
 (0)