From 456f7dcd9e700114c3f6345c7a5cc1bdf08f7744 Mon Sep 17 00:00:00 2001 From: "Tyler.S" Date: Thu, 7 Dec 2023 13:36:21 -0800 Subject: [PATCH 1/3] Don't convert start ledger to string for events command (cherry picked from commit 5571538a335fbd52434c355ef1c4794c920edd58) (cherry picked from commit 3afe4dba7a507c4622b88fc58889ae8ac7d61c8b) --- cmd/soroban-cli/src/rpc/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/soroban-cli/src/rpc/mod.rs b/cmd/soroban-cli/src/rpc/mod.rs index e10b17910..29d2f53bb 100644 --- a/cmd/soroban-cli/src/rpc/mod.rs +++ b/cmd/soroban-cli/src/rpc/mod.rs @@ -822,7 +822,7 @@ soroban config identity fund {address} --helper-url "# let mut oparams = ObjectParams::new(); match start { - EventStart::Ledger(l) => oparams.insert("startLedger", l.to_string())?, + EventStart::Ledger(l) => oparams.insert("startLedger", l)?, EventStart::Cursor(c) => { pagination.insert("cursor".to_string(), c.into()); } From 3a52e83f831fe272dfca5ca155af7b9982ed9651 Mon Sep 17 00:00:00 2001 From: Shawn Reuland Date: Thu, 7 Dec 2023 15:05:19 -0800 Subject: [PATCH 2/3] converted event.ledger to integer type (cherry picked from commit 214a0df2329312026aecca125d25c8ce96b2b16f) (cherry picked from commit 9b3796bee2895a7a4c98acd8eddf70111572e89f) --- cmd/soroban-cli/src/rpc/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/soroban-cli/src/rpc/mod.rs b/cmd/soroban-cli/src/rpc/mod.rs index 29d2f53bb..57a7b1994 100644 --- a/cmd/soroban-cli/src/rpc/mod.rs +++ b/cmd/soroban-cli/src/rpc/mod.rs @@ -356,7 +356,7 @@ pub struct Event { #[serde(rename = "type")] pub event_type: String, - pub ledger: String, + pub ledger: u32, #[serde(rename = "ledgerClosedAt")] pub ledger_closed_at: String, From c0b84da707aacc81802be1caf96d008ddf0b337a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 8 Dec 2023 00:09:16 +0000 Subject: [PATCH 3/3] Bump version to 20.0.1 --- Cargo.lock | 20 +++++++++---------- Cargo.toml | 10 +++++----- 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-cli/Cargo.toml | 2 +- cmd/soroban-rpc/lib/preflight/Cargo.toml | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fdc8613b..70a9c6d17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1908,7 +1908,7 @@ dependencies = [ [[package]] name = "preflight" -version = "20.0.0" +version = "20.0.1" dependencies = [ "anyhow", "base64 0.21.5", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "soroban-cli" -version = "20.0.0" +version = "20.0.1" dependencies = [ "assert_cmd", "assert_fs", @@ -2622,7 +2622,7 @@ dependencies = [ [[package]] name = "soroban-hello" -version = "20.0.0" +version = "20.0.1" [[package]] name = "soroban-ledger-snapshot" @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "soroban-spec-json" -version = "20.0.0" +version = "20.0.1" dependencies = [ "pretty_assertions", "serde", @@ -2717,7 +2717,7 @@ dependencies = [ [[package]] name = "soroban-spec-tools" -version = "20.0.0" +version = "20.0.1" dependencies = [ "base64 0.21.5", "ethnum", @@ -2735,7 +2735,7 @@ dependencies = [ [[package]] name = "soroban-spec-typescript" -version = "20.0.0" +version = "20.0.1" dependencies = [ "base64 0.21.5", "heck", @@ -2756,7 +2756,7 @@ dependencies = [ [[package]] name = "soroban-test" -version = "20.0.0" +version = "20.0.1" dependencies = [ "assert_cmd", "assert_fs", @@ -2953,21 +2953,21 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test_custom_types" -version = "20.0.0" +version = "20.0.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_hello_world" -version = "20.0.0" +version = "20.0.1" dependencies = [ "soroban-sdk", ] [[package]] name = "test_udt" -version = "20.0.0" +version = "20.0.1" dependencies = [ "soroban-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index 1b47961ec..4a8e00e32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ default-members = ["cmd/soroban-cli", "cmd/crates/soroban-test"] exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"] [workspace.package] -version = "20.0.0" +version = "20.0.1" [workspace.dependencies.soroban-env-host] version = "20.0.0" @@ -31,15 +31,15 @@ rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9" # path = "../rs-soroban-sdk/soroban-spec-rust" [workspace.dependencies.soroban-spec-json] -version = "20.0.0" +version = "20.0.1" path = "./cmd/crates/soroban-spec-json" [workspace.dependencies.soroban-spec-typescript] -version = "20.0.0" +version = "20.0.1" path = "./cmd/crates/soroban-spec-typescript" [workspace.dependencies.soroban-spec-tools] -version = "20.0.0" +version = "20.0.1" path = "./cmd/crates/soroban-spec-tools" [workspace.dependencies.soroban-sdk] @@ -53,7 +53,7 @@ git = "https://github.com/stellar/rs-soroban-sdk" rev = "822ce6cc3e461ccc925275b472d77b6ca35b2cd9" [workspace.dependencies.soroban-cli] -version = "20.0.0" +version = "20.0.1" path = "cmd/soroban-cli" [workspace.dependencies.stellar-xdr] diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml index 99cfaa9db..a1320d6b2 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.0.0" +version = "20.0.1" edition = "2021" rust-version = "1.70" 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 b721bc75a..63a36cee7 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.0.0" +version = "20.0.1" 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 96397c5fe..52f19932e 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.0.0" +version = "20.0.1" 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 c28ae0659..4b85e1cc7 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.0.0" +version = "20.0.1" authors = ["Stellar Development Foundation "] license = "Apache-2.0" edition = "2021" diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml index c2ca017ce..38f84c00f 100644 --- a/cmd/soroban-cli/Cargo.toml +++ b/cmd/soroban-cli/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-cli" authors = ["Stellar Development Foundation "] license = "Apache-2.0" readme = "README.md" -version = "20.0.0" +version = "20.0.1" edition = "2021" rust-version = "1.72" autobins = false diff --git a/cmd/soroban-rpc/lib/preflight/Cargo.toml b/cmd/soroban-rpc/lib/preflight/Cargo.toml index 8292cb4a7..afcf62c3a 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.0.0" +version = "20.0.1" publish = false [lib]