Update node core to reduce code (#330)

* Update node core to reduce code

* Update changelog

packages/node/CHANGELOG.md

@@ -5,9 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
 ### Changed
 - Enable ts strict mode
+- Update to latest `@subql/node-core` (#330)
 
 ## [4.7.3] - 2024-07-16
 ### Fixed

packages/node/package.json

@@ -25,7 +25,7 @@
     "@nestjs/platform-express": "^9.4.0",
     "@nestjs/schedule": "^3.0.1",
     "@subql/common-ethereum": "workspace:*",
-    "@subql/node-core": "^11.0.0",
+    "@subql/node-core": "^12.0.0",
     "@subql/testing": "^2.2.1",
     "@subql/types-ethereum": "workspace:*",
     "cacheable-lookup": "6",

packages/node/src/app.module.ts

@@ -4,21 +4,27 @@
 import { Module } from '@nestjs/common';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { ScheduleModule } from '@nestjs/schedule';
-import { DbModule } from '@subql/node-core';
-import { AdminModule } from './admin/admin.module';
+import { DbModule, CoreModule, MetaModule } from '@subql/node-core';
 import { ConfigureModule } from './configure/configure.module';
 import { FetchModule } from './indexer/fetch.module';
-import { MetaModule } from './meta/meta.module';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { version: ethersSdkVersion } = require('ethers/package.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { version: packageVersion } = require('../package.json');
 
 @Module({
   imports: [
     DbModule.forRoot(),
     EventEmitterModule.forRoot(),
     ConfigureModule.register(),
     ScheduleModule.forRoot(),
+    CoreModule,
     FetchModule,
-    MetaModule,
-    AdminModule,
+    MetaModule.forRoot({
+      version: packageVersion,
+      sdkVersion: { name: 'ethers.js', version: ethersSdkVersion },
+    }),
   ],
   controllers: [],
 })

packages/node/src/indexer/fetch.module.ts

@@ -4,10 +4,7 @@
 import { Module } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import {
-  PoiBenchmarkService,
-  IndexingBenchmarkService,
   StoreService,
-  PoiService,
   ApiService,
   NodeConfig,
   ConnectionPoolService,
@@ -16,8 +13,8 @@ import {
   IProjectUpgradeService,
   PoiSyncService,
   InMemoryCacheService,
-  SandboxService,
   MonitorService,
+  CoreModule,
 } from '@subql/node-core';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { EthereumApiConnection } from '../ethereum/api.connection';
@@ -35,10 +32,8 @@ import { ProjectService } from './project.service';
 import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
 
 @Module({
+  imports: [CoreModule],
   providers: [
-    InMemoryCacheService,
-    StoreService,
-    StoreCacheService,
     {
       provide: ApiService,
       useFactory: async (
@@ -64,8 +59,6 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
       ],
     },
     IndexerManager,
-    ConnectionPoolStateManager,
-    ConnectionPoolService,
     {
       provide: 'IBlockDispatcher',
       useFactory: (
@@ -132,22 +125,14 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
       ],
     },
     FetchService,
-    ConnectionPoolService,
-    IndexingBenchmarkService,
-    PoiBenchmarkService,
     EthDictionaryService,
-    SandboxService,
     DsProcessorService,
     DynamicDsService,
-    PoiService,
-    PoiSyncService,
     {
       useClass: ProjectService,
       provide: 'IProjectService',
     },
-    MonitorService,
     UnfinalizedBlocksService,
   ],
-  exports: [StoreService, StoreCacheService, MonitorService, PoiService],
 })
 export class FetchModule {}

packages/node/src/indexer/fetch.service.ts

@@ -13,6 +13,7 @@ import {
   getModulos,
   getLogger,
   Header,
+  StoreCacheService,
 } from '@subql/node-core';
 import { EthereumBlock, SubqlDatasource } from '@subql/types-ethereum';
 import { SubqueryProject } from '../configure/SubqueryProject';
@@ -47,6 +48,7 @@ export class FetchService extends BaseFetchService<
     unfinalizedBlocksService: UnfinalizedBlocksService,
     eventEmitter: EventEmitter2,
     schedulerRegistry: SchedulerRegistry,
+    storeCacheService: StoreCacheService,
   ) {
     super(
       nodeConfig,
@@ -57,6 +59,7 @@ export class FetchService extends BaseFetchService<
       eventEmitter,
       schedulerRegistry,
       unfinalizedBlocksService,
+      storeCacheService,
     );
   }
 

packages/node/src/indexer/worker/worker-fetch.module.ts

@@ -7,15 +7,9 @@ import {
   ApiService,
   ConnectionPoolService,
   WorkerDynamicDsService,
-  WorkerConnectionPoolStateManager,
-  ConnectionPoolStateManager,
   NodeConfig,
-  InMemoryCacheService,
-  WorkerInMemoryCacheService,
   WorkerUnfinalizedBlocksService,
-  SandboxService,
-  MonitorService,
-  WorkerMonitorService,
+  WorkerCoreModule,
 } from '@subql/node-core';
 import { SubqueryProject } from '../../configure/SubqueryProject';
 import { EthereumApiService } from '../../ethereum';
@@ -28,14 +22,9 @@ import { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';
 import { WorkerService } from './worker.service';
 
 @Module({
+  imports: [WorkerCoreModule],
   providers: [
     IndexerManager,
-    {
-      provide: ConnectionPoolStateManager,
-      useFactory: () =>
-        new WorkerConnectionPoolStateManager((global as any).host),
-    },
-    ConnectionPoolService,
     {
       provide: ApiService,
       useFactory: async (
@@ -60,7 +49,6 @@ import { WorkerService } from './worker.service';
         NodeConfig,
       ],
     },
-    SandboxService,
     DsProcessorService,
     {
       provide: DynamicDsService,
@@ -76,14 +64,6 @@ import { WorkerService } from './worker.service';
         new WorkerUnfinalizedBlocksService((global as any).host),
     },
     WorkerService,
-    {
-      provide: MonitorService,
-      useFactory: () => new WorkerMonitorService((global as any).host),
-    },
-    {
-      provide: InMemoryCacheService,
-      useFactory: () => new WorkerInMemoryCacheService((global as any).host),
-    },
   ],
 })
 export class WorkerFetchModule {}

packages/node/src/indexer/worker/worker.module.ts

@@ -4,7 +4,7 @@
 import { Module } from '@nestjs/common';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { ScheduleModule } from '@nestjs/schedule';
-import { DbModule } from '@subql/node-core';
+import { DbModule, WorkerCoreModule } from '@subql/node-core';
 import { ConfigureModule } from '../../configure/configure.module';
 import { WorkerFetchModule } from './worker-fetch.module';
 
@@ -14,6 +14,7 @@ import { WorkerFetchModule } from './worker-fetch.module';
     EventEmitterModule.forRoot(),
     ConfigureModule.register(),
     ScheduleModule.forRoot(),
+    WorkerCoreModule,
     WorkerFetchModule,
   ],
   controllers: [],