Install and use only the required dependencies (#162)

evm/package.json

@@ -13,7 +13,9 @@
     "generate": "typechain --target=ethers-v5 --out-dir=ts/src/types out/*/*.json"
   },
   "dependencies": {
-    "@wormhole-foundation/sdk":"^0.7.0-beta.3",
+    "@wormhole-foundation/sdk-base":"^0.7.0-beta.3",
+    "@wormhole-foundation/sdk-definitions":"^0.7.0-beta.3",
+    "@wormhole-foundation/sdk-evm":"^0.7.0-beta.3",
     "@wormhole-foundation/example-liquidity-layer-definitions":"0.0.1",
     "ethers": "^5.7.2"
   },

evm/ts/scripts/set_fast_transfer_parameters.ts

@@ -2,7 +2,8 @@ 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 { Chain, toChainId, toNative } from "@wormhole-foundation/sdk";
+import { toChainId } from "@wormhole-foundation/sdk-base";
+import { EvmAddress } from "@wormhole-foundation/sdk-evm";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -55,10 +56,9 @@ async function main() {
     const routerChainId = toChainId(chain);
 
     // Setup token router contract.
-    const tokenRouter = ITokenRouter__factory.connect(
-        toNative(chain as Chain, routers[routerChainId].address).toString(),
-        wallet,
-    );
+
+    const address = new EvmAddress(routers[routerChainId].address).toString();
+    const tokenRouter = ITokenRouter__factory.connect(address, wallet);
 
     await setFastTransferParams(routerChainId.toString(), tokenRouter, fastTransferParams);
 }

evm/ts/scripts/setup_matching_engine.ts

@@ -2,7 +2,8 @@ import { getConfig, ZERO_BYTES32 } from "./helpers";
 import { IMatchingEngine__factory, IMatchingEngine } from "../src/types/";
 import { RouterEndpointStruct } from "../src/types/IMatchingEngine";
 import { ethers } from "ethers";
-import { ChainId, toChain, toChainId, toNative } from "@wormhole-foundation/sdk";
+import { ChainId, toChain, toChainId } from "@wormhole-foundation/sdk-base";
+import { EvmAddress } from "@wormhole-foundation/sdk-evm";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -70,8 +71,7 @@ async function main() {
         throw Error("Invalid chainId");
     }
 
-    const engineChain = toChain(engineChainId);
-    const engineAddress = toNative(engineChain, matchingEngineConfig["address"]);
+    const engineAddress = new EvmAddress(matchingEngineConfig["address"]);
     // Setup token router contract.
     const engine = IMatchingEngine__factory.connect(engineAddress.toString(), wallet);
 

evm/ts/scripts/setup_token_router.ts

@@ -3,7 +3,7 @@ import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__fact
 import { ITokenRouter } from "../src/types/ITokenRouter";
 import { EndpointStruct } from "../src/types/ITokenRouter";
 import { ethers } from "ethers";
