Clean up deps, remove deprecated types

packages/node/package.json

@@ -19,7 +19,6 @@
     "subql-node-algorand": "./bin/run"
   },
   "dependencies": {
-    "@apollo/client": "3.5.8",
     "@nestjs/common": "^9.4.0",
     "@nestjs/core": "^9.4.0",
     "@nestjs/event-emitter": "^2.0.0",
@@ -32,14 +31,9 @@
     "algosdk": "^2.2.0",
     "axios": "^1.3.4",
     "cron-converter": "^1.0.2",
-    "dayjs": "^1.10.7",
-    "eventemitter2": "^6.4.5",
     "lodash": "^4.17.21",
-    "pg": "^8.7.1",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^7.5.2",
-    "tar": "^6.2.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {

packages/node/src/configure/SubqueryProject.ts

@@ -6,7 +6,6 @@ import { Injectable } from '@nestjs/common';
 import { validateSemver } from '@subql/common';
 import {
   parseAlgorandProjectManifest,
-  AlgorandDataSource,
   ProjectManifestV1_0_0Impl,
   BlockFilter,
   isRuntimeDs,
@@ -16,10 +15,10 @@ import {
 import {
   insertBlockFiltersCronSchedules,
   loadProjectTemplates,
-  SubqlProjectDs,
   updateDataSourcesV1_0_0,
 } from '@subql/node-core';
 import {
+  AlgorandDataSource,
   CustomDatasourceTemplate,
   RuntimeDatasourceTemplate,
 } from '@subql/types-algorand';
@@ -35,11 +34,9 @@ import { GraphQLSchema } from 'graphql';
 
 const { version: packageVersion } = require('../../package.json');
 
-export type AlgorandProjectDs = SubqlProjectDs<AlgorandDataSource>;
-
 export type AlgorandProjectDsTemplate =
-  | SubqlProjectDs<RuntimeDatasourceTemplate>
-  | SubqlProjectDs<CustomDatasourceTemplate>;
+  | RuntimeDatasourceTemplate
+  | CustomDatasourceTemplate;
 
 export type SubqlProjectBlockFilter = BlockFilter & {
   cronSchedule?: {
@@ -57,13 +54,13 @@ type NetworkConfig = IProjectNetworkConfig & { chainId: string };
 
 @Injectable()
 export class SubqueryProject {
-  #dataSources: AlgorandProjectDs[];
+  #dataSources: AlgorandDataSource[];
 
   constructor(
     readonly id: string,
     readonly root: string,
     readonly network: NetworkConfig,
-    dataSources: AlgorandProjectDs[],
+    dataSources: AlgorandDataSource[],
     readonly schema: GraphQLSchema,
     readonly templates: AlgorandProjectDsTemplate[],
     readonly runner?: RunnerSpecs,
@@ -72,7 +69,7 @@ export class SubqueryProject {
     this.#dataSources = dataSources;
   }
 
-  get dataSources(): AlgorandProjectDs[] {
+  get dataSources(): AlgorandDataSource[] {
     return this.#dataSources;
   }
 

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

@@ -14,29 +14,26 @@ import {
   IProjectUpgradeService,
   IBlock,
 } from '@subql/node-core';
-import { AlgorandBlock } from '@subql/types-algorand';
+import { AlgorandBlock, AlgorandDataSource } from '@subql/types-algorand';
 import { AlgorandApiService } from '../../algorand';
-import {
-  AlgorandProjectDs,
-  SubqueryProject,
-} from '../../configure/SubqueryProject';
+import { SubqueryProject } from '../../configure/SubqueryProject';
 import { IndexerManager } from '../indexer.manager';
 
 /**
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
 @Injectable()
 export class BlockDispatcherService
-  extends BlockDispatcher<AlgorandBlock, AlgorandProjectDs>
+  extends BlockDispatcher<AlgorandBlock, AlgorandDataSource>
   implements OnApplicationShutdown
 {
   constructor(
-    private apiService: AlgorandApiService,
+    apiService: AlgorandApiService,
     nodeConfig: NodeConfig,
     private indexerManager: IndexerManager,
     eventEmitter: EventEmitter2,
     @Inject('IProjectService')
-    projectService: IProjectService<AlgorandProjectDs>,
+    projectService: IProjectService<AlgorandDataSource>,
     @Inject('IProjectUpgradeService')
     projectUpgradeService: IProjectUpgradeService,
     storeService: StoreService,

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

@@ -16,12 +16,9 @@ import {
   InMemoryCacheService,
   createIndexerWorker,
 } from '@subql/node-core';
-import { AlgorandBlock } from '@subql/types-algorand';
+import { AlgorandBlock, AlgorandDataSource } from '@subql/types-algorand';
 import { AlgorandApiConnection } from '../../algorand';
-import {
-  AlgorandProjectDs,
-  SubqueryProject,
-} from '../../configure/SubqueryProject';
+import { SubqueryProject } from '../../configure/SubqueryProject';
 import { DynamicDsService } from '../dynamic-ds.service';
 import { BlockContent } from '../types';
 import { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';
@@ -33,14 +30,18 @@ type IndexerWorker = IIndexerWorker & {
 
 @Injectable()
 export class WorkerBlockDispatcherService
-  extends WorkerBlockDispatcher<AlgorandProjectDs, IndexerWorker, AlgorandBlock>
+  extends WorkerBlockDispatcher<
+    AlgorandDataSource,
+    IndexerWorker,
+    AlgorandBlock
+  >
   implements OnApplicationShutdown
 {
   constructor(
     nodeConfig: NodeConfig,
     eventEmitter: EventEmitter2,
     @Inject('IProjectService')
-    projectService: IProjectService<AlgorandProjectDs>,
+    projectService: IProjectService<AlgorandDataSource>,
     @Inject('IProjectUpgradeService')
     projectUpgadeService: IProjectUpgradeService,
     cacheService: InMemoryCacheService,
@@ -66,7 +67,7 @@ export class WorkerBlockDispatcherService
           IIndexerWorker,
           AlgorandApiConnection,
           BlockContent,
-          AlgorandProjectDs
+          AlgorandDataSource
         >(
           path.resolve(__dirname, '../../../dist/indexer/worker/worker.js'),
           [],

packages/node/src/indexer/dynamic-ds.service.ts

@@ -7,16 +7,14 @@ import {
   DatasourceParams,
   DynamicDsService as BaseDynamicDsService,
 } from '@subql/node-core';
+import { AlgorandDataSource } from '@subql/types-algorand';
 import { TransactionType } from 'algosdk';
-import {
-  AlgorandProjectDs,
-  SubqueryProject,
-} from '../configure/SubqueryProject';
+import { SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
 
 @Injectable()
 export class DynamicDsService extends BaseDynamicDsService<
-  AlgorandProjectDs,
+  AlgorandDataSource,
   SubqueryProject
 > {
   constructor(
@@ -28,8 +26,8 @@ export class DynamicDsService extends BaseDynamicDsService<
 
   protected async getDatasource(
     params: DatasourceParams,
-  ): Promise<AlgorandProjectDs> {
-    const dsObj = this.getTemplate<AlgorandProjectDs>(
+  ): Promise<AlgorandDataSource> {
+    const dsObj = this.getTemplate<AlgorandDataSource>(
       params.templateName,
       params.startBlock,
     );

packages/node/src/indexer/indexer.manager.ts

@@ -33,7 +33,6 @@ import {
   filterBlock,
   filterTransaction,
 } from '../algorand';
-import { AlgorandProjectDs } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
 import { DynamicDsService } from './dynamic-ds.service';
 import { BlockContent } from './types';
@@ -90,8 +89,8 @@ export class IndexerManager extends BaseIndexerManager<
 
   protected async indexBlockData(
     block: BlockContent,
-    dataSources: AlgorandProjectDs[],
-    getVM: (d: AlgorandProjectDs) => Promise<IndexerSandbox>,
+    dataSources: AlgorandDataSource[],
+    getVM: (d: AlgorandDataSource) => Promise<IndexerSandbox>,
   ): Promise<void> {
     await this.indexBlockContent(block, dataSources, getVM);
     for (const tx of block.transactions) {
@@ -101,8 +100,8 @@ export class IndexerManager extends BaseIndexerManager<
 
   private async indexBlockContent(
     block: AlgorandBlock,
-    dataSources: AlgorandProjectDs[],
-    getVM: (d: AlgorandProjectDs) => Promise<IndexerSandbox>,
+    dataSources: AlgorandDataSource[],
+    getVM: (d: AlgorandDataSource) => Promise<IndexerSandbox>,
   ): Promise<void> {
     for (const ds of dataSources) {
       await this.indexData(AlgorandHandlerKind.Block, block, ds, getVM);
@@ -111,8 +110,8 @@ export class IndexerManager extends BaseIndexerManager<
 
   private async indexBlockTransactionContent(
     txn: AlgorandTransaction,
-    dataSources: AlgorandProjectDs[],
-    getVM: (d: AlgorandProjectDs) => Promise<IndexerSandbox>,
+    dataSources: AlgorandDataSource[],
+    getVM: (d: AlgorandDataSource) => Promise<IndexerSandbox>,
   ): Promise<void> {
     for (const ds of dataSources) {
       await this.indexData(AlgorandHandlerKind.Transaction, txn, ds, getVM);

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

@@ -13,12 +13,10 @@ import {
   IProjectUpgradeService,
   profiler,
 } from '@subql/node-core';
+import { AlgorandDataSource } from '@subql/types-algorand';
 import { Sequelize } from '@subql/x-sequelize';
 import { AlgorandApiService } from '../algorand';
-import {
-  SubqueryProject,
-  AlgorandProjectDs,
-} from '../configure/SubqueryProject';
+import { SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
 import { DynamicDsService } from './dynamic-ds.service';
 import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
@@ -29,7 +27,7 @@ const { version: packageVersion } = require('../../package.json');
 @Injectable()
 export class ProjectService extends BaseProjectService<
   AlgorandApiService,
-  AlgorandProjectDs
+  AlgorandDataSource
 > {
   protected packageVersion = packageVersion;
 

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

@@ -7,16 +7,10 @@ import {
   IProjectService,
   BaseWorkerService,
   IProjectUpgradeService,
-  ApiService,
   IBlock,
 } from '@subql/node-core';
 import { AlgorandBlock, AlgorandDataSource } from '@subql/types-algorand';
-import {
-  AlgorandApi,
-  AlgorandApiService,
-  SafeAPIService,
-} from '../../algorand';
-import { AlgorandProjectDs } from '../../configure/SubqueryProject';
+import { AlgorandApiService } from '../../algorand';
 import { IndexerManager } from '../indexer.manager';
 import { BlockContent } from '../types';
 
@@ -46,7 +40,7 @@ export class WorkerService extends BaseWorkerService<
     private apiService: AlgorandApiService,
     private indexerManager: IndexerManager,
     @Inject('IProjectService')
-    projectService: IProjectService<AlgorandProjectDs>,
+    projectService: IProjectService<AlgorandDataSource>,
     @Inject('IProjectUpgradeService')
     projectUpgradeService: IProjectUpgradeService,
     nodeConfig: NodeConfig,

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

@@ -10,11 +10,9 @@ import {
   TestRunner,
   IBlock,
 } from '@subql/node-core';
+import { AlgorandDataSource } from '@subql/types-algorand';
 import { AlgorandApi, AlgorandApiService, SafeAPIService } from '../algorand';
-import {
-  AlgorandProjectDs,
-  SubqueryProject,
-} from '../configure/SubqueryProject';
+import { SubqueryProject } from '../configure/SubqueryProject';
 import { IndexerManager } from '../indexer/indexer.manager';
 import { ProjectService } from '../indexer/project.service';
 import { BlockContent } from '../indexer/types';
@@ -25,7 +23,7 @@ export class TestingService extends BaseTestingService<
   AlgorandApi,
   SafeAPIService,
   BlockContent,
-  AlgorandProjectDs
+  AlgorandDataSource
 > {
   constructor(
     nodeConfig: NodeConfig,
@@ -41,7 +39,7 @@ export class TestingService extends BaseTestingService<
         AlgorandApi,
         SafeAPIService,
         BlockContent,
-        AlgorandProjectDs
+        AlgorandDataSource
       >,
     ]
   > {