EVM-434-fix syncer problem

0xPolygon · Feb 6, 2023 · 860c4cd · 860c4cd
1 parent 3a064f9
commit 860c4cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/consensus/polybft/polybft.go b/consensus/polybft/polybft.go
@@ -298,7 +298,7 @@ func (p *Polybft) startConsensusProtocol() {
 			case ev := <-eventCh:
 				// The blockchain notification system can eventually deliver
 				// stale block notifications. These should be ignored
-				if ev.Source == "syncer" && ev.NewChain[0].Number > p.blockchain.CurrentHeader().Number {
+				if ev.Source == "syncer" && ev.NewChain[0].Number >= p.blockchain.CurrentHeader().Number {
 					syncerBlockCh <- struct{}{}
 				}
 			}

diff --git a/e2e-polybft/consensus_test.go b/e2e-polybft/consensus_test.go
@@ -141,7 +141,9 @@ func TestE2E_Consensus_RegisterValidator(t *testing.T) {
 	require.NoError(t, srv.RegisterValidator(newValidatorSecrets, newValidatorBalanceRaw, newValidatorStakeRaw))
 
 	// wait for an end of epoch so that stake gets finalized
-	cluster.WaitForBlock(5, 1*time.Minute)
+	currentBlock, err := srv.JSONRPC().Eth().BlockNumber()
+	require.NoError(t, err)
+	cluster.WaitForBlock(currentBlock+5, 1*time.Minute)
 
 	// start new validator
 	cluster.InitTestServer(t, 6, true, false)
@@ -184,7 +186,9 @@ func TestE2E_Consensus_RegisterValidator(t *testing.T) {
 	require.Equal(t, newValidatorStake, newValidatorInfo.TotalStake)
 
 	// wait 3 more epochs, so that rewards get accumulated to the registered validator account
-	cluster.WaitForBlock(20, 2*time.Minute)
+	currentBlock, err = srv.JSONRPC().Eth().BlockNumber()
+	require.NoError(t, err)
+	cluster.WaitForBlock(currentBlock+15, 2*time.Minute)
 
 	// query registered validator
 	newValidatorInfo, err = sidechain.GetValidatorInfo(newValidatorAddr, txRelayer)