@subql/node-ethereum 2.6.2-2 → 2.6.2-4

package/dist/ethereum/api.service.ethereum.js

@@ -83,17 +83,20 @@ let EthereumApiService = class EthereumApiService extends node_core_1.ApiService
                     return async (...args) => {
                         let retries = 0;
                         let currentApi = target;
+                        let throwingError;
                         while (retries < maxRetries) {
                             try {
                                 return await originalMethod.apply(currentApi, args);
                             }
                             catch (error) {
                                 logger.warn(`Request failed with api at height ${height} (retry ${retries}): ${error.message}`);
+                                throwingError = error;
                                 currentApi = this.unsafeApi.getSafeApi(height);
                                 retries++;
                             }
                         }
-                        throw new Error(`Maximum retries (${maxRetries}) exceeded for api at height ${height}`);
+                        logger.error(`Maximum retries (${maxRetries}) exceeded for api at height ${height}`);
+                        throw throwingError;
                     };
                 }
                 return Reflect.get(target, prop, receiver);

package/dist/ethereum/api.service.ethereum.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.service.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,2CAAoD;AACpD,yDAAsD;AAEtD,gDAM0B;AAE1B,kEAA+D;AAC/D,qDAAyD;AAIzD,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,KAAK,CAAC,CAAC;AAEhC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAG1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,sBAIvC;IACC,YACsC,OAAwB,EAC5D,qBAAmE,EAC3D,YAA2B;QAEnC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAJO,YAAO,GAAP,OAAO,CAAiB;QAEpD,iBAAY,GAAZ,YAAY,CAAe;IAGrC,CAAC;IAID,KAAK,CAAC,IAAI;QACR,IAAI;YACF,IAAI,OAA6B,CAAC;YAClC,IAAI;gBACF,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;aAChC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC/C,CAAC,CAAC,OAAO,CAAC,QAAQ;gBAClB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,kBAAkB,GAA0C,EAAE,CAAC;YAErE,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;gBAClC,MAAM,UAAU,GAAG,MAAM,sCAAqB,CAAC,MAAM,CACnD,QAAQ,EACR,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,YAAY,CAClB,CAAC;gBAEF,MAAM,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC;gBAEjC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAY,CAAC,YAAY,EAAE;oBAChD,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,CAAC;oBACX,QAAQ,EAAE,QAAQ;iBACnB,CAAC,CAAC;gBAEH,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;oBACrB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;iBAC3C;gBAED,IAAI,OAAO,CAAC,OAAO,KAAK,GAAG,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;oBACnD,MAAM,IAAI,CAAC,qBAAqB,CAC9B,SAAS,EACT,OAAO,CAAC,OAAO,EACf,GAAG,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAC5B,CAAC;iBACH;gBAED,kBAAkB,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;YAC5C,CAAC,CAAC,CACH,CAAC;YAEF,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;YAErE,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,4BAA4B,CAAC,CAAC;YAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;IAEO,qBAAqB,CAC3B,QAAgB,EAChB,QAAgB,EAChB,MAAc;QAEd,OAAO,KAAK,CACV,YAAY,QAAQ;mBACP,QAAQ;iBACV,MAAM,EAAE,CACpB,CAAC;IACJ,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,MAAM,UAAU,GAAG,CAAC,CAAC;QAErB,MAAM,OAAO,GAAkC;YAC7C,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;gBAC9B,MAAM,cAAc,GAAG,MAAM,CAAC,IAA6B,CAAC,CAAC;gBAC7D,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE;oBACxC,OAAO,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;wBAC9B,IAAI,OAAO,GAAG,CAAC,CAAC;wBAChB,IAAI,UAAU,GAAG,MAAM,CAAC;wBAExB,OAAO,OAAO,GAAG,UAAU,EAAE;4BAC3B,IAAI;gCACF,OAAO,MAAM,cAAc,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;6BACrD;4BAAC,OAAO,KAAK,EAAE;gCACd,MAAM,CAAC,IAAI,CACT,qCAAqC,MAAM,WAAW,OAAO,MAAM,KAAK,CAAC,OAAO,EAAE,CACnF,CAAC;gCACF,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gCAC/C,OAAO,EAAE,CAAC;6BACX;yBACF;wBAED,MAAM,IAAI,KAAK,CACb,oBAAoB,UAAU,gCAAgC,MAAM,EAAE,CACvE,CAAC;oBACJ,CAAC,CAAC;iBACH;gBACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC;SACF,CAAC;QAEF,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,GAAgB,EAChB,KAAe;QAEf,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF,CAAA;AAjIY,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAAkB,iCAAe;QACrC,iCAAqB;QACtB,6BAAa;GAR1B,kBAAkB,CAiI9B;AAjIY,gDAAkB","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { ProjectNetworkV1_0_0 } from '@subql/common-ethereum';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  NetworkMetadataPayload,\n  getLogger,\n  IndexerEvent,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from './api.connection';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\nconst logger = getLogger('api');\n\nconst MAX_RECONNECT_ATTEMPTS = 5;\n\n@Injectable()\nexport class EthereumApiService extends ApiService<\n  EthereumApi,\n  SafeEthProvider,\n  EthereumBlockWrapper\n> {\n  constructor(\n    @Inject('ISubqueryProject') private project: SubqueryProject,\n    connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n    private eventEmitter: EventEmitter2,\n  ) {\n    super(connectionPoolService);\n  }\n\n  networkMeta: NetworkMetadataPayload;\n\n  async init(): Promise<EthereumApiService> {\n    try {\n      let network: ProjectNetworkV1_0_0;\n      try {\n        network = this.project.network;\n      } catch (e) {\n        logger.error(Object.keys(e));\n        process.exit(1);\n      }\n\n      const endpoints = Array.isArray(network.endpoint)\n        ? network.endpoint\n        : [network.endpoint];\n\n      const endpointToApiIndex: Record<string, EthereumApiConnection> = {};\n\n      await Promise.all(\n        endpoints.map(async (endpoint, i) => {\n          const connection = await EthereumApiConnection.create(\n            endpoint,\n            this.fetchBlockBatches,\n            this.eventEmitter,\n          );\n\n          const api = connection.unsafeApi;\n\n          this.eventEmitter.emit(IndexerEvent.ApiConnected, {\n            value: 1,\n            apiIndex: i,\n            endpoint: endpoint,\n          });\n\n          if (!this.networkMeta) {\n            this.networkMeta = connection.networkMeta;\n          }\n\n          if (network.chainId !== api.getChainId().toString()) {\n            throw this.metadataMismatchError(\n              'ChainId',\n              network.chainId,\n              api.getChainId().toString(),\n            );\n          }\n\n          endpointToApiIndex[endpoint] = connection;\n        }),\n      );\n\n      this.connectionPoolService.addBatchToConnections(endpointToApiIndex);\n\n      return this;\n    } catch (e) {\n      logger.error(e, 'Failed to init api service');\n      process.exit(1);\n    }\n  }\n\n  private metadataMismatchError(\n    metadata: string,\n    expected: string,\n    actual: string,\n  ): Error {\n    return Error(\n      `Value of ${metadata} does not match across all endpoints. Please check that your endpoints are for the same network.\\n\n       Expected: ${expected}\n       Actual: ${actual}`,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.unsafeApi;\n  }\n\n  safeApi(height: number): SafeEthProvider {\n    const maxRetries = 5;\n\n    const handler: ProxyHandler<SafeEthProvider> = {\n      get: (target, prop, receiver) => {\n        const originalMethod = target[prop as keyof SafeEthProvider];\n        if (typeof originalMethod === 'function') {\n          return async (...args: any[]) => {\n            let retries = 0;\n            let currentApi = target;\n\n            while (retries < maxRetries) {\n              try {\n                return await originalMethod.apply(currentApi, args);\n              } catch (error) {\n                logger.warn(\n                  `Request failed with api at height ${height} (retry ${retries}): ${error.message}`,\n                );\n                currentApi = this.unsafeApi.getSafeApi(height);\n                retries++;\n              }\n            }\n\n            throw new Error(\n              `Maximum retries (${maxRetries}) exceeded for api at height ${height}`,\n            );\n          };\n        }\n        return Reflect.get(target, prop, receiver);\n      },\n    };\n\n    return new Proxy(this.unsafeApi.getSafeApi(height), handler);\n  }\n\n  private async fetchBlockBatches(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<EthereumBlockWrapper[]> {\n    return api.fetchBlocks(batch);\n  }\n}\n"]}
+{"version":3,"file":"api.service.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { ProjectNetworkV1_0_0 } from '@subql/common-ethereum';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  NetworkMetadataPayload,\n  getLogger,\n  IndexerEvent,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from './api.connection';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\nconst logger = getLogger('api');\n\nconst MAX_RECONNECT_ATTEMPTS = 5;\n\n@Injectable()\nexport class EthereumApiService extends ApiService<\n  EthereumApi,\n  SafeEthProvider,\n  EthereumBlockWrapper\n> {\n  constructor(\n    @Inject('ISubqueryProject') private project: SubqueryProject,\n    connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n    private eventEmitter: EventEmitter2,\n  ) {\n    super(connectionPoolService);\n  }\n\n  networkMeta: NetworkMetadataPayload;\n\n  async init(): Promise<EthereumApiService> {\n    try {\n      let network: ProjectNetworkV1_0_0;\n      try {\n        network = this.project.network;\n      } catch (e) {\n        logger.error(Object.keys(e));\n        process.exit(1);\n      }\n\n      const endpoints = Array.isArray(network.endpoint)\n        ? network.endpoint\n        : [network.endpoint];\n\n      const endpointToApiIndex: Record<string, EthereumApiConnection> = {};\n\n      await Promise.all(\n        endpoints.map(async (endpoint, i) => {\n          const connection = await EthereumApiConnection.create(\n            endpoint,\n            this.fetchBlockBatches,\n            this.eventEmitter,\n          );\n\n          const api = connection.unsafeApi;\n\n          this.eventEmitter.emit(IndexerEvent.ApiConnected, {\n            value: 1,\n            apiIndex: i,\n            endpoint: endpoint,\n          });\n\n          if (!this.networkMeta) {\n            this.networkMeta = connection.networkMeta;\n          }\n\n          if (network.chainId !== api.getChainId().toString()) {\n            throw this.metadataMismatchError(\n              'ChainId',\n              network.chainId,\n              api.getChainId().toString(),\n            );\n          }\n\n          endpointToApiIndex[endpoint] = connection;\n        }),\n      );\n\n      this.connectionPoolService.addBatchToConnections(endpointToApiIndex);\n\n      return this;\n    } catch (e) {\n      logger.error(e, 'Failed to init api service');\n      process.exit(1);\n    }\n  }\n\n  private metadataMismatchError(\n    metadata: string,\n    expected: string,\n    actual: string,\n  ): Error {\n    return Error(\n      `Value of ${metadata} does not match across all endpoints. Please check that your endpoints are for the same network.\\n\n       Expected: ${expected}\n       Actual: ${actual}`,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.unsafeApi;\n  }\n\n  safeApi(height: number): SafeEthProvider {\n    const maxRetries = 5;\n\n    const handler: ProxyHandler<SafeEthProvider> = {\n      get: (target, prop, receiver) => {\n        const originalMethod = target[prop as keyof SafeEthProvider];\n        if (typeof originalMethod === 'function') {\n          return async (...args: any[]) => {\n            let retries = 0;\n            let currentApi = target;\n            let throwingError: Error;\n\n            while (retries < maxRetries) {\n              try {\n                return await originalMethod.apply(currentApi, args);\n              } catch (error) {\n                logger.warn(\n                  `Request failed with api at height ${height} (retry ${retries}): ${error.message}`,\n                );\n                throwingError = error;\n                currentApi = this.unsafeApi.getSafeApi(height);\n                retries++;\n              }\n            }\n\n            logger.error(\n              `Maximum retries (${maxRetries}) exceeded for api at height ${height}`,\n            );\n            throw throwingError;\n          };\n        }\n        return Reflect.get(target, prop, receiver);\n      },\n    };\n\n    return new Proxy(this.unsafeApi.getSafeApi(height), handler);\n  }\n\n  private async fetchBlockBatches(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<EthereumBlockWrapper[]> {\n    return api.fetchBlocks(batch);\n  }\n}\n"]}

package/dist/ethereum/api.service.ethereum.test.js

@@ -69,5 +69,12 @@ describe('ApiService', () => {
         console.log('Finalized height', height);
         expect(height).toBeGreaterThan(16000000);
     });
+    it('ensure api errorCode is exposed when throwing', async () => {
+        expect.assertions(1);
+        return apiService
+            .safeApi(17520376)
+            .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')
+            .catch((e) => expect(e.code).toBe('INVALID_ARGUMENT'));
+    });
 });
 //# sourceMappingURL=api.service.ethereum.test.js.map

