Skip to content

Commit a1763da

Browse files
barnjaminbarnjamin
authored
Update Evm TS package (#178)
1 parent 80aebe9 commit a1763da

19 files changed

+102
-70
lines changed

‎evm/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ ts/lib
1212
ts/src/types
1313
dist
1414
ts-types
15+
*.tsbuildinfo

‎evm/package.json

+23-8
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,46 @@
44
"author": "Wormhole Contributors",
55
"license": "Apache-2.0",
66
"main": "./dist/cjs/index.js",
7-
"types":"./dist/cjs/index.d.ts",
7+
"types": "./dist/cjs/index.d.ts",
88
"module": "./dist/esm/index.js",
9+
"files": [
10+
"dist/cjs",
11+
"dist/esm"
12+
],
913
"scripts": {
1014
"build:esm": "tsc -p tsconfig.esm.json",
1115
"build:cjs": "tsc -p tsconfig.cjs.json",
1216
"build": "npm run build:esm && npm run build:cjs",
1317
"generate": "typechain --target=ethers-v5 --out-dir=ts/src/types out/*/*.json",
14-
"clean":"rm -rf dist && rm -rf node_modules"
18+
"clean": "rm -rf dist && rm -rf node_modules && rm -f ./*.tsbuildinfo"
19+
},
20+
"exports": {
21+
".": {
22+
"import": "./dist/esm/index.js",
23+
"require": "./dist/cjs/index.js",
24+
"types": "./dist/cjs/index.d.ts"
25+
},
26+
"./*": {
27+
"import": "./dist/esm/*/index.js",
28+
"require": "./dist/cjs/*/index.js",
29+
"types": "./dist/cjs/*/index.d.ts"
30+
}
1531
},
1632
"dependencies": {
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",
20-
"@wormhole-foundation/example-liquidity-layer-definitions":"0.0.1",
33+
"@wormhole-foundation/sdk-base": "^0.7.0-beta.6",
34+
"@wormhole-foundation/sdk-definitions": "^0.7.0-beta.6",
35+
"@wormhole-foundation/sdk-evm": "^0.7.0-beta.6",
36+
"@wormhole-foundation/example-liquidity-layer-definitions": "0.0.1",
2137
"ethers": "^5.7.2"
2238
},
2339
"devDependencies": {
24-
"envfile": "^6.18.0",
40+
"envfile": "^7.1.0",
2541
"@typechain/ethers-v5": "^10.2.0",
2642
"@types/chai": "^4.3.4",
2743
"@types/mocha": "^10.0.1",
2844
"@types/node": "^18.14.5",
2945
"chai": "^4.3.7",
3046
"dotenv": "^16.3.1",
31-
"ethers": "^5.7.2",
3247
"mocha": "^10.0.0",
3348
"prettier": "^2.8.7",
3449
"prettier-plugin-solidity": "^1.1.3",

‎evm/ts/tests/helpers/consts.ts ‎evm/ts/src/testing/consts.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FastTransferParameters } from "../../src";
1+
import { FastTransferParameters } from "..";
22

33
export type ValidNetwork = "Avalanche" | "Ethereum" | "Base";
44

‎evm/ts/tests/helpers/env.ts ‎evm/ts/src/testing/env.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ts-ignore
12
import { parse as envParse } from "envfile";
23
import * as fs from "fs";
34

‎evm/ts/tests/helpers/index.ts ‎evm/ts/src/testing/index.ts

File renamed without changes.

‎evm/ts/tests/helpers/mock/circleAttester.ts ‎evm/ts/src/testing/mock/circleAttester.ts

File renamed without changes.

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

File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ethers } from "ethers";
22
import { EvmObserver } from ".";
3-
import { parseEvmEvents, parseEvmEvent } from "../../../src";
3+
import { parseEvmEvents, parseEvmEvent } from "../..";
44
import { GUARDIAN_PRIVATE_KEY, WORMHOLE_GUARDIAN_SET_INDEX } from "../consts";
55
import { Chain, contracts } from "@wormhole-foundation/sdk-base";
66
import { serialize, toUniversal } from "@wormhole-foundation/sdk-definitions";

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ethers } from "ethers";
2-
import { IERC20 } from "../../src/types";
3-
import { IUSDC__factory } from "../../src/types/factories/IUSDC__factory";
2+
import { IERC20 } from "../types";
3+
import { IUSDC__factory } from "../types/factories/IUSDC__factory";
44
import { WALLET_PRIVATE_KEYS } from "./consts";
5-
import { EvmMatchingEngine } from "../../src";
5+
import { EvmMatchingEngine } from "..";
66
import { Chain } from "@wormhole-foundation/sdk-base";
77
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
88

