add NthNextValidatorV2 to decider, fix epoch number for leader rotati…

…on version 2
harmony-one · Nov 20, 2024 · d5d8358 · d5d8358
1 parent 5253e39
commit d5d8358
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/consensus/quorum/thread_safe_decider.go b/consensus/quorum/thread_safe_decider.go
@@ -56,6 +56,12 @@ func (a threadSafeDeciderImpl) NthNextValidator(slotList shard.SlotList, pubKey
 	return a.decider.NthNextValidator(slotList, pubKey, next)
 }
 
+func (a threadSafeDeciderImpl) NthNextValidatorV2(slotList shard.SlotList, pubKey *bls.PublicKeyWrapper, next int) (bool, *bls.PublicKeyWrapper) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	return a.decider.NthNextValidator(slotList, pubKey, next)
+}
+
 func (a threadSafeDeciderImpl) NthNextHmy(instance shardingconfig.Instance, pubkey *bls.PublicKeyWrapper, next int) (bool, *bls.PublicKeyWrapper) {
 	a.mu.Lock()
 	defer a.mu.Unlock()

diff --git a/internal/params/config.go b/internal/params/config.go
@@ -364,6 +364,7 @@ var (
 		big.NewInt(0),                      // AllowlistEpoch
 		big.NewInt(1),                      // LeaderRotationExternalNonBeaconLeaders
 		big.NewInt(1),                      // LeaderRotationExternalBeaconLeaders
+		big.NewInt(0),                      // LeaderRotationV2Epoch
 		big.NewInt(0),                      // FeeCollectEpoch
 		big.NewInt(0),                      // ValidatorCodeFixEpoch
 		big.NewInt(0),                      // BlockGas30M
@@ -414,6 +415,7 @@ var (
 		big.NewInt(0),        // AllowlistEpoch
 		big.NewInt(1),        // LeaderRotationExternalNonBeaconLeaders
 		big.NewInt(1),        // LeaderRotationExternalBeaconLeaders
+		big.NewInt(0),        // LeaderRotationV2Epoch
 		big.NewInt(0),        // FeeCollectEpoch
 		big.NewInt(0),        // ValidatorCodeFixEpoch
 		big.NewInt(0),        // HIP30Epoch