From 8e62954e2e8d08156870ee3b1ffd56ace478fa74 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 26 Mar 2024 12:09:41 +0100 Subject: [PATCH 1/2] Bump soroban Rust dependencies --- Cargo.lock | 68 ++++++++++++++++++++++++++++++++---------------------- Cargo.toml | 26 ++++++++++----------- 2 files changed, 54 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c4e384e..d683e64a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1549,8 +1549,9 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "20.2.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "20.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc32c6e817f3ca269764ec0d7d14da6210b74a5bf14d4e745aa3ee860558900" dependencies = [ "itertools 0.11.0", "proc-macro2", @@ -1560,8 +1561,9 @@ dependencies = [ [[package]] name = "soroban-env-common" -version = "20.2.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "20.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c14e18d879c520ff82612eaae0590acaf6a7f3b977407e1abb1c9e31f94c7814" dependencies = [ "arbitrary", "crate-git-revision", @@ -1577,8 +1579,9 @@ dependencies = [ [[package]] name = "soroban-env-guest" -version = "20.2.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "20.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5122ca2abd5ebcc1e876a96b9b44f87ce0a0e06df8f7c09772ddb58b159b7454" dependencies = [ "soroban-env-common", "static_assertions", @@ -1586,8 +1589,9 @@ dependencies = [ [[package]] name = "soroban-env-host" -version = "20.2.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "20.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114a0fa0d0cc39d0be16b1ee35b6e5f4ee0592ddcf459bde69391c02b03cf520" dependencies = [ "backtrace", "curve25519-dalek", @@ -1612,8 +1616,9 @@ dependencies = [ [[package]] name = "soroban-env-macros" -version = "20.2.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "20.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13e3f8c86f812e0669e78fcb3eae40c385c6a9dd1a4886a1de733230b4fcf27" dependencies = [ "itertools 0.11.0", "proc-macro2", @@ -1626,8 +1631,9 @@ dependencies = [ [[package]] name = "soroban-ledger-snapshot" -version = "20.4.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" +version = "20.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a54708f44890e0546180db6b4f530e2a88d83b05a9b38a131caa21d005e25a" dependencies = [ "serde", "serde_json", @@ -1639,8 +1645,9 @@ dependencies = [ [[package]] name = "soroban-sdk" -version = "20.4.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" +version = "20.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fc8be9068dd4e0212d8b13ad61089ea87e69ac212c262914503a961c8dc3a3" dependencies = [ "bytes-lit", "rand", @@ -1655,8 +1662,9 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" -version = "20.4.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" +version = "20.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db20def4ead836663633f58d817d0ed8e1af052c9650a04adf730525af85b964" dependencies = [ "crate-git-revision", "darling", @@ -1674,8 +1682,9 @@ dependencies = [ [[package]] name = "soroban-simulation" -version = "20.2.2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "20.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ddcf70d8b374a38ee47536add0c255ab72e9defced120be24cac55d69daaa4" dependencies = [ "anyhow", "rand", @@ -1686,8 +1695,9 @@ dependencies = [ [[package]] name = "soroban-spec" -version = "20.4.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" +version = "20.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eefeb5d373b43f6828145d00f0c5cc35e96db56a6671ae9614f84beb2711cab" dependencies = [ "base64 0.13.1", "stellar-xdr", @@ -1697,8 +1707,9 @@ dependencies = [ [[package]] name = "soroban-spec-rust" -version = "20.4.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" +version = "20.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3152bca4737ef734ac37fe47b225ee58765c9095970c481a18516a2b287c7a33" dependencies = [ "prettyplease", "proc-macro2", @@ -1713,7 +1724,8 @@ dependencies = [ [[package]] name = "soroban-wasmi" version = "0.31.1-soroban.20.0.1" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719" dependencies = [ "smallvec", "spin", @@ -1753,7 +1765,7 @@ dependencies = [ "ed25519-dalek", "ethnum", "hex", - "http 1.1.0", + "http 1.0.0", "itertools 0.10.5", "jsonrpsee-core", "jsonrpsee-http-client", @@ -2163,13 +2175,15 @@ checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasmi_arena" -version = "0.4.0" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" [[package]] name = "wasmi_core" version = "0.13.0" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" dependencies = [ "downcast-rs", "libm", diff --git a/Cargo.toml b/Cargo.toml index db874fb3..9f7c138f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,25 +12,25 @@ version = "20.3.3" rust-version = "1.74.0" [workspace.dependencies.soroban-env-host] -version = "=20.2.2" -git = "https://github.com/stellar/rs-soroban-env" -rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "=20.3.0" +# git = "https://github.com/stellar/rs-soroban-env" +# rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" # path = "../rs-soroban-env/soroban-env-host" [workspace.dependencies.soroban-simulation] -version = "=20.2.2" -git = "https://github.com/stellar/rs-soroban-env" -rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" +version = "=20.3.0" +# git = "https://github.com/stellar/rs-soroban-env" +# rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" # path = "../rs-soroban-env/soroban-simulation" [workspace.dependencies.soroban-spec] -version = "=20.4.0" -git = "https://github.com/stellar/rs-soroban-sdk" -rev = "89efc3c211d41f1ab143bed0a09cd6af353bb098" +version = "=20.5.0" +# git = "https://github.com/stellar/rs-soroban-sdk" +# rev = "89efc3c211d41f1ab143bed0a09cd6af353bb098" # path = "../rs-soroban-sdk/soroban-spec" [workspace.dependencies.soroban-spec-rust] -version = "=20.3.2" +version = "=20.5.0" # git = "https://github.com/stellar/rs-soroban-sdk" # rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" # path = "../rs-soroban-sdk/soroban-spec-rust" @@ -46,9 +46,9 @@ git = "https://github.com/stellar/soroban-cli" rev = "a59f5f421a27bab71472041fc619dd8b0d1cf902" [workspace.dependencies.soroban-sdk] -version = "=20.4.0" -git = "https://github.com/stellar/rs-soroban-sdk" -rev = "89efc3c211d41f1ab143bed0a09cd6af353bb098" +version = "=20.5.0" +# git = "https://github.com/stellar/rs-soroban-sdk" +# rev = "89efc3c211d41f1ab143bed0a09cd6af353bb098" [workspace.dependencies.soroban-token-sdk] version = "=20.3.2" From ab6f8162b98379796f0ad979764a9049789716fa Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:41:18 -0700 Subject: [PATCH 2/2] remove rust-analyze-compat The history of this build is we added it in some lower level repos that had complex workspace setups (e.g. env and sdk) and we kept breaking rust-analyzer which was destroying our IDE productivity. Things have changed, the sdk repo is not as complex as it was, the env still is. But in any case none of the problems we had would ever happen in this repo. --- .github/workflows/rust.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 695bbbd4..c38742b7 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -13,7 +13,7 @@ jobs: complete: if: always() - needs: [fmt, rust-analyzer-compat, build-and-test, publish-dry-run] + needs: [fmt, build-and-test, publish-dry-run] runs-on: ubuntu-latest steps: - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') @@ -26,15 +26,6 @@ jobs: - run: rustup update - run: cargo fmt --all --check - rust-analyzer-compat: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: rustup update - - run: rustup +nightly component add rust-analyzer - - name: Check if rust-analyzer encounters any errors parsing project - run: rustup run nightly rust-analyzer analysis-stats . 2>&1 | (! grep '^\[ERROR') - build-and-test: strategy: fail-fast: false