Skip to content

Commit 4ee1a5f

Browse files
authored
bump wormhole-sdk version and fix failing CI (wormhole-foundation#606)
* bump wormhole-sdk version * fix tests * update used foundry verison in evm dockerfile * update used foundry version to the same used in wormhole core * exclude build-info directory when compiling the contracts which contains json files that aren't valid ABIs
1 parent 761bcb2 commit 4ee1a5f

File tree

7 files changed

+779
-566
lines changed

7 files changed

+779
-566
lines changed

evm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=linux/amd64 ghcr.io/foundry-rs/foundry@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 as builder
1+
FROM --platform=linux/amd64 ghcr.io/foundry-rs/foundry:v1.0.0@sha256:d12a373ec950de170d5461014ef9320ba0fb6e0db6f87835999d0fcf3820370e as builder
22

33
WORKDIR /app
44
COPY foundry.toml foundry.toml

evm/ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"build": "npm run build:esm && npm run build:cjs",
3838
"rebuild": "npm run clean && npm run build",
3939
"clean": "rm -rf ./dist",
40-
"generate:test": "typechain --node16-modules --target ethers-v6 --out-dir ethers-ci-contracts '../out/**/*.json'",
40+
"generate:test": "typechain --node16-modules --target ethers-v6 --out-dir ethers-ci-contracts '../out/!(build-info)/*.json'",
4141
"generate:slim": "ABI_VERSION=`tsx scripts/readVersion.ts` && typechain --node16-modules --target ethers-v6 --out-dir src/ethers-contracts/$ABI_VERSION '../out/?(WormholeTransceiver.sol|NttManager.sol)/*.json'",
4242
"generate": "npm run generate:slim",
4343
"build:contracts": "cd ../.. && make build-evm-prod",

package-lock.json

Lines changed: 769 additions & 556 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@solana/web3.js": "^1.95.8",
2222
"@types/jest": "^29.5.12",
2323
"@types/node": "^20.12.2",
24-
"@wormhole-foundation/sdk": "^1.0.0",
24+
"@wormhole-foundation/sdk": "^1.14.2",
2525
"@wormhole-foundation/wormchain-sdk": "^0.0.1",
2626
"ethers": "^6.5.1",
2727
"ts-jest": "^29.1.2",

sdk/definitions/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"test": "jest --config ./jest.config.ts"
5050
},
5151
"peerDependencies": {
52-
"@wormhole-foundation/sdk-base": "^1.0.0",
53-
"@wormhole-foundation/sdk-definitions": "^1.0.0"
52+
"@wormhole-foundation/sdk-base": "^1.14.2",
53+
"@wormhole-foundation/sdk-definitions": "^1.14.2"
5454
},
5555
"type": "module"
5656
}

sdk/examples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"tsx": "^4.7.2"
3333
},
3434
"dependencies": {
35-
"@wormhole-foundation/sdk": "^1.0.0",
35+
"@wormhole-foundation/sdk": "^1.14.2",
3636
"@wormhole-foundation/sdk-definitions-ntt": "0.5.0",
3737
"@wormhole-foundation/sdk-evm-ntt": "0.5.0",
3838
"@wormhole-foundation/sdk-solana-ntt": "0.5.0",

sdk/route/__tests__/route.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import "@wormhole-foundation/sdk-solana-ntt";
1111

1212
import { EvmPlatform } from "@wormhole-foundation/sdk-evm";
1313
import { SolanaPlatform } from "@wormhole-foundation/sdk-solana";
14-
import { nttAutomaticRoute } from "../src/automatic.js";
15-
import { nttManualRoute } from "../src/manual.js";
14+
import { nttAutomaticRoute, NttAutomaticRoute } from "../src/automatic.js";
15+
import { nttManualRoute, NttManualRoute } from "../src/manual.js";
1616
import { NttRoute } from "../src/types.js";
1717

1818
const SOL_TOKEN = "EetppHswYvV1jjRWoQKC1hejdeBDHR9NNzNtCyRQfrrQ";
@@ -62,7 +62,7 @@ describe("Manual Route Tests", function () {
6262
const fromChain = wh.getChain("Solana");
6363
const toChain = wh.getChain("Sepolia");
6464

65-
let rt: routes.RouteConstructor;
65+
let rt: typeof NttManualRoute;
6666
it("Should create a Route Constructor given ntt config", function () {
6767
rt = nttManualRoute(conf);
6868
expect(rt).toBeTruthy();
@@ -160,7 +160,7 @@ describe("Automatic Route Tests", function () {
160160
const fromChain = wh.getChain("Solana");
161161
const toChain = wh.getChain("Sepolia");
162162

163-
let rt: routes.RouteConstructor;
163+
let rt: typeof NttAutomaticRoute;
164164
it("Should create a Route Constructor given ntt config", function () {
165165
rt = nttAutomaticRoute(conf);
166166
expect(rt).toBeTruthy();

0 commit comments

Comments
 (0)