Skip to content

Commit b505422

Browse files
committed
evm: fix ethers-v5 imports
universal/ts: remove @typechain/ethers-v5
1 parent 8267dcb commit b505422

17 files changed

+26
-71
lines changed

evm/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"@wormhole-foundation/example-liquidity-layer-definitions": "0.0.1",
3434
"@wormhole-foundation/sdk-base": "^0.10.9",
3535
"@wormhole-foundation/sdk-definitions": "^0.10.9",
36-
"@wormhole-foundation/sdk-evm": "^0.10.9"
36+
"@wormhole-foundation/sdk-evm": "^0.10.9",
37+
"ethers-v5": "npm:ethers@^5.7.2"
3738
},
3839
"devDependencies": {
3940
"@typechain/ethers-v5": "^10.2.0",
@@ -43,7 +44,6 @@
4344
"chai": "^4.3.7",
4445
"dotenv": "^16.3.1",
4546
"envfile": "^7.1.0",
46-
"ethers-v5": "npm:ethers@^5.7.2",
4747
"mocha": "^10.0.0",
4848
"prettier": "^2.8.7",
4949
"prettier-plugin-solidity": "^1.1.3",

evm/ts/scripts/set_fast_transfer_parameters.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { getConfig } from "./helpers";
22
import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
33
import { ITokenRouter, FastTransferParametersStruct } from "../src/types/ITokenRouter";
4-
import { ethers } from "ethers";
4+
import { ethers } from "ethers-v5";
55
import { toChain, toChainId } from "@wormhole-foundation/sdk-base";
66
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
77

evm/ts/scripts/setup_matching_engine.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { getConfig, ZERO_BYTES32 } from "./helpers";
22
import { IMatchingEngine__factory, IMatchingEngine } from "../src/types/";
33
import { RouterEndpointStruct } from "../src/types/IMatchingEngine";
4-
import { ethers } from "ethers";
4+
import { ethers } from "ethers-v5";
55
import { ChainId, toChain, toChainId } from "@wormhole-foundation/sdk-base";
66
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
77

evm/ts/scripts/setup_token_router.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { getConfig, ZERO_BYTES32 } from "./helpers";
22
import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
33
import { ITokenRouter } from "../src/types/ITokenRouter";
44
import { EndpointStruct } from "../src/types/ITokenRouter";
5-
import { ethers } from "ethers";
5+
import { ethers } from "ethers-v5";
66
import { toChain, toChainId } from "@wormhole-foundation/sdk-base";
77
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
88
import "@wormhole-foundation/sdk-evm";

evm/ts/src/MatchingEngine/evm.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ChainId } from "@wormhole-foundation/sdk-base";
2-
import { ethers } from "ethers";
2+
import { ethers } from "ethers-v5";
33
import { RouterEndpoint, LiveAuctionData, MatchingEngine, RedeemParameters } from ".";
44
import { LiquidityLayerTransactionResult } from "..";
55
import {

evm/ts/src/MatchingEngine/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LiquidityLayerTransactionResult, PreparedInstruction } from "..";
2-
import { ethers } from "ethers";
2+
import { ethers } from "ethers-v5";
33

44
export * from "./evm";
55

evm/ts/src/TokenRouter/evm.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ChainId } from "@wormhole-foundation/sdk-base";
2-
import { ethers } from "ethers";
2+
import { ethers } from "ethers-v5";
33
import { Endpoint, OrderResponse, TokenRouter, FastTransferParameters } from ".";
44
import { LiquidityLayerTransactionResult } from "..";
55
import {

evm/ts/src/TokenRouter/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LiquidityLayerTransactionResult, PreparedInstruction } from "..";
2-
import { ethers } from "ethers";
2+
import { ethers } from "ethers-v5";
33
export * from "./evm";
44

55
export type FastTransferParameters = {

evm/ts/src/error.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ethers } from "ethers";
1+
import { ethers } from "ethers-v5";
22

33
export type DecodedErr = {
44
selector: string;

evm/ts/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ethers } from "ethers";
1+
import { ethers } from "ethers-v5";
22

33
export * from "./MatchingEngine";
44
export * from "./TokenRouter";

evm/ts/src/testing/mock/circleAttester.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ethers } from "ethers";
1+
import { ethers } from "ethers-v5";
22
import { GUARDIAN_PRIVATE_KEY } from "../consts";
33

44
export type Attestation = {

evm/ts/src/testing/mock/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Chain } from "@wormhole-foundation/sdk-base";
2-
import { ethers } from "ethers";
2+
import { ethers } from "ethers-v5";
33

44
export * from "./circleAttester";
55
export * from "./wormhole";

evm/ts/src/testing/mock/wormhole.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ethers } from "ethers";
1+
import { ethers } from "ethers-v5";
22
import { EvmObserver } from ".";
33
import { parseEvmEvents, parseEvmEvent } from "../..";
44
import { GUARDIAN_PRIVATE_KEY, WORMHOLE_GUARDIAN_SET_INDEX } from "../consts";

evm/ts/src/testing/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ethers } from "ethers";
1+
import { ethers } from "ethers-v5";
22
import { IERC20 } from "../types";
33
import { IUSDC__factory } from "../types/factories/IUSDC__factory";
44
import { WALLET_PRIVATE_KEYS } from "./consts";

evm/ts/src/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ChainId, toChain } from "@wormhole-foundation/sdk-base";
22
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
3-
import { ethers } from "ethers";
3+
import { ethers } from "ethers-v5";
44
import { CoreBridgeLiquidityLayerMessage, MessageDecoder } from "./messages";
55

66
export function parseEvmEvents(

0 commit comments

Comments
 (0)