fix bugs

scroll-tech · Sep 19, 2024 · dc03c12 · dc03c12
1 parent e124dce
commit dc03c12
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/rollup/rollup_sync_service/rollup_sync_service.go b/rollup/rollup_sync_service/rollup_sync_service.go
@@ -52,6 +52,7 @@ const (
 
 // RollupSyncService collects ScrollChain batch commit/revert/finalize events and stores metadata into db.
 type RollupSyncService struct {
+	originalCtx                   context.Context
 	ctx                           context.Context
 	cancel                        context.CancelFunc
 	client                        *L1Client
@@ -99,10 +100,11 @@ func NewRollupSyncService(ctx context.Context, genesisConfig *params.ChainConfig
 		latestProcessedBlock = *block
 	}
 
-	ctx, cancel := context.WithCancel(ctx)
+	serviceCtx, cancel := context.WithCancel(ctx)
 
 	service := RollupSyncService{
-		ctx:                           ctx,
+		originalCtx:                   ctx,
+		ctx:                           serviceCtx,
 		cancel:                        cancel,
 		client:                        client,
 		db:                            db,
@@ -161,6 +163,9 @@ func (s *RollupSyncService) Stop() {
 func (s *RollupSyncService) ResetToHeight(height uint64) {
 	s.Stop()
 
+	newCtx, newCancel := context.WithCancel(s.originalCtx)
+	s.ctx = newCtx
+	s.cancel = newCancel
 	s.latestProcessedBlock = height
 
 	rawdb.WriteRollupEventSyncedL1BlockNumber(s.db, height)

diff --git a/rollup/sync_service/sync_service.go b/rollup/sync_service/sync_service.go
@@ -42,6 +42,7 @@ var (
 
 // SyncService collects all L1 messages and stores them in a local database.
 type SyncService struct {
+	originalCtx          context.Context
 	ctx                  context.Context
 	cancel               context.CancelFunc
 	client               *BridgeClient
@@ -76,10 +77,11 @@ func NewSyncService(ctx context.Context, genesisConfig *params.ChainConfig, node
 		latestProcessedBlock = *block
 	}
 
-	ctx, cancel := context.WithCancel(ctx)
+	serviceCtx, cancel := context.WithCancel(ctx)
 
 	service := SyncService{
-		ctx:                  ctx,
+		originalCtx:          ctx,
+		ctx:                  serviceCtx,
 		cancel:               cancel,
 		client:               client,
 		db:                   db,
@@ -143,6 +145,9 @@ func (s *SyncService) Stop() {
 func (s *SyncService) ResetToHeight(height uint64) {
 	s.Stop()
 
+	newCtx, newCancel := context.WithCancel(s.originalCtx)
+	s.ctx = newCtx
+	s.cancel = newCancel
 	s.latestProcessedBlock = height
 
 	rawdb.WriteSyncedL1BlockNumber(s.db, height)