From 99403654476dc8f13bf79602c6eb446f91ababac Mon Sep 17 00:00:00 2001 From: pritsheth Date: Sat, 9 Mar 2024 15:29:25 -0800 Subject: [PATCH] Keep soroban-rpc with readme and rename soroban-rpc client to stellar-rpc-client --- Cargo.lock | 130 ++++++++---------- Cargo.toml | 8 +- cmd/crates/soroban-rpc-client/README.md | 3 - cmd/crates/soroban-rpc/Cargo.toml | 12 ++ cmd/crates/soroban-rpc/README.md | 3 + .../Cargo.toml | 4 +- cmd/crates/stellar-rpc-client/README.md | 3 + .../src/fixtures/event_response.json | 0 .../src/lib.rs | 0 .../src/log.rs | 0 .../src/log/diagnostic_events.rs | 0 .../src/txn.rs | 0 12 files changed, 83 insertions(+), 80 deletions(-) delete mode 100644 cmd/crates/soroban-rpc-client/README.md create mode 100644 cmd/crates/soroban-rpc/Cargo.toml create mode 100644 cmd/crates/soroban-rpc/README.md rename cmd/crates/{soroban-rpc-client => stellar-rpc-client}/Cargo.toml (93%) create mode 100644 cmd/crates/stellar-rpc-client/README.md rename cmd/crates/{soroban-rpc-client => stellar-rpc-client}/src/fixtures/event_response.json (100%) rename cmd/crates/{soroban-rpc-client => stellar-rpc-client}/src/lib.rs (100%) rename cmd/crates/{soroban-rpc-client => stellar-rpc-client}/src/log.rs (100%) rename cmd/crates/{soroban-rpc-client => stellar-rpc-client}/src/log/diagnostic_events.rs (100%) rename cmd/crates/{soroban-rpc-client => stellar-rpc-client}/src/txn.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index a730a8d5..3c4e384e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1189,8 +1189,10 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" name = "preflight" version = "20.3.3" dependencies = [ + "anyhow", "base64 0.21.7", "libc", + "rand", "sha2", "soroban-env-host", "soroban-simulation", @@ -1547,9 +1549,8 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "20.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "319fbfbf8a7fcaf9c69425d79d59819eedded4b3e56633fee10a4de1af833d51" +version = "20.2.2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" dependencies = [ "itertools 0.11.0", "proc-macro2", @@ -1559,9 +1560,8 @@ dependencies = [ [[package]] name = "soroban-env-common" -version = "20.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d609330abbcc2d7fe185304de0c10ef1a95e64eb8effb6ee4faeea97668e0a" +version = "20.2.2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" dependencies = [ "arbitrary", "crate-git-revision", @@ -1577,9 +1577,8 @@ dependencies = [ [[package]] name = "soroban-env-guest" -version = "20.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280d73550935d482534abf3f897e89b40461b3401c3209163b3d0038f0b8b201" +version = "20.2.2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" dependencies = [ "soroban-env-common", "static_assertions", @@ -1587,9 +1586,8 @@ dependencies = [ [[package]] name = "soroban-env-host" -version = "20.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd99f4e075f62e0faec118c568fbc70373793fb921148115d5f3f2563945c02d" +version = "20.2.2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" dependencies = [ "backtrace", "curve25519-dalek", @@ -1614,9 +1612,8 @@ dependencies = [ [[package]] name = "soroban-env-macros" -version = "20.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c277d3828c200fef887ecd16bd24b2f16b7fc87207a23a94571ab909f2113d8" +version = "20.2.2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" dependencies = [ "itertools 0.11.0", "proc-macro2", @@ -1629,9 +1626,8 @@ dependencies = [ [[package]] name = "soroban-ledger-snapshot" -version = "20.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9cfeb46db19d0fb2e2c97d4e8aa102d660e0c80dc5412409a22dfd14241ca7" +version = "20.4.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" dependencies = [ "serde", "serde_json", @@ -1641,42 +1637,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "soroban-rpc" -version = "20.3.3" -dependencies = [ - "base64 0.21.7", - "clap", - "ed25519-dalek", - "ethnum", - "hex", - "http 1.0.0", - "itertools 0.10.5", - "jsonrpsee-core", - "jsonrpsee-http-client", - "serde", - "serde-aux", - "serde_json", - "sha2", - "soroban-env-host", - "soroban-sdk", - "soroban-spec", - "stellar-strkey 0.0.7", - "stellar-xdr", - "termcolor", - "termcolor_output", - "thiserror", - "tokio", - "tracing", - "wasmparser 0.90.0", - "which", -] - [[package]] name = "soroban-sdk" -version = "20.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842c20c8503b137f8a8a5981009eb1f5841b96516f1485d7e1bf9c02afb227d1" +version = "20.4.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" dependencies = [ "bytes-lit", "rand", @@ -1691,9 +1655,8 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" -version = "20.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0afc8337fadde3047fb774fa2abc3877a4a260b8e531868b65d5a1debc60b3b9" +version = "20.4.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" dependencies = [ "crate-git-revision", "darling", @@ -1711,9 +1674,8 @@ dependencies = [ [[package]] name = "soroban-simulation" -version = "20.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210b093c6d08b8e85ef5f4e4a231d5fa25d1d2787d4fecd50e11040849f259ba" +version = "20.2.2" +source = "git+https://github.com/stellar/rs-soroban-env?rev=8c9ab83c406bd86f56d52eae3e39dccf6b45b3da#8c9ab83c406bd86f56d52eae3e39dccf6b45b3da" dependencies = [ "anyhow", "rand", @@ -1724,9 +1686,8 @@ dependencies = [ [[package]] name = "soroban-spec" -version = "20.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01f31b81de71543d314ef9252e11f2194606d6a4c8c350fbc701eeaa45a8e2d9" +version = "20.4.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" dependencies = [ "base64 0.13.1", "stellar-xdr", @@ -1736,9 +1697,8 @@ dependencies = [ [[package]] name = "soroban-spec-rust" -version = "20.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1468c9f0025166fc5e8853ba47cbd97d93c877757a5a600fcf71529e5b3b398c" +version = "20.4.0" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=89efc3c211d41f1ab143bed0a09cd6af353bb098#89efc3c211d41f1ab143bed0a09cd6af353bb098" dependencies = [ "prettyplease", "proc-macro2", @@ -1753,8 +1713,7 @@ dependencies = [ [[package]] name = "soroban-wasmi" version = "0.31.1-soroban.20.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" dependencies = [ "smallvec", "spin", @@ -1785,6 +1744,37 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "stellar-rpc-client" +version = "20.3.3" +dependencies = [ + "base64 0.21.7", + "clap", + "ed25519-dalek", + "ethnum", + "hex", + "http 1.1.0", + "itertools 0.10.5", + "jsonrpsee-core", + "jsonrpsee-http-client", + "serde", + "serde-aux", + "serde_json", + "sha2", + "soroban-env-host", + "soroban-sdk", + "soroban-spec", + "stellar-strkey 0.0.7", + "stellar-xdr", + "termcolor", + "termcolor_output", + "thiserror", + "tokio", + "tracing", + "wasmparser 0.90.0", + "which", +] + [[package]] name = "stellar-strkey" version = "0.0.7" @@ -2173,15 +2163,13 @@ checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" +version = "0.4.0" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" [[package]] name = "wasmi_core" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" dependencies = [ "downcast-rs", "libm", diff --git a/Cargo.toml b/Cargo.toml index 2ae15829..4a6a407f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] resolver = "2" members = [ - "cmd/crates/soroban-rpc-client", + "cmd/crates/stellar-rpc-client", "cmd/soroban-rpc/lib/preflight", ] -default-members = ["cmd/crates/soroban-rpc-client"] +default-members = ["cmd/crates/stellar-rpc-client"] #exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"] [workspace.package] @@ -60,9 +60,9 @@ version = "=20.3.1" # git = "https://github.com/stellar/rs-soroban-sdk" # rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de" -[workspace.dependencies.soroban-rpc-client] +[workspace.dependencies.stellar-rpc-client] version = "20.3.3" -path = "cmd/crates/soroban-rpc-client" +path = "cmd/crates/stellar-rpc-client" [workspace.dependencies.stellar-xdr] version = "=20.1.0" diff --git a/cmd/crates/soroban-rpc-client/README.md b/cmd/crates/soroban-rpc-client/README.md deleted file mode 100644 index 739a8aba..00000000 --- a/cmd/crates/soroban-rpc-client/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# soroban-rpc-client - -Tools and utilities for soroban rpc client. diff --git a/cmd/crates/soroban-rpc/Cargo.toml b/cmd/crates/soroban-rpc/Cargo.toml new file mode 100644 index 00000000..a6f7b769 --- /dev/null +++ b/cmd/crates/soroban-rpc/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "soroban-rpc" +description = "Stellar RPC client for rust" +homepage = "https://github.com/stellar/soroban-rpc" +repository = "https://github.com/stellar/soroban-rpc" +authors = ["Stellar Development Foundation "] +license = "Apache-2.0" +readme = "README.md" +version.workspace = true +edition = "2021" +rust-version.workspace = true +autobins = false diff --git a/cmd/crates/soroban-rpc/README.md b/cmd/crates/soroban-rpc/README.md new file mode 100644 index 00000000..d26c2ecd --- /dev/null +++ b/cmd/crates/soroban-rpc/README.md @@ -0,0 +1,3 @@ +# soroban-rpc + +This crate is deprecated, please use stellar-rpc-client instead. diff --git a/cmd/crates/soroban-rpc-client/Cargo.toml b/cmd/crates/stellar-rpc-client/Cargo.toml similarity index 93% rename from cmd/crates/soroban-rpc-client/Cargo.toml rename to cmd/crates/stellar-rpc-client/Cargo.toml index 950d804d..51343d20 100644 --- a/cmd/crates/soroban-rpc-client/Cargo.toml +++ b/cmd/crates/stellar-rpc-client/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "soroban-rpc-client" -description = "Soroban RPC client for rust" +name = "stellar-rpc-client" +description = "Stellar RPC client for rust" homepage = "https://github.com/stellar/soroban-rpc" repository = "https://github.com/stellar/soroban-rpc" authors = ["Stellar Development Foundation "] diff --git a/cmd/crates/stellar-rpc-client/README.md b/cmd/crates/stellar-rpc-client/README.md new file mode 100644 index 00000000..a0bf1502 --- /dev/null +++ b/cmd/crates/stellar-rpc-client/README.md @@ -0,0 +1,3 @@ +# stellar-rpc-client + +A rust client for communicating with the soroban-rpc. diff --git a/cmd/crates/soroban-rpc-client/src/fixtures/event_response.json b/cmd/crates/stellar-rpc-client/src/fixtures/event_response.json similarity index 100% rename from cmd/crates/soroban-rpc-client/src/fixtures/event_response.json rename to cmd/crates/stellar-rpc-client/src/fixtures/event_response.json diff --git a/cmd/crates/soroban-rpc-client/src/lib.rs b/cmd/crates/stellar-rpc-client/src/lib.rs similarity index 100% rename from cmd/crates/soroban-rpc-client/src/lib.rs rename to cmd/crates/stellar-rpc-client/src/lib.rs diff --git a/cmd/crates/soroban-rpc-client/src/log.rs b/cmd/crates/stellar-rpc-client/src/log.rs similarity index 100% rename from cmd/crates/soroban-rpc-client/src/log.rs rename to cmd/crates/stellar-rpc-client/src/log.rs diff --git a/cmd/crates/soroban-rpc-client/src/log/diagnostic_events.rs b/cmd/crates/stellar-rpc-client/src/log/diagnostic_events.rs similarity index 100% rename from cmd/crates/soroban-rpc-client/src/log/diagnostic_events.rs rename to cmd/crates/stellar-rpc-client/src/log/diagnostic_events.rs diff --git a/cmd/crates/soroban-rpc-client/src/txn.rs b/cmd/crates/stellar-rpc-client/src/txn.rs similarity index 100% rename from cmd/crates/soroban-rpc-client/src/txn.rs rename to cmd/crates/stellar-rpc-client/src/txn.rs