refactor: use ethers conditional exports

re #632
semaphore-protocol · Feb 15, 2024 · 22d391d · 22d391d
1 parent 169445a
commit 22d391d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/packages/data/src/ethers.ts b/packages/data/src/ethers.ts
@@ -1,15 +1,15 @@
+import { ZeroAddress } from "ethers/constants"
+import { Contract } from "ethers/contract"
 import {
     AlchemyProvider,
     AnkrProvider,
     CloudflareProvider,
-    Contract,
     EtherscanProvider,
     InfuraProvider,
     JsonRpcProvider,
     PocketProvider,
-    Provider,
-    ZeroAddress
-} from "ethers"
+    Provider
+} from "ethers/providers"
 import checkParameter from "./checkParameter"
 import getEvents from "./getEvents"
 import SemaphoreABI from "./semaphoreABI.json"

diff --git a/packages/data/src/getEvents.ts b/packages/data/src/getEvents.ts
@@ -1,5 +1,5 @@
 /* istanbul ignore file */
-import { Contract, EventLog } from "ethers"
+import { Contract, EventLog } from "ethers/contract"
 
 /**
  * Returns the list of events of a contract with possible filters.

diff --git a/packages/data/tests/ethers.test.ts b/packages/data/tests/ethers.test.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-sparse-arrays */
-import { Contract, ZeroAddress } from "ethers"
+import { ZeroAddress } from "ethers/constants"
+import { Contract } from "ethers/contract"
 import SemaphoreEthers from "../src/ethers"
 import getEvents from "../src/getEvents"
 
@@ -8,9 +9,9 @@ jest.mock("../src/getEvents", () => ({
     default: jest.fn()
 }))
 
-jest.mock("ethers", () => ({
+jest.mock("ethers/contract", () => ({
     __esModule: true,
-    ...jest.requireActual("ethers"),
+    ...jest.requireActual("ethers/contract"),
     Contract: jest.fn(
         () =>
             ({

diff --git a/packages/data/tsconfig.json b/packages/data/tsconfig.json
@@ -1,4 +1,4 @@
 {
     "extends": "../../tsconfig.json",
-    "include": ["src", "rollup.config.ts"]
+    "include": ["src", "tests", "rollup.config.ts"]
 }
diff --git a/packages/proof/package.json b/packages/proof/package.json
@@ -38,7 +38,6 @@
         "access": "public"
     },
     "devDependencies": {
-        "@ethersproject/strings": "^5.7.0",
         "@rollup/plugin-alias": "^5.1.0",
         "@rollup/plugin-json": "^6.1.0",
         "@types/download": "^8.0.5",

diff --git a/packages/proof/src/generate-proof.ts b/packages/proof/src/generate-proof.ts
@@ -48,7 +48,6 @@ export default async function generateProof(
     }
 
     // If the Snark artifacts are not defined they will be automatically downloaded.
-    /* istanbul ignore next */
     if (!snarkArtifacts) {
         snarkArtifacts = await getSnarkArtifacts(merkleTreeDepth)
     }

diff --git a/packages/proof/src/hash.ts b/packages/proof/src/hash.ts
@@ -1,4 +1,5 @@
-import { keccak256, toBeHex } from "ethers"
+import { keccak256 } from "ethers/crypto"
+import { toBeHex } from "ethers/utils"
 import { NumericString } from "snarkjs"
 import { BigNumberish } from "./types"
 

diff --git a/packages/proof/src/to-bigint.ts b/packages/proof/src/to-bigint.ts
@@ -1,4 +1,5 @@
-import { encodeBytes32String, toBigInt as _toBigInt } from "ethers"
+import { encodeBytes32String } from "ethers/abi"
+import { toBigInt as _toBigInt } from "ethers/utils"
 import { BigNumberish } from "./types"
 
 export default function toBigInt(value: BigNumberish | Uint8Array | string): bigint {

diff --git a/tsconfig.json b/tsconfig.json
@@ -3,8 +3,8 @@
         "baseUrl": ".",
         "strict": true,
         "target": "ES5",
-        "module": "ES6",
-        "moduleResolution": "node",
+        "module": "ESNext",
+        "moduleResolution": "Bundler",
         "esModuleInterop": true,
         "preserveConstEnums": true,
         "resolveJsonModule": true,
@@ -14,7 +14,7 @@
         "declarationDir": "types",
         "typeRoots": ["node_modules/@types", "types"],
         "paths": {
-            "@semaphore-protocol/*": ["packages/*/src"]
+            "@semaphore-protocol/*": ["./packages/*/src"]
         }
     },
     "ts-node": {