Skip to content

Commit 40b3281

Browse files
barnjaminbarnjamin
authored
Create Solver workspace (#156)
1 parent fca6912 commit 40b3281

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+402
-3654
lines changed

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.PHONY: clean
33
clean:
44
rm -rf node_modules
5+
npm run clean
56
cd solana && $(MAKE) clean
67

78
.PHONY: clean-install

‎evm/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
"build:esm": "tsc -p tsconfig.esm.json",
1111
"build:cjs": "tsc -p tsconfig.cjs.json",
1212
"build": "npm run build:esm && npm run build:cjs",
13-
"generate": "typechain --target=ethers-v5 --out-dir=ts/src/types out/*/*.json"
13+
"generate": "typechain --target=ethers-v5 --out-dir=ts/src/types out/*/*.json",
14+
"clean":"rm -rf dist && rm -rf node_modules"
1415
},
1516
"dependencies": {
16-
"@wormhole-foundation/sdk":"^0.7.0-beta.3",
17+
"@wormhole-foundation/sdk-base":"^0.7.0-beta.4",
18+
"@wormhole-foundation/sdk-definitions":"^0.7.0-beta.4",
19+
"@wormhole-foundation/sdk-evm":"^0.7.0-beta.4",
1720
"@wormhole-foundation/example-liquidity-layer-definitions":"0.0.1",
1821
"ethers": "^5.7.2"
1922
},

‎evm/ts/scripts/set_fast_transfer_parameters.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { getConfig } from "./helpers";
22
import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
33
import { ITokenRouter, FastTransferParametersStruct } from "../src/types/ITokenRouter";
44
import { ethers } from "ethers";
5-
import { Chain, toChainId, toNative, toUniversal, toChain } from "@wormhole-foundation/sdk";
5+
import { toChain, toChainId } from "@wormhole-foundation/sdk-base";
6+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
67

