Make it compatible with ethers-v5

cowprotocol · Jul 17, 2023 · f09039f · f09039f
1 parent 17ee014
commit f09039f
Show file tree

Hide file tree

Showing 4 changed files with 459 additions and 49 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/app-data",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.3",
   "description": "CowProtocol AppData schema definitions",
   "type": "module",
   "source": "src/index.ts",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/cowprotocol/app-data#readme",
   "devDependencies": {
-    "ethers": "^6.6.4",
+    "ethers": "^5.0.26",
     "@babel/core": "^7.18.9",
     "@babel/preset-env": "^7.18.9",
     "@babel/preset-typescript": "^7.18.6",
@@ -59,7 +59,7 @@
   },
   "peerDependencies": {
     "cross-fetch": "^3.x",
-    "ethers": "^6.6.4",
+    "ethers": "^5.0.0",
     "ipfs-only-hash": "^4.x",
     "multiformats": "^9.x"
   },

diff --git a/src/api/appDataHexToCid.ts b/src/api/appDataHexToCid.ts
@@ -33,8 +33,8 @@ async function _appDataHexToCid(appDataHex: string): Promise<string> {
   cidPrefix[2] = 0x1b // keccak hash algorithm
   cidPrefix[3] = 32 // keccak hash length (0x20 = 32)
 
-  const { getBytes } = await import('ethers')
-  const hashBytes = getBytes(appDataHex) // 32 bytes of the keccak256 hash
+  const { utils } = await import('ethers')
+  const hashBytes = utils.arrayify(appDataHex) // 32 bytes of the keccak256 hash
 
   // Concat prefix and multihash
   var cidBytes = new Uint8Array(cidPrefix.length + hashBytes.length)

diff --git a/src/api/appDataToCid.ts b/src/api/appDataToCid.ts
@@ -98,9 +98,9 @@ export async function _appDataToCidAux(
  * @returns the IPFS CID v0 of the content
  */
 async function _appDataToCid(fullAppDataJson: string): Promise<string> {
-  const { keccak256, toUtf8Bytes } = await import('ethers')
+  const { utils } = await import('ethers')
 
-  const appDataHex = await keccak256(toUtf8Bytes(fullAppDataJson))
+  const appDataHex = await utils.keccak256(utils.toUtf8Bytes(fullAppDataJson))
   return appDataHexToCid(appDataHex)
 }