Merge remote-tracking branch 'refs/remotes/bnb-chain/develop' into ro…

…shan/builder

Makefile

@@ -30,7 +30,7 @@ truffle-test:
 	docker build . -f ./docker/Dockerfile --target bsc -t bsc
 	docker build . -f ./docker/Dockerfile.truffle -t truffle-test
 	docker-compose -f ./tests/truffle/docker-compose.yml up genesis
-	docker-compose -f ./tests/truffle/docker-compose.yml up -d bsc-rpc bsc-validator1
+	docker-compose -f ./tests/truffle/docker-compose.yml up -d bsc-rpc
 	sleep 30
 	docker-compose -f ./tests/truffle/docker-compose.yml up --exit-code-from truffle-test truffle-test
 	docker-compose -f ./tests/truffle/docker-compose.yml down

consensus/consensus.go

@@ -163,4 +163,5 @@ type PoSA interface {
 	GetFinalizedHeader(chain ChainHeaderReader, header *types.Header) *types.Header
 	VerifyVote(chain ChainHeaderReader, vote *types.VoteEnvelope) error
 	IsActiveValidatorAt(chain ChainHeaderReader, header *types.Header, checkVoteKeyFn func(bLSPublicKey *types.BLSPublicKey) bool) bool
+	SetValidator(validator common.Address)
 }

consensus/parlia/parlia.go

@@ -1876,6 +1876,17 @@ func (p *Parlia) GetFinalizedHeader(chain consensus.ChainHeaderReader, header *t
 	return chain.GetHeader(snap.Attestation.SourceHash, snap.Attestation.SourceNumber)
 }
 
+// SetValidator set the validator of parlia engine
+// It is used for builder
+func (p *Parlia) SetValidator(val common.Address) {
+	if val == (common.Address{}) {
+		return
+	}
+	p.lock.Lock()
+	defer p.lock.Unlock()
+	p.val = val
+}
+
 // ===========================     utility function        ==========================
 func (p *Parlia) backOffTime(snap *Snapshot, header *types.Header, val common.Address) uint64 {
 	if snap.inturn(val) {