From 8056cfd6c10ff02ac52fc644bc34632fbad79a8e Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 16 Jan 2024 19:53:58 +0100 Subject: [PATCH] Bump SDK dependency --- Cargo.lock | 105 ++++++++++------------------------------------------- Cargo.toml | 10 ++--- 2 files changed, 24 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9786b2571..451235fa7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1912,7 +1912,7 @@ dependencies = [ "base64 0.21.5", "libc", "sha2 0.10.8", - "soroban-env-host 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4)", + "soroban-env-host", "soroban-simulation", ] @@ -2488,17 +2488,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "soroban-builtin-sdk-macros" -version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" -dependencies = [ - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.39", -] - [[package]] name = "soroban-cli" version = "20.2.0" @@ -2539,7 +2528,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "shlex", - "soroban-env-host 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4)", + "soroban-env-host", "soroban-ledger-snapshot", "soroban-sdk", "soroban-spec", @@ -2567,22 +2556,6 @@ dependencies = [ name = "soroban-env-common" version = "20.1.0" source = "git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4#36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4" -dependencies = [ - "arbitrary", - "crate-git-revision 0.0.6", - "ethnum", - "num-derive", - "num-traits", - "soroban-env-macros 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4)", - "soroban-wasmi", - "static_assertions", - "stellar-xdr", -] - -[[package]] -name = "soroban-env-common" -version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" dependencies = [ "arbitrary", "crate-git-revision 0.0.6", @@ -2590,7 +2563,7 @@ dependencies = [ "num-derive", "num-traits", "serde", - "soroban-env-macros 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", + "soroban-env-macros", "soroban-wasmi", "static_assertions", "stellar-xdr", @@ -2599,42 +2572,16 @@ dependencies = [ [[package]] name = "soroban-env-guest" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" -dependencies = [ - "soroban-env-common 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", - "static_assertions", -] - -[[package]] -name = "soroban-env-host" -version = "20.1.0" source = "git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4#36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4" 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.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4)", - "soroban-env-common 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4)", - "soroban-wasmi", + "soroban-env-common", "static_assertions", - "stellar-strkey 0.0.8", ] [[package]] name = "soroban-env-host" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" +source = "git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4#36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4" dependencies = [ "backtrace", "curve25519-dalek 4.1.1", @@ -2650,8 +2597,8 @@ dependencies = [ "rand_chacha", "sha2 0.10.8", "sha3", - "soroban-builtin-sdk-macros 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", - "soroban-env-common 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", + "soroban-builtin-sdk-macros", + "soroban-env-common", "soroban-wasmi", "static_assertions", "stellar-strkey 0.0.8", @@ -2671,20 +2618,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "soroban-env-macros" -version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf#c1b238b65bfd13666be4ac14e0e390c31b549caf" -dependencies = [ - "itertools 0.11.0", - "proc-macro2", - "quote", - "serde", - "serde_json", - "stellar-xdr", - "syn 2.0.39", -] - [[package]] name = "soroban-hello" version = "20.2.0" @@ -2692,20 +2625,20 @@ version = "20.2.0" [[package]] name = "soroban-ledger-snapshot" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=e6c2c900ab82b5f6eec48f69cb2cb519e19819cb#e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" dependencies = [ "serde", "serde_json", "serde_with", - "soroban-env-common 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", - "soroban-env-host 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", + "soroban-env-common", + "soroban-env-host", "thiserror", ] [[package]] name = "soroban-sdk" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=e6c2c900ab82b5f6eec48f69cb2cb519e19819cb#e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" dependencies = [ "arbitrary", "bytes-lit", @@ -2715,7 +2648,7 @@ dependencies = [ "serde", "serde_json", "soroban-env-guest", - "soroban-env-host 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", + "soroban-env-host", "soroban-ledger-snapshot", "soroban-sdk-macros", "stellar-strkey 0.0.8", @@ -2724,7 +2657,7 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=e6c2c900ab82b5f6eec48f69cb2cb519e19819cb#e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" dependencies = [ "crate-git-revision 0.0.6", "darling", @@ -2733,7 +2666,7 @@ dependencies = [ "quote", "rustc_version", "sha2 0.10.8", - "soroban-env-common 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=c1b238b65bfd13666be4ac14e0e390c31b549caf)", + "soroban-env-common", "soroban-spec", "soroban-spec-rust", "stellar-xdr", @@ -2747,7 +2680,7 @@ source = "git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a920 dependencies = [ "anyhow", "rand", - "soroban-env-host 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4)", + "soroban-env-host", "static_assertions", "thiserror", ] @@ -2755,7 +2688,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=e6c2c900ab82b5f6eec48f69cb2cb519e19819cb#e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" dependencies = [ "base64 0.13.1", "stellar-xdr", @@ -2780,7 +2713,7 @@ dependencies = [ [[package]] name = "soroban-spec-rust" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=e6c2c900ab82b5f6eec48f69cb2cb519e19819cb#e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" dependencies = [ "prettyplease", "proc-macro2", @@ -2843,7 +2776,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "soroban-cli", - "soroban-env-host 20.1.0 (git+https://github.com/stellar/rs-soroban-env?rev=36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4)", + "soroban-env-host", "soroban-ledger-snapshot", "soroban-sdk", "soroban-spec", @@ -2857,7 +2790,7 @@ dependencies = [ [[package]] name = "soroban-token-sdk" version = "20.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=811ce3da801c03a21d5fa80fda187c0f1012240f#811ce3da801c03a21d5fa80fda187c0f1012240f" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=e6c2c900ab82b5f6eec48f69cb2cb519e19819cb#e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" dependencies = [ "soroban-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index 7b64480fc..c88cd4abc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,13 +29,13 @@ rev = "36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4" [workspace.dependencies.soroban-spec] version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" +rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" # path = "../rs-soroban-sdk/soroban-spec" [workspace.dependencies.soroban-spec-rust] version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" +rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" # path = "../rs-soroban-sdk/soroban-spec-rust" [workspace.dependencies.soroban-spec-json] @@ -53,17 +53,17 @@ path = "./cmd/crates/soroban-spec-tools" [workspace.dependencies.soroban-sdk] version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" +rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" [workspace.dependencies.soroban-token-sdk] version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" +rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" [workspace.dependencies.soroban-ledger-snapshot] version = "=20.1.0" git = "https://github.com/stellar/rs-soroban-sdk" -rev = "811ce3da801c03a21d5fa80fda187c0f1012240f" +rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb" [workspace.dependencies.soroban-cli] version = "20.2.0"