Skip to content

Commit 8c54e02

Browse files
AgusVelez5AgusVelez5
committed
Merge tag 'v0.3.1' into deployment-scripts
2 parents f1e8653 + 05b9e57 commit 8c54e02

Some content is hidden

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

70 files changed

+1836
-984
lines changed

‎.github/workflows/solana.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: solana
2+
23
on:
34
push:
45
branches:
@@ -8,7 +9,9 @@ on:
89
- 'solana/**'
910

1011
env:
12+
CARGO_TERM_COLOR: always
1113
RUSTC_VERSION: 1.75.0
14+
1215
jobs:
1316
cancel-previous-runs:
1417
runs-on: ubuntu-latest
@@ -17,6 +20,7 @@ jobs:
1720
uses: styfle/cancel-workflow-action@0.9.1
1821
with:
1922
access_token: ${{ github.token }}
23+
2024
make-cargo-test-all:
2125
name: make cargo-test-all
2226
runs-on: ubuntu-latest
@@ -26,10 +30,10 @@ jobs:
2630
uses: dtolnay/rust-toolchain@master
2731
with:
2832
toolchain: ${{ env.RUSTC_VERSION }}
29-
components: clippy, rustfmt
3033
- name: make cargo-test-all
3134
run: make cargo-test-all
3235
working-directory: ./solana
36+
3337
make-lint:
3438
name: make lint
3539
runs-on: ubuntu-latest
@@ -43,6 +47,7 @@ jobs:
4347
- name: make lint
4448
run: make lint
4549
working-directory: ./solana
50+
4651
make-check-idl:
4752
name: make check-idl
4853
runs-on: ubuntu-latest
@@ -51,14 +56,15 @@ jobs:
5156
- uses: metadaoproject/setup-anchor@v2
5257
with:
5358
node-version: "20.11.0"
54-
solana-cli-version: "1.18.11"
55-
anchor-version: "0.30.0"
59+
solana-cli-version: "1.18.15"
60+
anchor-version: "0.30.1"
5661
- name: Set default Rust toolchain
5762
run: rustup default stable
5863
working-directory: ./solana
5964
- name: make check-idl
6065
run: make check-idl
6166
working-directory: ./solana
67+
6268
make-anchor-test:
6369
name: make anchor-test
6470
runs-on: ubuntu-latest
@@ -71,14 +77,15 @@ jobs:
7177
- uses: metadaoproject/setup-anchor@v2
7278
with:
7379
node-version: "20.11.0"
74-
solana-cli-version: "1.18.11"
75-
anchor-version: "0.30.0"
80+
solana-cli-version: "1.18.15"
81+
anchor-version: "0.30.1"
7682
- name: Set default Rust toolchain
7783
run: rustup default stable
7884
working-directory: ./solana
7985
- name: make anchor-test
8086
run: make anchor-test
8187
working-directory: ./solana
88+
8289
make-anchor-test-upgrade:
8390
name: make anchor-test-upgrade
8491
runs-on: ubuntu-latest
@@ -91,8 +98,8 @@ jobs:
9198
- uses: metadaoproject/setup-anchor@v2
9299
with:
93100
node-version: "20.11.0"
94-
solana-cli-version: "1.18.11"
95-
anchor-version: "0.30.0"
101+
solana-cli-version: "1.18.15"
102+
anchor-version: "0.30.1"
96103
- name: Set default Rust toolchain
97104
run: rustup default stable
98105
working-directory: ./solana

‎.github/workflows/universal-rs.yml

+66-54
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,76 @@
11
name: universal-rs
22

33
on:
4-
push:
5-
branches: [main]
6-
pull_request:
7-
paths:
8-
- 'universal/**'
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
paths:
9+
- 'universal/**'
910

1011
env:
11-
CARGO_TERM_COLOR: always
12+
CARGO_TERM_COLOR: always
13+
RUSTC_VERSION: 1.75.0
1214

1315
jobs:
14-
test:
15-
name: test ${{ matrix.rust }}
16-
runs-on: ubuntu-latest
17-
timeout-minutes: 30
18-
strategy:
19-
fail-fast: false
20-
matrix:
21-
rust: ["stable", "beta", "nightly", "1.75"] # MSRV
22-
steps:
23-
- uses: actions/checkout@v3
24-
- uses: dtolnay/rust-toolchain@master
25-
with:
26-
toolchain: ${{ matrix.rust }}
27-
- uses: Swatinem/rust-cache@v2
28-
- name: test
29-
run: cd universal/rs && cargo test --workspace --all-features
16+
test:
17+
name: test
18+
runs-on: ubuntu-latest
19+
timeout-minutes: 30
20+
strategy:
21+
fail-fast: false
22+
steps:
23+
- uses: actions/checkout@v4
24+
- name: Install toolchain
25+
uses: dtolnay/rust-toolchain@master
26+
with:
27+
toolchain: ${{ env.RUSTC_VERSION }}
28+
- name: test
29+
run: cargo test --workspace --all-features
30+
working-directory: ./universal/rs
3031

