Bump version to cosmos-sdk v0.50.14

app/app.go

@@ -102,6 +102,7 @@ import (
 	upgrades "github.com/firmachain/firmachain/app/upgrades"
 	v4 "github.com/firmachain/firmachain/app/upgrades/v4"
 	v5 "github.com/firmachain/firmachain/app/upgrades/v5"
+	v5_1 "github.com/firmachain/firmachain/app/upgrades/v5.1"
 	"github.com/firmachain/firmachain/client/docs"
 
 	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
@@ -171,7 +172,7 @@ import (
 )
 
 var (
-	Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade}
+	Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade, v5_1.Upgrade}
 )
 
 func getGovProposalHandlers() []govclient.ProposalHandler {
@@ -1040,8 +1041,12 @@ func (app *App) updateValidatorMinCommision(ctx sdk.Context) {
 				panic(err)
 			}
 			// call the before-modification hook since we're about to update the commission
-			staking.Hooks().BeforeValidatorModified(ctx, valBs)
-			staking.SetValidator(ctx, v)
+			if err := staking.Hooks().BeforeValidatorModified(ctx, valBs); err != nil {
+				panic(err)
+			}
+			if err := staking.SetValidator(ctx, v); err != nil {
+				panic(err)
+			}
 		}
 	}
 }
@@ -1057,7 +1062,9 @@ func (app *App) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.
 	if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
-	app.AppKeepers.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
+	if err := app.AppKeepers.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()); err != nil {
+		return nil, err
+	}
 	return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
 }
 

app/apptesting/test_helpers.go

@@ -221,7 +221,7 @@ func genesisStateWithValSet(
 	bondAmt := sdk.DefaultPowerReduction
 
 	for _, val := range valSet.Validators {
-		pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey)
+		pk, err := cryptocodec.FromCmtPubKeyInterface(val.PubKey)
 		require.NoError(t, err)
 		pkAny, err := codectypes.NewAnyWithValue(pk)
 		require.NoError(t, err)

app/apptesting/test_suite.go

@@ -30,8 +30,6 @@ import (
 	contracttypes "github.com/firmachain/firmachain/x/contract/types"
 	nfttypes "github.com/firmachain/firmachain/x/nft/types"
 	tokentypes "github.com/firmachain/firmachain/x/token/types"
-
-	header "cosmossdk.io/core/header"
 )
 
 type AddressWithKeys struct {
@@ -159,7 +157,7 @@ func (s *TestSuite) ConfirmUpgradeSucceeded(upgradeName string, upgradeHeight in
 
 	s.Ctx = s.Ctx.WithBlockHeight(upgradeHeight)
 
-	s.Ctx = s.Ctx.WithHeaderInfo(header.Info{Height: upgradeHeight, Time: s.Ctx.BlockTime().Add(time.Second)}).WithBlockHeight(upgradeHeight)
+	s.Ctx = s.Ctx.WithHeaderInfo(coreheader.Info{Height: upgradeHeight, Time: s.Ctx.BlockTime().Add(time.Second)}).WithBlockHeight(upgradeHeight)
 
 	res, err := s.App.PreBlocker(s.Ctx, nil)
 	_ = res
@@ -209,7 +207,9 @@ func (s *TestSuite) MakeAndSingTx(
 	msgs := make([]sdk.Msg, 0, 1)
 	msgs = append(msgs, msg)
 	builder := cfg.NewTxBuilder()
-	builder.SetMsgs(msgs...)
+	if err := builder.SetMsgs(msgs...); err != nil {
+		s.NoError(err)
+	}
 	builder.SetMemo(memo)
 	builder.SetGasLimit(gasLimit)
 	builder.SetFeeAmount(feeAmount)

app/export.go

@@ -179,20 +179,24 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str
 	/* Handle staking state. */
 
 	// iterate through redelegations, reset creation height
-	app.AppKeepers.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) {
+	_ = app.AppKeepers.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) {
 		for i := range red.Entries {
 			red.Entries[i].CreationHeight = 0
 		}
-		app.AppKeepers.StakingKeeper.SetRedelegation(ctx, red)
+		if err := app.AppKeepers.StakingKeeper.SetRedelegation(ctx, red); err != nil {
+			panic(err)
+		}
 		return false
 	})
 
 	// iterate through unbonding delegations, reset creation height
-	app.AppKeepers.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) {
+	_ = app.AppKeepers.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) {
 		for i := range ubd.Entries {
 			ubd.Entries[i].CreationHeight = 0
 		}
-		app.AppKeepers.StakingKeeper.SetUnbondingDelegation(ctx, ubd)
+		if err := app.AppKeepers.StakingKeeper.SetUnbondingDelegation(ctx, ubd); err != nil {
+			panic(err)
+		}
 		return false
 	})
 