package/dist/ethereum/api.service.ethereum.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.service.ethereum.test.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.test.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { INestApplication } from '@nestjs/common';\nimport { EventEmitterModule } from '@nestjs/event-emitter';\nimport { Test } from '@nestjs/testing';\nimport { ConnectionPoolService, delay, NodeConfig } from '@subql/node-core';\nimport { GraphQLSchema } from 'graphql';\nimport { range } from 'lodash';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from './api.service.ethereum';\n\n// Add api key to work\nconst WS_ENDPOINT = 'wss://eth.api.onfinality.io/ws?apikey=';\nconst HTTP_ENDPOINT = 'https://eth.api.onfinality.io/public';\n\nfunction testSubqueryProject(endpoint: string): SubqueryProject {\n  return {\n    network: {\n      endpoint,\n      chainId: '1',\n    },\n    dataSources: [],\n    id: 'test',\n    root: './',\n    schema: new GraphQLSchema({}),\n    templates: [],\n  };\n}\n\nconst prepareApiService = async (\n  endpoint: string = HTTP_ENDPOINT,\n): Promise<[EthereumApiService, INestApplication]> => {\n  const module = await Test.createTestingModule({\n    providers: [\n      ConnectionPoolService,\n      {\n        provide: NodeConfig,\n        useFactory: () => ({}),\n      },\n      {\n        provide: 'ISubqueryProject',\n        useFactory: () => testSubqueryProject(endpoint),\n      },\n      EthereumApiService,\n    ],\n    imports: [EventEmitterModule.forRoot()],\n  }).compile();\n\n  const app = module.createNestApplication();\n  await app.init();\n  const apiService = app.get(EthereumApiService);\n  await apiService.init();\n  return [apiService, app];\n};\n\njest.setTimeout(90000);\ndescribe('ApiService', () => {\n  let apiService: EthereumApiService;\n  let app: INestApplication;\n\n  beforeEach(async () => {\n    [apiService, app] = await prepareApiService();\n  });\n\n  afterEach(async () => {\n    return app?.close();\n  });\n\n  it('can instantiate api', async () => {\n    console.log(apiService.api.getChainId());\n    await delay(0.5);\n  });\n\n  it('can fetch blocks', async () => {\n    await apiService.api.fetchBlocks(range(12369621, 12369625));\n    await delay(0.5);\n  });\n\n  it('can get the finalized height', async () => {\n    const height = await apiService.api.getFinalizedBlockHeight();\n\n    console.log('Finalized height', height);\n    expect(height).toBeGreaterThan(16_000_000);\n  });\n});\n"]}
+{"version":3,"file":"api.service.ethereum.test.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.test.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { INestApplication } from '@nestjs/common';\nimport { EventEmitterModule } from '@nestjs/event-emitter';\nimport { Test } from '@nestjs/testing';\nimport { ConnectionPoolService, delay, NodeConfig } from '@subql/node-core';\nimport { GraphQLSchema } from 'graphql';\nimport { range } from 'lodash';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from './api.service.ethereum';\n\n// Add api key to work\nconst WS_ENDPOINT = 'wss://eth.api.onfinality.io/ws?apikey=';\nconst HTTP_ENDPOINT = 'https://eth.api.onfinality.io/public';\n\nfunction testSubqueryProject(endpoint: string): SubqueryProject {\n  return {\n    network: {\n      endpoint,\n      chainId: '1',\n    },\n    dataSources: [],\n    id: 'test',\n    root: './',\n    schema: new GraphQLSchema({}),\n    templates: [],\n  };\n}\n\nconst prepareApiService = async (\n  endpoint: string = HTTP_ENDPOINT,\n): Promise<[EthereumApiService, INestApplication]> => {\n  const module = await Test.createTestingModule({\n    providers: [\n      ConnectionPoolService,\n      {\n        provide: NodeConfig,\n        useFactory: () => ({}),\n      },\n      {\n        provide: 'ISubqueryProject',\n        useFactory: () => testSubqueryProject(endpoint),\n      },\n      EthereumApiService,\n    ],\n    imports: [EventEmitterModule.forRoot()],\n  }).compile();\n\n  const app = module.createNestApplication();\n  await app.init();\n  const apiService = app.get(EthereumApiService);\n  await apiService.init();\n  return [apiService, app];\n};\n\njest.setTimeout(90000);\ndescribe('ApiService', () => {\n  let apiService: EthereumApiService;\n  let app: INestApplication;\n\n  beforeEach(async () => {\n    [apiService, app] = await prepareApiService();\n  });\n\n  afterEach(async () => {\n    return app?.close();\n  });\n\n  it('can instantiate api', async () => {\n    console.log(apiService.api.getChainId());\n    await delay(0.5);\n  });\n\n  it('can fetch blocks', async () => {\n    await apiService.api.fetchBlocks(range(12369621, 12369625));\n    await delay(0.5);\n  });\n\n  it('can get the finalized height', async () => {\n    const height = await apiService.api.getFinalizedBlockHeight();\n\n    console.log('Finalized height', height);\n    expect(height).toBeGreaterThan(16_000_000);\n  });\n\n  it('ensure api errorCode is exposed when throwing', async () => {\n    expect.assertions(1);\n    return apiService\n      .safeApi(17520376)\n      .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')\n      .catch((e) => expect(e.code).toBe('INVALID_ARGUMENT'));\n  });\n});\n"]}

