diff --git a/Cargo.lock b/Cargo.lock index a109a932..c3175d25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,9 +34,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -151,6 +151,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -172,12 +178,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - [[package]] name = "block-buffer" version = "0.10.4" @@ -241,9 +241,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.1" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -251,21 +251,21 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", @@ -528,16 +528,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "escape-bytes" version = "0.1.1" @@ -695,9 +685,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -723,15 +713,6 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "http" version = "0.2.11" @@ -1003,12 +984,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - [[package]] name = "log" version = "0.4.20" @@ -1198,7 +1173,7 @@ name = "preflight" version = "20.3.5" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.0", "libc", "rand", "sha2", @@ -1312,19 +1287,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - [[package]] name = "rustls" version = "0.21.10" @@ -1412,7 +1374,7 @@ version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -1591,7 +1553,7 @@ dependencies = [ "soroban-wasmi", "static_assertions", "stellar-xdr", - "wasmparser 0.116.1", + "wasmparser", ] [[package]] @@ -1634,7 +1596,7 @@ dependencies = [ "soroban-wasmi", "static_assertions", "stellar-strkey 0.0.8", - "wasmparser 0.116.1", + "wasmparser", ] [[package]] @@ -1725,7 +1687,7 @@ dependencies = [ "base64 0.13.1", "stellar-xdr", "thiserror", - "wasmparser 0.116.1", + "wasmparser", ] [[package]] @@ -1783,10 +1745,8 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" name = "stellar-rpc-client" version = "20.3.5" dependencies = [ - "base64 0.21.7", "clap", "ed25519-dalek", - "ethnum", "hex", "http 1.0.0", "itertools 0.10.5", @@ -1806,8 +1766,6 @@ dependencies = [ "thiserror", "tokio", "tracing", - "wasmparser 0.90.0", - "which", ] [[package]] @@ -1855,9 +1813,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -2214,15 +2172,6 @@ dependencies = [ "paste", ] -[[package]] -name = "wasmparser" -version = "0.90.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62c8d843f4423efee314dc75a1049886deba3214f7e7f9ff0e4e58b4d618581" -dependencies = [ - "indexmap 1.9.3", -] - [[package]] name = "wasmparser" version = "0.116.1" @@ -2242,18 +2191,6 @@ dependencies = [ "indexmap-nostd", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 796b5067..fd3ea2b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,40 +29,11 @@ version = "=21.0.0" # rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3" # path = "../rs-soroban-sdk/soroban-spec" -[workspace.dependencies.soroban-spec-rust] -version = "=21.0.0" -# git = "https://github.com/stellar/rs-soroban-sdk" -# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3" -# path = "../rs-soroban-sdk/soroban-spec-rust" - -[workspace.dependencies.soroban-spec-json] -version = "20.3.0" -git = "https://github.com/stellar/soroban-cli" -rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3" - -[workspace.dependencies.soroban-spec-typescript] -version = "20.3.0" -git = "https://github.com/stellar/soroban-cli" -rev = "a59f5f421a27bab71472041fc619dd8b0d1cf902" - [workspace.dependencies.soroban-sdk] version = "=21.0.0" # git = "https://github.com/stellar/rs-soroban-sdk" # rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3" -[workspace.dependencies.soroban-token-sdk] -version = "=21.0.0" -# git = "https://github.com/stellar/rs-soroban-sdk" -# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3" - -[workspace.dependencies.soroban-ledger-snapshot] -version = "=21.0.0" -# git = "https://github.com/stellar/rs-soroban-sdk" -# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3" - -[workspace.dependencies.stellar-rpc-client] -version = "20.3.5" -path = "cmd/crates/stellar-rpc-client" [workspace.dependencies.stellar-xdr] version = "=21.0.0" @@ -71,49 +42,8 @@ default-features = true # rev = "a80c899c61e869fd00b7b475a4947ab6aaf9dcac" [workspace.dependencies] -stellar-strkey = "0.0.7" -sep5 = "0.0.2" -base64 = "0.21.2" -thiserror = "1.0.46" +base64 = "0.22.0" sha2 = "0.10.7" -ethnum = "1.3.2" -hex = "0.4.3" -itertools = "0.10.0" - -serde-aux = "4.1.2" -serde_json = "1.0.82" -serde = "1.0.82" - -clap = { version = "4.1.8", features = [ - "derive", - "env", - "deprecated", - "string", -] } -clap_complete = "4.1.4" -tracing = "0.1.37" -tracing-subscriber = "0.3.16" -tracing-appender = "0.2.2" -which = "4.4.0" -wasmparser = "0.90.0" -termcolor = "1.1.3" -termcolor_output = "1.0.1" -ed25519-dalek = "2.0.0" - -# networking -http = "1.0.0" -jsonrpsee-http-client = "0.20.1" -jsonrpsee-core = "0.20.1" -tokio = "1.28.1" - -# [patch."https://github.com/stellar/rs-soroban-env"] -# soroban-env-host = { path = "../rs-soroban-env/soroban-env-host/" } -# [patch."https://github.com/stellar/rs-soroban-sdk"] -# soroban-spec = { path = "../rs-soroban-sdk/soroban-spec/" } -# soroban-token-spec = { path = "../rs-soroban-sdk/soroban-token-spec/" } -# soroban-sdk = { path = "../rs-soroban-sdk/soroban-sdk/" } -# [patch."https://github.com/stellar/rs-stellar-xdr"] -# stellar-xdr = { path = "../rs-stellar-xdr/" } [profile.test-wasms] inherits = "release" diff --git a/cmd/crates/stellar-rpc-client/Cargo.toml b/cmd/crates/stellar-rpc-client/Cargo.toml index 51343d20..419e8657 100644 --- a/cmd/crates/stellar-rpc-client/Cargo.toml +++ b/cmd/crates/stellar-rpc-client/Cargo.toml @@ -29,10 +29,7 @@ clap = { version = "4.1.8", features = ["derive", "env", "deprecated", "string"] serde_json = "1.0.82" serde-aux = "4.1.2" itertools = "0.10.0" -ethnum = "1.3.2" hex = "0.4.3" -wasmparser = "0.90.0" -base64 = "0.21.2" thiserror = "1.0.46" serde = "1.0.82" tokio = "1.28.1" @@ -45,6 +42,3 @@ jsonrpsee-http-client = "0.20.1" jsonrpsee-core = "0.20.1" http = "1.0.0" - -[dev-dependencies] -which = "4.4.0"