Merge branch 'main' into dependabot/github_actions/docker/login-action-3

Author: puneet2019

app/encoding.go

@@ -10,6 +10,7 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/std"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	grouptypes "github.com/cosmos/cosmos-sdk/x/group"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 	interchainquerytypes "github.com/persistenceOne/persistence-sdk/v7/x/interchainquery/types"
@@ -76,6 +77,9 @@ func AppendModuleInterfaces(interfaceRegistry codectypes.InterfaceRegistry, mbm
 
 	// params types proposals
 	paramstypes.RegisterInterfaces(interfaceRegistry)
+
+	//crisis types
+	crisistypes.RegisterInterfaces(interfaceRegistry)
 }
 
 func AppendModuleLegacyCodecs(amino *codec.LegacyAmino, mbm module.BasicManager) {
@@ -112,4 +116,6 @@ func AppendModuleLegacyCodecs(amino *codec.LegacyAmino, mbm module.BasicManager)
 	// params types proposals
 	paramstypes.RegisterLegacyAminoCodec(amino)
 
+	//crisis types
+	crisistypes.RegisterLegacyAminoCodec(amino)
 }

app/export.go

@@ -44,8 +44,6 @@ func (app *Application) ExportAppStateAndValidators(forZeroHeight bool, jailWhit
 }
 
 func (app *Application) prepForZeroHeightGenesis(context sdk.Context, jailWhiteList []string) {
-	/* Just to be safe, assert the invariants on current state. */
-	app.CrisisKeeper.AssertInvariants(context)
 
 	/* Handle fee distribution state. */
 

app/keepers/keepers.go

@@ -28,8 +28,6 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	consensusparamskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
 	consensusparamstypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
-	crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	epochskeeper "github.com/cosmos/cosmos-sdk/x/epochs/keeper"
@@ -91,7 +89,6 @@ type AppKeepers struct {
 	GovKeeper             *govkeeper.Keeper
 	ProtocolPoolKeeper    *protocolpoolkeeper.Keeper
 	UpgradeKeeper         *upgradekeeper.Keeper
-	CrisisKeeper          *crisiskeeper.Keeper
 	IBCKeeper             *ibckeeper.Keeper
 	ICAHostKeeper         *icahostkeeper.Keeper
 	EvidenceKeeper        *evidencekeeper.Keeper
@@ -233,17 +230,6 @@ func NewAppKeeper(
 	)
 	appKeepers.SlashingKeeper = &slashingKeeper
 
-	invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod))
-	appKeepers.CrisisKeeper = crisiskeeper.NewKeeper(
-		appCodec,
-		runtime.NewKVStoreService(appKeepers.keys[crisistypes.StoreKey]),
-		invCheckPeriod,
-		appKeepers.BankKeeper,
-		authtypes.FeeCollectorName,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-		appKeepers.AccountKeeper.AddressCodec(),
-	)
-
 	// get skipUpgradeHeights from the app options
 	skipUpgradeHeights := map[int64]bool{}
 	for _, h := range cast.ToIntSlice(appOpts.Get(server.FlagUnsafeSkipUpgrades)) {

app/keepers/keys.go

@@ -10,7 +10,6 @@ import (
 	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	consensusparamstypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	epochstypes "github.com/cosmos/cosmos-sdk/x/epochs/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -37,7 +36,6 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 		authzkeeper.StoreKey,
 		banktypes.StoreKey,
 		consensusparamstypes.StoreKey,
-		crisistypes.StoreKey,
 		distributiontypes.StoreKey,
 		epochstypes.StoreKey,
 		evidencetypes.StoreKey,

app/modules.go

@@ -22,8 +22,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
-	"github.com/cosmos/cosmos-sdk/x/crisis"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	"github.com/cosmos/cosmos-sdk/x/distribution"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	"github.com/cosmos/cosmos-sdk/x/epochs"
@@ -110,7 +108,6 @@ func appModules(
 		epochs.NewAppModule(*app.EpochsKeeper),
 		liquid.NewAppModule(appCodec, app.LiquidKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
 		liquidstake.NewAppModule(*app.LiquidStakeKeeper),
-		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
 		ibctm.NewAppModule(app.TMLightClientModule),
 		protocolpool.NewAppModule(*app.ProtocolPoolKeeper, app.AccountKeeper, app.BankKeeper),
 	}
@@ -139,7 +136,6 @@ func orderBeginBlockers() []string {
 		minttypes.ModuleName,
 		distributiontypes.ModuleName,
 		protocolpooltypes.ModuleName,
-		crisistypes.ModuleName,
 		govtypes.ModuleName,
 		stakingtypes.ModuleName,
 		ibctransfertypes.ModuleName,
@@ -165,7 +161,6 @@ func orderBeginBlockers() []string {
 
 func orderEndBlockers() []string {
 	return []string{
-		crisistypes.ModuleName,
 		govtypes.ModuleName,
 		stakingtypes.ModuleName,
 		ibctransfertypes.ModuleName,
@@ -209,7 +204,6 @@ func orderInitGenesis() []string {
 		slashingtypes.ModuleName,
 		govtypes.ModuleName,
 		minttypes.ModuleName,
-		crisistypes.ModuleName,
 		ibctransfertypes.ModuleName,
 		ibcexported.ModuleName,
 		icatypes.ModuleName,
@@ -241,7 +235,6 @@ func orderExportGenesis() []string {
 		slashingtypes.ModuleName,
 		govtypes.ModuleName,
 		minttypes.ModuleName,
-		crisistypes.ModuleName,
 		genutiltypes.ModuleName,
 		evidencetypes.ModuleName,
 		authz.ModuleName,

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

@@ -2,6 +2,7 @@ package v17_0_0_rc0
 
 import (
 	store "cosmossdk.io/store/types"
+	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
 	"github.com/persistenceOne/persistenceCore/v17/app/upgrades"
@@ -17,6 +18,6 @@ var Upgrade = upgrades.Upgrade{
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
 		Added:   []string{},
-		Deleted: []string{paramstypes.StoreKey},
+		Deleted: []string{paramstypes.StoreKey, crisistypes.StoreKey},
 	},
 }

app/upgrades/v17.0.0/constants.go

@@ -2,6 +2,7 @@ package v17_0_0
 
 import (
 	store "cosmossdk.io/store/types"
+	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
 	"github.com/persistenceOne/persistenceCore/v17/app/upgrades"
@@ -17,6 +18,6 @@ var Upgrade = upgrades.Upgrade{
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
 		Added:   []string{},
-		Deleted: []string{paramstypes.StoreKey},
+		Deleted: []string{paramstypes.StoreKey, crisistypes.StoreKey},
 	},
 }

proto/pstake/liquidstake/v1beta1/liquidstake.proto

@@ -24,6 +24,7 @@ message Params {
   // UnstakeFeeRate specifies the fee rate when liquid unstake is requested,
   // unbonded by subtracting it from unbondingAmount
   string unstake_fee_rate = 3 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
@@ -54,6 +55,7 @@ message Params {
   // rewards. The fee is taken in favour of the fee account (see
   // FeeAccountAddress).
   string autocompound_fee_rate = 8 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
@@ -141,8 +143,9 @@ message LiquidValidatorState {
 
   // del_shares define the delegation shares of the validator
   string del_shares = 4 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
+    (gogoproto.nullable)   = false
   ];
 
   // liquid_tokens define the token amount worth of delegation shares of the
@@ -162,6 +165,7 @@ message NetAmountState {
 
   // mint_rate is stkXPRTTotalSupply / NetAmount
   string mint_rate = 1 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
@@ -175,12 +179,14 @@ message NetAmountState {
   // net_amount is proxy account's native token balance + total liquid tokens +
   // total remaining rewards + total unbonding balance
   string net_amount = 3 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 
   // total_del_shares define the delegation shares of all liquid validators
   string total_del_shares = 4 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
@@ -195,6 +201,7 @@ message NetAmountState {
   // total_remaining_rewards define the sum of remaining rewards of proxy
   // account by all liquid validators
   string total_remaining_rewards = 6 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];

x/liquidstake/keeper/keeper_test.go

@@ -12,7 +12,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
-	"github.com/cosmos/cosmos-sdk/x/crisis"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	"github.com/cosmos/cosmos-sdk/x/mint"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -73,10 +72,7 @@ func (s *KeeperTestSuite) SetupTest() {
 	s.Require().NoError(err)
 }
 
-func (s *KeeperTestSuite) TearDownTest() {
-	// invariant check
-	crisis.EndBlocker(s.ctx, *s.app.CrisisKeeper)
-}
+func (s *KeeperTestSuite) TearDownTest() {}
 
 func (s *KeeperTestSuite) CreateValidators(powers []int64) ([]sdk.AccAddress, []sdk.ValAddress, []cryptotypes.PubKey) {
 	_, err := s.app.BeginBlocker(s.ctx)