evm: fix ethers-v5 imports

universal/ts: remove @typechain/ethers-v5
wormhole-foundation · Oct 22, 2024 · b505422 · b505422
1 parent 8267dcb
commit b505422
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 71 deletions.
diff --git a/evm/package.json b/evm/package.json
@@ -33,7 +33,8 @@
     "@wormhole-foundation/example-liquidity-layer-definitions": "0.0.1",
     "@wormhole-foundation/sdk-base": "^0.10.9",
     "@wormhole-foundation/sdk-definitions": "^0.10.9",
-    "@wormhole-foundation/sdk-evm": "^0.10.9"
+    "@wormhole-foundation/sdk-evm": "^0.10.9",
+    "ethers-v5": "npm:ethers@^5.7.2"
   },
   "devDependencies": {
     "@typechain/ethers-v5": "^10.2.0",
@@ -43,7 +44,6 @@
     "chai": "^4.3.7",
     "dotenv": "^16.3.1",
     "envfile": "^7.1.0",
-    "ethers-v5": "npm:ethers@^5.7.2",
     "mocha": "^10.0.0",
     "prettier": "^2.8.7",
     "prettier-plugin-solidity": "^1.1.3",

diff --git a/evm/ts/scripts/set_fast_transfer_parameters.ts b/evm/ts/scripts/set_fast_transfer_parameters.ts
@@ -1,7 +1,7 @@
 import { getConfig } from "./helpers";
 import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
 import { ITokenRouter, FastTransferParametersStruct } from "../src/types/ITokenRouter";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { toChain, toChainId } from "@wormhole-foundation/sdk-base";
 import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 

diff --git a/evm/ts/scripts/setup_matching_engine.ts b/evm/ts/scripts/setup_matching_engine.ts
@@ -1,7 +1,7 @@
 import { getConfig, ZERO_BYTES32 } from "./helpers";
 import { IMatchingEngine__factory, IMatchingEngine } from "../src/types/";
 import { RouterEndpointStruct } from "../src/types/IMatchingEngine";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { ChainId, toChain, toChainId } from "@wormhole-foundation/sdk-base";
 import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 

diff --git a/evm/ts/scripts/setup_token_router.ts b/evm/ts/scripts/setup_token_router.ts
@@ -2,7 +2,7 @@ import { getConfig, ZERO_BYTES32 } from "./helpers";
 import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
 import { ITokenRouter } from "../src/types/ITokenRouter";
 import { EndpointStruct } from "../src/types/ITokenRouter";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { toChain, toChainId } from "@wormhole-foundation/sdk-base";
 import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 import "@wormhole-foundation/sdk-evm";

diff --git a/evm/ts/src/MatchingEngine/evm.ts b/evm/ts/src/MatchingEngine/evm.ts
@@ -1,5 +1,5 @@
 import { ChainId } from "@wormhole-foundation/sdk-base";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { RouterEndpoint, LiveAuctionData, MatchingEngine, RedeemParameters } from ".";
 import { LiquidityLayerTransactionResult } from "..";
 import {

diff --git a/evm/ts/src/MatchingEngine/index.ts b/evm/ts/src/MatchingEngine/index.ts
@@ -1,5 +1,5 @@
 import { LiquidityLayerTransactionResult, PreparedInstruction } from "..";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 
 export * from "./evm";
 

diff --git a/evm/ts/src/TokenRouter/evm.ts b/evm/ts/src/TokenRouter/evm.ts
@@ -1,5 +1,5 @@
 import { ChainId } from "@wormhole-foundation/sdk-base";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { Endpoint, OrderResponse, TokenRouter, FastTransferParameters } from ".";
 import { LiquidityLayerTransactionResult } from "..";
 import {

diff --git a/evm/ts/src/TokenRouter/index.ts b/evm/ts/src/TokenRouter/index.ts
@@ -1,5 +1,5 @@
 import { LiquidityLayerTransactionResult, PreparedInstruction } from "..";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 export * from "./evm";
 
 export type FastTransferParameters = {

diff --git a/evm/ts/src/error.ts b/evm/ts/src/error.ts
@@ -1,4 +1,4 @@
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 
 export type DecodedErr = {
     selector: string;

diff --git a/evm/ts/src/index.ts b/evm/ts/src/index.ts
@@ -1,4 +1,4 @@
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 
 export * from "./MatchingEngine";
 export * from "./TokenRouter";

diff --git a/evm/ts/src/testing/mock/circleAttester.ts b/evm/ts/src/testing/mock/circleAttester.ts
@@ -1,4 +1,4 @@
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { GUARDIAN_PRIVATE_KEY } from "../consts";
 
 export type Attestation = {

diff --git a/evm/ts/src/testing/mock/index.ts b/evm/ts/src/testing/mock/index.ts
@@ -1,5 +1,5 @@
 import { Chain } from "@wormhole-foundation/sdk-base";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 
 export * from "./circleAttester";
 export * from "./wormhole";

diff --git a/evm/ts/src/testing/mock/wormhole.ts b/evm/ts/src/testing/mock/wormhole.ts
@@ -1,4 +1,4 @@
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { EvmObserver } from ".";
 import { parseEvmEvents, parseEvmEvent } from "../..";
 import { GUARDIAN_PRIVATE_KEY, WORMHOLE_GUARDIAN_SET_INDEX } from "../consts";

diff --git a/evm/ts/src/testing/utils.ts b/evm/ts/src/testing/utils.ts
@@ -1,4 +1,4 @@
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { IERC20 } from "../types";
 import { IUSDC__factory } from "../types/factories/IUSDC__factory";
 import { WALLET_PRIVATE_KEYS } from "./consts";

diff --git a/evm/ts/src/utils.ts b/evm/ts/src/utils.ts
@@ -1,6 +1,6 @@
 import { ChainId, toChain } from "@wormhole-foundation/sdk-base";
 import { toUniversal } from "@wormhole-foundation/sdk-definitions";
-import { ethers } from "ethers";
+import { ethers } from "ethers-v5";
 import { CoreBridgeLiquidityLayerMessage, MessageDecoder } from "./messages";
 
 export function parseEvmEvents(