package/dist/indexer/dynamic-ds.service.js

@@ -36,7 +36,6 @@ let DynamicDsService = class DynamicDsService extends node_core_1.DynamicDsServi
             throw new Error(`Unable to find matching template in project for name: "${params.templateName}"`);
         }
         const dsObj = Object.assign(Object.assign({}, template), { startBlock: params.startBlock });
-        delete dsObj.name;
         try {
             if ((0, common_ethereum_1.isCustomDs)(dsObj)) {
                 dsObj.processor.options = Object.assign(Object.assign({}, dsObj.processor.options), params.args);

package/dist/indexer/dynamic-ds.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,2CAAoD;AACpD,4DAIgC;AAChC,gDAG0B;AAC1B,yDAAiD;AACjD,qDAA+C;AAC/C,mCAAmC;AACnC,kEAA+E;AAC/E,iEAA4D;AAGrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAoC;IACxE,YACmB,kBAAsC,EACV,OAAwB;QAErE,KAAK,EAAE,CAAC;QAHS,uBAAkB,GAAlB,kBAAkB,CAAoB;QACV,YAAO,GAAP,OAAO,CAAiB;IAGvE,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,MAAwB;;QAExB,MAAM,QAAQ,GAAG,IAAA,kBAAS,EACxB,MAAA,IAAI,CAAC,OAAO,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,0DAA0D,MAAM,CAAC,YAAY,GAAG,CACjF,CAAC;SACH;QAED,MAAM,KAAK,GAAG,gCACT,QAAQ,KACX,UAAU,EAAE,MAAM,CAAC,UAAU,GACZ,CAAC;QACpB,OAAO,KAAK,CAAC,IAAI,CAAC;QAClB,IAAI;YACF,IAAI,IAAA,4BAAU,EAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,SAAS,CAAC,OAAO,mCAClB,KAAK,CAAC,SAAS,CAAC,OAAO,GACvB,MAAM,CAAC,IAAI,CACf,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;aACzD;iBAAM,IAAI,IAAA,6BAAW,EAAC,KAAK,CAAC,EAAE;gBAC7B,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,GACb,MAAM,CAAC,IAAI,CACf,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAA,gCAAY,EAAC,+CAA6B,EAAE,KAAK,CAAC,CAAC;gBAEpE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,QAAQ,EAAE;oBACpC,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,KAAK;iBAC5B,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,MAAM;yBAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;yBACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;iBACH;aACF;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;CACF,CAAA;AA1DY,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCADU,yCAAkB;QACD,iCAAe;GAH5D,gBAAgB,CA0D5B;AA1DY,4CAAgB","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  EthereumRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-ethereum';\nimport {\n  DatasourceParams,\n  DynamicDsService as BaseDynamicDsService,\n} from '@subql/node-core';\nimport { plainToClass } from 'class-transformer';\nimport { validateSync } from 'class-validator';\nimport { cloneDeep } from 'lodash';\nimport { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\n@Injectable()\nexport class DynamicDsService extends BaseDynamicDsService<SubqlProjectDs> {\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    @Inject('ISubqueryProject') private readonly project: SubqueryProject,\n  ) {\n    super();\n  }\n\n  protected async getDatasource(\n    params: DatasourceParams,\n  ): Promise<SubqlProjectDs> {\n    const template = cloneDeep(\n      this.project.templates?.find((t) => t.name === params.templateName),\n    );\n\n    if (!template) {\n      throw new Error(\n        `Unable to find matching template in project for name: \"${params.templateName}\"`,\n      );\n    }\n\n    const dsObj = {\n      ...template,\n      startBlock: params.startBlock,\n    } as SubqlProjectDs;\n    delete dsObj.name;\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        dsObj.options = {\n          ...dsObj.options,\n          ...params.args,\n        };\n\n        const parsedDs = plainToClass(EthereumRuntimeDataSourceImpl, dsObj);\n\n        const errors = validateSync(parsedDs, {\n          whitelist: true,\n          forbidNonWhitelisted: false,\n        });\n        if (errors.length) {\n          throw new Error(\n            `Dynamic ds is invalid\\n${errors\n              .map((e) => e.toString())\n              .join('\\n')}`,\n          );\n        }\n      }\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}
+{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,2CAAoD;AACpD,4DAIgC;AAChC,gDAG0B;AAC1B,yDAAiD;AACjD,qDAA+C;AAC/C,mCAAmC;AACnC,kEAA+E;AAC/E,iEAA4D;AAGrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAoC;IACxE,YACmB,kBAAsC,EACV,OAAwB;QAErE,KAAK,EAAE,CAAC;QAHS,uBAAkB,GAAlB,kBAAkB,CAAoB;QACV,YAAO,GAAP,OAAO,CAAiB;IAGvE,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,MAAwB;;QAExB,MAAM,QAAQ,GAAG,IAAA,kBAAS,EACxB,MAAA,IAAI,CAAC,OAAO,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,0DAA0D,MAAM,CAAC,YAAY,GAAG,CACjF,CAAC;SACH;QAED,MAAM,KAAK,GAAG,gCACT,QAAQ,KACX,UAAU,EAAE,MAAM,CAAC,UAAU,GACZ,CAAC;QACpB,IAAI;YACF,IAAI,IAAA,4BAAU,EAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,SAAS,CAAC,OAAO,mCAClB,KAAK,CAAC,SAAS,CAAC,OAAO,GACvB,MAAM,CAAC,IAAI,CACf,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;aACzD;iBAAM,IAAI,IAAA,6BAAW,EAAC,KAAK,CAAC,EAAE;gBAC7B,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,GACb,MAAM,CAAC,IAAI,CACf,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAA,gCAAY,EAAC,+CAA6B,EAAE,KAAK,CAAC,CAAC;gBAEpE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,QAAQ,EAAE;oBACpC,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,KAAK;iBAC5B,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,MAAM;yBAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;yBACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;iBACH;aACF;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;CACF,CAAA;AAzDY,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCADU,yCAAkB;QACD,iCAAe;GAH5D,gBAAgB,CAyD5B;AAzDY,4CAAgB","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  EthereumRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-ethereum';\nimport {\n  DatasourceParams,\n  DynamicDsService as BaseDynamicDsService,\n} from '@subql/node-core';\nimport { plainToClass } from 'class-transformer';\nimport { validateSync } from 'class-validator';\nimport { cloneDeep } from 'lodash';\nimport { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\n@Injectable()\nexport class DynamicDsService extends BaseDynamicDsService<SubqlProjectDs> {\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    @Inject('ISubqueryProject') private readonly project: SubqueryProject,\n  ) {\n    super();\n  }\n\n  protected async getDatasource(\n    params: DatasourceParams,\n  ): Promise<SubqlProjectDs> {\n    const template = cloneDeep(\n      this.project.templates?.find((t) => t.name === params.templateName),\n    );\n\n    if (!template) {\n      throw new Error(\n        `Unable to find matching template in project for name: \"${params.templateName}\"`,\n      );\n    }\n\n    const dsObj = {\n      ...template,\n      startBlock: params.startBlock,\n    } as SubqlProjectDs;\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        dsObj.options = {\n          ...dsObj.options,\n          ...params.args,\n        };\n\n        const parsedDs = plainToClass(EthereumRuntimeDataSourceImpl, dsObj);\n\n        const errors = validateSync(parsedDs, {\n          whitelist: true,\n          forbidNonWhitelisted: false,\n        });\n        if (errors.length) {\n          throw new Error(\n            `Dynamic ds is invalid\\n${errors\n              .map((e) => e.toString())\n              .join('\\n')}`,\n          );\n        }\n      }\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}

package/dist/indexer/fetch.service.spec.js

@@ -2,8 +2,66 @@
 // Copyright 2020-2022 OnFinality Limited authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_core_1 = require("@subql/node-core");
 const types_ethereum_1 = require("@subql/types-ethereum");
+const graphql_1 = require("graphql");
+const ds_processor_service_1 = require("./ds-processor.service");
+const dynamic_ds_service_1 = require("./dynamic-ds.service");
 const fetch_service_1 = require("./fetch.service");
+const HTTP_ENDPOINT = 'https://eth.api.onfinality.io/public';
+const mockTempDs = [
+    {
+        name: 'ERC721',
+        kind: types_ethereum_1.EthereumDatasourceKind.Runtime,
+        assets: new Map(),
+        mapping: {
+            entryScript: '',
+            file: '',
+            handlers: [
+                {
+                    handler: 'handleERC721',
+                    kind: types_ethereum_1.EthereumHandlerKind.Event,
+                    filter: {
+                        topics: ['Transfer(address, address, uint256)'],
+                    },
+                },
+            ],
+        },
+    },
+    {
+        name: 'ERC1155',
+        kind: types_ethereum_1.EthereumDatasourceKind.Runtime,
+        assets: new Map(),
+        mapping: {
+            entryScript: '',
+            file: '',
+            handlers: [
+                {
+                    handler: 'handleERC1155',
+                    kind: types_ethereum_1.EthereumHandlerKind.Event,
+                    filter: {
+                        topics: [
+                            'TransferSingle(address, address, address, uint256, uint256)',
+                        ],
+                    },
+                },
+            ],
+        },
+    },
+];
+function testSubqueryProject(endpoint, ds, mockTempDs) {
+    return {
+        network: {
+            endpoint,
+            chainId: '1',
+        },
+        dataSources: ds,
+        id: 'test',
+        root: './',
+        schema: new graphql_1.GraphQLSchema({}),
+        templates: mockTempDs,
+    };
+}
 describe('Dictioanry queries', () => {
     describe('Transaction filters', () => {
         it('Build a filter for contract creation transactions', () => {
@@ -33,5 +91,132 @@ describe('Dictioanry queries', () => {
             ]);
         });
     });
+    describe('Correct dictionary query with dynamic ds', () => {
+        it('Build correct erc1155 transfer single query', () => {
+            const ds = {
+                kind: types_ethereum_1.EthereumDatasourceKind.Runtime,
+                assets: new Map(),
+                startBlock: 1,
+                mapping: {
+                    file: '',
+                    handlers: [
+                        {
+                            handler: 'handleDyanmicDs',
+                            kind: types_ethereum_1.EthereumHandlerKind.Event,
+                            filter: {
+                                topics: [
+                                    'TransferSingle(address, address, address, uint256, uint256)',
+                                ],
+                            },
+                        },
+                    ],
+                },
+            };
+            const result = (0, fetch_service_1.buildDictionaryQueryEntries)([ds], 1);
+            expect(result).toEqual([
+                {
+                    entity: 'evmLogs',
+                    conditions: [
+                        {
+                            field: 'topics0',
+                            value: '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',
+                            matcher: 'equalTo',
+                        },
+                    ],
+                },
+            ]);
+        });
+        it('Build dictionary query for multiple dictionary queries', async () => {
+            const nodeConfig = new node_core_1.NodeConfig({
+                subquery: '',
+                subqueryName: '',
+            });
+            const ds = {
+                kind: types_ethereum_1.EthereumDatasourceKind.Runtime,
+                assets: new Map(),
+                startBlock: 1,
+                mapping: {
+                    file: '',
+                    handlers: [
+                        {
+                            handler: 'handleDyanmicDs',
+                            kind: types_ethereum_1.EthereumHandlerKind.Event,
+                            filter: {
+                                topics: [
+                                    'TransferSingle(address, address, address, uint256, uint256)',
+                                ],
+                            },
+                        },
+                    ],
+                },
+            };
+            const project = testSubqueryProject(HTTP_ENDPOINT, ds, mockTempDs);
+            const dsProcessService = new ds_processor_service_1.DsProcessorService(project, nodeConfig);
+            const dynamicDsService = new dynamic_ds_service_1.DynamicDsService(dsProcessService, project);
+            const fetchService = new fetch_service_1.FetchService(null, null, project, null, null, dsProcessService, dynamicDsService, null, null, null);
+            const mockMetadataDS = [
+                {
+                    templateName: 'ERC721',
+                    args: { address: '0xc9aeee58550328a2462f758c8d47022ec53589c2' },
+                    startBlock: 1,
+                },
+                {
+                    templateName: 'ERC1155',
+                    args: { address: '0x63228048121877a9e0f52020834a135074e8207c' },
+                    startBlock: 1,
+                },
+            ];
+            jest
+                .spyOn(dynamicDsService, 'getDynamicDatasourceParams')
+                .mockResolvedValue(mockMetadataDS);
+            dynamicDsService.project.templates = mockTempDs;
+            const loadedDSResult = await dynamicDsService.getDynamicDatasources(); // mocks params to mockMetadataDS
+            fetchService.project.dataSources = [ds];
+            fetchService.templateDynamicDatasouces = loadedDSResult;
+            const dictionaryQueries = fetchService.buildDictionaryQueryEntries(1);
+            expect(dictionaryQueries).toEqual([
+                {
+                    entity: 'evmLogs',
+                    conditions: [
+                        {
+                            field: 'topics0',
+                            value: '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',
+                            matcher: 'equalTo',
+                        },
+                    ],
+                },
+                {
+                    entity: 'evmLogs',
+                    conditions: [
+                        {
+                            field: 'address',
+                            value: ['0xc9aeee58550328a2462f758c8d47022ec53589c2'],
+                            matcher: 'in',
+                        },
+                        {
+                            field: 'topics0',
+                            value: '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                            matcher: 'equalTo',
+                        },
+                    ],
+                },
+                {
+                    entity: 'evmLogs',
+                    conditions: [
+                        {
+                            field: 'address',
+                            value: ['0x63228048121877a9e0f52020834a135074e8207c'],
+                            matcher: 'in',
+                        },
+                        {
+                            field: 'topics0',
+                            value: '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',
+                            matcher: 'equalTo',
+                        },
+                    ],
+                },
+            ]);
+        });
+    });
 });
 //# sourceMappingURL=fetch.service.spec.js.map

package/dist/indexer/fetch.service.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.service.spec.js","sourceRoot":"","sources":["../../src/indexer/fetch.service.spec.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;AAEtC,0DAI+B;AAC/B,mDAA8D;AAE9D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,EAAE,GAA2B;gBACjC,IAAI,EAAE,uCAAsB,CAAC,OAAO;gBACpC,MAAM,EAAE,IAAI,GAAG,EAAE;gBACjB,UAAU,EAAE,CAAC;gBACb,OAAO,EAAE;oBACP,IAAI,EAAE,EAAE;oBACR,QAAQ,EAAE;wBACR;4BACE,OAAO,EAAE,mBAAmB;4BAC5B,IAAI,EAAE,oCAAmB,CAAC,IAAI;4BAC9B,MAAM,EAAE;gCACN,EAAE,EAAE,IAAI;6BACT;yBACF;qBACF;iBACF;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,IAAA,2CAA2B,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAEpD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACrB;oBACE,MAAM,EAAE,iBAAiB;oBACzB,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBAC9D;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport {\n  EthereumDatasourceKind,\n  EthereumHandlerKind,\n  SubqlRuntimeDatasource,\n} from '@subql/types-ethereum';\nimport { buildDictionaryQueryEntries } from './fetch.service';\n\ndescribe('Dictioanry queries', () => {\n  describe('Transaction filters', () => {\n    it('Build a filter for contract creation transactions', () => {\n      const ds: SubqlRuntimeDatasource = {\n        kind: EthereumDatasourceKind.Runtime,\n        assets: new Map(),\n        startBlock: 1,\n        mapping: {\n          file: '',\n          handlers: [\n            {\n              handler: 'handleTransaction',\n              kind: EthereumHandlerKind.Call,\n              filter: {\n                to: null,\n              },\n            },\n          ],\n        },\n      };\n\n      const result = buildDictionaryQueryEntries([ds], 1);\n\n      expect(result).toEqual([\n        {\n          entity: 'evmTransactions',\n          conditions: [{ field: 'to', matcher: 'isNull', value: true }],\n        },\n      ]);\n    });\n  });\n});\n"]}
+{"version":3,"file":"fetch.service.spec.js","sourceRoot":"","sources":["../../src/indexer/fetch.service.spec.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { NodeConfig } from '@subql/node-core';\nimport {\n  EthereumDatasourceKind,\n  EthereumHandlerKind,\n  SubqlRuntimeDatasource,\n} from '@subql/types-ethereum';\nimport { GraphQLSchema } from 'graphql';\nimport {\n  SubqlProjectDsTemplate,\n  SubqueryProject,\n} from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { buildDictionaryQueryEntries, FetchService } from './fetch.service';\n\nconst HTTP_ENDPOINT = 'https://eth.api.onfinality.io/public';\nconst mockTempDs: SubqlProjectDsTemplate[] = [\n  {\n    name: 'ERC721',\n    kind: EthereumDatasourceKind.Runtime,\n    assets: new Map(),\n    mapping: {\n      entryScript: '',\n      file: '',\n      handlers: [\n        {\n          handler: 'handleERC721',\n          kind: EthereumHandlerKind.Event,\n          filter: {\n            topics: ['Transfer(address, address, uint256)'],\n          },\n        },\n      ],\n    },\n  },\n  {\n    name: 'ERC1155',\n    kind: EthereumDatasourceKind.Runtime,\n    assets: new Map(),\n    mapping: {\n      entryScript: '',\n      file: '',\n      handlers: [\n        {\n          handler: 'handleERC1155',\n          kind: EthereumHandlerKind.Event,\n          filter: {\n            topics: [\n              'TransferSingle(address, address, address, uint256, uint256)',\n            ],\n          },\n        },\n      ],\n    },\n  },\n];\n\nfunction testSubqueryProject(\n  endpoint: string,\n  ds: any,\n  mockTempDs,\n): SubqueryProject {\n  return {\n    network: {\n      endpoint,\n      chainId: '1',\n    },\n    dataSources: ds as any,\n    id: 'test',\n    root: './',\n    schema: new GraphQLSchema({}),\n    templates: mockTempDs as any,\n  };\n}\n\ndescribe('Dictioanry queries', () => {\n  describe('Transaction filters', () => {\n    it('Build a filter for contract creation transactions', () => {\n      const ds: SubqlRuntimeDatasource = {\n        kind: EthereumDatasourceKind.Runtime,\n        assets: new Map(),\n        startBlock: 1,\n        mapping: {\n          file: '',\n          handlers: [\n            {\n              handler: 'handleTransaction',\n              kind: EthereumHandlerKind.Call,\n              filter: {\n                to: null,\n              },\n            },\n          ],\n        },\n      };\n\n      const result = buildDictionaryQueryEntries([ds], 1);\n\n      expect(result).toEqual([\n        {\n          entity: 'evmTransactions',\n          conditions: [{ field: 'to', matcher: 'isNull', value: true }],\n        },\n      ]);\n    });\n  });\n  describe('Correct dictionary query with dynamic ds', () => {\n    it('Build correct erc1155 transfer single query', () => {\n      const ds: SubqlRuntimeDatasource = {\n        kind: EthereumDatasourceKind.Runtime,\n        assets: new Map(),\n        startBlock: 1,\n        mapping: {\n          file: '',\n          handlers: [\n            {\n              handler: 'handleDyanmicDs',\n              kind: EthereumHandlerKind.Event,\n              filter: {\n                topics: [\n                  'TransferSingle(address, address, address, uint256, uint256)',\n                ],\n              },\n            },\n          ],\n        },\n      };\n      const result = buildDictionaryQueryEntries([ds], 1);\n      expect(result).toEqual([\n        {\n          entity: 'evmLogs',\n          conditions: [\n            {\n              field: 'topics0',\n              value:\n                '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',\n              matcher: 'equalTo',\n            },\n          ],\n        },\n      ]);\n    });\n\n    it('Build dictionary query for multiple dictionary queries', async () => {\n      const nodeConfig = new NodeConfig({\n        subquery: '',\n        subqueryName: '',\n      });\n      const ds: SubqlRuntimeDatasource = {\n        kind: EthereumDatasourceKind.Runtime,\n        assets: new Map(),\n        startBlock: 1,\n        mapping: {\n          file: '',\n          handlers: [\n            {\n              handler: 'handleDyanmicDs',\n              kind: EthereumHandlerKind.Event,\n              filter: {\n                topics: [\n                  'TransferSingle(address, address, address, uint256, uint256)',\n                ],\n              },\n            },\n          ],\n        },\n      };\n\n      const project = testSubqueryProject(HTTP_ENDPOINT, ds, mockTempDs);\n\n      const dsProcessService = new DsProcessorService(project, nodeConfig);\n\n      const dynamicDsService = new DynamicDsService(dsProcessService, project);\n      const fetchService = new FetchService(\n        null,\n        null,\n        project,\n        null,\n        null,\n        dsProcessService,\n        dynamicDsService,\n        null,\n        null,\n        null,\n      );\n      const mockMetadataDS = [\n        {\n          templateName: 'ERC721',\n          args: { address: '0xc9aeee58550328a2462f758c8d47022ec53589c2' },\n          startBlock: 1,\n        },\n        {\n          templateName: 'ERC1155',\n          args: { address: '0x63228048121877a9e0f52020834a135074e8207c' },\n          startBlock: 1,\n        },\n      ];\n\n      jest\n        .spyOn(dynamicDsService as any, 'getDynamicDatasourceParams')\n        .mockResolvedValue(mockMetadataDS);\n\n      (dynamicDsService as any).project.templates = mockTempDs;\n      const loadedDSResult = await (\n        dynamicDsService as any\n      ).getDynamicDatasources(); // mocks params to mockMetadataDS\n\n      (fetchService as any).project.dataSources = [ds];\n      (fetchService as any).templateDynamicDatasouces = loadedDSResult;\n\n      const dictionaryQueries = (\n        fetchService as any\n      ).buildDictionaryQueryEntries(1);\n      expect(dictionaryQueries).toEqual([\n        {\n          entity: 'evmLogs',\n          conditions: [\n            {\n              field: 'topics0',\n              value:\n                '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',\n              matcher: 'equalTo',\n            },\n          ],\n        },\n        {\n          entity: 'evmLogs',\n          conditions: [\n            {\n              field: 'address',\n              value: ['0xc9aeee58550328a2462f758c8d47022ec53589c2'],\n              matcher: 'in',\n            },\n            {\n              field: 'topics0',\n              value:\n                '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n              matcher: 'equalTo',\n            },\n          ],\n        },\n        {\n          entity: 'evmLogs',\n          conditions: [\n            {\n              field: 'address',\n              value: ['0x63228048121877a9e0f52020834a135074e8207c'],\n              matcher: 'in',\n            },\n            {\n              field: 'topics0',\n              value:\n                '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',\n              matcher: 'equalTo',\n            },\n          ],\n        },\n      ]);\n    });\n  });\n});\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subql/node-ethereum",
-  "version": "2.6.2-2",
+  "version": "2.6.2-4",
   "description": "",
   "author": "Ian He",
   "license": "Apache-2.0",
@@ -29,7 +29,7 @@
     "@subql/node-core": "^2.5.1",
     "@subql/testing": "^2.0.0",
     "@subql/types": "^2.1.2",
-    "@subql/types-ethereum": "2.2.2",
+    "@subql/types-ethereum": "2.2.3-0",
     "@willsoto/nestjs-prometheus": "^4.4.0",
     "cacheable-lookup": "6",
     "cron-converter": "^1.0.2",
@@ -68,5 +68,5 @@
     "/dist",
     "/bin"
   ],
-  "stableVersion": "2.6.2-1"
+  "stableVersion": "2.6.2-3"
 }