Skip to content

Commit ed981b6

Browse files
committed
Merge remote-tracking branch 'origin/v2.0-dev' into fix/sdk-invalid-quorum
2 parents 20a836b + 3316b47 commit ed981b6

File tree

956 files changed

+50839
-32763
lines changed

Some content is hidden

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

956 files changed

+50839
-32763
lines changed

.cargo/config-test-sdk-data.toml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[target.aarch64-unknown-linux-musl]
2+
rustflags = ["-C", "target-feature=-crt-static"]
3+
4+
[target.x86_64-unknown-linux-musl]
5+
rustflags = [
6+
"-C",
7+
"target-feature=-crt-static",
8+
"-C",
9+
"target-cpu=x86-64",
10+
]
11+
12+
[target.x86_64-unknown-linux-gnu]
13+
rustflags = [
14+
"-C",
15+
"target-feature=-crt-static",
16+
"-C",
17+
"target-cpu=x86-64",
18+
]
19+
20+
[target.aarch64-unknown-linux-gnu]
21+
linker = "aarch64-linux-gnu-gcc"
22+
23+
[target.wasm32-unknown-unknown]
24+
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
25+
26+
[target.'cfg(all())']
27+
rustflags = ["--cfg", "tokio_unstable", '--cfg', 'create_sdk_test_data']

.cargo/config.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
# TODO: We shouldn't go with tokio_unstable to production
2-
31
[target.aarch64-unknown-linux-musl]
4-
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tokio_unstable"]
2+
rustflags = ["-C", "target-feature=-crt-static"]
53

64
[target.x86_64-unknown-linux-musl]
75
rustflags = [
86
"-C",
97
"target-feature=-crt-static",
10-
"--cfg",
11-
"tokio_unstable",
128
"-C",
139
"target-cpu=x86-64",
1410
]
@@ -17,8 +13,6 @@ rustflags = [
1713
rustflags = [
1814
"-C",
1915
"target-feature=-crt-static",
20-
"--cfg",
21-
"tokio_unstable",
2216
"-C",
2317
"target-cpu=x86-64",
2418
]
@@ -29,5 +23,5 @@ linker = "aarch64-linux-gnu-gcc"
2923
[target.wasm32-unknown-unknown]
3024
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
3125

32-
[build]
26+
[target.'cfg(all())']
3327
rustflags = ["--cfg", "tokio_unstable"]

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN set -ex; \
6666
rm /tmp/cargo-binstall; \
6767
cargo binstall -V
6868
69-
RUN cargo binstall [email protected].99 --locked \
69+
RUN cargo binstall [email protected].100 --locked \
7070
--no-discover-github-token \
7171
--disable-telemetry \
7272
--no-track \

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
7171

7272
- name: Install wasm-bindgen-cli
73-
run: cargo binstall [email protected].99
73+
run: cargo binstall [email protected].100
7474
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
7575

7676
- name: Install Binaryen

.github/workflows/tests-build-js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
5151

5252
- name: Install wasm-bindgen-cli
53-
run: cargo binstall [email protected].99
53+
run: cargo binstall [email protected].100
5454
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
5555

5656
- name: Install Binaryen

.github/workflows/tests-rs-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
check_each_feature:
206206
name: Check each feature
207207
runs-on: ubuntu-24.04
208-
timeout-minutes: 10
208+
timeout-minutes: 15
209209
if: ${{ inputs.check-each-feature }}
210210
steps:
211211
- name: Check out repo

.pnp.cjs

Lines changed: 1046 additions & 1084 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-39.2 KB
Binary file not shown.
41.3 KB
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)