add hardfork epoch to use GT for check Quorum in uniformVoteWeight

GheisMohammadi · GheisMohammadi · commit 366fce08b937 · 2025-01-27T23:34:05.000+08:00
diff --git a/cmd/harmony/main.go b/cmd/harmony/main.go
@@ -705,7 +705,8 @@ func setupChain(hc harmonyconfig.HarmonyConfig, nodeConfig *nodeconfig.ConfigTyp
 }
 
 func setupConsensusAndNode(hc harmonyconfig.HarmonyConfig, nodeConfig *nodeconfig.ConfigType, registry *registry.Registry) *node.Node {
-	decider := quorum.NewDecider(quorum.SuperMajorityVote, uint32(hc.General.ShardID))
+	useGT := registry.GetBlockchain().Config().IsLeaderRotationV2Epoch(registry.GetBlockchain().CurrentBlock().Epoch())
+	decider := quorum.NewDecider(quorum.SuperMajorityVote, uint32(hc.General.ShardID), useGT)
 
 	// Parse minPeers from harmonyconfig.HarmonyConfig
 	var minPeers int
diff --git a/consensus/consensus_service.go b/consensus/consensus_service.go
@@ -373,7 +373,8 @@ func (consensus *Consensus) updateConsensusInformation(reason string) Mode {
 
 	// Only happens once, the flip-over to a new Decider policy
 	if isFirstTimeStaking || haventUpdatedDecider {
-		decider := quorum.NewDecider(quorum.SuperMajorityStake, consensus.ShardID)
+		useGT := consensus.Blockchain().Config().IsLeaderRotationV2Epoch(consensus.Blockchain().CurrentBlock().Epoch())
+		decider := quorum.NewDecider(quorum.SuperMajorityStake, consensus.ShardID, useGT)
 		consensus.decider = decider
 	}
 
diff --git a/consensus/consensus_service_test.go b/consensus/consensus_service_test.go
@@ -26,7 +26,7 @@ func TestSignAndMarshalConsensusMessage(t *testing.T) {
 	if err != nil {
 		t.Fatalf("newhost failure: %v", err)
 	}
-	decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID)
+	decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID, false)
 	blsPriKey := bls.RandPrivateKey()
 	reg := registry.New()
 	consensus, err := New(host, shard.BeaconChainShardID, multibls.GetPrivateKeys(blsPriKey), reg, decider, 3, false)
@@ -58,7 +58,7 @@ func TestSetViewID(t *testing.T) {
 		t.Fatalf("newhost failure: %v", err)
 	}
 	decider := quorum.NewDecider(
-		quorum.SuperMajorityVote, shard.BeaconChainShardID,
+		quorum.SuperMajorityVote, shard.BeaconChainShardID, false,
 	)
 	blsPriKey := bls.RandPrivateKey()
 	reg := registry.New()
diff --git a/consensus/consensus_test.go b/consensus/consensus_test.go
@@ -79,7 +79,7 @@ func GenerateConsensusForTesting() (p2p.Host, multibls.PrivateKeys, *Consensus,
 		return nil, nil, nil, nil, err
 	}
 
-	decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID)
+	decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID, false)
 	multiBLSPrivateKey := multibls.GetPrivateKeys(bls.RandPrivateKey())
 
 	consensus, err := New(host, shard.BeaconChainShardID, multiBLSPrivateKey, registry.New(), decider, 3, false)
diff --git a/consensus/construct_test.go b/consensus/construct_test.go
@@ -37,7 +37,7 @@ func TestConstructAnnounceMessage(test *testing.T) {
 		test.Fatalf("newhost failure: %v", err)
 	}
 	decider := quorum.NewDecider(
-		quorum.SuperMajorityVote, shard.BeaconChainShardID,
+		quorum.SuperMajorityVote, shard.BeaconChainShardID, false,
 	)
 	blsPriKey := bls.RandPrivateKey()
 	reg := registry.New()
@@ -70,7 +70,7 @@ func TestConstructPreparedMessage(test *testing.T) {
 		test.Fatalf("newhost failure: %v", err)
 	}
 	decider := quorum.NewDecider(
-		quorum.SuperMajorityVote, shard.BeaconChainShardID,
+		quorum.SuperMajorityVote, shard.BeaconChainShardID, false,
 	)
 	blsPriKey := bls.RandPrivateKey()
 	reg := registry.New()
