Merge pull request #2277 from cheng762/develop

update max Validators only for main net
PlatONnetwork · Feb 28, 2025 · 8642dfc · 8642dfc
2 parents 9d3ec22 + 92b2026
commit 8642dfc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/params/config.go b/params/config.go
@@ -157,6 +157,8 @@ var (
 	AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), PrivatePIP7ChainID, "lat", "", big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), &CbftConfig{Period: 3}, FORKVERSION_1_5_0, sync.RWMutex{}}
 
 	PrivatePIP7ChainID = new(big.Int).SetUint64(2203181)
+
+	MainPIP7ChainID = new(big.Int).SetUint64(210425)
 )
 
 // TrustedCheckpoint represents a set of post-processed trie roots (CHT and

diff --git a/x/plugin/gov_plugin.go b/x/plugin/gov_plugin.go
@@ -149,7 +149,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 versionProposal.NewVersion == params.FORKVERSION_1_5_0 && govPlugin.chainConfig.PIP7ChainID.Cmp(params.MainPIP7ChainID) == 0 {
 				if err := gov.UpdateGovernParamValue(gov.ModuleStaking, gov.KeyMaxValidators, fmt.Sprint(xcom.MaxValidatorsForVersion150), blockNumber+1, blockHash); err != nil {
 					return err
 				}

diff --git a/x/plugin/staking_plugin.go b/x/plugin/staking_plugin.go
@@ -3166,9 +3166,10 @@ func vrfElection(validatorList staking.ValidatorQueue, shiftLen int, nonce []byt
 		return nil, err
 	}
 	if len(preNonces) < len(validatorList) {
-		log.Error("Failed to vrfElection on Election", "blockNumber", blockNumber, "validatorListSize", len(validatorList),
-			"nonceSize", len(nonce), "preNoncesSize", len(preNonces), "parentHash", hex.EncodeToString(parentHash.Bytes()))
-		return nil, staking.ErrWrongFuncParams
+		validatorList = validatorList[:len(preNonces)]
+		//log.Error("Failed to vrfElection on Election", "blockNumber", blockNumber, "validatorListSize", len(validatorList),
+		//	"nonceSize", len(nonce), "preNoncesSize", len(preNonces), "parentHash", hex.EncodeToString(parentHash.Bytes()))
+		//return nil, staking.ErrWrongFuncParams
 	}
 	if len(preNonces) > len(validatorList) {
 		preNonces = preNonces[len(preNonces)-len(validatorList):]