Bump sdk v50 #5

catShaark · 2024-10-21T07:21:20Z

No description provided.

catShaark · 2024-10-21T07:23:35Z

proto/multistaking/v1/multi_staking.proto

@@ -14,12 +14,12 @@ message MultiStakingCoin {
  string denom = 1;
  string amount = 2 [
    (cosmos_proto.scalar) = "cosmos.Int",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",


move to 50, we replace sdk.Int with math.Int

catShaark · 2024-10-21T07:24:34Z

proto/multistaking/v1/multi_staking.proto

@@ -70,7 +70,7 @@ message MultiStakingCoinInfo {
  string denom = 1;
  string bond_weight = 2 [
    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",


sdk.Dec becomes math.LegacyDec

vietanh2k · 2024-10-21T07:41:29Z

test/simapp/app.go

@@ -111,16 +115,13 @@ var (
 		auth.AppModuleBasic{},
 		genutil.AppModuleBasic{},
 		bank.AppModuleBasic{},
-		capability.AppModuleBasic{},


(cosmos/cosmos-sdk#15344) Capability module was removed

vietanh2k · 2024-10-21T07:59:19Z

test/simapp/app.go

@@ -161,6 +162,7 @@ type SimApp struct {
 	legacyAmino       *codec.LegacyAmino
 	appCodec          codec.Codec
 	interfaceRegistry types.InterfaceRegistry
+	txConfig          client.TxConfig


add txConfig and BasicModuleManager base to cosmos simapp

vietanh2k · 2024-10-21T08:16:54Z

test/simapp/app.go

 		authzkeeper.StoreKey, consensusparamtypes.StoreKey,
 	)
-	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
-	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
+	tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)


References to types/store.go which contained aliases for store types have been remapped to point to appropriate store/types

vietanh2k · 2024-10-21T08:24:25Z

test/simapp/app.go

@@ -254,47 +288,58 @@ func NewSimApp(
 	// set the BaseApp's parameter store
 	app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(
 		appCodec,
-		keys[consensusparamtypes.StoreKey],
+		runtime.NewKVStoreService(keys[consensusparamtypes.StoreKey]),


use the runtime.NewKVStoreService method to create a KVStoreService from a StoreKey

vietanh2k · 2024-10-21T08:31:37Z

test/simapp/app.go

+		logger,
+	)
+
+	enabledSignModes := append(tx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL)


must be added after setting the app's bank keeper when using (legacy) application wiring

vietanh2k · 2024-10-21T09:54:03Z

test/simapp/app.go


+	app.BasicModuleManager = module.NewBasicManagerFromManager(


set up BasicModuleManager

vietanh2k · 2024-10-21T10:12:59Z

test/simapp/app.go

@@ -520,6 +590,7 @@ func NewSimApp(

 	app.SetAnteHandler(anteHandler)
 	app.SetInitChainer(app.InitChainer)
+	app.SetPreBlocker(app.PreBlocker)


set a pre-blocker function for the app

vietanh2k · 2024-10-21T10:14:04Z

test/simapp/app.go

 // BeginBlocker application updates every begin block
-func (app *SimApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {


BeginBlock and EndBlock have changed their signature

vietanh2k · 2024-10-21T10:18:00Z

test/simapp/app.go

 	var genesisState GenesisState
-	if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
+	if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)


check err for func

vietanh2k · 2024-10-21T11:09:55Z

test/simapp/app.go

@@ -565,9 +649,9 @@ func (app *SimApp) LoadHeight(height int64) error {
 func (app *SimApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig) {
 	clientCtx := apiSvr.ClientCtx
 	// Register new tx routes from grpc-gateway.
-	authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)


rename import

vietanh2k · 2024-10-21T11:10:32Z

test/simapp/app.go

@@ -595,8 +679,13 @@ func (app *SimApp) RegisterTendermintService(clientCtx client.Context) {

 // RegisterNodeService registers the node gRPC service on the provided
 // application gRPC query router.
-func (app *SimApp) RegisterNodeService(clientCtx client.Context) {
-	node.RegisterNodeService(clientCtx, app.GRPCQueryRouter())
+func (app *SimApp) RegisterNodeService(clientCtx client.Context, cfg config.Config) {


(cosmos/cosmos-sdk#15597) RegisterNodeService now requires a config parameter

vietanh2k · 2024-10-21T11:11:41Z

test/simapp/export.go

 ) (servertypes.ExportedApp, error) {
 	// as if they could withdraw from the start of the next block
-	ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()})


(cosmos/cosmos-sdk#16342) NewContext was renamed to NewContextLegacy

vietanh2k · 2024-10-21T11:13:30Z

test/simapp/export.go

@@ -29,7 +32,10 @@ func (app *SimApp) ExportAppStateAndValidators(
 		app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs)
 	}

-	genState := app.mm.ExportGenesis(ctx, app.appCodec)


ExportGenesis was changed to ExportGenesisForModules

vietanh2k · 2024-10-21T11:14:21Z

test/simapp/export.go

@@ -102,16 +125,33 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 	ctx = ctx.WithBlockHeight(0)

 	// reinitialize all validators
-	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {


check err for func

vietanh2k · 2024-10-22T05:18:56Z

test/simapp/state.go

@@ -140,11 +144,11 @@ func AppStateRandomizedFn(
 	// number of bonded accounts
 	var initialStake, numInitiallyBonded int64
 	appParams.GetOrGenerate(
-		cdc, sims.StakePerAccount, &initialStake, r,


(cosmos/cosmos-sdk#16062) GetOrGenerate no longer requires a codec argument

vietanh2k · 2024-10-22T05:20:28Z

test/simapp/test_helpers.go

 	}
 )

 // Setup initializes a new SimApp. A Nop logger is set in SimApp.
-func Setup(isCheckTx bool) *SimApp {


Remove isCheckTx as it is not being used

vietanh2k · 2024-10-22T05:37:35Z

test/simapp/test_helpers.go


-	// commit genesis changes


(Baseapp) BeginBlock and EndBlock are now internal to baseapp. For testing, user must call FinalizeBlock

vietanh2k · 2024-10-22T06:58:18Z

test/simapp/utils.go

 )

 // SetupSimulation creates the config, db (levelDB), temporary directory and logger for
 // the simulation tests. If `FlagEnabledValue` is false it skips the current test.
 // Returns error on an invalid db intantiation or temp dir creation.
 func SetupSimulation(dirPrefix, dbName string) (simtypes.Config, dbm.DB, string, log.Logger, bool, error) {
-	if !FlagEnabledValue {


enable set up simulation

vietanh2k · 2024-10-22T08:16:19Z

x/multi-staking/keeper/abci.go

@@ -15,7 +16,8 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) {
 }

 // need a way to better name this func
-func GetUnbondingHeightsAndUnbondedAmounts(ctx sdk.Context, unbondingDelegation stakingtypes.UnbondingDelegation) map[int64]math.Int {


cosmos/cosmos-sdk#16324) NewKeeper now takes a KVStoreService instead of a StoreKey, and methods in the Keeper now take a context.Context instead of a sdk.Context

vietanh2k · 2024-10-22T08:19:22Z

x/multi-staking/keeper/genesis_test.go

 			AppStateBytes:   appState.AppState,
 		},
 	)

-	emptyApp.Commit()


finalizeBlock 2 apps to fix the test export

vietanh2k · 2024-10-22T08:20:07Z

x/multi-staking/keeper/invartiants_test.go

-				editMsg := stakingtypes.NewMsgEditValidator(valAddr, stakingtypes.Description{
+				newRate := math.LegacyMustNewDecFromStr("0.03")
+				newMinSelfDelegation := math.NewInt(300)
+				editMsg := stakingtypes.NewMsgEditValidator(valAddr.String(), stakingtypes.Description{


(cosmos/cosmos-sdk#17098) NewMsgCreateValidator, NewValidator, NewMsgCancelUnbondingDelegation, NewMsgUndelegate, NewMsgBeginRedelegate, NewMsgDelegate and NewMsgEditValidator takes a string instead of sdk.ValAddress or sdk.AccAddress

vietanh2k · 2024-10-22T08:21:36Z

x/multi-staking/keeper/keeper.go

 }

-func (k Keeper) DequeueAllMatureUBDQueue(ctx sdk.Context, currTime time.Time) (matureUnbonds []stakingtypes.DVPair) {


cosmos/cosmos-sdk#16324) NewKeeper now takes a KVStoreService instead of a StoreKey, and methods in the Keeper now take a context.Context instead of a sdk.Context

vietanh2k · 2024-10-22T08:32:16Z

x/multi-staking/keeper/msg_server_test.go

@@ -689,10 +692,10 @@ func (suite *KeeperTestSuite) TestBeginRedelegate() {
 				suite.Require().Equal(tc.expRate[0], lockRecord1.GetBondWeight())
 				suite.Require().Equal(tc.expLock[0], lockRecord1.LockedCoin.Amount)

-				delegation1, found := suite.app.StakingKeeper.GetDelegation(suite.ctx, delAddr, valAddr1)


now returns an error instead of a found bool

vietanh2k · 2024-10-22T08:32:54Z

x/multi-staking/module.go

-func (AppModule) ConsensusVersion() uint64 { return 2 }
+func (AppModule) ConsensusVersion() uint64 { return 3 }
+
+// IsAppModule implements the appmodule.AppModule interface.


increase ConsensusVersion

vietanh2k · 2024-10-22T08:39:12Z

x/multi-staking/simulation/genesis.go

+)
+
+// Simulation parameter constants
+const (


create RandomizedGenState for module multi-staking

vietanh2k · 2024-10-22T08:45:20Z

x/multi-staking/module.go

@@ -143,6 +150,9 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	if err := cfg.RegisterMigration(multistakingtypes.ModuleName, 1, m.Migrate1to2); err != nil {
 		panic(fmt.Sprintf("failed to migrate x/%s from version 1 to 2: %v", stakingtypes.ModuleName, err))
 	}
+	if err := cfg.RegisterMigration(multistakingtypes.ModuleName, 2, m.Migrate2to3); err != nil {


upgrade handler from v0.47 to v0.50

vietanh2k · 2024-10-22T08:51:33Z

x/multi-staking/module.go

+func (am AppModule) IsAppModule() {}
+
+// IsOnePerModuleType implements the depinject.OnePerModuleType interface.
+func (am AppModule) IsOnePerModuleType() {}


add interface func

vietanh2k · 2024-10-22T10:00:15Z

test/simapp/app.go

-	legacyAmino := encodingConfig.Amino
-	interfaceRegistry := encodingConfig.InterfaceRegistry
+	legacyAmino := codec.NewLegacyAmino()
+	interfaceRegistry, err := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{


set up encoding config

vietanh2k · 2024-10-22T10:05:39Z

test/simapp/app.go

@@ -241,7 +275,7 @@ func NewSimApp(
 		invCheckPeriod:    invCheckPeriod,
 		keys:              keys,
 		tkeys:             tkeys,
-		memKeys:           memKeys,


Remove as it is not being used

vietanh2k · 2024-10-22T10:12:49Z

test/simapp/simd/cmd/root.go

-		genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, simapp.DefaultNodeHome, genutiltypes.DefaultMessageValidator),
-		genutilcli.MigrateGenesisCmd(),
-		genutilcli.GenTxCmd(simapp.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, simapp.DefaultNodeHome),
+		genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, simapp.DefaultNodeHome, genutiltypes.DefaultMessageValidator, addresscodec.NewBech32Codec("cosmos")),


(cosmos/cosmos-sdk#15567) CollectGenTxsCmd & GenTxCmd takes a address.Codec to be able to decode addresses.

vietanh2k · 2024-10-22T10:29:49Z

test/simapp/types.go

@@ -20,20 +20,20 @@ type App interface {
 	LegacyAmino() *codec.LegacyAmino

 	// Application updates every begin block.
-	BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock


BeginBlock and EndBlock have changed their signature

vietanh2k · 2024-10-22T10:31:16Z

x/multi-staking/keeper/invariants.go

@@ -42,7 +42,7 @@ func ModuleAccountInvariants(k Keeper) sdk.Invariant {
 		moduleAccount := authtypes.NewModuleAddress(types.ModuleName)
 		escrowBalances := k.bankKeeper.GetAllBalances(ctx, moduleAccount)

-		broken := !escrowBalances.IsEqual(totalLockCoinAmount)


(cosmos/cosmos-sdk#14739) Deprecate the method Coin.IsEqual in favour of Coin.Equal.

vietanh2k · 2024-10-22T10:35:58Z

x/multi-staking/keeper/keeper_test.go

-
-	app.BeginBlock(abci.RequestBeginBlock{Header: newHeader})
-
-	suite.ctx = app.NewContext(false, newHeader)


update base on cosmos sdk NextBlock

vietanh2k · 2024-10-23T10:46:08Z

test/simapp/app.go

 		staking.AppModuleBasic{},
 		multistaking.AppModuleBasic{},
 		mint.AppModuleBasic{},
 		distr.AppModuleBasic{},
 		gov.NewAppModuleBasic(
 			[]govclient.ProposalHandler{
 				paramsclient.ProposalHandler,
-				upgradeclient.LegacyProposalHandler,


(cosmos/cosmos-sdk#14880) use gov v1 proposals in upgrade cli

…king into bump_sdk_v50

sontrinh16 and others added 14 commits September 30, 2024 13:17

bump sdk50

f36ce8c

upgrade sdk 50

eb28c45

fix bug register interface

1966be5

fix genesis bug

5612e93

fix bug val address

c8cdb40

Fix keeper test

c7b8bac

Fix dependency

844c50d

lint

56fc9b4

add migrations for multistaking modules

7e6827e

add preblocker, fix bug

363ba66

simulation

5796e59

sim test

33ce278

simtest

b062d1d

fix test export

5ec6210

catShaark commented Oct 21, 2024

View reviewed changes

vietanh2k reviewed Oct 21, 2024

View reviewed changes

vietanh2k reviewed Oct 22, 2024

View reviewed changes

vietanh2k reviewed Oct 23, 2024

View reviewed changes

vietanh2k and others added 3 commits October 24, 2024 11:57

correct check

2b78988

Use correct validator codec

c19b60f

Publish Staking module

921f404

trinitys7 force-pushed the bump_sdk_v50 branch from 921f404 to c19b60f Compare October 24, 2024 07:23

vietanh2k and others added 6 commits October 24, 2024 15:47

lint

2805667

Add cosmos.msg.v1.service proto annotation

29cf831

Merge branch 'bump_sdk_v50' of https://github.com/decentrio/multi-sta…

bb04cd6

…king into bump_sdk_v50

fix lint

b21e19d

fix typo

3c6a39c

refactor consensus version and migrations

b3e83b6

		// BeginBlocker application updates every begin block
		func (app *SimApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {

		}

		func (k Keeper) DequeueAllMatureUBDQueue(ctx sdk.Context, currTime time.Time) (matureUnbonds []stakingtypes.DVPair) {


		app.BeginBlock(abci.RequestBeginBlock{Header: newHeader})

		suite.ctx = app.NewContext(false, newHeader)

Bump sdk v50 #5

Are you sure you want to change the base?

Bump sdk v50 #5

Conversation

catShaark commented Oct 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vietanh2k Oct 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vietanh2k Oct 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vietanh2k Oct 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vietanh2k Oct 21, 2024 •

edited

Loading

vietanh2k Oct 21, 2024 •

edited

Loading

vietanh2k Oct 22, 2024 •

edited

Loading