Compatibility fix for new & old versions of truffle (#142)

oasisprotocol · Jun 29, 2023 · 3bff308 · 3bff308
1 parent 9a74e57
commit 3bff308
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml
@@ -175,7 +175,7 @@ jobs:
       - name: Test Integration Hardhat
         run: pnpm test
 
-        
+
   test-client-go:
     name: test-client-go
     runs-on: ubuntu-latest
@@ -200,6 +200,18 @@ jobs:
     strategy:
       matrix:
         example: [hardhat, hardhat-boilerplate, truffle]
+        truffle_version: [none, 5.8.2, 5.10.1]
+        exclude:
+          - example: hardhat
+            truffle_version: 5.8.2
+          - example: hardhat
+            truffle_version: 5.10.1
+          - example: hardhat-boilerplate
+            truffle_version: 5.8.2
+          - example: hardhat-boilerplate
+            truffle_version: 5.10.1
+          - example: truffle
+            truffle_version: none
     defaults:
       run:
         working-directory: examples/${{ matrix.example }}
@@ -244,11 +256,16 @@ jobs:
         with:
           name: integration-hardhat
           path: integrations/hardhat/dist
-          
+
       - name: Install dependencies
         run: |
           pnpm install
 
+      - name: Update Truffle version
+        if: ${{ matrix.example == 'truffle' && matrix.truffle_version != 'none' }}
+        run: |
+          pnpm up truffle@${{matrix.truffle_version}}
+
       - name: Build
         run: |
           ! grep -q '"build":' package.json || pnpm run build

diff --git a/clients/js/src/compat.ts b/clients/js/src/compat.ts
@@ -512,9 +512,19 @@ export async function fetchRuntimePublicKey(
     // first opportunistically try `send` from the provider
     try {
       const source = provider as {
-        send: (method: string, params: any[]) => Promise<any>;
+        send: (
+          method: string,
+          params: any[] | ((err: any, ok?: any) => void),
+        ) => Promise<any>;
       };
-      const { key } = await source.send(OASIS_CALL_DATA_PUBLIC_KEY, []);
+      const arg =
+        'engine' in provider
+          ? // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            function (err: any, ok?: any) {
+              return;
+            }
+          : [];
+      const { key } = await source.send(OASIS_CALL_DATA_PUBLIC_KEY, arg);
       if (key) return arrayify(key);
     } catch {
       // don't do anything, move on to try chainId