Update 1.10: London and Berlin forks

Makefile

@@ -269,3 +269,6 @@ debug-delete-log:
 	@echo "[WARN] - it needs sudo to remove folder created with loki docker image user"
 	sudo rm -rf test/logs_aggregator/loki
 
+
+docker-go-test:
+	docker run --rm -it -v "$PWD":/go/src/github.com/harmony-one/harmony frozen621/harmony-test bash -c 'make go-test'

Test.Dockerfile

@@ -0,0 +1,22 @@
+FROM golang:1.24
+
+ARG ENV=dev
+
+RUN apt-get update && \
+    apt-get install -y build-essential make git curl libgmp-dev libssl-dev gcc g++ && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /go/src/github.com/harmony-one
+
+RUN git clone https://github.com/harmony-one/mcl.git && \
+    git clone https://github.com/harmony-one/bls.git
+
+RUN echo "Cloning branch: ${ENV}" && \
+    git clone -b ${ENV} https://github.com/harmony-one/harmony.git && \
+    cd harmony && \
+    go mod tidy && \
+    make deps
+
+WORKDIR /go/src/github.com/harmony-one/harmony
+
+CMD ["make", "go-test"]

consensus/consensus.go

@@ -61,7 +61,6 @@ type DownloadAsync interface {
 
 // Consensus is the main struct with all states and data related to consensus process.
 type Consensus struct {
-	decider quorum.Decider
 	// FBFTLog stores the pbft messages and blocks during FBFT process
 	fBFTLog *FBFTLog
 	// current indicates what state a node is in
@@ -147,6 +146,10 @@ func (consensus *Consensus) Blockchain() core.BlockChain {
 	return consensus.registry.GetBlockchain()
 }
 
+func (consensus *Consensus) decider() quorum.Decider {
+	return consensus.registry.GetQuorum()
+}
+
 func (consensus *Consensus) FBFTLog() FBFT {
 	return threadsafeFBFTLog{
 		log: consensus.fBFTLog,
@@ -217,7 +220,7 @@ func (consensus *Consensus) BlocksNotSynchronized(reason string) {
 func (consensus *Consensus) VdfSeedSize() int {
 	consensus.mutex.RLock()
 	defer consensus.mutex.RUnlock()
-	return int(consensus.decider.ParticipantsCount()) * 2 / 3
+	return int(consensus.decider().ParticipantsCount()) * 2 / 3
 }
 
 // GetPublicKeys returns the public keys
@@ -285,11 +288,11 @@ func New(
 	Decider quorum.Decider, minPeers int, aggregateSig bool,
 ) (*Consensus, error) {
 	consensus := Consensus{
-		mutex:        &sync.RWMutex{},
-		ShardID:      shard,
-		fBFTLog:      NewFBFTLog(),
-		current:      NewState(Normal, shard),
-		decider:      Decider,
+		mutex:   &sync.RWMutex{},
+		ShardID: shard,
+		fBFTLog: NewFBFTLog(),
+		current: NewState(Normal, shard),
+		//decider:      Decider,
 		registry:     registry,
 		MinPeers:     minPeers,
 		AggregateSig: aggregateSig,
@@ -300,6 +303,7 @@ func New(
 		dHelper:           downloadAsync{},
 		pendingCXReceipts: make(map[utils.CXKey]*types.CXReceiptsProof), // All the receipts received but not yet processed for Consensus
 	}
+	registry.SetQuorum(Decider)
 
 	if multiBLSPriKey != nil {
 		consensus.priKey = multiBLSPriKey
@@ -338,7 +342,7 @@ func (consensus *Consensus) Registry() *registry.Registry {
 }
 
 func (consensus *Consensus) Decider() quorum.Decider {
-	return quorum.NewThreadSafeDecider(consensus.decider, consensus.mutex)
+	return consensus.registry.GetQuorum()
 }
 
 // InitConsensusWithValidators initialize shard state

consensus/consensus_service.go

@@ -2,6 +2,7 @@ package consensus
 
 import (
 	"math/big"
+	"sync"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -75,7 +76,7 @@ func (consensus *Consensus) signAndMarshalConsensusMessage(message *msg_pb.Messa
 }
 
 func (consensus *Consensus) updatePublicKeys(pubKeys, allowlist []bls_cosi.PublicKeyWrapper) int64 {
-	consensus.decider.UpdateParticipants(pubKeys, allowlist)
+	consensus.decider().UpdateParticipants(pubKeys, allowlist)
 	consensus.getLogger().Info().Msg("My Committee updated")
 	for i := range pubKeys {
 		consensus.getLogger().Info().
@@ -84,7 +85,7 @@ func (consensus *Consensus) updatePublicKeys(pubKeys, allowlist []bls_cosi.Publi
 			Msg("Member")
 	}
 
-	allKeys := consensus.decider.Participants()
+	allKeys := consensus.decider().Participants()
 	if len(allKeys) != 0 {
 		consensus.setLeaderPubKey(&allKeys[0])
 		consensus.getLogger().Info().
@@ -108,7 +109,7 @@ func (consensus *Consensus) updatePublicKeys(pubKeys, allowlist []bls_cosi.Publi
 	if !consensus.isViewChangingMode() {
 		consensus.resetViewChangeState()
 	}
-	return consensus.decider.ParticipantsCount()
+	return consensus.decider().ParticipantsCount()
 }
 
 // Sign on the hash of the message
@@ -136,7 +137,7 @@ func signConsensusMessage(message *msg_pb.Message,
 func (consensus *Consensus) updateBitmaps() {
 	consensus.getLogger().Debug().
 		Msg("[UpdateBitmaps] Updating consensus bitmaps")
-	members := consensus.decider.Participants()
+	members := consensus.decider().Participants()
 	prepareBitmap := bls_cosi.NewMask(members)
 	commitBitmap := bls_cosi.NewMask(members)
 	multiSigBitmap := bls_cosi.NewMask(members)
@@ -153,9 +154,9 @@ func (consensus *Consensus) sendLastSignPower() {
 			consensus.getLogger().Err(err).Msg("Leader not found in the committee")
 			return
 		}
-		comm := getOrZero(consensus.decider.CurrentTotalPower(quorum.Commit))
-		prep := getOrZero(consensus.decider.CurrentTotalPower(quorum.Prepare))
-		view := consensus.decider.ComputeTotalPowerByMask(consensus.vc.GetViewIDBitmap(consensus.current.viewChangingID)).Int64()
+		comm := getOrZero(consensus.decider().CurrentTotalPower(quorum.Commit))
+		prep := getOrZero(consensus.decider().CurrentTotalPower(quorum.Prepare))
+		view := consensus.decider().ComputeTotalPowerByMask(consensus.vc.GetViewIDBitmap(consensus.current.viewChangingID)).Int64()
 		for view > 100 {
 			view /= 10
 		}
@@ -199,7 +200,7 @@ func (consensus *Consensus) resetState() {
 
 	consensus.current.blockHash = [32]byte{}
 	consensus.current.block = []byte{}
-	consensus.decider.ResetPrepareAndCommitVotes()
+	consensus.decider().ResetPrepareAndCommitVotes()
 	if consensus.prepareBitmap != nil {
 		consensus.prepareBitmap.Clear()
 	}
@@ -216,7 +217,7 @@ func (consensus *Consensus) IsValidatorInCommittee(pubKey bls.SerializedPublicKe
 }
 
 func (consensus *Consensus) isValidatorInCommittee(pubKey bls.SerializedPublicKey) bool {
-	return consensus.decider.IndexOf(pubKey) != -1
+	return consensus.decider().IndexOf(pubKey) != -1
 }
 
 // SetMode sets the mode of consensus
@@ -304,7 +305,7 @@ func (consensus *Consensus) setBlockNum(blockNum uint64) {
 // ReadSignatureBitmapPayload read the payload for signature and bitmap; offset is the beginning position of reading
 func (consensus *Consensus) ReadSignatureBitmapPayload(recvPayload []byte, offset int) (*bls_core.Sign, *bls_cosi.Mask, error) {
 	consensus.mutex.RLock()
-	members := consensus.decider.Participants()
+	members := consensus.decider().Participants()
 	consensus.mutex.RUnlock()
 	return readSignatureBitmapPayload(recvPayload, offset, members)
 }
@@ -370,12 +371,12 @@ func (consensus *Consensus) updateConsensusInformation(reason string) Mode {
 	isFirstTimeStaking := consensus.Blockchain().Config().IsStaking(nextEpoch) &&
 		curHeader.IsLastBlockInEpoch() && !consensus.Blockchain().Config().IsStaking(curEpoch)
 	haventUpdatedDecider := consensus.Blockchain().Config().IsStaking(curEpoch) &&
-		consensus.decider.Policy() != quorum.SuperMajorityStake
+		consensus.decider().Policy() != quorum.SuperMajorityStake
 
 	// Only happens once, the flip-over to a new Decider policy
 	if isFirstTimeStaking || haventUpdatedDecider {
-		decider := quorum.NewDecider(quorum.SuperMajorityStake, consensus.ShardID)
-		consensus.decider = decider
+		decider := quorum.NewThreadSafeDecider(quorum.NewDecider(quorum.SuperMajorityStake, consensus.ShardID), &sync.RWMutex{})
+		consensus.registry.SetQuorum(decider)
 	}
 
 	var committeeToSet *shard.Committee
@@ -448,7 +449,7 @@ func (consensus *Consensus) updateConsensusInformation(reason string) Mode {
 	consensus.updatePublicKeys(pubKeys, shard.Schedule.InstanceForEpoch(nextEpoch).ExternalAllowlist())
 
 	// Update voters in the committee
-	if _, err := consensus.decider.SetVoters(
+	if _, err := consensus.decider().SetVoters(
 		committeeToSet, epochToSet,
 	); err != nil {
 		consensus.getLogger().Error().
@@ -619,7 +620,7 @@ func (consensus *Consensus) selfCommit(payload []byte) error {
 		return errGetPreparedBlock
 	}
 
-	aggSig, mask, err := readSignatureBitmapPayload(payload, 32, consensus.decider.Participants())
+	aggSig, mask, err := readSignatureBitmapPayload(payload, 32, consensus.decider().Participants())
 	if err != nil {
 		return errReadBitmapPayload
 	}
@@ -643,7 +644,7 @@ func (consensus *Consensus) selfCommit(payload []byte) error {
 			continue
 		}
 
-		if _, err := consensus.decider.AddNewVote(
+		if _, err := consensus.decider().AddNewVote(
 			quorum.Commit,
 			[]*bls_cosi.PublicKeyWrapper{key.Pub},
 			key.Pri.SignHash(commitPayload),
@@ -665,7 +666,7 @@ func (consensus *Consensus) selfCommit(payload []byte) error {
 // Method is thread safe.
 func (consensus *Consensus) NumSignaturesIncludedInBlock(block *types.Block) uint32 {
 	count := uint32(0)
-	members := consensus.decider.Participants()
+	members := consensus.decider().Participants()
 	pubKeys := consensus.getPublicKeys()
 
 	// TODO(audit): do not reconstruct the Mask

consensus/consensus_v2.go

@@ -88,7 +88,7 @@ func (consensus *Consensus) HandleMessageUpdate(ctx context.Context, peer libp2p
 	case t == msg_pb.MessageType_VIEWCHANGE:
 		fbftMsg, err = ParseViewChangeMessage(msg)
 	case t == msg_pb.MessageType_NEWVIEW:
-		members := consensus.decider.Participants()
+		members := consensus.decider().Participants()
 		fbftMsg, err = ParseNewViewMessage(msg, members)
 	case t == msg_pb.MessageType_LAST_SIGN_POWER:
 		return nil
@@ -151,7 +151,7 @@ func (consensus *Consensus) finalCommit(waitTime time.Duration, viewID uint64, i
 }
 
 func (consensus *Consensus) _finalCommit(isLeader bool) {
-	numCommits := consensus.decider.SignersCount(quorum.Commit)
+	numCommits := consensus.decider().SignersCount(quorum.Commit)
 
 	consensus.getLogger().Info().
 		Int64("NumCommits", numCommits).
@@ -478,7 +478,7 @@ func (consensus *Consensus) BlockChannel(newBlock *types.Block) {
 			Int("numTxs", len(newBlock.Transactions())).
 			Int("numStakingTxs", len(newBlock.StakingTransactions())).
 			Time("startTime", startTime).
-			Int64("publicKeys", consensus.decider.ParticipantsCount()).
+			Int64("publicKeys", consensus.decider().ParticipantsCount()).
 			Msg("[ConsensusMainLoop] STARTING CONSENSUS")
 		consensus.announce(newBlock)
 	})
@@ -788,18 +788,18 @@ func (consensus *Consensus) rotateLeader(epoch *big.Int, defaultKey *bls.PublicK
 
 	for i := 0; i < len(committee.Slots); i++ {
 		if bc.Config().IsLeaderRotationV2Epoch(epoch) {
-			wasFound, next = consensus.decider.NthNextValidatorV2(committee.Slots, leader, offset)
+			wasFound, next = consensus.decider().NthNextValidatorV2(committee.Slots, leader, offset)
 		} else if bc.Config().IsLeaderRotationExternalValidatorsAllowed(epoch) {
-			wasFound, next = consensus.decider.NthNextValidator(committee.Slots, leader, offset)
+			wasFound, next = consensus.decider().NthNextValidator(committee.Slots, leader, offset)
 		} else {
-			wasFound, next = consensus.decider.NthNextHmy(shard.Schedule.InstanceForEpoch(epoch), leader, offset)
+			wasFound, next = consensus.decider().NthNextHmy(shard.Schedule.InstanceForEpoch(epoch), leader, offset)
 		}
 		if !wasFound {
 			consensus.getLogger().Error().Msg("Failed to get next leader")
 			// Seems like nothing we can do here.
 			return defaultKey
 		}
-		members := consensus.decider.Participants()
+		members := consensus.decider().Participants()
 		mask := bls.NewMask(members)
 		skipped := 0
 		for i := 0; i < blocksCountAliveness; i++ {

consensus/construct.go

@@ -79,7 +79,7 @@ func (consensus *Consensus) construct(
 		)
 	} else {
 		// TODO: use a persistent bitmap to report bitmap
-		mask := bls.NewMask(consensus.decider.Participants())
+		mask := bls.NewMask(consensus.decider().Participants())
 		for _, key := range priKeys {
 			mask.SetKey(key.Pub.Bytes, true)
 		}
@@ -158,7 +158,7 @@ func (consensus *Consensus) construct(
 func (consensus *Consensus) constructQuorumSigAndBitmap(p quorum.Phase) []byte {
 	buffer := bytes.Buffer{}
 	// 96 bytes aggregated signature
-	aggSig := consensus.decider.AggregateVotes(p)
+	aggSig := consensus.decider().AggregateVotes(p)
 	buffer.Write(aggSig.Serialize())
 	// Bitmap
 	if p == quorum.Prepare {

consensus/double_sign.go

@@ -17,7 +17,7 @@ func (consensus *Consensus) checkDoubleSign(recvMsg *FBFTMessage) bool {
 	if consensus.couldThisBeADoubleSigner(recvMsg) {
 		addrSet := map[common.Address]struct{}{}
 		for _, pubKey2 := range recvMsg.SenderPubkeys {
-			if alreadyCastBallot := consensus.decider.ReadBallot(
+			if alreadyCastBallot := consensus.decider().ReadBallot(
 				quorum.Commit, pubKey2.Bytes,
 			); alreadyCastBallot != nil {
 				for _, pubKey1 := range alreadyCastBallot.SignerPubKeys {