From 969687879433225d0143269d4b8930ae4396b407 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 6 Feb 2024 13:38:09 -0800 Subject: [PATCH] Merge pull request #1190 from stellar/release/v20.3.0 Bump version to 20.3.0 (cherry picked from commit dea94a98f4323534a1c4efa9db53be44091fbd52) --- Cargo.lock | 281 ++++-------------- Cargo.toml | 42 +-- cmd/crates/soroban-test/Cargo.toml | 2 +- .../tests/fixtures/hello/Cargo.toml | 2 +- .../test-wasms/custom_type/Cargo.toml | 2 +- .../test-wasms/hello_world/Cargo.toml | 2 +- cmd/soroban-rpc/lib/preflight/Cargo.toml | 2 +- 7 files changed, 79 insertions(+), 254 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d179ecd2b..c6940a563 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2780,12 +2780,12 @@ dependencies = [ [[package]] name = "preflight" -version = "20.2.0" +version = "20.3.0" dependencies = [ "base64 0.21.7", "libc", "sha2 0.10.8", - "soroban-env-host 20.2.0", + "soroban-env-host", "soroban-simulation", ] @@ -3400,17 +3400,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "soroban-builtin-sdk-macros" -version = "20.2.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e#1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" -dependencies = [ - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "soroban-builtin-sdk-macros" version = "20.2.1" @@ -3461,12 +3450,12 @@ dependencies = [ "serde_json", "sha2 0.10.8", "shlex", - "soroban-env-host 20.2.1", - "soroban-ledger-snapshot 20.3.1", - "soroban-sdk 20.3.1", - "soroban-spec 20.3.1", + "soroban-env-host", + "soroban-ledger-snapshot", + "soroban-sdk", + "soroban-spec", "soroban-spec-json", - "soroban-spec-rust 20.3.1", + "soroban-spec-rust", "soroban-spec-tools", "soroban-spec-typescript", "stellar-strkey 0.0.7", @@ -3486,83 +3475,32 @@ dependencies = [ "which", ] -[[package]] -name = "soroban-env-common" -version = "20.2.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e#1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" -dependencies = [ - "arbitrary", - "crate-git-revision 0.0.6", - "ethnum", - "num-derive", - "num-traits", - "serde", - "soroban-env-macros 20.2.0", - "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", - "static_assertions", - "stellar-xdr", -] - [[package]] name = "soroban-env-common" version = "20.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d609330abbcc2d7fe185304de0c10ef1a95e64eb8effb6ee4faeea97668e0a" dependencies = [ + "arbitrary", "crate-git-revision 0.0.6", "ethnum", "num-derive", "num-traits", "serde", - "soroban-env-macros 20.2.1", - "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "soroban-env-macros", + "soroban-wasmi", "static_assertions", "stellar-xdr", ] -[[package]] -name = "soroban-env-guest" -version = "20.2.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e#1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" -dependencies = [ - "soroban-env-common 20.2.0", - "static_assertions", -] - [[package]] name = "soroban-env-guest" version = "20.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "280d73550935d482534abf3f897e89b40461b3401c3209163b3d0038f0b8b201" dependencies = [ - "soroban-env-common 20.2.1", - "static_assertions", -] - -[[package]] -name = "soroban-env-host" -version = "20.2.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e#1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" -dependencies = [ - "backtrace", - "curve25519-dalek 4.1.1", - "ed25519-dalek 2.0.0", - "getrandom", - "hex-literal", - "hmac 0.12.1", - "k256", - "num-derive", - "num-integer", - "num-traits", - "rand", - "rand_chacha", - "sha2 0.10.8", - "sha3", - "soroban-builtin-sdk-macros 20.2.0", - "soroban-env-common 20.2.0", - "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", + "soroban-env-common", "static_assertions", - "stellar-strkey 0.0.8", ] [[package]] @@ -3571,6 +3509,7 @@ version = "20.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd99f4e075f62e0faec118c568fbc70373793fb921148115d5f3f2563945c02d" dependencies = [ + "backtrace", "curve25519-dalek 4.1.1", "ed25519-dalek 2.0.0", "getrandom", @@ -3584,27 +3523,13 @@ dependencies = [ "rand_chacha", "sha2 0.10.8", "sha3", - "soroban-builtin-sdk-macros 20.2.1", - "soroban-env-common 20.2.1", - "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "soroban-builtin-sdk-macros", + "soroban-env-common", + "soroban-wasmi", "static_assertions", "stellar-strkey 0.0.8", ] -[[package]] -name = "soroban-env-macros" -version = "20.2.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e#1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" -dependencies = [ - "itertools 0.11.0", - "proc-macro2", - "quote", - "serde", - "serde_json", - "stellar-xdr", - "syn", -] - [[package]] name = "soroban-env-macros" version = "20.2.1" @@ -3622,20 +3547,7 @@ dependencies = [ [[package]] name = "soroban-hello" -version = "20.2.0" - -[[package]] -name = "soroban-ledger-snapshot" version = "20.3.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de#4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" -dependencies = [ - "serde", - "serde_json", - "serde_with", - "soroban-env-common 20.2.0", - "soroban-env-host 20.2.0", - "thiserror", -] [[package]] name = "soroban-ledger-snapshot" @@ -3646,66 +3558,31 @@ dependencies = [ "serde", "serde_json", "serde_with", - "soroban-env-common 20.2.1", - "soroban-env-host 20.2.1", + "soroban-env-common", + "soroban-env-host", "thiserror", ] -[[package]] -name = "soroban-sdk" -version = "20.3.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de#4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" -dependencies = [ - "arbitrary", - "bytes-lit", - "ctor", - "ed25519-dalek 2.0.0", - "rand", - "serde", - "serde_json", - "soroban-env-guest 20.2.0", - "soroban-env-host 20.2.0", - "soroban-ledger-snapshot 20.3.0", - "soroban-sdk-macros 20.3.0", - "stellar-strkey 0.0.8", -] - [[package]] name = "soroban-sdk" version = "20.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "842c20c8503b137f8a8a5981009eb1f5841b96516f1485d7e1bf9c02afb227d1" dependencies = [ + "arbitrary", "bytes-lit", + "ctor", + "ed25519-dalek 2.0.0", "rand", "serde", "serde_json", - "soroban-env-guest 20.2.1", - "soroban-env-host 20.2.1", - "soroban-ledger-snapshot 20.3.1", - "soroban-sdk-macros 20.3.1", + "soroban-env-guest", + "soroban-env-host", + "soroban-ledger-snapshot", + "soroban-sdk-macros", "stellar-strkey 0.0.8", ] -[[package]] -name = "soroban-sdk-macros" -version = "20.3.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de#4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" -dependencies = [ - "crate-git-revision 0.0.6", - "darling", - "itertools 0.11.0", - "proc-macro2", - "quote", - "rustc_version", - "sha2 0.10.8", - "soroban-env-common 20.2.0", - "soroban-spec 20.3.0", - "soroban-spec-rust 20.3.0", - "stellar-xdr", - "syn", -] - [[package]] name = "soroban-sdk-macros" version = "20.3.1" @@ -3719,36 +3596,26 @@ dependencies = [ "quote", "rustc_version", "sha2 0.10.8", - "soroban-env-common 20.2.1", - "soroban-spec 20.3.1", - "soroban-spec-rust 20.3.1", + "soroban-env-common", + "soroban-spec", + "soroban-spec-rust", "stellar-xdr", "syn", ] [[package]] name = "soroban-simulation" -version = "20.2.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e#1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" +version = "20.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "210b093c6d08b8e85ef5f4e4a231d5fa25d1d2787d4fecd50e11040849f259ba" dependencies = [ "anyhow", "rand", - "soroban-env-host 20.2.0", + "soroban-env-host", "static_assertions", "thiserror", ] -[[package]] -name = "soroban-spec" -version = "20.3.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de#4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" -dependencies = [ - "base64 0.13.1", - "stellar-xdr", - "thiserror", - "wasmparser 0.88.0", -] - [[package]] name = "soroban-spec" version = "20.3.1" @@ -3770,26 +3637,11 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.9.9", - "soroban-spec 20.3.1", + "soroban-spec", "stellar-xdr", "thiserror", ] -[[package]] -name = "soroban-spec-rust" -version = "20.3.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de#4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" -dependencies = [ - "prettyplease", - "proc-macro2", - "quote", - "sha2 0.10.8", - "soroban-spec 20.3.0", - "stellar-xdr", - "syn", - "thiserror", -] - [[package]] name = "soroban-spec-rust" version = "20.3.1" @@ -3800,7 +3652,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "soroban-spec 20.3.1", + "soroban-spec", "stellar-xdr", "syn", "thiserror", @@ -3816,7 +3668,7 @@ dependencies = [ "hex", "itertools 0.10.5", "serde_json", - "soroban-spec 20.3.1", + "soroban-spec", "stellar-strkey 0.0.7", "stellar-xdr", "thiserror", @@ -3837,14 +3689,14 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.9.9", - "soroban-spec 20.3.1", + "soroban-spec", "stellar-xdr", "thiserror", ] [[package]] name = "soroban-test" -version = "20.2.0" +version = "20.3.0" dependencies = [ "assert_cmd", "assert_fs", @@ -3854,10 +3706,10 @@ dependencies = [ "serde_json", "sha2 0.10.8", "soroban-cli", - "soroban-env-host 20.2.0", - "soroban-ledger-snapshot 20.3.0", - "soroban-sdk 20.3.0", - "soroban-spec 20.3.0", + "soroban-env-host", + "soroban-ledger-snapshot", + "soroban-sdk", + "soroban-spec", "soroban-spec-tools", "stellar-strkey 0.0.7", "thiserror", @@ -3867,10 +3719,11 @@ dependencies = [ [[package]] name = "soroban-token-sdk" -version = "20.3.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de#4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" +version = "20.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "867bd2927e092f2bbf65d1e3cda9f89fa1d1eea935776416bf3ead47fccc82ef" dependencies = [ - "soroban-sdk 20.3.0", + "soroban-sdk", ] [[package]] @@ -3881,20 +3734,8 @@ checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719" dependencies = [ "smallvec", "spin", - "wasmi_arena 0.4.1", - "wasmi_core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmparser-nostd", -] - -[[package]] -name = "soroban-wasmi" -version = "0.31.1-soroban.20.0.1" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" -dependencies = [ - "smallvec", - "spin", - "wasmi_arena 0.4.0", - "wasmi_core 0.13.0 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", + "wasmi_arena", + "wasmi_core", "wasmparser-nostd", ] @@ -4061,30 +3902,30 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test_custom_types" -version = "20.2.0" +version = "20.3.0" dependencies = [ - "soroban-sdk 20.3.0", + "soroban-sdk", ] [[package]] name = "test_hello_world" -version = "20.2.0" +version = "20.3.0" dependencies = [ - "soroban-sdk 20.3.0", + "soroban-sdk", ] [[package]] name = "test_swap" version = "20.3.0" dependencies = [ - "soroban-sdk 20.3.0", + "soroban-sdk", ] [[package]] name = "test_token" version = "20.3.0" dependencies = [ - "soroban-sdk 20.3.0", + "soroban-sdk", "soroban-token-sdk", ] @@ -4092,7 +3933,7 @@ dependencies = [ name = "test_udt" version = "20.3.0" dependencies = [ - "soroban-sdk 20.3.0", + "soroban-sdk", ] [[package]] @@ -4609,11 +4450,6 @@ version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" -[[package]] -name = "wasmi_arena" -version = "0.4.0" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" - [[package]] name = "wasmi_arena" version = "0.4.1" @@ -4632,17 +4468,6 @@ dependencies = [ "paste", ] -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - [[package]] name = "wasmparser" version = "0.88.0" diff --git a/Cargo.toml b/Cargo.toml index ebc8457dc..11f7f2a6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,27 +14,27 @@ version = "20.3.0" rust-version = "1.74.0" [workspace.dependencies.soroban-env-host] -version = "=20.2.0" -git = "https://github.com/stellar/rs-soroban-env" -rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" +version = "=20.2.1" +# git = "https://github.com/stellar/rs-soroban-env" +# rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" # path = "../rs-soroban-env/soroban-env-host" [workspace.dependencies.soroban-simulation] -version = "=20.2.0" -git = "https://github.com/stellar/rs-soroban-env" -rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" +version = "=20.2.1" +# git = "https://github.com/stellar/rs-soroban-env" +# rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e" # path = "../rs-soroban-env/soroban-simulation" [workspace.dependencies.soroban-spec] -version = "=20.3.0" -git = "https://github.com/stellar/rs-soroban-sdk" -rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" +version = "=20.3.1" +# git = "https://github.com/stellar/rs-soroban-sdk" +# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" # path = "../rs-soroban-sdk/soroban-spec" [workspace.dependencies.soroban-spec-rust] -version = "=20.3.0" -git = "https://github.com/stellar/rs-soroban-sdk" -rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" +version = "=20.3.1" +# git = "https://github.com/stellar/rs-soroban-sdk" +# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" # path = "../rs-soroban-sdk/soroban-spec-rust" [workspace.dependencies.soroban-spec-json] @@ -53,19 +53,19 @@ git = "https://github.com/stellar/soroban-tools" rev = "a59f5f421a27bab71472041fc619dd8b0d1cf902" [workspace.dependencies.soroban-sdk] -version = "=20.3.0" -git = "https://github.com/stellar/rs-soroban-sdk" -rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" +version = "=20.3.1" +# git = "https://github.com/stellar/rs-soroban-sdk" +# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" [workspace.dependencies.soroban-token-sdk] -version = "=20.3.0" -git = "https://github.com/stellar/rs-soroban-sdk" -rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" +version = "=20.3.1" +# git = "https://github.com/stellar/rs-soroban-sdk" +# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" [workspace.dependencies.soroban-ledger-snapshot] -version = "=20.3.0" -git = "https://github.com/stellar/rs-soroban-sdk" -rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" +version = "=20.3.1" +# git = "https://github.com/stellar/rs-soroban-sdk" +# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" [workspace.dependencies.soroban-cli] version = "20.3.0" diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml index 649a37e57..786be1b35 100644 --- a/cmd/crates/soroban-test/Cargo.toml +++ b/cmd/crates/soroban-test/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test" authors = ["Stellar Development Foundation "] license = "Apache-2.0" readme = "README.md" -version = "20.2.0" +version = "20.3.0" edition = "2021" rust-version.workspace = true autobins = false diff --git a/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml index 01b80b0f6..faf33ea6a 100644 --- a/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml +++ b/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "soroban-hello" -version = "20.2.0" +version = "20.3.0" edition = "2021" publish = false diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml index 67df45b69..c9f237136 100644 --- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml +++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test_custom_types" -version = "20.2.0" +version = "20.3.0" authors = ["Stellar Development Foundation "] license = "Apache-2.0" edition = "2021" diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml index e5ced55fa..36652fd23 100644 --- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml +++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test_hello_world" -version = "20.2.0" +version = "20.3.0" authors = ["Stellar Development Foundation "] license = "Apache-2.0" edition = "2021" diff --git a/cmd/soroban-rpc/lib/preflight/Cargo.toml b/cmd/soroban-rpc/lib/preflight/Cargo.toml index 7b1f0e488..418f8c190 100644 --- a/cmd/soroban-rpc/lib/preflight/Cargo.toml +++ b/cmd/soroban-rpc/lib/preflight/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "preflight" -version = "20.2.0" +version = "20.3.0" publish = false [lib]