From 71872a05e828717aeb30a69212544855023e622f Mon Sep 17 00:00:00 2001
From: JQQQ <jiqiang90@hotmail.com>
Date: Thu, 6 Jun 2024 11:40:33 +1200
Subject: [PATCH 1/3] fix import from monitor service

---
 packages/node/CHANGELOG.md                                     | 3 +++
 .../indexer/blockDispatcher/worker-block-dispatcher.service.ts | 2 +-
 packages/node/src/indexer/fetch.module.ts                      | 2 +-
 packages/node/src/main.ts                                      | 2 +-
 packages/node/src/yargs.ts                                     | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md
index b2d9dc88dd..3addd1895b 100644
--- a/packages/node/CHANGELOG.md
+++ b/packages/node/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fix import monitor service from node-core
+
 ## [4.6.1] - 2024-06-06
 ### Fixed
 - Fix import admin from node-core, update dockerfile to fix monitor default directory permission issue
diff --git a/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts b/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts
index 48537c1ab5..43a396622f 100644
--- a/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts
+++ b/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts
@@ -15,8 +15,8 @@ import {
   PoiSyncService,
   InMemoryCacheService,
   createIndexerWorker as createIndexerWorkerCore,
+  MonitorServiceInterface,
 } from '@subql/node-core';
-import { MonitorServiceInterface } from '@subql/node-core/indexer/monitor.service';
 import { SubstrateBlock, SubstrateDatasource } from '@subql/types';
 import { SubqueryProject } from '../../configure/SubqueryProject';
 import { ApiPromiseConnection } from '../apiPromise.connection';
diff --git a/packages/node/src/indexer/fetch.module.ts b/packages/node/src/indexer/fetch.module.ts
index 9c916419ab..eec3f4c33d 100644
--- a/packages/node/src/indexer/fetch.module.ts
+++ b/packages/node/src/indexer/fetch.module.ts
@@ -16,8 +16,8 @@ import {
   PoiSyncService,
   InMemoryCacheService,
   SandboxService,
+  MonitorService,
 } from '@subql/node-core';
-import { MonitorService } from '@subql/node-core/indexer/monitor.service';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { ApiService } from './api.service';
 import { ApiPromiseConnection } from './apiPromise.connection';
diff --git a/packages/node/src/main.ts b/packages/node/src/main.ts
index a9fc010f35..c4cba136aa 100644
--- a/packages/node/src/main.ts
+++ b/packages/node/src/main.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 
-import { initLogger } from '@subql/node-core/logger';
+import { initLogger } from '@subql/node-core';
 import { yargsOptions } from './yargs';
 
 const { argv } = yargsOptions;
diff --git a/packages/node/src/yargs.ts b/packages/node/src/yargs.ts
index 857d19a71b..d4aebd402c 100644
--- a/packages/node/src/yargs.ts
+++ b/packages/node/src/yargs.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 
-import { yargsBuilder } from '@subql/node-core/yargs';
+import { yargsBuilder } from '@subql/node-core';
 
 export const yargsOptions = yargsBuilder({
   initTesting: () => {

From eb38e7414bc801e87d558a4863664f27ff3c5c99 Mon Sep 17 00:00:00 2001
From: JQQQ <jiqiang90@hotmail.com>
Date: Thu, 6 Jun 2024 11:52:39 +1200
Subject: [PATCH 2/3] rollback changes

---
 packages/node/src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node/src/main.ts b/packages/node/src/main.ts
index c4cba136aa..a9fc010f35 100644
--- a/packages/node/src/main.ts
+++ b/packages/node/src/main.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 
-import { initLogger } from '@subql/node-core';
+import { initLogger } from '@subql/node-core/logger';
 import { yargsOptions } from './yargs';
 
 const { argv } = yargsOptions;

From 17062d14d2506682068dc61df5517bdf812842f6 Mon Sep 17 00:00:00 2001
From: JQQQ <jiqiang90@hotmail.com>
Date: Thu, 6 Jun 2024 12:00:18 +1200
Subject: [PATCH 3/3] rollback

---
 packages/node/src/yargs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node/src/yargs.ts b/packages/node/src/yargs.ts
index d4aebd402c..857d19a71b 100644
--- a/packages/node/src/yargs.ts
+++ b/packages/node/src/yargs.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 
-import { yargsBuilder } from '@subql/node-core';
+import { yargsBuilder } from '@subql/node-core/yargs';
 
 export const yargsOptions = yargsBuilder({
   initTesting: () => {