‎evm/ts/tests/00__environment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
WORMHOLE_GUARDIAN_SET_INDEX,
2020
WORMHOLE_MESSAGE_FEE,
2121
mineWait,
22-
} from "./helpers";
22+
} from "../src/testing";
2323

2424
describe("Environment", () => {
2525
const chainNames: ValidNetwork[] = ["Avalanche", "Ethereum", "Base"];

‎evm/ts/tests/01__registration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
parseLiquidityLayerEnvFile,
1010
ChainType,
1111
LiquidityLayerEnv,
12-
} from "./helpers";
12+
} from "../src/testing";
1313
import { expect } from "chai";
1414
import { toChainId } from "@wormhole-foundation/sdk-base";
1515
import { toUniversal } from "@wormhole-foundation/sdk-definitions";

‎evm/ts/tests/02__configuration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
DEFAULT_FAST_TRANSFER_PARAMS,
99
MATCHING_ENGINE_NAME,
1010
parseLiquidityLayerEnvFile,
11-
} from "./helpers";
11+
} from "../src/testing";
1212
import { expect } from "chai";
1313
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
1414
import "@wormhole-foundation/sdk-evm";

‎evm/ts/tests/03__marketOrder.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
ChainType,
1515
parseLiquidityLayerEnvFile,
1616
tryNativeToUint8Array,
17-
} from "./helpers";
17+
} from "../src/testing";
1818
import { toChainId } from "@wormhole-foundation/sdk-base";
1919

2020
const CHAIN_PATHWAYS: ValidNetwork[][] = [

‎evm/ts/tests/04__fastMarketOrder.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
mineToGracePeriod,
2727
mineToPenaltyPeriod,
2828
tryNativeToUint8Array,
29-
} from "./helpers";
29+
} from "../src/testing";
3030

3131
import { toChainId } from "@wormhole-foundation/sdk-base";
3232
import { deserialize, keccak256, toUniversal } from "@wormhole-foundation/sdk-definitions";

‎evm/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"extends":"../tsconfig.json",
33
"compilerOptions": {
4-
"rootDir": "./ts",
4+
"rootDir": "./ts/src",
55
},
6-
"include": ["ts/src"],
6+
"include": ["ts/src/**/*.ts"],
77
"exclude": ["node_modules", "ts/scripts", "ts/tests"]
88
}

‎package-lock.json

+56-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎solana/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"dependencies": {
3232
"@certusone/wormhole-spydk": "^0.0.1",
3333
"@wormhole-foundation/example-liquidity-layer-definitions": "0.0.1",
34-
"@wormhole-foundation/sdk-base": "^0.7.0-beta.4",
35-
"@wormhole-foundation/sdk-definitions": "^0.7.0-beta.4",
36-
"@wormhole-foundation/sdk-solana": "^0.7.0-beta.4",
37-
"@wormhole-foundation/sdk-solana-core": "^0.7.0-beta.4",
34+
"@wormhole-foundation/sdk-base": "^0.7.0-beta.6",
35+
"@wormhole-foundation/sdk-definitions": "^0.7.0-beta.6",
36+
"@wormhole-foundation/sdk-solana": "^0.7.0-beta.6",
37+
"@wormhole-foundation/sdk-solana-core": "^0.7.0-beta.6",
3838
"@coral-xyz/anchor": "^0.30.0",
3939
"@solana/spl-token": "^0.4.6",
4040
"@solana/spl-token-group": "^0.0.4",

‎solver/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"@solana/spl-token": "^0.4.6",
1717
"@wormhole-foundation/example-liquidity-layer-evm": "0.0.1",
1818
"@wormhole-foundation/example-liquidity-layer-solana": "0.0.1",
19-
"@wormhole-foundation/sdk-base": "^0.7.0-beta.4",
20-
"@wormhole-foundation/sdk-definitions": "^0.7.0-beta.4",
21-
"@wormhole-foundation/sdk-solana": "^0.7.0-beta.4"
19+
"@wormhole-foundation/sdk-base": "^0.7.0-beta.6",
20+
"@wormhole-foundation/sdk-definitions": "^0.7.0-beta.6",
21+
"@wormhole-foundation/sdk-solana": "^0.7.0-beta.6"
2222
}
2323
}

‎universal/ts/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"clean":"rm -rf node_modules && rm -rf dist"
2020
},
2121
"dependencies": {
22-
"@wormhole-foundation/sdk-base":"^0.7.0-beta.4",
23-
"@wormhole-foundation/sdk-definitions":"^0.7.0-beta.4"
22+
"@wormhole-foundation/sdk-base":"^0.7.0-beta.6",
23+
"@wormhole-foundation/sdk-definitions":"^0.7.0-beta.6"
2424
},
2525
"devDependencies": {
2626
"envfile": "^6.18.0",

0 commit comments

Comments
 (0)