From b0fd707d1ae8a53595e22fcef634f6a944f82cb7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 6 Feb 2024 00:27:41 +0000 Subject: [PATCH 1/7] Bump version to 20.3.1 --- Cargo.lock | 48 ++++++++++++++++++++++++------------------------ Cargo.toml | 14 +++++++------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a4e284319..c53b89f98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1172,7 +1172,7 @@ dependencies = [ [[package]] name = "soroban-ledger-snapshot" -version = "20.3.0" +version = "20.3.1" dependencies = [ "pretty_assertions", "serde", @@ -1185,7 +1185,7 @@ dependencies = [ [[package]] name = "soroban-sdk" -version = "20.3.0" +version = "20.3.1" dependencies = [ "arbitrary", "bytes-lit", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" -version = "20.3.0" +version = "20.3.1" dependencies = [ "crate-git-revision", "darling", @@ -1226,7 +1226,7 @@ dependencies = [ [[package]] name = "soroban-spec" -version = "20.3.0" +version = "20.3.1" dependencies = [ "base64 0.13.1", "pretty_assertions", @@ -1237,7 +1237,7 @@ dependencies = [ [[package]] name = "soroban-spec-rust" -version = "20.3.0" +version = "20.3.1" dependencies = [ "pretty_assertions", "prettyplease", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "soroban-token-sdk" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] @@ -1356,119 +1356,119 @@ dependencies = [ [[package]] name = "test_add_i128" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_add_u128" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_add_u64" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_alloc" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_auth" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_contract_data" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_empty" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_empty2" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_errors" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_events" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_fuzz" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_import_contract" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_invoke_contract" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_logging" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_multiimpl" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_udt" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_workspace_contract" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", "test_workspace_lib", @@ -1476,7 +1476,7 @@ dependencies = [ [[package]] name = "test_workspace_lib" -version = "20.3.0" +version = "20.3.1" dependencies = [ "soroban-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index 5a19af536..e464b3eb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,16 +29,16 @@ members = [ ] [workspace.package] -version = "20.3.0" +version = "20.3.1" rust-version = "1.74.0" [workspace.dependencies] -soroban-sdk = { version = "20.3.0", path = "soroban-sdk" } -soroban-sdk-macros = { version = "20.3.0", path = "soroban-sdk-macros" } -soroban-spec = { version = "20.3.0", path = "soroban-spec" } -soroban-spec-rust = { version = "20.3.0", path = "soroban-spec-rust" } -soroban-ledger-snapshot = { version = "20.3.0", path = "soroban-ledger-snapshot" } -soroban-token-sdk = { version = "20.3.0", path = "soroban-token-sdk" } +soroban-sdk = { version = "20.3.1", path = "soroban-sdk" } +soroban-sdk-macros = { version = "20.3.1", path = "soroban-sdk-macros" } +soroban-spec = { version = "20.3.1", path = "soroban-spec" } +soroban-spec-rust = { version = "20.3.1", path = "soroban-spec-rust" } +soroban-ledger-snapshot = { version = "20.3.1", path = "soroban-ledger-snapshot" } +soroban-token-sdk = { version = "20.3.1", path = "soroban-token-sdk" } [workspace.dependencies.soroban-env-common] version = "=20.2.0" From b97d1dd513e29fe7810e2b29f4d42aef20c3dcc2 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 6 Feb 2024 12:18:14 +1000 Subject: [PATCH 2/7] change nightly version used --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3cbc1d8e6..a0b70e6d2 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,8 @@ CARGO_DOC_ARGS?=--open doc: fmt cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils - cargo +nightly doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) + # nightly-2024-02-05 introduced a problem with curve-dalek crate + cargo +nightly-2024-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) test: fmt build cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test From 4a7600cc897e11a2db29683c55e020093805d99b Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 6 Feb 2024 12:32:08 +1000 Subject: [PATCH 3/7] fix --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b15e9a5f4..c87828167 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -148,7 +148,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: stellar/actions/rust-cache@main - - run: rustup install nightly + # nightly-2024-02-05 introduced a problem with curve-dalek crate + - run: rustup install nightly-2024-02-03 - run: make doc readme: From fc2ee9bedc17d8d4e16ec74d1c841d0abdfd66ed Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 6 Feb 2024 12:35:42 +1000 Subject: [PATCH 4/7] make comments link to issue --- .github/workflows/rust.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c87828167..c94628973 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -148,7 +148,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: stellar/actions/rust-cache@main - # nightly-2024-02-05 introduced a problem with curve-dalek crate + # TODO: Upgrade to latest nightly after problem that was introduced in nightly-2024-02-05 (https://github.com/dalek-cryptography/curve25519-dalek/issues/618) is resolved. - run: rustup install nightly-2024-02-03 - run: make doc diff --git a/Makefile b/Makefile index a0b70e6d2..ab542aa02 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CARGO_DOC_ARGS?=--open doc: fmt cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils - # nightly-2024-02-05 introduced a problem with curve-dalek crate + # TODO: Upgrade to latest nightly after problem that was introduced in nightly-2024-02-05 (https://github.com/dalek-cryptography/curve25519-dalek/issues/618) is resolved. cargo +nightly-2024-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) test: fmt build From bd4b740a2a1b0a5265df53184402678464b49996 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 6 Feb 2024 17:36:54 +1000 Subject: [PATCH 5/7] fix --- .github/workflows/rust.yml | 2 +- Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c94628973..29bf5fe2f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -157,7 +157,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: stellar/actions/rust-cache@main - - run: rustup install nightly + - run: rustup install nightly-2024-02-03 - run: make readme - run: git add -N . && git diff HEAD --exit-code diff --git a/Makefile b/Makefile index ab542aa02..aa97b38b3 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ CARGO_DOC_ARGS?=--open doc: fmt cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils # TODO: Upgrade to latest nightly after problem that was introduced in nightly-2024-02-05 (https://github.com/dalek-cryptography/curve25519-dalek/issues/618) is resolved. - cargo +nightly-2024-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) + cargo +nightly-2014-02-03-2024-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) test: fmt build cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test @@ -24,11 +24,11 @@ check: build fmt cargo hack check --release --target wasm32-unknown-unknown build-fuzz: - cd tests/fuzz/fuzz && cargo +nightly fuzz check + cd tests/fuzz/fuzz && cargo +nightly-2014-02-03 fuzz check readme: cd soroban-sdk \ - && cargo +nightly rustdoc -- -Zunstable-options -wjson \ + && cargo +nightly-2014-02-03 rustdoc -- -Zunstable-options -wjson \ && cat ../target/doc/soroban_sdk.json \ | jq -r '.index[.root].docs' \ > README.md @@ -37,7 +37,7 @@ watch: cargo watch --clear --watch-when-idle --shell '$(MAKE)' watch-doc: - cargo +nightly watch --clear --watch-when-idle --shell '$(MAKE) doc CARGO_DOC_ARGS=' + cargo +nightly-2014-02-03 watch --clear --watch-when-idle --shell '$(MAKE) doc CARGO_DOC_ARGS=' fmt: cargo fmt --all From 5b4a16ca361129d92002a39c1944fa91eb55e8f9 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 6 Feb 2024 21:06:50 +1000 Subject: [PATCH 6/7] fix --- .github/workflows/rust.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 29bf5fe2f..0213f5e6d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -136,7 +136,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: stellar/actions/rust-cache@main - - run: rustup install nightly + - run: rustup install nightly-2024-02-03 - uses: stellar/binaries@v15 with: name: cargo-fuzz diff --git a/Makefile b/Makefile index aa97b38b3..ba5338a4b 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ CARGO_DOC_ARGS?=--open doc: fmt cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils # TODO: Upgrade to latest nightly after problem that was introduced in nightly-2024-02-05 (https://github.com/dalek-cryptography/curve25519-dalek/issues/618) is resolved. - cargo +nightly-2014-02-03-2024-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) + cargo +nightly-2014-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) test: fmt build cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test From 842bb44a78278a7d1db27ba4285612d633ee9b88 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 6 Feb 2024 21:29:53 +1000 Subject: [PATCH 7/7] fix --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ba5338a4b..ac75becc0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ CARGO_DOC_ARGS?=--open doc: fmt cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils # TODO: Upgrade to latest nightly after problem that was introduced in nightly-2024-02-05 (https://github.com/dalek-cryptography/curve25519-dalek/issues/618) is resolved. - cargo +nightly-2014-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) + cargo +nightly-2024-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS) test: fmt build cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test @@ -24,11 +24,11 @@ check: build fmt cargo hack check --release --target wasm32-unknown-unknown build-fuzz: - cd tests/fuzz/fuzz && cargo +nightly-2014-02-03 fuzz check + cd tests/fuzz/fuzz && cargo +nightly-2024-02-03 fuzz check readme: cd soroban-sdk \ - && cargo +nightly-2014-02-03 rustdoc -- -Zunstable-options -wjson \ + && cargo +nightly-2024-02-03 rustdoc -- -Zunstable-options -wjson \ && cat ../target/doc/soroban_sdk.json \ | jq -r '.index[.root].docs' \ > README.md @@ -37,7 +37,7 @@ watch: cargo watch --clear --watch-when-idle --shell '$(MAKE)' watch-doc: - cargo +nightly-2014-02-03 watch --clear --watch-when-idle --shell '$(MAKE) doc CARGO_DOC_ARGS=' + cargo +nightly-2024-02-03 watch --clear --watch-when-idle --shell '$(MAKE) doc CARGO_DOC_ARGS=' fmt: cargo fmt --all