-import { toChain, toChainId, toNative } from "@wormhole-foundation/sdk";
+import { toChain, toChainId, toNative } from "@wormhole-foundation/sdk-connect";
 
 export function getArgs() {
     const argv = require("yargs")

evm/ts/src/MatchingEngine/evm.ts

@@ -1,4 +1,4 @@
-import { ChainId } from "@wormhole-foundation/sdk";
+import { ChainId } from "@wormhole-foundation/sdk-base";
 import { ethers } from "ethers";
 import { RouterEndpoint, LiveAuctionData, MatchingEngine, RedeemParameters } from ".";
 import { LiquidityLayerTransactionResult } from "..";

evm/ts/src/TokenRouter/evm.ts

@@ -1,4 +1,4 @@
-import { ChainId } from "@wormhole-foundation/sdk";
+import { ChainId } from "@wormhole-foundation/sdk-base";
 import { ethers } from "ethers";
 import { Endpoint, OrderResponse, TokenRouter, FastTransferParameters } from ".";
 import { LiquidityLayerTransactionResult } from "..";

evm/ts/src/TokenRouter/index.ts

@@ -1,4 +1,3 @@
-import { VAA } from "@wormhole-foundation/sdk";
 import { LiquidityLayerTransactionResult, PreparedInstruction } from "..";
 import { ethers } from "ethers";
 export * from "./evm";

evm/ts/src/index.ts

@@ -2,7 +2,6 @@ import { ethers } from "ethers";
 
 export * from "./MatchingEngine";
 export * from "./TokenRouter";
-export * from "./consts";
 export * from "./error";
 export * from "./messages";
 export * from "./utils";

evm/ts/src/messages.ts

@@ -7,7 +7,7 @@ import {
     messages,
     payloads,
 } from "@wormhole-foundation/example-liquidity-layer-definitions";
-import { toChainId } from "@wormhole-foundation/sdk";
+import { toChainId } from "@wormhole-foundation/sdk-base";
 
 export type LiquidityLayerMessageBody = {
     fill?: Fill;

evm/ts/src/utils.ts

@@ -1,5 +1,5 @@
-import { Message } from "@wormhole-foundation/example-liquidity-layer-definitions";
-import { ChainId, toChain, toUniversal } from "@wormhole-foundation/sdk";
+import { ChainId, toChain } from "@wormhole-foundation/sdk-base";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 import { ethers } from "ethers";
 import { CoreBridgeLiquidityLayerMessage, MessageDecoder } from "./messages";
 

evm/ts/tests/01__registration.ts

@@ -11,7 +11,9 @@ import {
     LiquidityLayerEnv,
 } from "./helpers";
 import { expect } from "chai";
-import { toChainId, toNative, toUniversal } from "@wormhole-foundation/sdk";
+import { toChainId } from "@wormhole-foundation/sdk-base";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
+import "@wormhole-foundation/sdk-evm";
 
 const CHAIN_PATHWAYS: ValidNetwork[] = ["Ethereum", "Avalanche", "Base"];
 

evm/ts/tests/02__configuration.ts

@@ -10,7 +10,8 @@ import {
     parseLiquidityLayerEnvFile,
 } from "./helpers";
 import { expect } from "chai";
-import { toNative, toUniversal } from "@wormhole-foundation/sdk";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
+import "@wormhole-foundation/sdk-evm";
 
 const CHAIN_PATHWAYS: ValidNetwork[] = ["Ethereum", "Avalanche", "Base"];
 

evm/ts/tests/03__marketOrder.ts

@@ -15,7 +15,7 @@ import {
     parseLiquidityLayerEnvFile,
     tryNativeToUint8Array,
 } from "./helpers";
-import { serialize, toChainId } from "@wormhole-foundation/sdk";
+import { toChainId } from "@wormhole-foundation/sdk-base";
 
 const CHAIN_PATHWAYS: ValidNetwork[][] = [
     ["Ethereum", "Avalanche"],

evm/ts/tests/04__fastMarketOrder.ts

@@ -27,7 +27,10 @@ import {
     mineToPenaltyPeriod,
     tryNativeToUint8Array,
 } from "./helpers";
-import { deserialize, keccak256, toChainId, toUniversal } from "@wormhole-foundation/sdk";
+
+import { toChainId } from "@wormhole-foundation/sdk-base";
+import { deserialize, keccak256, toUniversal } from "@wormhole-foundation/sdk-definitions";
+import "@wormhole-foundation/sdk-evm";
 
 // Cannot send a fast market order from the matching engine chain.
 const CHAIN_PATHWAYS: ValidNetwork[][] = [

evm/ts/tests/helpers/mock/index.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@wormhole-foundation/sdk";
+import { Chain } from "@wormhole-foundation/sdk-base";
 import { ethers } from "ethers";
 
 export * from "./circleAttester";

evm/ts/tests/helpers/mock/wormhole.ts

@@ -2,9 +2,9 @@ import { ethers } from "ethers";
 import { EvmObserver } from ".";
 import { parseEvmEvents, parseEvmEvent } from "../../../src";
 import { GUARDIAN_PRIVATE_KEY, WORMHOLE_GUARDIAN_SET_INDEX } from "../consts";
-import { Chain, VAA, contracts, serialize, toUniversal } from "@wormhole-foundation/sdk";
+import { Chain, contracts } from "@wormhole-foundation/sdk-base";
+import { serialize, toUniversal } from "@wormhole-foundation/sdk-definitions";
 import { mocks } from "@wormhole-foundation/sdk-definitions/testing";
-import { tryNativeToUint8Array } from "../utils";
 
 export class GuardianNetwork implements EvmObserver<Uint8Array> {
     guardians: mocks.MockGuardians;

evm/ts/tests/helpers/utils.ts

@@ -3,7 +3,8 @@ import { IERC20 } from "../../src/types";
 import { IUSDC__factory } from "../../src/types/factories/IUSDC__factory";
 import { WALLET_PRIVATE_KEYS } from "./consts";
 import { EvmMatchingEngine } from "../../src";
-import { Chain, toUniversal } from "@wormhole-foundation/sdk";
+import { Chain } from "@wormhole-foundation/sdk-base";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 
 export interface ScoreKeeper {
     player: ethers.Wallet;