fix a bug

scroll-tech · Sep 24, 2024 · 0556725 · 0556725
1 parent e42e4c4
commit 0556725
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/rollup/rollup_sync_service/rollup_sync_service.go b/rollup/rollup_sync_service/rollup_sync_service.go
@@ -178,7 +178,10 @@ func (s *RollupSyncService) fetchRollupEvents() {
 
 	initialProcessedBlock := s.latestProcessedBlock.Load()
 	currentProcessedBlock := initialProcessedBlock
-	defer s.latestProcessedBlock.CompareAndSwap(initialProcessedBlock, currentProcessedBlock)
+	// func() ensures using final currentProcessedBlock value when function returns
+	defer func() {
+		s.latestProcessedBlock.CompareAndSwap(initialProcessedBlock, currentProcessedBlock)
+	}()
 
 	log.Trace("Sync service fetch rollup events", "latest processed block", currentProcessedBlock, "latest confirmed", latestConfirmed)
 

diff --git a/rollup/sync_service/sync_service.go b/rollup/sync_service/sync_service.go
@@ -166,7 +166,10 @@ func (s *SyncService) fetchMessages() {
 
 	initialProcessedBlock := s.latestProcessedBlock.Load()
 	currentProcessedBlock := initialProcessedBlock
-	defer s.latestProcessedBlock.CompareAndSwap(initialProcessedBlock, currentProcessedBlock)
+	// func() ensures using final currentProcessedBlock value when function returns
+	defer func() {
+		s.latestProcessedBlock.CompareAndSwap(initialProcessedBlock, currentProcessedBlock)
+	}()
 
 	log.Trace("Sync service fetchMessages", "latestProcessedBlock", currentProcessedBlock, "latestConfirmed", latestConfirmed)