From 05567250b852b20225f5a622375bb7d992602ecf Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Tue, 24 Sep 2024 18:16:54 +0800 Subject: [PATCH] fix a bug --- rollup/rollup_sync_service/rollup_sync_service.go | 5 ++++- rollup/sync_service/sync_service.go | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rollup/rollup_sync_service/rollup_sync_service.go b/rollup/rollup_sync_service/rollup_sync_service.go index 186643530aca..a413498bc310 100644 --- 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 index 2c5210d37a59..9a682566a0ab 100644 --- 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)