From 4bbaddf304a605cf5bbbd547fb2cd23221cf25c4 Mon Sep 17 00:00:00 2001 From: George Kudrayvtsev Date: Mon, 18 Sep 2023 18:59:21 -0700 Subject: [PATCH] Bump env and sdk version to rc2 --- Cargo.lock | 109 ++++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 16 ++++---- 2 files changed, 94 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 633fbdf0f..d775ec058 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1855,7 +1855,7 @@ dependencies = [ "base64 0.21.3", "libc", "sha2 0.10.7", - "soroban-env-host", + "soroban-env-host 20.0.0-rc1", "thiserror", ] @@ -2505,7 +2505,7 @@ dependencies = [ "serde_json", "sha2 0.10.7", "shlex", - "soroban-env-host", + "soroban-env-host 20.0.0-rc1", "soroban-ledger-snapshot", "soroban-sdk", "soroban-spec", @@ -2532,6 +2532,21 @@ dependencies = [ name = "soroban-env-common" version = "20.0.0-rc1" source = "git+https://github.com/stellar/rs-soroban-env?rev=f19ef13363a1e0cbff7b100c0599a1d63dea88a6#f19ef13363a1e0cbff7b100c0599a1d63dea88a6" +dependencies = [ + "crate-git-revision 0.0.6", + "ethnum", + "num-derive", + "num-traits", + "soroban-env-macros 20.0.0-rc1", + "soroban-wasmi", + "static_assertions", + "stellar-xdr", +] + +[[package]] +name = "soroban-env-common" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c63bff68a15d79aca3a705ee6916a68db57b7e6#8c63bff68a15d79aca3a705ee6916a68db57b7e6" dependencies = [ "arbitrary", "crate-git-revision 0.0.6", @@ -2539,7 +2554,7 @@ dependencies = [ "num-derive", "num-traits", "serde", - "soroban-env-macros", + "soroban-env-macros 20.0.0-rc2", "soroban-wasmi", "static_assertions", "stellar-xdr", @@ -2547,10 +2562,10 @@ dependencies = [ [[package]] name = "soroban-env-guest" -version = "20.0.0-rc1" -source = "git+https://github.com/stellar/rs-soroban-env?rev=f19ef13363a1e0cbff7b100c0599a1d63dea88a6#f19ef13363a1e0cbff7b100c0599a1d63dea88a6" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c63bff68a15d79aca3a705ee6916a68db57b7e6#8c63bff68a15d79aca3a705ee6916a68db57b7e6" dependencies = [ - "soroban-env-common", + "soroban-env-common 20.0.0-rc2", "static_assertions", ] @@ -2570,8 +2585,31 @@ dependencies = [ "rand_chacha 0.3.1", "sha2 0.10.7", "sha3", - "soroban-env-common", - "soroban-native-sdk-macros", + "soroban-env-common 20.0.0-rc1", + "soroban-native-sdk-macros 20.0.0-rc1", + "soroban-wasmi", + "static_assertions", + "stellar-strkey 0.0.7 (git+https://github.com/stellar/rs-stellar-strkey?rev=e6ba45c60c16de28c7522586b80ed0150157df73)", +] + +[[package]] +name = "soroban-env-host" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c63bff68a15d79aca3a705ee6916a68db57b7e6#8c63bff68a15d79aca3a705ee6916a68db57b7e6" +dependencies = [ + "backtrace", + "ed25519-dalek 2.0.0", + "getrandom 0.2.10", + "k256", + "num-derive", + "num-integer", + "num-traits", + "rand 0.8.5", + "rand_chacha 0.3.1", + "sha2 0.10.7", + "sha3", + "soroban-env-common 20.0.0-rc2", + "soroban-native-sdk-macros 20.0.0-rc2", "soroban-wasmi", "static_assertions", "stellar-strkey 0.0.7 (git+https://github.com/stellar/rs-stellar-strkey?rev=e6ba45c60c16de28c7522586b80ed0150157df73)", @@ -2591,19 +2629,33 @@ dependencies = [ "syn 2.0.31", ] +[[package]] +name = "soroban-env-macros" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c63bff68a15d79aca3a705ee6916a68db57b7e6#8c63bff68a15d79aca3a705ee6916a68db57b7e6" +dependencies = [ + "itertools", + "proc-macro2", + "quote", + "serde", + "serde_json", + "stellar-xdr", + "syn 2.0.31", +] + [[package]] name = "soroban-hello" version = "20.0.0-rc2" [[package]] name = "soroban-ledger-snapshot" -version = "20.0.0-rc1" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=f743d6f9e49caa08924318907cd0588b60d7f187#f743d6f9e49caa08924318907cd0588b60d7f187" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=0992413f9b05e5bfb1f872bce99e89d9129b2e61#0992413f9b05e5bfb1f872bce99e89d9129b2e61" dependencies = [ "serde", "serde_json", - "soroban-env-common", - "soroban-env-host", + "soroban-env-common 20.0.0-rc2", + "soroban-env-host 20.0.0-rc2", "thiserror", ] @@ -2618,10 +2670,21 @@ dependencies = [ "syn 2.0.31", ] +[[package]] +name = "soroban-native-sdk-macros" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c63bff68a15d79aca3a705ee6916a68db57b7e6#8c63bff68a15d79aca3a705ee6916a68db57b7e6" +dependencies = [ + "itertools", + "proc-macro2", + "quote", + "syn 2.0.31", +] + [[package]] name = "soroban-sdk" -version = "20.0.0-rc1" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=f743d6f9e49caa08924318907cd0588b60d7f187#f743d6f9e49caa08924318907cd0588b60d7f187" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=0992413f9b05e5bfb1f872bce99e89d9129b2e61#0992413f9b05e5bfb1f872bce99e89d9129b2e61" dependencies = [ "arbitrary", "bytes-lit", @@ -2629,7 +2692,7 @@ dependencies = [ "ed25519-dalek 2.0.0", "rand 0.8.5", "soroban-env-guest", - "soroban-env-host", + "soroban-env-host 20.0.0-rc2", "soroban-ledger-snapshot", "soroban-sdk-macros", "stellar-strkey 0.0.7 (git+https://github.com/stellar/rs-stellar-strkey?rev=e6ba45c60c16de28c7522586b80ed0150157df73)", @@ -2637,8 +2700,8 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" -version = "20.0.0-rc1" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=f743d6f9e49caa08924318907cd0588b60d7f187#f743d6f9e49caa08924318907cd0588b60d7f187" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=0992413f9b05e5bfb1f872bce99e89d9129b2e61#0992413f9b05e5bfb1f872bce99e89d9129b2e61" dependencies = [ "crate-git-revision 0.0.6", "darling", @@ -2647,7 +2710,7 @@ dependencies = [ "quote", "rustc_version", "sha2 0.10.7", - "soroban-env-common", + "soroban-env-common 20.0.0-rc2", "soroban-spec", "soroban-spec-rust", "stellar-xdr", @@ -2656,8 +2719,8 @@ dependencies = [ [[package]] name = "soroban-spec" -version = "20.0.0-rc1" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=f743d6f9e49caa08924318907cd0588b60d7f187#f743d6f9e49caa08924318907cd0588b60d7f187" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=0992413f9b05e5bfb1f872bce99e89d9129b2e61#0992413f9b05e5bfb1f872bce99e89d9129b2e61" dependencies = [ "base64 0.13.1", "stellar-xdr", @@ -2681,8 +2744,8 @@ dependencies = [ [[package]] name = "soroban-spec-rust" -version = "20.0.0-rc1" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=f743d6f9e49caa08924318907cd0588b60d7f187#f743d6f9e49caa08924318907cd0588b60d7f187" +version = "20.0.0-rc2" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=0992413f9b05e5bfb1f872bce99e89d9129b2e61#0992413f9b05e5bfb1f872bce99e89d9129b2e61" dependencies = [ "prettyplease", "proc-macro2", @@ -2745,7 +2808,7 @@ dependencies = [ "serde_json", "sha2 0.10.7", "soroban-cli", - "soroban-env-host", + "soroban-env-host 20.0.0-rc1", "soroban-ledger-snapshot", "soroban-sdk", "soroban-spec", diff --git a/Cargo.toml b/Cargo.toml index 108317a69..0723978f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,15 +19,15 @@ git = "https://github.com/stellar/rs-soroban-env" rev = "f19ef13363a1e0cbff7b100c0599a1d63dea88a6" [workspace.dependencies.soroban-spec] -version = "20.0.0-rc1" +version = "20.0.0-rc2" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "f743d6f9e49caa08924318907cd0588b60d7f187" +rev = "0992413f9b05e5bfb1f872bce99e89d9129b2e61" # path = "../rs-soroban-sdk/soroban-spec" [workspace.dependencies.soroban-spec-rust] -version = "20.0.0-rc1" +version = "20.0.0-rc2" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "f743d6f9e49caa08924318907cd0588b60d7f187" +rev = "0992413f9b05e5bfb1f872bce99e89d9129b2e61" # path = "../rs-soroban-sdk/soroban-spec-rust" [workspace.dependencies.soroban-spec-json] @@ -43,14 +43,14 @@ version = "20.0.0-rc2" path = "./cmd/crates/soroban-spec-tools" [workspace.dependencies.soroban-sdk] -version = "20.0.0-rc1" +version = "20.0.0-rc2" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "f743d6f9e49caa08924318907cd0588b60d7f187" +rev = "0992413f9b05e5bfb1f872bce99e89d9129b2e61" [workspace.dependencies.soroban-ledger-snapshot] -version = "20.0.0-rc1" +version = "20.0.0-rc2" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "f743d6f9e49caa08924318907cd0588b60d7f187" +rev = "0992413f9b05e5bfb1f872bce99e89d9129b2e61" [workspace.dependencies.soroban-cli] version = "20.0.0-rc2"