Skip to content

Commit 03b5180

Browse files
authored
Merge pull request iron-fish#5697 from iron-fish/staging
Staging to master v2.10.0
2 parents 6693fe5 + 22ddf34 commit 03b5180

File tree

130 files changed

+5545
-1029
lines changed

Some content is hidden

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

130 files changed

+5545
-1029
lines changed

.github/workflows/build-ironfish-rust-nodejs.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
settings:
17-
- host: ubuntu-latest
17+
- host: ubuntu-22.04
1818
target: x86_64-apple-darwin
1919

2020
- host: windows-latest
@@ -24,16 +24,16 @@ jobs:
2424
- host: macos-latest
2525
target: x86_64-unknown-linux-gnu
2626

27-
- host: ubuntu-latest
27+
- host: ubuntu-22.04
2828
target: x86_64-unknown-linux-musl
2929

30-
- host: ubuntu-latest
30+
- host: ubuntu-22.04
3131
target: aarch64-apple-darwin
3232

33-
- host: ubuntu-latest
33+
- host: ubuntu-22.04
3434
target: aarch64-unknown-linux-gnu
3535

36-
- host: ubuntu-latest
36+
- host: ubuntu-22.04
3737
target: aarch64-unknown-linux-musl
3838

3939
name: Build ${{ matrix.settings.target }}
@@ -94,19 +94,19 @@ jobs:
9494
- host: windows-latest
9595
target: x86_64-pc-windows-msvc
9696

97-
- host: ubuntu-latest
97+
- host: ubuntu-22.04
9898
target: x86_64-unknown-linux-gnu
9999
docker: node:18-slim
100100

101-
- host: ubuntu-latest
101+
- host: ubuntu-22.04
102102
target: x86_64-unknown-linux-musl
103103
docker: node:18-alpine
104104

105-
- host: ubuntu-latest
105+
- host: ubuntu-22.04
106106
target: aarch64-unknown-linux-gnu
107107
docker: ghcr.io/napi-rs/napi-rs/nodejs:aarch64-16
108108

109-
- host: ubuntu-latest
109+
- host: ubuntu-22.04
110110
target: aarch64-unknown-linux-musl
111111
docker: arm64v8/node:18-alpine
112112
platform: linux/arm64/v8

.github/workflows/check-pr-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
check:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- if: ${{ contains(github.event.pull_request.base.ref, 'master') && !contains(github.event.pull_request.title, 'master') }}
1414
run: |

.github/workflows/ci-regenerate-fixtures.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
test:
99
name: Test
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111

1212
steps:
1313
- name: Check out Git repository

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
lint:
1313
name: Lint
1414

15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-22.04
1616

1717
steps:
1818
- name: Check out Git repository
@@ -51,7 +51,7 @@ jobs:
5151
5252
test:
5353
name: Test
54-
runs-on: ubuntu-latest
54+
runs-on: ubuntu-22.04
5555
strategy:
5656
matrix:
5757
shard: [1/3, 2/3, 3/3]
@@ -96,7 +96,7 @@ jobs:
9696

9797
testslow:
9898
name: Slow Tests
99-
runs-on: ubuntu-latest
99+
runs-on: ubuntu-22.04
100100
strategy:
101101
matrix:
102102
shard: [1/2, 2/2]

.github/workflows/deploy-node-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ permissions:
3737
jobs:
3838
Deploy:
3939
name: Deploy
40-
runs-on: ubuntu-latest
40+
runs-on: ubuntu-22.04
4141

4242
steps:
4343
- name: Check out Git repository

.github/workflows/deploy-npm-ironfish-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Check out Git repository
1414
uses: actions/checkout@v4

.github/workflows/deploy-npm-ironfish-rust-nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
publish:
1515
name: Publish
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-22.04
1717
needs:
1818
- build-and-test
1919
defaults:

.github/workflows/deploy-npm-ironfish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
deploy:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-22.04
99
steps:
1010
- name: Check out Git repository
1111
uses: actions/checkout@v4

.github/workflows/push-version-to-api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
Push:
1616
name: Push Version to API
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-22.04
1818

1919
steps:
2020
- name: Check out Git repository