@@ -232,11 +236,13 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str
 	/* Handle slashing state. */
 
 	// reset start height on signing infos
-	app.AppKeepers.SlashingKeeper.IterateValidatorSigningInfos(
+	_ = app.AppKeepers.SlashingKeeper.IterateValidatorSigningInfos(
 		ctx,
 		func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) {
 			info.StartHeight = 0
-			app.AppKeepers.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info)
+			if err := app.AppKeepers.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info); err != nil {
+				panic(err)
+			}
 			return false
 		},
 	)

app/helpers/mock.go

@@ -24,7 +24,7 @@ func NewPV() PV {
 
 // GetPubKey implements PrivValidator interface
 func (pv PV) GetPubKey() (crypto.PubKey, error) {
-	return cryptocodec.ToTmPubKeyInterface(pv.PrivKey.PubKey())
+	return cryptocodec.ToCmtPubKeyInterface(pv.PrivKey.PubKey())
 }
 
 // SignVote implements PrivValidator interface

app/upgrades/v5.1/constants.go

@@ -0,0 +1,15 @@
+package v5_1
+
+import (
+	store "cosmossdk.io/store/types"
+	upgrades "github.com/firmachain/firmachain/app/upgrades"
+)
+
+// UpgradeName defines the on-chain upgrade name for the upgrade.
+const UpgradeName = "v0.5.1"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateV0_5_1UpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}

app/upgrades/v5.1/upgrades.go

@@ -0,0 +1,24 @@
+package v5_1
+
+import (
+	"context"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	"github.com/firmachain/firmachain/app/keepers"
+)
+
+func CreateV0_5_1UpgradeHandler(
+	mm *module.Manager,
+	cfg module.Configurator,
+	_ *keepers.AppKeepers,
+	_ *codec.ProtoCodec,
+) upgradetypes.UpgradeHandler {
+	return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx := sdk.UnwrapSDKContext(c)
+		return mm.RunMigrations(ctx, cfg, vm)
+	}
+}

app/upgrades/v5/upgrades.go

@@ -152,7 +152,9 @@ func CreateV0_5_0UpgradeHandler(
 		newGovParams.MinInitialDepositRatio = "0.500000000000000000"
 		newGovParams.ProposalCancelRatio = "0.500000000000000000"
 		newGovParams.ProposalCancelDest = "firma1kvlelvv6u7h4jasqlpu956czt4543xqzc37h2v"
-		keepers.GovKeeper.Params.Set(ctx, newGovParams)
+		if err := keepers.GovKeeper.Params.Set(ctx, newGovParams); err != nil {
+			return nil, err
+		}
 		logger.Info("gov: GovKeeper params set")
 
 		keepers.IBCKeeper.ClientKeeper.SetParams(ctx, newIBCCoreParams)

cmd/firmachaind/genaccounts.go

@@ -67,6 +67,9 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 					return fmt.Errorf("failed to get address from Keyring: %w", err)
 				}
 				addr, err = info.GetAddress()
+				if err != nil {
+					return err
+				}
 			}
 
 			coins, err := sdk.ParseCoinsNormalized(args[1])