From 0afd50bf4058384ed07817a9cc37d01101c5c426 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 5 Jan 2023 19:10:58 +0000 Subject: [PATCH 1/2] Bump version to 0.4.1 --- Cargo.lock | 36 ++++++++++++++++++------------------ Cargo.toml | 14 +++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41e01a4f5..93b4e7315 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -830,7 +830,7 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "soroban-auth" -version = "0.4.0" +version = "0.4.1" dependencies = [ "ed25519-dalek", "rand 0.7.3", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "soroban-ledger-snapshot" -version = "0.4.0" +version = "0.4.1" dependencies = [ "pretty_assertions", "serde", @@ -921,7 +921,7 @@ dependencies = [ [[package]] name = "soroban-sdk" -version = "0.4.0" +version = "0.4.1" dependencies = [ "bytes-lit", "ed25519-dalek", @@ -938,7 +938,7 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" -version = "0.4.0" +version = "0.4.1" dependencies = [ "darling", "itertools", @@ -953,7 +953,7 @@ dependencies = [ [[package]] name = "soroban-spec" -version = "0.4.0" +version = "0.4.1" dependencies = [ "base64", "darling", @@ -974,7 +974,7 @@ dependencies = [ [[package]] name = "soroban-token-spec" -version = "0.4.0" +version = "0.4.1" dependencies = [ "ed25519-dalek", "rand 0.7.3", @@ -1094,84 +1094,84 @@ dependencies = [ [[package]] name = "test_add_i128" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_add_u128" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_add_u64" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_contract_data" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_empty" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_empty2" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_errors" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_events" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_import_contract" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_invoke_contract" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_logging" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_udt" -version = "0.4.0" +version = "0.4.1" dependencies = [ "soroban-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index be4443a6a..2e047c536 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,15 +23,15 @@ members = [ ] [workspace.package] -version = "0.4.0" +version = "0.4.1" [workspace.dependencies] -soroban-sdk = { version = "0.4.0", path = "soroban-sdk" } -soroban-sdk-macros = { version = "0.4.0", path = "soroban-sdk-macros" } -soroban-auth = { version = "0.4.0", path = "soroban-auth" } -soroban-spec = { version = "0.4.0", path = "soroban-spec" } -soroban-ledger-snapshot = { version = "0.4.0", path = "soroban-ledger-snapshot" } -soroban-token-spec = { version = "0.4.0", path = "soroban-token-spec" } +soroban-sdk = { version = "0.4.1", path = "soroban-sdk" } +soroban-sdk-macros = { version = "0.4.1", path = "soroban-sdk-macros" } +soroban-auth = { version = "0.4.1", path = "soroban-auth" } +soroban-spec = { version = "0.4.1", path = "soroban-spec" } +soroban-ledger-snapshot = { version = "0.4.1", path = "soroban-ledger-snapshot" } +soroban-token-spec = { version = "0.4.1", path = "soroban-token-spec" } [workspace.dependencies.soroban-env-common] version = "0.0.12" From bedd335ed00ce5b1dec032c2a8aa1f88e1517714 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Thu, 5 Jan 2023 11:13:13 -0800 Subject: [PATCH 2/2] Remove extra char causing downstream conflict --- Cargo.lock | 21 +++++---------------- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93b4e7315..e39cb72c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -848,7 +848,7 @@ dependencies = [ "soroban-env-macros", "soroban-wasmi", "static_assertions", - "stellar-xdr 0.0.12 (git+https://github.com/stellar/rs-stellar-xdr?rev=154e07e)", + "stellar-xdr", ] [[package]] @@ -892,7 +892,7 @@ dependencies = [ "quote", "serde", "serde_json", - "stellar-xdr 0.0.12 (git+https://github.com/stellar/rs-stellar-xdr?rev=154e07e)", + "stellar-xdr", "syn", "thiserror", ] @@ -933,7 +933,7 @@ dependencies = [ "soroban-sdk-macros", "soroban-spec", "stellar-strkey", - "stellar-xdr 0.0.12 (git+https://github.com/stellar/rs-stellar-xdr?rev=154e07eb)", + "stellar-xdr", ] [[package]] @@ -947,7 +947,7 @@ dependencies = [ "sha2 0.10.6", "soroban-env-common", "soroban-spec", - "stellar-xdr 0.0.12 (git+https://github.com/stellar/rs-stellar-xdr?rev=154e07eb)", + "stellar-xdr", "syn", ] @@ -966,7 +966,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.6", - "stellar-xdr 0.0.12 (git+https://github.com/stellar/rs-stellar-xdr?rev=154e07eb)", + "stellar-xdr", "syn", "thiserror", "wasmparser", @@ -1037,17 +1037,6 @@ dependencies = [ "serde_with", ] -[[package]] -name = "stellar-xdr" -version = "0.0.12" -source = "git+https://github.com/stellar/rs-stellar-xdr?rev=154e07eb#154e07ebbb0ad307475fd665d5a0dcf169a9596f" -dependencies = [ - "crate-git-revision", - "hex", - "serde", - "serde_with", -] - [[package]] name = "strsim" version = "0.10.0" diff --git a/Cargo.toml b/Cargo.toml index 2e047c536..f4ecdbe9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ rev = "5e582a8b" [workspace.dependencies.stellar-xdr] version = "0.0.12" git = "https://github.com/stellar/rs-stellar-xdr" -rev = "154e07eb" +rev = "154e07e" default-features = false # [patch."https://github.com/stellar/rs-soroban-env"]