updated deps + use address-encoder cbor

ensdomains · Nov 9, 2023 · dbe091d · dbe091d
1 parent 00e267d
commit dbe091d
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 33 deletions.
diff --git a/packages/ensjs/package.json b/packages/ensjs/package.json
@@ -99,10 +99,9 @@
   "dependencies": {
     "@adraffy/ens-normalize": "1.9.0",
     "@ensdomains/address-encoder": "1.0.0-rc.2",
-    "@ensdomains/content-hash": "^3.0.0-beta.5",
-    "@ensdomains/dnsprovejs": "^0.4.1",
+    "@ensdomains/content-hash": "3.1.0-rc.0",
+    "@ensdomains/dnsprovejs": "^0.5.0",
     "abitype": "^0.8.0",
-    "cbor": "^8.1.0",
     "dns-packet": "^5.3.1",
     "graphql": "^16.3.0",
     "graphql-request": "6.1.0",
@@ -123,6 +122,7 @@
     "@types/jest": "^27.4.1",
     "@types/node": "^20.3.3",
     "@types/pako": "^2.0.0",
+    "cbor": "^8.1.0",
     "@types/traverse": "^0.6.32",
     "dotenv": "^16.0.0",
     "esbuild": "^0.15.6",

diff --git a/packages/ensjs/src/functions/public/_getAbi.ts b/packages/ensjs/src/functions/public/_getAbi.ts
@@ -84,8 +84,8 @@ const decode = async (
     }
     // CBOR
     case 4: {
-      const { decodeFirst } = await import('cbor')
-      abiData = await decodeFirst(hexToBytes(encodedAbiData))
+      const { cborDecode } = await import('@ensdomains/address-encoder/utils')
+      abiData = await cborDecode(hexToBytes(encodedAbiData).buffer)
       decoded = true
       break
     }

diff --git a/packages/ensjs/src/utils/encoders/encodeAbi.ts b/packages/ensjs/src/utils/encoders/encodeAbi.ts
@@ -86,8 +86,8 @@ export const encodeAbi = async <
     }
     case 'cbor': {
       contentType = 4
-      const { encode } = await import('cbor')
-      encodedData = bytesToHex(encode(data))
+      const { cborEncode } = await import('@ensdomains/address-encoder/utils')
+      encodedData = bytesToHex(new Uint8Array(cborEncode(data)))
       break
     }
     default: {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml