Sync @subql dependencies (#264)

* Update @subql deps

* Add admin changes, address build issues

---------

Co-authored-by: stwiname <[email protected]>

packages/common-cosmos/CHANGELOG.md

@@ -5,6 +5,8 @@ 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
+- Add default value in model class to follow ES2022 rule (#264)
 
 ## [4.3.0] - 2024-05-02
 ### Changed

packages/common-cosmos/package.json

@@ -22,7 +22,7 @@
     "@protobufs/google": "^0.0.10",
     "@protobufs/ibc": "^0.1.0",
     "@protobufs/tendermint": "^0.0.10",
-    "@subql/common": "^3.5.1",
+    "@subql/common": "^3.8.0",
     "@subql/types-cosmos": "workspace:*",
     "@subql/x-cosmology-telescope": "^1.4.14",
     "fs-extra": "^11.1.1",

packages/common-cosmos/src/project/versioned/v1_0_0/model.ts

@@ -31,7 +31,7 @@ const COSMOS_NODE_NAME = `@subql/node-cosmos`;
 
 export class CosmosRunnerNodeImpl extends RunnerNodeImpl {
   @Equals(COSMOS_NODE_NAME, {message: `Runner Cosmos node name incorrect, suppose be '${COSMOS_NODE_NAME}'`})
-  name: string;
+  name: string = COSMOS_NODE_NAME;
 }
 
 export class CosmosRuntimeDataSourceImpl
@@ -73,7 +73,7 @@ export class CosmosProjectNetwork extends CommonProjectNetworkV1_0_0<CosmosChain
   @Type(() => CosmosCustomModuleImpl)
   @IsOptional()
   @ValidateNested({each: true})
-  chaintypes?: Map<string, CosmosCustomModuleImpl>;
+  declare chaintypes?: Map<string, CosmosCustomModuleImpl>;
 }
 
 export class RuntimeDatasourceTemplateImpl extends CosmosRuntimeDataSourceImpl implements RuntimeDatasourceTemplate {
@@ -137,7 +137,7 @@ export class ProjectManifestV1_0_0Impl
   }
 
   @Equals('1.0.0')
-  specVersion: string;
+  specVersion = '1.0.0';
   @IsString()
   name: string;
   @IsString()

packages/node/CHANGELOG.md

@@ -5,6 +5,11 @@ 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]
+### Added
+- Add monitor service to record block indexing actions in order to improve POI accuracy, and provide debug info for Admin api (#264)
+
+### Changed
+- Update dependencies (#264)
 
 ## [3.11.2] - 2024-06-12
 ### Fixed

packages/node/Dockerfile

@@ -35,6 +35,10 @@ RUN rm /app.tgz && \
     yarn cache clean && \
     rm -rf /root/.npm /root/.cache
 
+# Create ./.monitor directory and set permissions
+RUN mkdir -p .monitor && \
+    chown 1000:1000 .monitor
+
 # Make the user not ROOT
 USER 1000
 

packages/node/package.json

@@ -29,9 +29,9 @@
     "@nestjs/event-emitter": "^2.0.0",
     "@nestjs/platform-express": "^9.4.0",
     "@nestjs/schedule": "^3.0.1",
-    "@subql/common": "^3.5.1",
+    "@subql/common": "^3.8.0",
     "@subql/common-cosmos": "workspace:*",
-    "@subql/node-core": "^10.1.1",
+    "@subql/node-core": "^10.6.0",
     "@subql/types-cosmos": "workspace:*",
     "lodash": "^4.17.21",
     "protobufjs": "^6.11.4",

packages/node/src/admin/admin.module.ts

@@ -0,0 +1,13 @@
+// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
+// SPDX-License-Identifier: GPL-3.0
+
+import { Module } from '@nestjs/common';
+import { adminControllers, adminServices } from '@subql/node-core';
+import { FetchModule } from '../indexer/fetch.module';
+
+@Module({
+  imports: [FetchModule],
+  controllers: [...adminControllers],
+  providers: [...adminServices],
+})
+export class AdminModule {}

packages/node/src/app.module.ts

@@ -5,6 +5,7 @@ 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 { ConfigureModule } from './configure/configure.module';
 import { FetchModule } from './indexer/fetch.module';
 import { MetaModule } from './meta/meta.module';
@@ -17,6 +18,7 @@ import { MetaModule } from './meta/meta.module';
     ScheduleModule.forRoot(),
     FetchModule,
     MetaModule,
+    AdminModule,
   ],
   controllers: [],
 })

packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts

@@ -16,6 +16,7 @@ import {
   IProjectUpgradeService,
   InMemoryCacheService,
   createIndexerWorker,
+  MonitorServiceInterface,
 } from '@subql/node-core';
 import { SubqueryProject } from '../../configure/SubqueryProject';
 import { CosmosClientConnection } from '../cosmosClient.connection';
@@ -48,6 +49,7 @@ export class WorkerBlockDispatcherService
     dynamicDsService: DynamicDsService,
     unfinalizedBlocksSevice: UnfinalizedBlocksService,
     connectionPoolState: ConnectionPoolStateManager<CosmosClientConnection>,
+    monitorService?: MonitorServiceInterface,
   ) {
     super(
       nodeConfig,
@@ -74,10 +76,12 @@ export class WorkerBlockDispatcherService
           connectionPoolState,
           project.root,
           projectService.startHeight,
+          monitorService,
           {
             tempDir: project.tempDir,
           },
         ),
+      monitorService,
     );
   }
 

