diff --git a/Cargo.lock b/Cargo.lock index 5bc2bb596e..5f68940ca4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -627,7 +627,7 @@ dependencies = [ "axum-core", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "itoa", @@ -638,7 +638,7 @@ dependencies = [ "pin-project-lite", "serde_core", "sync_wrapper", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", ] @@ -651,7 +651,7 @@ checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "mime", @@ -723,15 +723,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" -dependencies = [ - "serde", -] - [[package]] name = "bigdecimal" version = "0.4.10" @@ -845,19 +836,19 @@ dependencies = [ "futures-util", "hex", "home", - "http 1.3.1", + "http 1.4.0", "http-body-util", "hyper 1.7.0", "hyper-named-pipe", - "hyper-rustls 0.27.7", + "hyper-rustls", "hyper-util", "hyperlocal", "log", "num", "pin-project-lite", "rand 0.9.2", - "rustls 0.23.31", - "rustls-native-certs 0.8.1", + "rustls", + "rustls-native-certs", "rustls-pki-types", "serde", "serde_derive", @@ -1019,6 +1010,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.3" @@ -1200,6 +1197,16 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "compression-codecs" version = "0.4.30" @@ -2381,25 +2388,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "h2" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.11.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.12" @@ -2411,7 +2399,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.3.1", + "http 1.4.0", "indexmap 2.11.0", "slab", "tokio", @@ -2550,12 +2538,11 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -2577,7 +2564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http 1.4.0", ] [[package]] @@ -2588,7 +2575,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "pin-project-lite", ] @@ -2649,7 +2636,6 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.27", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2673,8 +2659,8 @@ dependencies = [ "bytes", "futures-channel", "futures-core", - "h2 0.4.12", - "http 1.3.1", + "h2", + "http 1.4.0", "http-body 1.0.1", "httparse", "httpdate", @@ -2701,35 +2687,20 @@ dependencies = [ "winapi", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.32", - "log", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.3.1", + "http 1.4.0", "hyper 1.7.0", "hyper-util", - "rustls 0.23.31", + "log", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls", "tower-service", "webpki-roots", ] @@ -2774,7 +2745,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "hyper 1.7.0", "ipnet", @@ -3139,6 +3110,50 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys 0.3.1", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" +dependencies = [ + "jni-sys 0.4.1", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.106", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -3161,55 +3176,59 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.20.4" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" +checksum = "316c96719901f05d1137f19ba598b5fe9c9bc39f4335f67f6be8613921946480" dependencies = [ - "anyhow", "async-trait", - "beef", + "bytes", "futures-util", - "hyper 0.14.32", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", "jsonrpsee-types", + "pin-project", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.18", "tokio", + "tower", "tracing", ] [[package]] name = "jsonrpsee-http-client" -version = "0.20.4" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" +checksum = "790bedefcec85321e007ff3af84b4e417540d5c87b3c9779b9e247d1bcc3dab8" dependencies = [ - "async-trait", - "hyper 0.14.32", - "hyper-rustls 0.24.2", + "base64 0.22.1", + "http-body 1.0.1", + "hyper 1.7.0", + "hyper-rustls", + "hyper-util", "jsonrpsee-core", "jsonrpsee-types", + "rustls", + "rustls-platform-verifier", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.18", "tokio", - "tower 0.4.13", - "tracing", + "tower", "url", ] [[package]] name = "jsonrpsee-types" -version = "0.20.4" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" +checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5" dependencies = [ - "anyhow", - "beef", + "http 1.4.0", "serde", "serde_json", - "thiserror 1.0.69", - "tracing", + "thiserror 2.0.18", ] [[package]] @@ -3522,7 +3541,7 @@ dependencies = [ "bytes", "colored", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.7.0", @@ -4266,7 +4285,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.1.1", - "rustls 0.23.31", + "rustls", "socket2 0.6.0", "thiserror 2.0.18", "tokio", @@ -4286,7 +4305,7 @@ dependencies = [ "rand 0.9.2", "ring", "rustc-hash 2.1.1", - "rustls 0.23.31", + "rustls", "rustls-pki-types", "slab", "thiserror 2.0.18", @@ -4494,12 +4513,12 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.12", - "http 1.3.1", + "h2", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.7.0", - "hyper-rustls 0.27.7", + "hyper-rustls", "hyper-tls", "hyper-util", "js-sys", @@ -4509,7 +4528,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.31", + "rustls", "rustls-pki-types", "serde", "serde_json", @@ -4517,9 +4536,9 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", - "tokio-rustls 0.26.2", + "tokio-rustls", "tokio-util", - "tower 0.5.2", + "tower", "tower-http", "tower-service", "url", @@ -4683,18 +4702,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.31" @@ -4705,23 +4712,11 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.10", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework 2.11.1", -] - [[package]] name = "rustls-native-certs" version = "0.8.1" @@ -4734,15 +4729,6 @@ dependencies = [ "security-framework 3.4.0", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pki-types" version = "1.12.0" @@ -4754,20 +4740,37 @@ dependencies = [ ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-platform-verifier" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" dependencies = [ - "ring", - "untrusted", + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework 3.4.0", + "security-framework-sys", + "webpki-root-certs 0.26.11", + "windows-sys 0.59.0", ] +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" -version = "0.103.10" +version = "0.103.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" dependencies = [ "ring", "rustls-pki-types", @@ -4894,16 +4897,6 @@ dependencies = [ "sha2 0.10.9", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sdd" version = "3.0.10" @@ -5406,8 +5399,6 @@ dependencies = [ "humantime", "indexmap 2.11.0", "itertools 0.10.5", - "jsonrpsee-core", - "jsonrpsee-http-client", "keyring", "mockito", "num-bigint", @@ -5839,13 +5830,13 @@ dependencies = [ [[package]] name = "stellar-rpc-client" -version = "26.0.0-rc.1" +version = "26.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92627395efaf7ddab9497978fd948345f0d15e2084a217625177e5e04bd42fe9" +checksum = "552320c1293e7adf4a127fa0ec6b42c6acc0ca6405fc208012f0f2fc47a3ecf1" dependencies = [ "clap", "hex", - "http 1.3.1", + "http 1.4.0", "itertools 0.10.5", "jsonrpsee-core", "jsonrpsee-http-client", @@ -6260,7 +6251,7 @@ dependencies = [ "etcetera", "ferroid", "futures", - "http 1.3.1", + "http 1.4.0", "itertools 0.14.0", "log", "memchr", @@ -6468,23 +6459,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.31", + "rustls", "tokio", ] @@ -6564,8 +6545,8 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", - "h2 0.4.12", - "http 1.3.1", + "h2", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.7.0", @@ -6577,7 +6558,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-stream", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", "tracing", @@ -6594,21 +6575,6 @@ dependencies = [ "tonic", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.5.2" @@ -6637,11 +6603,11 @@ dependencies = [ "bitflags", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "iri-string", "pin-project-lite", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", ] @@ -6664,7 +6630,6 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -6836,7 +6801,7 @@ dependencies = [ "base64 0.22.1", "log", "percent-encoding", - "rustls 0.23.31", + "rustls", "rustls-pki-types", "ureq-proto", "utf-8", @@ -6850,7 +6815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d81f9efa9df032be5934a46a068815a10a042b494b6a58cb0a1a97bb5467ed6f" dependencies = [ "base64 0.22.1", - "http 1.3.1", + "http 1.4.0", "httparse", "log", ] @@ -7246,6 +7211,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" +dependencies = [ + "webpki-root-certs 1.0.7", +] + +[[package]] +name = "webpki-root-certs" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "1.0.2" @@ -7386,6 +7369,15 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -7431,6 +7423,21 @@ dependencies = [ "windows-link 0.2.0", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -7479,6 +7486,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -7497,6 +7510,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -7515,6 +7534,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -7545,6 +7570,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -7563,6 +7594,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -7581,6 +7618,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -7599,6 +7642,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index 11f8764a6a..e43666a0af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ exclude = [ [workspace.package] version = "26.0.0" -rust-version = "1.92.0" +rust-version = "1.93.0" # Dependencies located in this repo: [workspace.dependencies.soroban-cli] @@ -71,7 +71,7 @@ version = "26.0.0-rc.1" # Dependencies from the rs-stellar-rpc-client repo: [workspace.dependencies.soroban-rpc] package = "stellar-rpc-client" -version = "26.0.0-rc.1" +version = "26.0.0-rc.2" # Dependencies from elsewhere shared by crates: [workspace.dependencies] @@ -107,8 +107,6 @@ termcolor = "1.1.3" termcolor_output = "1.0.1" ed25519-dalek = ">= 2.1.1" http = "1.0.0" -jsonrpsee-http-client = "0.20.1" -jsonrpsee-core = "0.20.1" walkdir = "2.5.0" toml_edit = "0.22.20" toml = "0.8.19" diff --git a/cmd/crates/soroban-spec-typescript/src/lib.rs b/cmd/crates/soroban-spec-typescript/src/lib.rs index cfe7d21630..28185f66be 100644 --- a/cmd/crates/soroban-spec-typescript/src/lib.rs +++ b/cmd/crates/soroban-spec-typescript/src/lib.rs @@ -125,10 +125,10 @@ pub fn generate(spec: &[ScSpecEntry]) -> String { // Filter out function entries with names that start with "__" and partition the results for entry in &collected { match entry { - Entry::Function { name, inputs, .. } if name == "__constructor" => { - if !inputs.is_empty() { - constructor_args = Some(inputs.clone()); - } + Entry::Function { name, inputs, .. } + if name == "__constructor" && !inputs.is_empty() => + { + constructor_args = Some(inputs.clone()); } _ => {} } diff --git a/cmd/crates/soroban-test/tests/it/build.rs b/cmd/crates/soroban-test/tests/it/build.rs index 124dc13cdd..1863af976b 100644 --- a/cmd/crates/soroban-test/tests/it/build.rs +++ b/cmd/crates/soroban-test/tests/it/build.rs @@ -763,7 +763,7 @@ fn build_no_error_for_package() { let cargo_toml_path = dir_path.join("Cargo.toml"); let cargo_toml_path_content = std::fs::read_to_string(&cargo_toml_path).unwrap(); let modified_cargo_toml_content = - format!("{cargo_toml_path_content}\n[profile.release]\noverflow-checks = true\n",); + format!("{cargo_toml_path_content}\n[profile.release]\noverflow-checks = true\n"); std::fs::write(&cargo_toml_path, modified_cargo_toml_content).unwrap(); sandbox @@ -876,7 +876,7 @@ fn build_errors_when_overflow_check_only_applied_to_members() { let member_cargo_toml_path = dir_path.join("contracts").join("add").join("Cargo.toml"); let member_cargo_toml_content = std::fs::read_to_string(&member_cargo_toml_path).unwrap(); let modified_member_content = - format!("{member_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n",); + format!("{member_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n"); std::fs::write(&member_cargo_toml_path, modified_member_content).unwrap(); // Add overflow-checks = true to "add2" member @@ -887,7 +887,7 @@ fn build_errors_when_overflow_check_only_applied_to_members() { .join("Cargo.toml"); let member_2_cargo_toml_content = std::fs::read_to_string(&member_2_cargo_toml_path).unwrap(); let modified_member_2_content = - format!("{member_2_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n",); + format!("{member_2_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n"); std::fs::write(&member_2_cargo_toml_path, modified_member_2_content).unwrap(); sandbox diff --git a/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs b/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs index 48ab4423d5..6345ef9637 100644 --- a/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs +++ b/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs @@ -73,7 +73,7 @@ impl Exchange for Emulator { let resp: Response = HttpClient::new() .post(&self.url) .headers(headers) - .timeout(Duration::from_secs(60)) + .timeout(Duration::from_mins(1)) .json(&request) .send() .await diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml index 7cd0452bc5..f443372043 100644 --- a/cmd/soroban-cli/Cargo.toml +++ b/cmd/soroban-cli/Cargo.toml @@ -79,8 +79,6 @@ reqwest = { version = "0.12.7", default-features = false, features = [ "blocking", "stream", ] } -jsonrpsee-http-client = "0.20.1" -jsonrpsee-core = "0.20.1" regex = "1.6.0" wasm-opt = { version = "0.116.1", optional = true } chrono = { version = "0.4.27", features = ["serde"] } diff --git a/cmd/soroban-cli/src/commands/contract/arg_parsing.rs b/cmd/soroban-cli/src/commands/contract/arg_parsing.rs index 86297b4569..0c89e65786 100644 --- a/cmd/soroban-cli/src/commands/contract/arg_parsing.rs +++ b/cmd/soroban-cli/src/commands/contract/arg_parsing.rs @@ -629,8 +629,7 @@ fn parse_argument_with_validation( // unit variants — from_string in soroban-spec-tools handles both forms correctly. let is_union_udt = if let ScSpecTypeDef::Udt(udt) = expected_type { spec.find(&udt.name.to_utf8_string_lossy()) - .map(|entry| matches!(entry, ScSpecEntry::UdtUnionV0(_))) - .unwrap_or(false) + .is_ok_and(|entry| matches!(entry, ScSpecEntry::UdtUnionV0(_))) } else { false }; diff --git a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs index 618346359d..6a51b3a078 100644 --- a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs +++ b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs @@ -92,9 +92,6 @@ pub enum Error { #[error("xdr processing error: {0}")] Xdr(#[from] XdrError), - #[error("jsonrpc error: {0}")] - JsonRpc(#[from] jsonrpsee_core::Error), - #[error("cannot parse salt: {salt}")] CannotParseSalt { salt: String }, diff --git a/cmd/soroban-cli/src/commands/contract/init.rs b/cmd/soroban-cli/src/commands/contract/init.rs index dd95a6b972..47f21d955a 100644 --- a/cmd/soroban-cli/src/commands/contract/init.rs +++ b/cmd/soroban-cli/src/commands/contract/init.rs @@ -1,6 +1,6 @@ use std::borrow::Cow; use std::{ - fs::{create_dir_all, metadata, write, Metadata}, + fs::{create_dir_all, metadata, write}, io, path::{Path, PathBuf}, str, @@ -158,10 +158,7 @@ impl Runner { } fn file_exists(file_path: &Path) -> bool { - metadata(file_path) - .as_ref() - .map(Metadata::is_file) - .unwrap_or(false) + metadata(file_path).is_ok_and(|m| m.is_file()) } fn create_dir_all(path: &Path) -> Result<(), Error> { diff --git a/cmd/soroban-cli/src/commands/contract/upload.rs b/cmd/soroban-cli/src/commands/contract/upload.rs index 5bc0c35f76..203da3cc35 100644 --- a/cmd/soroban-cli/src/commands/contract/upload.rs +++ b/cmd/soroban-cli/src/commands/contract/upload.rs @@ -71,9 +71,6 @@ pub enum Error { #[error("xdr processing error: {0}")] Xdr(#[from] XdrError), - #[error("jsonrpc error: {0}")] - JsonRpc(#[from] jsonrpsee_core::Error), - #[error(transparent)] Rpc(#[from] rpc::Error), diff --git a/cmd/soroban-cli/src/commands/doctor.rs b/cmd/soroban-cli/src/commands/doctor.rs index 680e1e7cab..7e4321d90b 100644 --- a/cmd/soroban-cli/src/commands/doctor.rs +++ b/cmd/soroban-cli/src/commands/doctor.rs @@ -98,7 +98,7 @@ async fn print_network( "Network" }; - print.globeln(format!("{prefix} {name:?} ({})", network.rpc_url,)); + print.globeln(format!("{prefix} {name:?} ({})", network.rpc_url)); print.blankln(format!("protocol {}", version_info.protocol_version)); print.blankln(format!("rpc {}", version_info.version)); diff --git a/cmd/soroban-cli/src/commands/snapshot/create.rs b/cmd/soroban-cli/src/commands/snapshot/create.rs index 8247e7a439..d55d3ebb67 100644 --- a/cmd/soroban-cli/src/commands/snapshot/create.rs +++ b/cmd/soroban-cli/src/commands/snapshot/create.rs @@ -380,14 +380,12 @@ impl Cmd { ScVal::ContractInstance(ScContractInstance { executable: ContractExecutable::Wasm(hash), .. - }) => { - if !current.wasm_hashes.contains(hash) { - next.wasm_hashes.insert(hash.clone()); - print.infoln(format!( - "Adding wasm {} to search", - hex::encode(hash) - )); - } + }) if !current.wasm_hashes.contains(hash) => { + next.wasm_hashes.insert(hash.clone()); + print.infoln(format!( + "Adding wasm {} to search", + hex::encode(hash) + )); } ScVal::ContractInstance(ScContractInstance { executable: ContractExecutable::StellarAsset, diff --git a/cmd/soroban-cli/src/config/data.rs b/cmd/soroban-cli/src/config/data.rs index 5b4accb907..8a5332182c 100644 --- a/cmd/soroban-cli/src/config/data.rs +++ b/cmd/soroban-cli/src/config/data.rs @@ -131,7 +131,7 @@ impl std::fmt::Display for DatedAction { .map_or_else(|| "SUCCESS".to_string(), |_| "ERROR".to_string()), Action::Send { response } => response.status.clone(), }; - write!(f, "{id} {} {status} {datetime} {uri} ", a.type_str(),) + write!(f, "{id} {} {status} {datetime} {uri} ", a.type_str()) } } diff --git a/cmd/soroban-cli/src/config/network.rs b/cmd/soroban-cli/src/config/network.rs index 0400d362f0..8fd673c888 100644 --- a/cmd/soroban-cli/src/config/network.rs +++ b/cmd/soroban-cli/src/config/network.rs @@ -1,6 +1,6 @@ use itertools::Itertools; -use jsonrpsee_http_client::HeaderMap; use phf::phf_map; +use reqwest::header::HeaderMap; use reqwest::header::{HeaderName, HeaderValue, InvalidHeaderName, InvalidHeaderValue}; use serde::{Deserialize, Serialize}; use serde_json::Value; diff --git a/cmd/soroban-cli/src/config/upgrade_check.rs b/cmd/soroban-cli/src/config/upgrade_check.rs index 59aa98cf71..4c7b6d22ac 100644 --- a/cmd/soroban-cli/src/config/upgrade_check.rs +++ b/cmd/soroban-cli/src/config/upgrade_check.rs @@ -1,8 +1,8 @@ use crate::config::locator; use chrono::{DateTime, Utc}; -use jsonrpsee_core::Serialize; use semver::Version; use serde::Deserialize; +use serde::Serialize; use serde_json; use std::fs; diff --git a/cmd/soroban-cli/src/log/cost.rs b/cmd/soroban-cli/src/log/cost.rs index c870736f7f..14b0e1fe3f 100644 --- a/cmd/soroban-cli/src/log/cost.rs +++ b/cmd/soroban-cli/src/log/cost.rs @@ -7,9 +7,9 @@ impl Debug for Cost<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { // TODO: Should we output the footprint here? writeln!(f, "==================== Cost ====================")?; - writeln!(f, "CPU used: {}", self.0.instructions,)?; - writeln!(f, "Bytes read: {}", self.0.disk_read_bytes,)?; - writeln!(f, "Bytes written: {}", self.0.write_bytes,)?; + writeln!(f, "CPU used: {}", self.0.instructions)?; + writeln!(f, "Bytes read: {}", self.0.disk_read_bytes)?; + writeln!(f, "Bytes written: {}", self.0.write_bytes)?; writeln!(f, "==============================================")?; Ok(()) } diff --git a/cmd/soroban-cli/src/log/event.rs b/cmd/soroban-cli/src/log/event.rs index 96e8a3f4ea..fbb6b06182 100644 --- a/cmd/soroban-cli/src/log/event.rs +++ b/cmd/soroban-cli/src/log/event.rs @@ -101,17 +101,15 @@ pub fn contract_with_spec(events: &[DiagnosticEvent], print: &Print, spec: Optio }, in_successful_contract_call, .. - } => { - if topics[0] == xdr::ScVal::Symbol(str_to_sc_symbol("log")) { - let status = if in_successful_contract_call { - "Success" - } else { - "Failure" - }; + } if topics.first() == Some(&xdr::ScVal::Symbol(str_to_sc_symbol("log"))) => { + let status = if in_successful_contract_call { + "Success" + } else { + "Failure" + }; - let data = serde_json::to_string(&data).unwrap(); - print.logln(format!("{contract_id} - {status} - Log: {data}")); - } + let data = serde_json::to_string(&data).unwrap(); + print.logln(format!("{contract_id} - {status} - Log: {data}")); } _ => {} diff --git a/cmd/soroban-cli/src/signer/mod.rs b/cmd/soroban-cli/src/signer/mod.rs index 7482fcf94b..9608788252 100644 --- a/cmd/soroban-cli/src/signer/mod.rs +++ b/cmd/soroban-cli/src/signer/mod.rs @@ -248,7 +248,7 @@ impl Signer { TransactionEnvelope::Tx(TransactionV1Envelope { tx, signatures }) => { let tx_hash = transaction_hash(tx, &network.network_passphrase)?; self.print - .infoln(format!("Signing transaction: {}", hex::encode(tx_hash),)); + .infoln(format!("Signing transaction: {}", hex::encode(tx_hash))); let decorated_signature = self.sign_tx_hash(tx_hash, tx_env, network).await?; let mut sigs = signatures.clone().into_vec(); sigs.push(decorated_signature); diff --git a/cmd/soroban-cli/src/upgrade_check.rs b/cmd/soroban-cli/src/upgrade_check.rs index 5025326520..a27e57d327 100644 --- a/cmd/soroban-cli/src/upgrade_check.rs +++ b/cmd/soroban-cli/src/upgrade_check.rs @@ -7,7 +7,7 @@ use std::error::Error; use std::io::IsTerminal; use std::time::Duration; -const MINIMUM_CHECK_INTERVAL: Duration = Duration::from_secs(60 * 60 * 24); // 1 day +const MINIMUM_CHECK_INTERVAL: Duration = Duration::from_hours(24); // 1 day const CRATES_IO_API_URL: &str = "https://crates.io/api/v1/crates/"; const NO_UPDATE_CHECK_ENV_VAR: &str = "STELLAR_NO_UPDATE_CHECK"; diff --git a/deny.toml b/deny.toml index 3a2234bfbd..dd05ae3b5b 100644 --- a/deny.toml +++ b/deny.toml @@ -34,8 +34,7 @@ yanked = "warn" ignore = [ "RUSTSEC-2024-0436", # paste is no longer maintained "RUSTSEC-2025-0052", # async-std has been discontinued - used only in test dependencies - "RUSTSEC-2025-0134", # rustls-pemfile has been discontinued - need to update stellar-rpc-client with compatible jsonrpsee (possible other deps too) - "RUSTSEC-2026-0097", # rand 0.8.5 unsound advisory - currently present in Cargo.lock via transitive dependencies such as ark-std and soroban-env-host +"RUSTSEC-2026-0097", # rand 0.8.5 unsound advisory - currently present in Cargo.lock via transitive dependencies such as ark-std and soroban-env-host ] # Threshold for security vulnerabilities, any vulnerability with a CVSS score # lower than the range specified will be ignored. Note that ignored advisories