Fix abi validation when DS has no abi specified (#307)

* Fix abi validation when DS has no abi specified * Update changelog
subquery · Jun 10, 2024 · 0929aeb · 0929aeb
1 parent 6f27550
commit 0929aeb
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 0 deletions.
diff --git a/packages/common-ethereum/CHANGELOG.md b/packages/common-ethereum/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]
+### Fixed
+- Abi validatation when DS doesn't specify abi option (#307)
 
 ## [3.8.1] - 2024-06-07
 ### Added

diff --git a/packages/common-ethereum/src/codegen/codegen-controller.spec.ts b/packages/common-ethereum/src/codegen/codegen-controller.spec.ts
@@ -351,4 +351,41 @@ describe('Codegen spec', () => {
       /Topic: "NotExist\(address a\)" not found in erc20 contract interface/
     );
   });
+
+  it('doesnt validate if datasource has no abi option set', async () => {
+    const ds: SubqlRuntimeDatasource = {
+      kind: EthereumDatasourceKind.Runtime,
+      startBlock: 1,
+      assets: new Map([['erc20', {file: './abis/erc20.json'}]]),
+      mapping: {
+        file: '',
+        handlers: [
+          {
+            handler: 'handleTransaction',
+            kind: EthereumHandlerKind.Event,
+            filter: {
+              topics: ['Transfer(address a,address b,uint256 c)'],
+            },
+          },
+          {
+            handler: 'handleTransaction',
+            kind: EthereumHandlerKind.Event,
+            filter: {
+              topics: ['Transfer(address a,address b,uint256 c)', 'NotExist(address a)'],
+            },
+          },
+        ],
+      },
+    };
+
+    await expect(
+      generateAbis(
+        [ds],
+        PROJECT_PATH,
+        (p) => Promise.resolve(),
+        (v) => v,
+        () => Promise.resolve()
+      )
+    ).resolves.not.toThrow();
+  });
 });
diff --git a/packages/common-ethereum/src/codegen/codegen-controller.ts b/packages/common-ethereum/src/codegen/codegen-controller.ts
@@ -45,6 +45,10 @@ function validateCustomDsDs(d: {kind: string}): boolean {
 function validateAbi(datasources: SubqlRuntimeDatasource[], projectPath: string) {
   const issues: string[] = [];
   for (const datasource of datasources) {
+    if (!datasource.options?.abi) {
+      // No ABI to validate
+      continue;
+    }
     const abiName = datasource.options.abi;
     const topicIssues: string[] = [];
     const funcIssues: string[] = [];