From 419045151e099fe712ce707a09883ffc7093fdb8 Mon Sep 17 00:00:00 2001
From: Tate <yongzhao.tan@onfinality.io>
Date: Wed, 12 Feb 2025 15:08:47 +0000
Subject: [PATCH] fix some bug

---
 packages/node-core/src/indexer/core.module.ts           | 2 --
 packages/node-core/src/indexer/store.service.ts         | 5 ++---
 packages/node/src/indexer/fetch.module.ts               | 2 ++
 packages/node/src/indexer/worker/worker-fetch.module.ts | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/node-core/src/indexer/core.module.ts b/packages/node-core/src/indexer/core.module.ts
index 3620e08d84..75cc9e1fcc 100644
--- a/packages/node-core/src/indexer/core.module.ts
+++ b/packages/node-core/src/indexer/core.module.ts
@@ -11,7 +11,6 @@ import {ConnectionPoolService} from './connectionPool.service';
 import {ConnectionPoolStateManager} from './connectionPoolState.manager';
 import {InMemoryCacheService} from './inMemoryCache.service';
 import {MonitorService} from './monitor.service';
-import {MultiChainRewindService} from './multiChainRewind.service';
 import {PoiService, PoiSyncService} from './poi';
 import {SandboxService} from './sandbox.service';
 import {StoreService} from './store.service';
@@ -34,7 +33,6 @@ import {storeModelFactory} from './storeModelProvider';
       useFactory: storeModelFactory,
       inject: [NodeConfig, EventEmitter2, Sequelize],
     },
-    MultiChainRewindService,
     AdminListener,
   ],
   controllers: [AdminController],
diff --git a/packages/node-core/src/indexer/store.service.ts b/packages/node-core/src/indexer/store.service.ts
index 79bb9203a0..80dda84231 100644
--- a/packages/node-core/src/indexer/store.service.ts
+++ b/packages/node-core/src/indexer/store.service.ts
@@ -173,7 +173,7 @@ export class StoreService {
       this.subqueryProject.network.chainId
     );
 
-    if (this.historical === 'timestamp') {
+    if (this.config.historical === 'timestamp') {
       this._globalDataRepo = GlobalDataFactory(this.sequelize, schema);
     }
 
@@ -509,8 +509,7 @@ group by
 
   private async initChainRewindTimestamp() {
     if (this.historical !== 'timestamp') return;
-    if (await this.getRewindTimestamp()) return;
-
+    if ((await this.getRewindTimestamp()) !== undefined) return;
     const rewindTimestampKey = generateRewindTimestampKey(this.subqueryProject.network.chainId);
     await this.globalDataRepo.create({key: rewindTimestampKey, value: 0});
   }
diff --git a/packages/node/src/indexer/fetch.module.ts b/packages/node/src/indexer/fetch.module.ts
index e64f3a80ee..057657cb26 100644
--- a/packages/node/src/indexer/fetch.module.ts
+++ b/packages/node/src/indexer/fetch.module.ts
@@ -23,6 +23,7 @@ import {
   WorkerBlockDispatcher,
   FetchService,
   DictionaryService,
+  MultiChainRewindService,
 } from '@subql/node-core';
 import { SubstrateDatasource } from '@subql/types';
 import { BlockchainService } from '../blockchain.service';
@@ -67,6 +68,7 @@ import { IIndexerWorker } from './worker/worker';
       useClass: ProjectService,
       provide: 'IProjectService',
     },
+    MultiChainRewindService,
     /* END: Move to node core */
     IndexerManager,
     {
diff --git a/packages/node/src/indexer/worker/worker-fetch.module.ts b/packages/node/src/indexer/worker/worker-fetch.module.ts
index 8c4bc8ee29..8cbe249478 100644
--- a/packages/node/src/indexer/worker/worker-fetch.module.ts
+++ b/packages/node/src/indexer/worker/worker-fetch.module.ts
@@ -9,6 +9,7 @@ import {
   WorkerCoreModule,
   ProjectService,
   DsProcessorService,
+  MultiChainRewindService,
 } from '@subql/node-core';
 import { BlockchainService } from '../../blockchain.service';
 import { ApiService } from '../api.service';
@@ -48,6 +49,7 @@ import { WorkerService } from './worker.service';
       provide: 'IBlockchainService',
       useClass: BlockchainService,
     },
+    MultiChainRewindService,
     WorkerService,
   ],
   exports: [],