Fix load of abi fragments from store missing array (#92)

* Fix load of abi fragments from store missing array * Turbo repo upgrade * Changeset * Update pnpm version in github actions
3loop · Sep 2, 2024 · 03306a6 · 03306a6
1 parent 76badf6
commit 03306a6
Show file tree

Hide file tree

Showing 11 changed files with 9,133 additions and 6,118 deletions.
diff --git a/.changeset/dull-tools-visit.md b/.changeset/dull-tools-visit.md
@@ -0,0 +1,5 @@
+---
+'@3loop/transaction-decoder': minor
+---
+
+Fix store abi loader for fragments needs wrapping in square brakets to act as array
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -21,7 +21,7 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 8
+          version: 9.9.0
           run_install: false
 
       - name: Get pnpm store directory

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 8
+          version: 9.9.0
           run_install: false
 
       - name: Get pnpm store directory
@@ -56,8 +56,8 @@ jobs:
         with:
           version: pnpm run version
           publish: pnpm exec changeset publish
-          commit: "[ci] release"
-          title: "[ci] release"
+          commit: '[ci] release'
+          title: '[ci] release'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
     "eslint": "^8.47.0",
     "prettier": "^3.0.2",
     "tsconfig": "workspace:*",
-    "turbo": "latest"
+    "turbo": "2.1.1"
   },
-  "packageManager": "pnpm@8.6.10",
+  "packageManager": "pnpm@9.9.0",
   "name": "@3loop/decoder-monorepo"
 }
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
@@ -4,10 +4,10 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "@vercel/style-guide": "^4.0.2",
-    "eslint-config-turbo": "^1.10.12",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-config-prettier": "^8.10.0",
+    "@vercel/style-guide": "^6.0.0",
+    "eslint-config-turbo": "^2.1.1",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-sort-export-all": "^1.4.1"
   }
 }
diff --git a/packages/transaction-decoder/README.md b/packages/transaction-decoder/README.md
@@ -119,7 +119,7 @@ const AbiStoreLive = Layer.succeed(
         if (abi) {
           return {
             type: 'func',
-            abi: `[${abi}]`,
+            abi: abi,
             address,
             chainID: chainID,
             signature,

diff --git a/packages/transaction-decoder/src/abi-loader.ts b/packages/transaction-decoder/src/abi-loader.ts
@@ -152,7 +152,8 @@ const AbiLoaderRequestResolver = RequestResolver.makeBatched((requests: Array<Ab
       cachedResults,
       ([request, result]) => {
         const group = requestGroups[makeRequestKey(request)]
-        const abi = result?.abi ?? null
+        const abi = getBestMatch(result)
+
         return Effect.forEach(group, (req) => Request.succeed(req, abi), { discard: true })
       },
       {

diff --git a/packages/transaction-decoder/test/mocks/abi-loader-mock.ts b/packages/transaction-decoder/test/mocks/abi-loader-mock.ts
@@ -71,7 +71,7 @@ export const MockedAbiStoreLive = Layer.succeed(
                 status: 'success',
                 result: {
                   type: 'func',
-                  abi: `[${signatureAbi}]`,
+                  abi: signatureAbi,
                   address,
                   chainID: 1,
                   signature,
@@ -82,7 +82,7 @@ export const MockedAbiStoreLive = Layer.succeed(
                 status: 'success',
                 result: {
                   type: 'event',
-                  abi: `[${signatureAbi}]`,
+                  abi: signatureAbi,
                   address,
                   chainID: 1,
                   event,

diff --git a/packages/transaction-decoder/test/vanilla.test.ts b/packages/transaction-decoder/test/vanilla.test.ts
@@ -46,7 +46,7 @@ describe('Transaction Decoder', () => {
                 status: 'success',
                 result: {
                   type: 'func',
-                  abi: `[${signatureAbi}]`,
+                  abi: signatureAbi,
                   address,
                   chainID: 1,
                   signature,
@@ -57,7 +57,7 @@ describe('Transaction Decoder', () => {
                 status: 'success',
                 result: {
                   type: 'event',
-                  abi: `[${signatureAbi}]`,
+                  abi: signatureAbi,
                   address,
                   chainID: 1,
                   event,