packages/node/src/indexer/cosmosClient.connection.ts

@@ -10,6 +10,7 @@ import {
   ApiErrorType,
   IApiConnectionSpecific,
   NetworkMetadataPayload,
+  exitWithError,
 } from '@subql/node-core';
 import { getLogger } from '@subql/node-core/dist';
 import { CosmosClient, CosmosSafeClient } from './api.service';
@@ -67,8 +68,10 @@ export class CosmosClientConnection
     const rpcClient =
       endpoint.includes('ws://') || endpoint.includes('wss://')
         ? new WebsocketClient(endpoint, (err) => {
-            logger.error(err, `Websocket connection failed`);
-            process.exit(1);
+            exitWithError(
+              new Error(`Websocket connection failed`, { cause: err }),
+              logger,
+            );
           })
         : new HttpClient(httpEndpoint);
 

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

@@ -16,6 +16,7 @@ import {
   IProjectUpgradeService,
   InMemoryCacheService,
   SandboxService,
+  MonitorService,
 } from '@subql/node-core';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { ApiService } from './api.service';
@@ -57,6 +58,7 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
         dynamicDsService: DynamicDsService,
         unfinalizedBlocks: UnfinalizedBlocksService,
         connectionPoolState: ConnectionPoolStateManager<CosmosClientConnection>,
+        monitorService?: MonitorService,
       ) =>
         nodeConfig.workers
           ? new WorkerBlockDispatcherService(
@@ -72,6 +74,7 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
               dynamicDsService,
               unfinalizedBlocks,
               connectionPoolState,
+              monitorService,
             )
           : new BlockDispatcherService(
               apiService,
@@ -100,6 +103,7 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
         DynamicDsService,
         UnfinalizedBlocksService,
         ConnectionPoolStateManager,
+        MonitorService,
       ],
     },
     FetchService,
@@ -116,8 +120,9 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
       useClass: ProjectService,
       provide: 'IProjectService',
     },
+    MonitorService,
     UnfinalizedBlocksService,
   ],
-  exports: [StoreService, StoreCacheService],
+  exports: [StoreService, StoreCacheService, MonitorService, PoiService],
 })
 export class FetchModule {}

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

@@ -13,6 +13,8 @@ import {
   NodeConfig,
   SandboxService,
   WorkerUnfinalizedBlocksService,
+  MonitorService,
+  WorkerMonitorService,
 } from '@subql/node-core';
 import { SubqueryProject } from '../../configure/SubqueryProject';
 import { ApiService } from '../api.service';
@@ -77,6 +79,10 @@ import { WorkerService } from './worker.service';
       provide: InMemoryCacheService,
       useFactory: () => new WorkerInMemoryCacheService((global as any).host),
     },
+    {
+      provide: MonitorService,
+      useFactory: () => new WorkerMonitorService((global as any).host),
+    },
   ],
   exports: [],
 })

packages/node/src/init.ts

@@ -3,7 +3,7 @@
 
 import { NestFactory } from '@nestjs/core';
 import { findAvailablePort, notifyUpdates } from '@subql/common';
-import { getLogger, NestLogger } from '@subql/node-core';
+import { exitWithError, getLogger, NestLogger } from '@subql/node-core';
 import { AppModule } from './app.module';
 import { ApiService } from './indexer/api.service';
 import { FetchService } from './indexer/fetch.service';
@@ -28,12 +28,14 @@ export async function bootstrap(): Promise<void> {
 
   const port = validate(argv.port) ?? (await findAvailablePort(DEFAULT_PORT));
   if (!port) {
-    logger.error(
-      `Unable to find available port (tried ports in range (${port}..${
-        port + 10
-      })). Try setting a free port manually by setting the --port flag`,
+    exitWithError(
+      new Error(
+        `Unable to find available port (tried ports in range (${port}..${
+          port + 10
+        })). Try setting a free port manually by setting the --port flag`,
+      ),
+      logger,
     );
-    process.exit(1);
   }
 
   if (argv.unsafe) {

packages/node/src/subcommands/testing.init.ts

@@ -1,7 +1,7 @@
 // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 
-import { getLogger } from '@subql/node-core';
+import { exitWithError, getLogger } from '@subql/node-core';
 import { ConfigureModule } from '../configure/configure.module';
 import { TestingService } from './testing.service';
 
@@ -13,8 +13,7 @@ export async function testingInit(): Promise<void> {
     const testingService = new TestingService(nodeConfig, project);
     await testingService.run();
   } catch (e) {
-    logger.error(e, 'Testing failed');
-    process.exit(1);
+    exitWithError(new Error(`Testing failed`, { cause: e }), logger);
   }
   process.exit(0);
 }

packages/node/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "es2017",
     "sourceMap": true,
     "tsBuildInfoFile": "dist/.tsbuildinfo",
     "rootDir": "src",

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2017",
+    "target": "ES2022",
     "noImplicitAny": false,
     "noImplicitThis": true,
     "moduleResolution": "node",
@@ -11,7 +11,7 @@
     "experimentalDecorators": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "lib": ["ES2017", "ES2020"],
+    "lib": ["ES2022"],
     "emitDecoratorMetadata": true,
     "declaration": true,
     "sourceMap": true,