From beb795914dfe5c8773aa79fde438dbf2e49adfe3 Mon Sep 17 00:00:00 2001 From: clearly <910372762@qq.com> Date: Tue, 19 Nov 2024 15:28:33 +0800 Subject: [PATCH 1/2] update gov param max validators to 225 --- x/plugin/gov_plugin.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/x/plugin/gov_plugin.go b/x/plugin/gov_plugin.go index cb64fe0703..eab30ab9c1 100644 --- a/x/plugin/gov_plugin.go +++ b/x/plugin/gov_plugin.go @@ -149,6 +149,12 @@ func (govPlugin *GovPlugin) BeginBlock(blockHash common.Hash, header *types.Head } log.Info("Successfully upgraded the new version 1.3.0", "blockNumber", blockNumber, "blockHash", blockHash, "preActiveProposalID", preActiveVersionProposalID) } + if versionProposal.NewVersion == params.FORKVERSION_1_5_0 { + if err := gov.UpdateGovernParamValue(gov.ModuleStaking, gov.KeyMaxValidators, "225", blockNumber+1, blockHash); err != nil { + return err + } + log.Info("Successfully upgraded the new version 1.5.0", "blockNumber", blockNumber, "blockHash", blockHash) + } log.Info("version proposal is active", "blockNumber", blockNumber, "proposalID", versionProposal.ProposalID, "newVersion", versionProposal.NewVersion, "newVersionString", xutil.ProgramVersion2Str(versionProposal.NewVersion)) } From 5fd5a79160551a7be295af512cc3b3649594980a Mon Sep 17 00:00:00 2001 From: clearly <910372762@qq.com> Date: Thu, 21 Nov 2024 15:27:11 +0800 Subject: [PATCH 2/2] update MaxValidators --- x/plugin/gov_plugin.go | 2 +- x/xcom/common_config.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/x/plugin/gov_plugin.go b/x/plugin/gov_plugin.go index eab30ab9c1..b3539ebd4f 100644 --- a/x/plugin/gov_plugin.go +++ b/x/plugin/gov_plugin.go @@ -150,7 +150,7 @@ func (govPlugin *GovPlugin) BeginBlock(blockHash common.Hash, header *types.Head log.Info("Successfully upgraded the new version 1.3.0", "blockNumber", blockNumber, "blockHash", blockHash, "preActiveProposalID", preActiveVersionProposalID) } if versionProposal.NewVersion == params.FORKVERSION_1_5_0 { - if err := gov.UpdateGovernParamValue(gov.ModuleStaking, gov.KeyMaxValidators, "225", blockNumber+1, blockHash); err != nil { + if err := gov.UpdateGovernParamValue(gov.ModuleStaking, gov.KeyMaxValidators, fmt.Sprint(xcom.MaxValidatorsForVersion150), blockNumber+1, blockHash); err != nil { return err } log.Info("Successfully upgraded the new version 1.5.0", "blockNumber", blockNumber, "blockHash", blockHash) diff --git a/x/xcom/common_config.go b/x/xcom/common_config.go index f17d0dff54..afcbeb57f9 100644 --- a/x/xcom/common_config.go +++ b/x/xcom/common_config.go @@ -20,11 +20,12 @@ import ( "encoding/json" "errors" "fmt" - "github.com/PlatONnetwork/PlatON-Go/params" - "github.com/PlatONnetwork/PlatON-Go/rlp" "math/big" "sync" + "github.com/PlatONnetwork/PlatON-Go/params" + "github.com/PlatONnetwork/PlatON-Go/rlp" + "github.com/PlatONnetwork/PlatON-Go/log" "github.com/PlatONnetwork/PlatON-Go/common" @@ -69,6 +70,8 @@ const ( ElectionBasePIP3 = 43 MainNetECHash = "0x259176769541cdb61bc19806cbf5a3f3489f4829b6b69f804f45f947a0c9c3e9" + + MaxValidatorsForVersion150 = 225 ) var (