78
export function getArgs() {
89
const argv = require("yargs")

‎evm/ts/scripts/setup_matching_engine.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { getConfig, ZERO_BYTES32 } from "./helpers";
22
import { IMatchingEngine__factory, IMatchingEngine } from "../src/types/";
33
import { RouterEndpointStruct } from "../src/types/IMatchingEngine";
44
import { ethers } from "ethers";
5-
import { ChainId, toChain, toChainId, toNative, toUniversal } from "@wormhole-foundation/sdk";
5+
import { ChainId, toChain, toChainId } from "@wormhole-foundation/sdk-base";
6+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
67

78
export function getArgs() {
89
const argv = require("yargs")

‎evm/ts/scripts/setup_token_router.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__fact
33
import { ITokenRouter } from "../src/types/ITokenRouter";
44
import { EndpointStruct } from "../src/types/ITokenRouter";
55
import { ethers } from "ethers";
6-
import { toChain, toChainId, toNative, toUniversal } from "@wormhole-foundation/sdk";
6+
import { toChain, toChainId } from "@wormhole-foundation/sdk-base";
7+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
8+
import "@wormhole-foundation/sdk-evm";
79

810
export function getArgs() {
911
const argv = require("yargs")

‎evm/ts/src/MatchingEngine/evm.ts

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

‎evm/ts/src/TokenRouter/evm.ts

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

‎evm/ts/src/TokenRouter/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { VAA } from "@wormhole-foundation/sdk";
21
import { LiquidityLayerTransactionResult, PreparedInstruction } from "..";
32
import { ethers } from "ethers";
43
export * from "./evm";

‎evm/ts/src/consts.ts

-5
This file was deleted.

‎evm/ts/src/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { ethers } from "ethers";
22

33
export * from "./MatchingEngine";
44
export * from "./TokenRouter";
5-
export * from "./consts";
65
export * from "./error";
76
export * from "./messages";
87
export * from "./utils";

‎evm/ts/src/messages.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
messages,
88
payloads,
99
} from "@wormhole-foundation/example-liquidity-layer-definitions";
10-
import { toChainId } from "@wormhole-foundation/sdk";
10+
import { toChainId } from "@wormhole-foundation/sdk-base";
1111

1212
export type LiquidityLayerMessageBody = {
1313
fill?: Fill;

‎evm/ts/src/utils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Message } from "@wormhole-foundation/example-liquidity-layer-definitions";
2-
import { ChainId, toChain, toUniversal } from "@wormhole-foundation/sdk";
1+
import { ChainId, toChain } from "@wormhole-foundation/sdk-base";
2+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
33
import { ethers } from "ethers";
44
import { CoreBridgeLiquidityLayerMessage, MessageDecoder } from "./messages";
55

‎evm/ts/tests/01__registration.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import {
1111
LiquidityLayerEnv,
1212
} from "./helpers";
1313
import { expect } from "chai";
14-
import { toChainId, toNative, toUniversal } from "@wormhole-foundation/sdk";
14+
import { toChainId } from "@wormhole-foundation/sdk-base";
15+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
16+
import "@wormhole-foundation/sdk-evm";
1517

1618
const CHAIN_PATHWAYS: ValidNetwork[] = ["Ethereum", "Avalanche", "Base"];
1719

‎evm/ts/tests/02__configuration.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import {
1010
parseLiquidityLayerEnvFile,
1111
} from "./helpers";
1212
import { expect } from "chai";
13-
import { toNative, toUniversal } from "@wormhole-foundation/sdk";
13+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
14+
import "@wormhole-foundation/sdk-evm";
1415

1516
const CHAIN_PATHWAYS: ValidNetwork[] = ["Ethereum", "Avalanche", "Base"];
1617

‎evm/ts/tests/03__marketOrder.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
parseLiquidityLayerEnvFile,
1616
tryNativeToUint8Array,
1717
} from "./helpers";
18-
import { serialize, toChainId } from "@wormhole-foundation/sdk";
18+
import { toChainId } from "@wormhole-foundation/sdk-base";
1919

2020
const CHAIN_PATHWAYS: ValidNetwork[][] = [
2121
["Ethereum", "Avalanche"],

‎evm/ts/tests/04__fastMarketOrder.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ import {
2727
mineToPenaltyPeriod,
2828
tryNativeToUint8Array,
2929
} from "./helpers";
30-
import { deserialize, keccak256, toChainId, toUniversal } from "@wormhole-foundation/sdk";
30+
31+
import { toChainId } from "@wormhole-foundation/sdk-base";
32+
import { deserialize, keccak256, toUniversal } from "@wormhole-foundation/sdk-definitions";
33+
import "@wormhole-foundation/sdk-evm";
3134

3235
// Cannot send a fast market order from the matching engine chain.
3336
const CHAIN_PATHWAYS: ValidNetwork[][] = [

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

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

44
export * from "./circleAttester";

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { ethers } from "ethers";
22
import { EvmObserver } from ".";
33
import { parseEvmEvents, parseEvmEvent } from "../../../src";
44
import { GUARDIAN_PRIVATE_KEY, WORMHOLE_GUARDIAN_SET_INDEX } from "../consts";
5-
import { Chain, VAA, contracts, serialize, toUniversal } from "@wormhole-foundation/sdk";
5+
import { Chain, contracts } from "@wormhole-foundation/sdk-base";
6+
import { serialize, toUniversal } from "@wormhole-foundation/sdk-definitions";
67
import { mocks } from "@wormhole-foundation/sdk-definitions/testing";
7-
import { tryNativeToUint8Array } from "../utils";
88

99
export class GuardianNetwork implements EvmObserver<Uint8Array> {
1010
guardians: mocks.MockGuardians;

‎evm/ts/tests/helpers/utils.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { IERC20 } from "../../src/types";
33
import { IUSDC__factory } from "../../src/types/factories/IUSDC__factory";
44
import { WALLET_PRIVATE_KEYS } from "./consts";
55
import { EvmMatchingEngine } from "../../src";
6-
import { Chain, toUniversal } from "@wormhole-foundation/sdk";
6+
import { Chain } from "@wormhole-foundation/sdk-base";
7+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
78

89
export interface ScoreKeeper {
910
player: ethers.Wallet;

0 commit comments

Comments
 (0)