fix: error in ethers version 5 compatibility code

TradeTrust · Jan 3, 2025 · 12498eb · 12498eb
1 parent 352009f
commit 12498eb
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,15 @@
 {
   "name": "@tradetrust-tt/token-registry",
-  "version": "5.0.0",
+  "version": "5.1.1",
   "release": {
     "branches": [
-      { "name": "master" },
-      { "name": "v4", "range": "4.x.x" }
+      {
+        "name": "master"
+      },
+      {
+        "name": "v4",
+        "range": "4.x.x"
+      }
     ],
     "tagFormat": "v${version}"
   },

diff --git a/src/constants/default-address.ts b/src/constants/default-address.ts
@@ -1,4 +1,6 @@
-import { ethers } from "ethers";
+import { ethers as packedEthers } from "ethers";
+
+const ethers = { ...packedEthers };
 
 if (ethers.version.includes("/5")) {
   (ethers as any).ZeroAddress = (ethers as any)?.constants?.AddressZero;

diff --git a/src/constants/role-hash.ts b/src/constants/role-hash.ts
@@ -1,4 +1,6 @@
-import { ethers } from "ethers";
+import { ethers as packedEthers } from "ethers";
+
+const ethers = { ...packedEthers };
 
 if (ethers.version.includes("/5")) {
   (ethers as any).id = (ethers as any).utils.id;

diff --git a/src/utils/compute-interface-id.ts b/src/utils/compute-interface-id.ts
@@ -1,4 +1,6 @@
-import { ethers } from "ethers";
+import { ethers as packedEthers } from "ethers";
+
+const ethers = { ...packedEthers };
 
 if (ethers.version.includes("/5")) {
   (ethers as any).id = (ethers as any).utils.id;

diff --git a/src/utils/compute-title-escrow-address.ts b/src/utils/compute-title-escrow-address.ts
@@ -1,4 +1,4 @@
-import { ethers } from "ethers";
+import { ethers as packedEthers } from "ethers";
 
 interface Params {
   implementationAddress: string;
@@ -7,6 +7,8 @@ interface Params {
   tokenId: string;
 }
 
+const ethers = { ...packedEthers };
+
 if (ethers.version.includes("/5")) {
   (ethers as any).keccak256 = (ethers as any).utils.keccak256;
   (ethers as any).solidityPackedKeccak256 = (ethers as any).utils.solidityKeccak256;

diff --git a/src/utils/encode-init-params.ts b/src/utils/encode-init-params.ts
@@ -1,4 +1,6 @@
-import { ethers } from "ethers";
+import { ethers as packedEthers } from "ethers";
+
+const ethers = { ...packedEthers };
 
 export interface Params {
   name: string;

diff --git a/src/utils/get-event-from-receipt.ts b/src/utils/get-event-from-receipt.ts
@@ -1,4 +1,6 @@
-import { ethers } from "ethers";
+import { ethers as packedEthers } from "ethers";
+
+const ethers = { ...packedEthers };
 
 if (ethers.version.includes("/5")) {
   (ethers as any).Interface = (ethers as any).utils.Interface;