.github/workflows/rust_ci.yml

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- "ironfish-phase2/**"
77
- "ironfish-rust/**"
88
- "ironfish-rust-nodejs/**"
9+
- "ironfish-rust-wasm/**"
910
- "ironfish-zkp/**"
1011
- "rust-toolchain"
1112
- ".github/workflows/rust*"
@@ -20,6 +21,7 @@ on:
2021
- "ironfish-phase2/**"
2122
- "ironfish-rust/**"
2223
- "ironfish-rust-nodejs/**"
24+
- "ironfish-rust-wasm/**"
2325
- "ironfish-zkp/**"
2426
- "rust-toolchain"
2527
- ".github/workflows/rust*"
@@ -31,7 +33,7 @@ name: Rust CI
3133
jobs:
3234
rust_lint:
3335
name: Lint Rust
34-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-22.04
3537
steps:
3638
- uses: actions/checkout@v4
3739

@@ -48,17 +50,20 @@ jobs:
4850
- name: Check for license headers for ironfish-rust-nodejs
4951
run: ./ci/lintHeaders.sh ./ironfish-rust-nodejs/src *.rs
5052

51-
- name: "`cargo fmt` check on ironfish-rust"
53+
- name: Check for license headers for ironfish-rust-wasm
54+
run: ./ci/lintHeaders.sh ./ironfish-rust-wasm/src *.rs
55+
56+
- name: cargo fmt
5257
run: |
5358
cargo fmt --all -- --check
5459
55-
- name: "Clippy check on ironfish-rust"
60+
- name: cargo clippy
5661
run: |
5762
cargo clippy --all-targets --all-features -- -D warnings
5863
5964
cargo_check:
6065
name: Check Rust
61-
runs-on: ubuntu-latest
66+
runs-on: ubuntu-22.04
6267
steps:
6368
- uses: actions/checkout@v4
6469

@@ -78,7 +83,7 @@ jobs:
7883
7984
cargo_vet:
8085
name: Vet Dependencies
81-
runs-on: ubuntu-latest
86+
runs-on: ubuntu-22.04
8287
steps:
8388
- uses: actions/checkout@v4
8489

@@ -98,7 +103,7 @@ jobs:
98103
99104
ironfish_rust:
100105
name: Test ironfish-rust
101-
runs-on: ubuntu-latest
106+
runs-on: ubuntu-22.04
102107
strategy:
103108
matrix:
104109
shard: [1/2, 2/2]
@@ -137,7 +142,7 @@ jobs:
137142

138143
ironfish_rust_no_default_features:
139144
name: Test ironfish-rust (no default features)
140-
runs-on: ubuntu-latest
145+
runs-on: ubuntu-22.04
141146
strategy:
142147
matrix:
143148
shard: [1/2, 2/2]
@@ -163,7 +168,7 @@ jobs:
163168
164169
ironfish_rust_all_features:
165170
name: Test ironfish-rust (all features)
166-
runs-on: ubuntu-latest
171+
runs-on: ubuntu-22.04
167172
strategy:
168173
matrix:
169174
shard: [1/2, 2/2]
@@ -189,7 +194,7 @@ jobs:
189194
190195
ironfish_zkp:
191196
name: Test ironfish-zkp
192-
runs-on: ubuntu-latest
197+
runs-on: ubuntu-22.04
193198
steps:
194199
- uses: actions/checkout@v4
195200

@@ -220,3 +225,29 @@ jobs:
220225
with:
221226
token: ${{secrets.CODECOV_TOKEN}}
222227
flags: ironfish-zkp
228+
229+
ironfish_wasm:
230+
name: Test ironfish-rust-wasm
231+
runs-on: ubuntu-22.04
232+
steps:
233+
- uses: actions/checkout@v4
234+
235+
- name: Cache Rust
236+
uses: Swatinem/rust-cache@v2
237+
with:
238+
shared-key: wasm
239+
240+
- name: Install wasm-pack
241+
# use the installation method reccommended on
242+
# https://rustwasm.github.io/docs/wasm-bindgen/wasm-bindgen-test/continuous-integration.html#github-actions
243+
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
244+
245+
- name: Run tests in Firefox
246+
run: |
247+
cd ironfish-rust-wasm
248+
wasm-pack test --headless --firefox
249+
250+
- name: Run tests in Chrome
251+
run: |
252+
cd ironfish-rust-wasm
253+
wasm-pack test --headless --chrome

0 commit comments

Comments
 (0)