31-
clippy:
32-
name: clippy
33-
runs-on: ubuntu-latest
34-
timeout-minutes: 30
35-
steps:
36-
- uses: actions/checkout@v3
37-
- uses: dtolnay/rust-toolchain@clippy
38-
- run: cd universal/rs && cargo clippy --workspace --all-targets
39-
env:
40-
RUSTFLAGS: -Dwarnings
32+
clippy:
33+
name: clippy
34+
runs-on: ubuntu-latest
35+
timeout-minutes: 30
36+
steps:
37+
- uses: actions/checkout@v4
38+
- name: Install toolchain
39+
uses: dtolnay/rust-toolchain@master
40+
with:
41+
toolchain: ${{ env.RUSTC_VERSION }}
42+
components: clippy
43+
- run: cargo clippy --workspace --all-targets
44+
working-directory: ./universal/rs
45+
env:
46+
RUSTFLAGS: -Dwarnings
4147

42-
docs:
43-
name: docs
44-
runs-on: ubuntu-latest
45-
timeout-minutes: 30
46-
steps:
47-
- uses: actions/checkout@v3
48-
- uses: dtolnay/rust-toolchain@nightly
49-
with:
50-
components: rust-docs
51-
- run: cd universal/rs && cargo doc --workspace --no-deps --document-private-items
52-
env:
53-
RUSTDOCFLAGS: "--cfg docsrs -D warnings"
48+
docs:
49+
name: docs
50+
runs-on: ubuntu-latest
51+
timeout-minutes: 30
52+
steps:
53+
- uses: actions/checkout@v4
54+
- name: Install toolchain
55+
uses: dtolnay/rust-toolchain@master
56+
with:
57+
toolchain: ${{ env.RUSTC_VERSION }}
58+
components: rust-docs
59+
- run: cargo doc --workspace --no-deps --document-private-items
60+
working-directory: ./universal/rs
61+
env:
62+
RUSTDOCFLAGS: "--cfg docsrs -D warnings"
5463

55-
fmt:
56-
name: fmt
57-
runs-on: ubuntu-latest
58-
timeout-minutes: 30
59-
steps:
60-
- uses: actions/checkout@v3
61-
- uses: dtolnay/rust-toolchain@nightly
62-
with:
63-
components: rustfmt
64-
- run: cd universal/rs && cargo fmt --all --check
64+
fmt:
65+
name: fmt
66+
runs-on: ubuntu-latest
67+
timeout-minutes: 30
68+
steps:
69+
- uses: actions/checkout@v4
70+
- name: Install toolchain
71+
uses: dtolnay/rust-toolchain@master
72+
with:
73+
toolchain: ${{ env.RUSTC_VERSION }}
74+
components: rustfmt
75+
- run: cargo fmt --all --check
76+
working-directory: ./universal/rs

‎evm/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@
3030
}
3131
},
3232
"dependencies": {
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",
3633
"@wormhole-foundation/example-liquidity-layer-definitions": "0.0.1",
37-
"ethers": "^5.7.2"
34+
"@wormhole-foundation/sdk-base": "^0.10.9",
35+
"@wormhole-foundation/sdk-definitions": "^0.10.9",
36+
"@wormhole-foundation/sdk-evm": "^0.10.9"
3837
},
3938
"devDependencies": {
40-
"envfile": "^7.1.0",
4139
"@typechain/ethers-v5": "^10.2.0",
4240
"@types/chai": "^4.3.4",
4341
"@types/mocha": "^10.0.1",
4442
"@types/node": "^18.14.5",
4543
"chai": "^4.3.7",
4644
"dotenv": "^16.3.1",
45+
"envfile": "^7.1.0",
46+
"ethers": "^5.7.2",
4747
"mocha": "^10.0.0",
4848
"prettier": "^2.8.7",
4949
"prettier-plugin-solidity": "^1.1.3",

‎evm/ts/tests/01__registration.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import "@wormhole-foundation/sdk-evm/address";
2+
13
import { ethers } from "ethers";
24
import { ITokenRouter__factory, IMatchingEngine__factory } from "../src/types";
35
import {
@@ -13,7 +15,6 @@ import {
1315
import { expect } from "chai";
1416
import { toChainId } from "@wormhole-foundation/sdk-base";
1517
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
16-
import "@wormhole-foundation/sdk-evm";
1718

1819
const CHAIN_PATHWAYS: ValidNetwork[] = ["Ethereum", "Avalanche", "Base"];
1920

‎evm/ts/tests/02__configuration.ts

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
} from "../src/testing";
1212
import { expect } from "chai";
1313
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
14-
import "@wormhole-foundation/sdk-evm";
1514

1615
const CHAIN_PATHWAYS: ValidNetwork[] = ["Ethereum", "Avalanche", "Base"];
1716

‎evm/ts/tests/04__fastMarketOrder.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import "@wormhole-foundation/sdk-evm/address";
2+
13
import { expect } from "chai";
24
import { ethers } from "ethers";
35
import {
@@ -30,7 +32,6 @@ import {
3032

3133
import { toChainId } from "@wormhole-foundation/sdk-base";
3234
import { deserialize, keccak256, toUniversal } from "@wormhole-foundation/sdk-definitions";
33-
import "@wormhole-foundation/sdk-evm";
3435

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

0 commit comments

Comments
 (0)