@@ -150,7 +150,7 @@ func TestConstructPrepareMessage(test *testing.T) {
 	priKeyWrapper2 := bls.PrivateKeyWrapper{Pri: blsPriKey2, Pub: &pubKeyWrapper2}
 
 	decider := quorum.NewDecider(
-		quorum.SuperMajorityStake, shard.BeaconChainShardID,
+		quorum.SuperMajorityStake, shard.BeaconChainShardID, false,
 	)
 
 	consensus, err := New(
@@ -242,7 +242,7 @@ func TestConstructCommitMessage(test *testing.T) {
 	priKeyWrapper2 := bls.PrivateKeyWrapper{Pri: blsPriKey2, Pub: &pubKeyWrapper2}
 
 	decider := quorum.NewDecider(
-		quorum.SuperMajorityStake, shard.BeaconChainShardID,
+		quorum.SuperMajorityStake, shard.BeaconChainShardID, false,
 	)
 
 	consensus, err := New(host, shard.BeaconChainShardID, multibls.GetPrivateKeys(blsPriKey1), registry.New(), decider, 3, false)
@@ -324,7 +324,7 @@ func TestPopulateMessageFields(t *testing.T) {
 	}
 	blsPriKey := bls.RandPrivateKey()
 	decider := quorum.NewDecider(
-		quorum.SuperMajorityVote, shard.BeaconChainShardID,
+		quorum.SuperMajorityVote, shard.BeaconChainShardID, false,
 	)
 	consensus, err := New(
 		host, shard.BeaconChainShardID, multibls.GetPrivateKeys(blsPriKey), registry.New(), decider, 3, false,
diff --git a/consensus/quorum/one-node-staked-vote.go b/consensus/quorum/one-node-staked-vote.go
@@ -160,7 +160,7 @@ func (v *stakedVoteWeight) IsQuorumAchievedByMask(mask *bls_cosi.Mask) bool {
 	const msg = "[IsQuorumAchievedByMask] Voting power: need %+v, have %+v"
 	utils.Logger().Debug().
 		Msgf(msg, threshold, currentTotalPower)
-	return (*currentTotalPower).GTE(threshold)
+	return (*currentTotalPower).GT(threshold)
 }
 
 func (v *stakedVoteWeight) ComputeTotalPowerByMask(mask *bls_cosi.Mask) numeric.Dec {
diff --git a/consensus/quorum/one-node-staked-vote_test.go b/consensus/quorum/one-node-staked-vote_test.go
@@ -34,7 +34,7 @@ var (
 type secretKeyMap map[bls.SerializedPublicKey]bls_core.SecretKey
 
 func init() {
-	basicDecider = NewDecider(SuperMajorityStake, shard.BeaconChainShardID)
+	basicDecider = NewDecider(SuperMajorityStake, shard.BeaconChainShardID, false)
 	shard.Schedule = shardingconfig.LocalnetSchedule
 }
 
@@ -71,7 +71,7 @@ func setupBaseCase() (Decider, *TallyResult, shard.SlotList, map[string]secretKe
 		pubKeys = append(pubKeys, wrapper)
 	}
 
-	decider := NewDecider(SuperMajorityStake, shard.BeaconChainShardID)
+	decider := NewDecider(SuperMajorityStake, shard.BeaconChainShardID, false)
 	decider.UpdateParticipants(pubKeys, []bls.PublicKeyWrapper{})
 	tally, err := decider.SetVoters(&shard.Committee{
 		ShardID: shard.BeaconChainShardID, Slots: slotList,
@@ -100,7 +100,7 @@ func setupEdgeCase() (Decider, *TallyResult, shard.SlotList, secretKeyMap) {
 		pubKeys = append(pubKeys, wrapper)
 	}
 
-	decider := NewDecider(SuperMajorityStake, shard.BeaconChainShardID)
+	decider := NewDecider(SuperMajorityStake, shard.BeaconChainShardID, false)
 	decider.UpdateParticipants(pubKeys, []bls.PublicKeyWrapper{})
 	tally, err := decider.SetVoters(&shard.Committee{
 		ShardID: shard.BeaconChainShardID, Slots: slotList,
diff --git a/consensus/quorum/quorom_test.go b/consensus/quorum/quorom_test.go
@@ -53,7 +53,7 @@ func TestPolicyStrings(t *testing.T) {
 }
 
 func TestAddingQuoromParticipants(t *testing.T) {
-	decider := NewDecider(SuperMajorityVote, shard.BeaconChainShardID)
+	decider := NewDecider(SuperMajorityVote, shard.BeaconChainShardID, false)
 
 	assert.Equal(t, int64(0), decider.ParticipantsCount())
 
@@ -77,7 +77,7 @@ func TestSubmitVote(test *testing.T) {
 	viewID := uint64(2)
 
 	decider := NewDecider(
-		SuperMajorityStake, shard.BeaconChainShardID,
+		SuperMajorityStake, shard.BeaconChainShardID, false,
 	)
 
 	message := "test string"
@@ -131,7 +131,7 @@ func TestSubmitVoteAggregateSig(test *testing.T) {
 	viewID := uint64(2)
 
 	decider := NewDecider(
-		SuperMajorityStake, shard.BeaconChainShardID,
+		SuperMajorityStake, shard.BeaconChainShardID, false,
 	)
 
 	blsPriKey1 := bls.RandPrivateKey()
@@ -203,7 +203,7 @@ func TestAddNewVote(test *testing.T) {
 	viewID := uint64(2)
 
 	decider := NewDecider(
-		SuperMajorityStake, shard.BeaconChainShardID,
+		SuperMajorityStake, shard.BeaconChainShardID, false,
 	)
 
 	slotList := shard.SlotList{}
@@ -305,7 +305,7 @@ func TestAddNewVoteAggregateSig(test *testing.T) {
 	viewID := uint64(2)
 
 	decider := NewDecider(
-		SuperMajorityStake, shard.BeaconChainShardID,
+		SuperMajorityStake, shard.BeaconChainShardID, false,
 	)
 
 	slotList := shard.SlotList{}
@@ -386,7 +386,7 @@ func TestAddNewVoteInvalidAggregateSig(test *testing.T) {
 	viewID := uint64(2)
 
 	decider := NewDecider(
-		SuperMajorityStake, shard.BeaconChainShardID,
+		SuperMajorityStake, shard.BeaconChainShardID, false,
 	)
 
 	slotList := shard.SlotList{}
diff --git a/consensus/quorum/quorum.go b/consensus/quorum/quorum.go
@@ -483,12 +483,13 @@ func newBallotsBackedSignatureReader() *cIdentities {
 }
 
 // NewDecider ..
-func NewDecider(p Policy, shardID uint32) Decider {
+func NewDecider(p Policy, shardID uint32, useGTforQuorumChecking bool) Decider {
 	switch p {
 	case SuperMajorityVote:
 		return &uniformVoteWeight{
 			SignatureReader:            newBallotsBackedSignatureReader(),
 			lastPowerSignersCountCache: make(map[Phase]int64),
+			useGTforQuorumChecking:     useGTforQuorumChecking,
 		}
 	case SuperMajorityStake:
 		return &stakedVoteWeight{
diff --git a/core_test/shardchain_test.go b/core_test/shardchain_test.go
@@ -41,7 +41,7 @@ func TestAddNewBlock(t *testing.T) {
 		nil, testDBFactory, &core.GenesisInitializer{NetworkType: nodeconfig.GetShardConfig(shard.BeaconChainShardID).GetNetworkType()}, engine, &chainconfig,
 	)
 	decider := quorum.NewDecider(
-		quorum.SuperMajorityVote, shard.BeaconChainShardID,
+		quorum.SuperMajorityVote, shard.BeaconChainShardID, false,
 	)
 	blockchain, err := collection.ShardChain(shard.BeaconChainShardID)
 	if err != nil {
diff --git a/hmy/staking.go b/hmy/staking.go
@@ -96,7 +96,7 @@ func (hmy *Harmony) getSuperCommittees() (*quorum.Transition, error) {
 	rawStakes := []effective.SlotPurchase{}
 	validatorSpreads := map[common.Address]numeric.Dec{}
 	for _, comm := range prevCommittee.Shards {
-		decider := quorum.NewDecider(quorum.SuperMajorityStake, comm.ShardID)
+		decider := quorum.NewDecider(quorum.SuperMajorityStake, comm.ShardID, false)
 		// before staking skip computing
 		if hmy.BlockChain.Config().IsStaking(prevCommittee.Epoch) {
 			if _, err := decider.SetVoters(&comm, prevCommittee.Epoch); err != nil {
@@ -111,7 +111,7 @@ func (hmy *Harmony) getSuperCommittees() (*quorum.Transition, error) {
 	rawStakes = []effective.SlotPurchase{}
 	validatorSpreads = map[common.Address]numeric.Dec{}
 	for _, comm := range nowCommittee.Shards {
-		decider := quorum.NewDecider(quorum.SuperMajorityStake, comm.ShardID)
+		decider := quorum.NewDecider(quorum.SuperMajorityStake, comm.ShardID, false)
 		if _, err := decider.SetVoters(&comm, nowCommittee.Epoch); err != nil {
 			return nil, errors.Wrapf(
 				err,

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,8 @@ func setupChain(hc harmonyconfig.HarmonyConfig, nodeConfig *nodeconfig.ConfigTyp`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`func setupConsensusAndNode(hc harmonyconfig.HarmonyConfig, nodeConfig nodeconfig.ConfigType, registry registry.Registry) *node.Node {`
`708`		`- decider := quorum.NewDecider(quorum.SuperMajorityVote, uint32(hc.General.ShardID))`
	`708`	`+ useGT := registry.GetBlockchain().Config().IsLeaderRotationV2Epoch(registry.GetBlockchain().CurrentBlock().Epoch())`
	`709`	`+ decider := quorum.NewDecider(quorum.SuperMajorityVote, uint32(hc.General.ShardID), useGT)`
`709`	`710`
`710`	`711`	`// Parse minPeers from harmonyconfig.HarmonyConfig`
`711`	`712`	`var minPeers int`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,8 @@ func (consensus *Consensus) updateConsensusInformation(reason string) Mode {`
`373`	`373`
`374`	`374`	`// Only happens once, the flip-over to a new Decider policy`
`375`	`375`	`if isFirstTimeStaking \|\| haventUpdatedDecider {`
`376`		`- decider := quorum.NewDecider(quorum.SuperMajorityStake, consensus.ShardID)`
	`376`	`+ useGT := consensus.Blockchain().Config().IsLeaderRotationV2Epoch(consensus.Blockchain().CurrentBlock().Epoch())`
	`377`	`+ decider := quorum.NewDecider(quorum.SuperMajorityStake, consensus.ShardID, useGT)`
`377`	`378`	`consensus.decider = decider`
`378`	`379`	`}`
`379`	`380`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func TestSignAndMarshalConsensusMessage(t *testing.T) {`
`26`	`26`	`if err != nil {`
`27`	`27`	`t.Fatalf("newhost failure: %v", err)`
`28`	`28`	`}`
`29`		`- decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID)`
	`29`	`+ decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID, false)`
`30`	`30`	`blsPriKey := bls.RandPrivateKey()`
`31`	`31`	`reg := registry.New()`
`32`	`32`	`consensus, err := New(host, shard.BeaconChainShardID, multibls.GetPrivateKeys(blsPriKey), reg, decider, 3, false)`
`@@ -58,7 +58,7 @@ func TestSetViewID(t *testing.T) {`
`58`	`58`	`t.Fatalf("newhost failure: %v", err)`
`59`	`59`	`}`
`60`	`60`	`decider := quorum.NewDecider(`
`61`		`- quorum.SuperMajorityVote, shard.BeaconChainShardID,`
	`61`	`+ quorum.SuperMajorityVote, shard.BeaconChainShardID, false,`
`62`	`62`	`)`
`63`	`63`	`blsPriKey := bls.RandPrivateKey()`
`64`	`64`	`reg := registry.New()`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func GenerateConsensusForTesting() (p2p.Host, multibls.PrivateKeys, *Consensus,`
`79`	`79`	`return nil, nil, nil, nil, err`
`80`	`80`	`}`
`81`	`81`
`82`		`- decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID)`
	`82`	`+ decider := quorum.NewDecider(quorum.SuperMajorityVote, shard.BeaconChainShardID, false)`
`83`	`83`	`multiBLSPrivateKey := multibls.GetPrivateKeys(bls.RandPrivateKey())`
`84`	`84`
`85`	`85`	`consensus, err := New(host, shard.BeaconChainShardID, multiBLSPrivateKey, registry.New(), decider, 3, false)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func TestConstructAnnounceMessage(test *testing.T) {`
`37`	`37`	`test.Fatalf("newhost failure: %v", err)`
`38`	`38`	`}`
`39`	`39`	`decider := quorum.NewDecider(`
`40`		`- quorum.SuperMajorityVote, shard.BeaconChainShardID,`
	`40`	`+ quorum.SuperMajorityVote, shard.BeaconChainShardID, false,`
`41`	`41`	`)`
`42`	`42`	`blsPriKey := bls.RandPrivateKey()`
`43`	`43`	`reg := registry.New()`
`@@ -70,7 +70,7 @@ func TestConstructPreparedMessage(test *testing.T) {`
`70`	`70`	`test.Fatalf("newhost failure: %v", err)`
`71`	`71`	`}`
`72`	`72`	`decider := quorum.NewDecider(`
`73`		`- quorum.SuperMajorityVote, shard.BeaconChainShardID,`
	`73`	`+ quorum.SuperMajorityVote, shard.BeaconChainShardID, false,`
`74`	`74`	`)`
`75`	`75`	`blsPriKey := bls.RandPrivateKey()`
`76`	`76`	`reg := registry.New()`
`@@ -150,7 +150,7 @@ func TestConstructPrepareMessage(test *testing.T) {`
`150`	`150`	`priKeyWrapper2 := bls.PrivateKeyWrapper{Pri: blsPriKey2, Pub: &pubKeyWrapper2}`
`151`	`151`
`152`	`152`	`decider := quorum.NewDecider(`
`153`		`- quorum.SuperMajorityStake, shard.BeaconChainShardID,`
	`153`	`+ quorum.SuperMajorityStake, shard.BeaconChainShardID, false,`
`154`	`154`	`)`
`155`	`155`
`156`	`156`	`consensus, err := New(`
`@@ -242,7 +242,7 @@ func TestConstructCommitMessage(test *testing.T) {`
`242`	`242`	`priKeyWrapper2 := bls.PrivateKeyWrapper{Pri: blsPriKey2, Pub: &pubKeyWrapper2}`
`243`	`243`
`244`	`244`	`decider := quorum.NewDecider(`
`245`		`- quorum.SuperMajorityStake, shard.BeaconChainShardID,`
	`245`	`+ quorum.SuperMajorityStake, shard.BeaconChainShardID, false,`
`246`	`246`	`)`
`247`	`247`
`248`	`248`	`consensus, err := New(host, shard.BeaconChainShardID, multibls.GetPrivateKeys(blsPriKey1), registry.New(), decider, 3, false)`
`@@ -324,7 +324,7 @@ func TestPopulateMessageFields(t *testing.T) {`
`324`	`324`	`}`
`325`	`325`	`blsPriKey := bls.RandPrivateKey()`
`326`	`326`	`decider := quorum.NewDecider(`
`327`		`- quorum.SuperMajorityVote, shard.BeaconChainShardID,`
	`327`	`+ quorum.SuperMajorityVote, shard.BeaconChainShardID, false,`
`328`	`328`	`)`
`329`	`329`	`consensus, err := New(`
`330`	`330`	`host, shard.BeaconChainShardID, multibls.GetPrivateKeys(blsPriKey), registry.New(), decider, 3, false,`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func (v stakedVoteWeight) IsQuorumAchievedByMask(mask bls_cosi.Mask) bool {`
`160`	`160`	`const msg = "[IsQuorumAchievedByMask] Voting power: need %+v, have %+v"`
`161`	`161`	`utils.Logger().Debug().`
`162`	`162`	`Msgf(msg, threshold, currentTotalPower)`
`163`		`- return (*currentTotalPower).GTE(threshold)`
	`163`	`+ return (*currentTotalPower).GT(threshold)`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`func (v stakedVoteWeight) ComputeTotalPowerByMask(mask bls_cosi.Mask) numeric.Dec {`
Original file line number	Diff line number	Diff line change
`@@ -483,12 +483,13 @@ func newBallotsBackedSignatureReader() *cIdentities {`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`// NewDecider ..`
`486`		`-func NewDecider(p Policy, shardID uint32) Decider {`
	`486`	`+func NewDecider(p Policy, shardID uint32, useGTforQuorumChecking bool) Decider {`
`487`	`487`	`switch p {`
`488`	`488`	`case SuperMajorityVote:`
`489`	`489`	`return &uniformVoteWeight{`
`490`	`490`	`SignatureReader: newBallotsBackedSignatureReader(),`
`491`	`491`	`lastPowerSignersCountCache: make(map[Phase]int64),`
	`492`	`+ useGTforQuorumChecking: useGTforQuorumChecking,`
`492`	`493`	`}`
`493`	`494`	`case SuperMajorityStake:`
`494`	`495`	`return &stakedVoteWeight{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func TestAddNewBlock(t *testing.T) {`
`41`	`41`	`nil, testDBFactory, &core.GenesisInitializer{NetworkType: nodeconfig.GetShardConfig(shard.BeaconChainShardID).GetNetworkType()}, engine, &chainconfig,`
`42`	`42`	`)`
`43`	`43`	`decider := quorum.NewDecider(`
`44`		`- quorum.SuperMajorityVote, shard.BeaconChainShardID,`
	`44`	`+ quorum.SuperMajorityVote, shard.BeaconChainShardID, false,`
`45`	`45`	`)`
`46`	`46`	`blockchain, err := collection.ShardChain(shard.BeaconChainShardID)`
`47`	`47`	`if err != nil {`