Sync @subql dependencies (#40)

* Update @subql deps * Apply changes relating to updated deps * Update changelogs --------- Co-authored-by: stwiname <[email protected]>
subquery · Apr 29, 2024 · b67cad1 · b67cad1
1 parent 8419959
commit b67cad1
Show file tree

Hide file tree

Showing 24 changed files with 113 additions and 430 deletions.
diff --git a/packages/common-concordium/CHANGELOG.md b/packages/common-concordium/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
+- Update dependencies and apply changes to match (#40)
 
 ## [3.5.1] - 2024-04-11
 ### Fixed

diff --git a/packages/common-concordium/package.json b/packages/common-concordium/package.json
@@ -15,7 +15,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@concordium/node-sdk": "9.4.0",
-    "@subql/common": "^3.5.0",
+    "@subql/common": "^3.5.1",
     "@subql/types-concordium": "workspace:*",
     "js-yaml": "^4.1.0",
     "pino": "^6.13.3",

diff --git a/packages/common-concordium/src/project/utils.ts b/packages/common-concordium/src/project/utils.ts
@@ -10,27 +10,29 @@ import {
   ConcordiumRuntimeDatasource,
 } from '@subql/types-concordium';
 
+type DefaultFilter = Record<string, unknown>;
+
 export function isBlockHandlerProcessor<E>(
-  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, unknown, unknown>
-): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.Block, unknown, E> {
+  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, DefaultFilter, unknown>
+): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.Block, DefaultFilter, E> {
   return hp.baseHandlerKind === ConcordiumHandlerKind.Block;
 }
 
 export function isTransactionHandlerProcessor<E>(
-  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, unknown, unknown>
-): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.Transaction, unknown, E> {
+  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, DefaultFilter, unknown>
+): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.Transaction, DefaultFilter, E> {
   return hp.baseHandlerKind === ConcordiumHandlerKind.Transaction;
 }
 
 export function isTransactionEventHandlerProcessor<E>(
-  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, unknown, unknown>
-): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.TransactionEvent, unknown, E> {
+  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, DefaultFilter, unknown>
+): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.TransactionEvent, DefaultFilter, E> {
   return hp.baseHandlerKind === ConcordiumHandlerKind.TransactionEvent;
 }
 
 export function isSpecialEventHandlerProcessor<E>(
-  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, unknown, unknown>
-): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.SpecialEvent, unknown, E> {
+  hp: SecondLayerHandlerProcessor<ConcordiumHandlerKind, DefaultFilter, unknown>
+): hp is SecondLayerHandlerProcessor<ConcordiumHandlerKind.SpecialEvent, DefaultFilter, E> {
   return hp.baseHandlerKind === ConcordiumHandlerKind.SpecialEvent;
 }
 

diff --git a/packages/node/CHANGELOG.md b/packages/node/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
+- Update dependencies and apply changes to match (#40)
 
 ## [3.10.1] - 2024-04-11
 ### Fixed

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -26,9 +26,9 @@
     "@nestjs/event-emitter": "^2.0.0",
     "@nestjs/platform-express": "^9.4.0",
     "@nestjs/schedule": "^3.0.1",
-    "@subql/common": "^3.5.0",
+    "@subql/common": "^3.5.1",
     "@subql/common-concordium": "workspace:*",
-    "@subql/node-core": "^8.0.1",
+    "@subql/node-core": "^10.0.0",
     "@subql/types-concordium": "workspace:*",
     "cacheable-lookup": "6",
     "cron-converter": "^1.0.2",

diff --git a/packages/node/src/indexer/blockDispatcher/block-dispatcher.service.ts b/packages/node/src/indexer/blockDispatcher/block-dispatcher.service.ts
@@ -5,7 +5,6 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import {
   NodeConfig,
-  SmartBatchService,
   StoreCacheService,
   StoreService,
   IProjectService,
@@ -18,7 +17,6 @@ import {
 } from '@subql/node-core';
 import { ConcordiumBlock, ConcordiumDatasource } from '@subql/types-concordium';
 import { SubqueryProject } from '../../configure/SubqueryProject';
-import { DynamicDsService } from '../dynamic-ds.service';
 import { IndexerManager } from '../indexer.manager';
 
 /**
@@ -38,24 +36,20 @@ export class BlockDispatcherService
     projectService: IProjectService<ConcordiumDatasource>,
     @Inject('IProjectUpgradeService')
     projectUpgradeService: IProjectUpgradeService,
-    smartBatchService: SmartBatchService,
     storeService: StoreService,
     storeCacheService: StoreCacheService,
     poiSyncService: PoiSyncService,
     @Inject('ISubqueryProject') project: SubqueryProject,
-    dynamicDsService: DynamicDsService,
   ) {
     super(
       nodeConfig,
       eventEmitter,
       projectService,
       projectUpgradeService,
-      smartBatchService,
       storeService,
       storeCacheService,
       poiSyncService,
       project,
-      dynamicDsService,
       apiService.fetchBlocks.bind(apiService),
     );
   }

diff --git a/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts b/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts
@@ -6,7 +6,6 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import {
   NodeConfig,
-  SmartBatchService,
   StoreService,
   StoreCacheService,
   IProjectService,
@@ -45,7 +44,6 @@ export class WorkerBlockDispatcherService
     projectService: IProjectService<ConcordiumDatasource>,
     @Inject('IProjectUpgradeService')
     projectUpgadeService: IProjectUpgradeService,
-    smartBatchService: SmartBatchService,
     cacheService: InMemoryCacheService,
     storeService: StoreService,
     storeCacheService: StoreCacheService,
@@ -60,12 +58,10 @@ export class WorkerBlockDispatcherService
       eventEmitter,
       projectService,
       projectUpgadeService,
-      smartBatchService,
       storeService,
       storeCacheService,
       poiSyncService,
       project,
-      dynamicDsService,
       () =>
         createIndexerWorker<
           IIndexerWorker,

diff --git a/packages/node/src/indexer/dictionary/v1/dictionaryV1.ts b/packages/node/src/indexer/dictionary/v1/dictionaryV1.ts
@@ -7,11 +7,14 @@ import {
   ConcordiumSpecialEventFilter,
   ConcordiumTransactionEventFilter,
   ConcordiumTransactionFilter,
-  DictionaryQueryCondition,
   ConcordiumDatasource,
   ConcordiumHandlerKind,
 } from '@subql/types-concordium';
-import { DictionaryQueryEntry, DsProcessor } from '@subql/types-core';
+import {
+  DictionaryQueryCondition,
+  DictionaryQueryEntry,
+  DsProcessor,
+} from '@subql/types-core';
 import { setWith, sortBy, uniqBy } from 'lodash';
 import { SubqueryProject } from '../../../configure/SubqueryProject';
 

diff --git a/packages/node/src/indexer/ds-processor.service.ts b/packages/node/src/indexer/ds-processor.service.ts
@@ -2,76 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0
 
 import { Injectable } from '@nestjs/common';
-import {
-  ConcordiumHandlerKind,
-  isCustomDs,
-  SubqlDatasourceProcessor,
-} from '@subql/common-concordium';
+import { isCustomDs, SubqlDatasourceProcessor } from '@subql/common-concordium';
 import { BaseDsProcessorService } from '@subql/node-core';
 import {
   ConcordiumCustomDatasource,
   ConcordiumDatasource,
-  SecondLayerHandlerProcessor_0_0_0,
-  SecondLayerHandlerProcessor_1_0_0,
 } from '@subql/types-concordium';
 
-export function isSecondLayerHandlerProcessor_0_0_0<
-  K extends ConcordiumHandlerKind,
-  F extends Record<string, unknown>,
-  E,
-  DS extends ConcordiumCustomDatasource = ConcordiumCustomDatasource,
->(
-  processor:
-    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>
-    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,
-): processor is SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> {
-  // Exisiting datasource processors had no concept of specVersion, therefore undefined is equivalent to 0.0.0
-  return processor.specVersion === undefined;
-}
-
-export function isSecondLayerHandlerProcessor_1_0_0<
-  K extends ConcordiumHandlerKind,
-  F extends Record<string, unknown>,
-  E,
-  DS extends ConcordiumCustomDatasource = ConcordiumCustomDatasource,
->(
-  processor:
-    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>
-    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,
-): processor is SecondLayerHandlerProcessor_1_0_0<K, F, E, DS> {
-  return processor.specVersion === '1.0.0';
-}
-
-export function asSecondLayerHandlerProcessor_1_0_0<
-  K extends ConcordiumHandlerKind,
-  F extends Record<string, unknown>,
-  E,
-  DS extends ConcordiumCustomDatasource = ConcordiumCustomDatasource,
->(
-  processor:
-    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>
-    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,
-): SecondLayerHandlerProcessor_1_0_0<K, F, E, DS> {
-  if (isSecondLayerHandlerProcessor_1_0_0(processor)) {
-    return processor;
-  }
-
-  if (!isSecondLayerHandlerProcessor_0_0_0(processor)) {
-    throw new Error('Unsupported ds processor version');
-  }
-
-  return {
-    ...processor,
-    specVersion: '1.0.0',
-    filterProcessor: (params) =>
-      processor.filterProcessor(params.filter, params.input, params.ds),
-    transformer: (params) =>
-      processor
-        .transformer(params.input, params.ds, params.api, params.assets)
-        .then((res) => [res]),
-  };
-}
-
 @Injectable()
 export class DsProcessorService extends BaseDsProcessorService<
   ConcordiumDatasource,

diff --git a/packages/node/src/indexer/dynamic-ds.service.ts b/packages/node/src/indexer/dynamic-ds.service.ts
@@ -14,38 +14,28 @@ import {
 import { ConcordiumDatasource } from '@subql/types-concordium';
 import { plainToClass } from 'class-transformer';
 import { validateSync } from 'class-validator';
-import { cloneDeep } from 'lodash';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
 
 @Injectable()
-export class DynamicDsService extends BaseDynamicDsService<ConcordiumDatasource> {
+export class DynamicDsService extends BaseDynamicDsService<
+  ConcordiumDatasource,
+  SubqueryProject
+> {
   constructor(
     private readonly dsProcessorService: DsProcessorService,
-    @Inject('ISubqueryProject') private readonly project: SubqueryProject,
+    @Inject('ISubqueryProject') project: SubqueryProject,
   ) {
-    super();
+    super(project);
   }
 
   protected async getDatasource(
     params: DatasourceParams,
   ): Promise<ConcordiumDatasource> {
-    const t = this.project.templates?.find(
-      (t) => t.name === params.templateName,
+    const dsObj = this.getTemplate<ConcordiumDatasource>(
+      params.templateName,
+      params.startBlock,
     );
-
-    if (!t) {
-      throw new Error(
-        `Unable to find matching template in project for name: "${params.templateName}"`,
-      );
-    }
-
-    const { name, ...template } = cloneDeep(t);
-
-    const dsObj = {
-      ...template,
-      startBlock: params.startBlock,
-    } as ConcordiumDatasource;
     try {
       if (isCustomDs(dsObj)) {
         dsObj.processor.options = {

diff --git a/packages/node/src/indexer/fetch.module.ts b/packages/node/src/indexer/fetch.module.ts
@@ -12,11 +12,11 @@ import {
   NodeConfig,
   ConnectionPoolService,
   ConnectionPoolStateManager,
-  SmartBatchService,
   StoreCacheService,
   IProjectUpgradeService,
   PoiSyncService,
   InMemoryCacheService,
+  SandboxService,
 } from '@subql/node-core';
 import { ConcordiumApiConnection } from '../concordium/api.connection';
 import { ConcordiumApiService } from '../concordium/api.service.concordium';
@@ -31,7 +31,6 @@ import { DynamicDsService } from './dynamic-ds.service';
 import { FetchService } from './fetch.service';
 import { IndexerManager } from './indexer.manager';
 import { ProjectService } from './project.service';
-import { SandboxService } from './sandbox.service';
 import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
 
 @Module({
@@ -67,13 +66,6 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
     ConnectionPoolStateManager,
     ConnectionPoolService,
     PoiSyncService,
-    {
-      provide: SmartBatchService,
-      useFactory: (nodeConfig: NodeConfig) => {
-        return new SmartBatchService(nodeConfig.batchSize);
-      },
-      inject: [NodeConfig],
-    },
     {
       provide: 'IBlockDispatcher',
       useFactory: (
@@ -83,7 +75,6 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
         projectUpgradeService: IProjectUpgradeService,
         apiService: ConcordiumApiService,
         indexerManager: IndexerManager,
-        smartBatchService: SmartBatchService,
         cacheService: InMemoryCacheService,
         storeService: StoreService,
         storeCacheService: StoreCacheService,
@@ -99,7 +90,6 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
               eventEmitter,
               projectService,
               projectUpgradeService,
-              smartBatchService,
               cacheService,
               storeService,
               storeCacheService,
@@ -116,12 +106,10 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
               eventEmitter,
               projectService,
               projectUpgradeService,
-              smartBatchService,
               storeService,
               storeCacheService,
               poiSyncService,
               project,
-              dynamicDsService,
             ),
       inject: [
         NodeConfig,
@@ -130,7 +118,6 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
         'IProjectUpgradeService',
         ApiService,
         IndexerManager,
-        SmartBatchService,
         InMemoryCacheService,
         StoreService,
         StoreCacheService,

diff --git a/packages/node/src/indexer/fetch.service.ts b/packages/node/src/indexer/fetch.service.ts
@@ -65,10 +65,6 @@ export class FetchService extends BaseFetchService<
     return this.apiService.unsafeApi;
   }
 
-  protected getGenesisHash(): string {
-    return this.apiService.networkMeta.genesisHash;
-  }
-
   protected async getFinalizedHeight(): Promise<number> {
     const block = await this.api.getFinalizedBlock();