Merge branch 'resequence' into banana

0xPolygonHermez · Sep 13, 2024 · 7cef229 · 7cef229
2 parents 802afd4 + ed27ecc
commit 7cef229
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/zk/legacy_executor_verifier/legacy_executor_verifier.go b/zk/legacy_executor_verifier/legacy_executor_verifier.go
@@ -315,6 +315,13 @@ func (v *LegacyExecutorVerifier) VerifyWithoutExecutor(request *VerifierRequest)
 	return promise
 }
 
+func (v *LegacyExecutorVerifier) HasPendingVerifications() bool {
+	v.mtxPromises.Lock()
+	defer v.mtxPromises.Unlock()
+
+	return len(v.promises) > 0
+}
+
 func (v *LegacyExecutorVerifier) ProcessResultsSequentially(logPrefix string) ([]*VerifierBundle, error) {
 	v.mtxPromises.Lock()
 	defer v.mtxPromises.Unlock()

diff --git a/zk/stages/stage_sequence_execute.go b/zk/stages/stage_sequence_execute.go
@@ -251,6 +251,11 @@ func sequencingStageStep(
 
 		if batchState.isResequence() {
 			if !batchState.resequenceBatchJob.HasMoreBlockToProcess() {
+				for streamWriter.legacyVerifier.HasPendingVerifications() {
+					streamWriter.CommitNewUpdates()
+					time.Sleep(1 * time.Second)
+				}
+
 				runLoopBlocks = false
 				break
 			}