diff --git a/Cargo.lock b/Cargo.lock index 298978fcc..5e8497d85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -143,15 +143,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - [[package]] name = "async-trait" version = "0.1.80" @@ -551,16 +542,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" -[[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "bumpalo" version = "3.6.1" @@ -1281,7 +1262,7 @@ checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" dependencies = [ "futures-core", "futures-sink", - "pin-project 1.0.5", + "pin-project 1.1.5", "spin 0.9.4", ] @@ -1505,19 +1486,6 @@ dependencies = [ "url", ] -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - [[package]] name = "h2" version = "0.3.18" @@ -1995,35 +1963,36 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" +checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.22.5", "jsonrpsee-server", - "jsonrpsee-types", + "jsonrpsee-types 0.22.5", "jsonrpsee-ws-client", + "tokio", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.16.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" +checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" dependencies = [ "futures-util", "http 0.2.11", - "jsonrpsee-core", - "jsonrpsee-types", - "pin-project 1.0.5", - "rustls-native-certs 0.6.3", + "jsonrpsee-core 0.22.5", + "pin-project 1.1.5", + "rustls-native-certs 0.7.0", + "rustls-pki-types", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.1", + "tokio-rustls 0.25.0", "tokio-util", "tracing", - "webpki-roots 0.22.2", + "url", ] [[package]] @@ -2033,42 +2002,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", - "arrayvec", - "async-lock", "async-trait", "beef", "futures-channel", + "jsonrpsee-types 0.16.2", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" +dependencies = [ + "anyhow", + "async-trait", + "beef", "futures-timer", "futures-util", - "globset", "hyper 0.14.28", - "jsonrpsee-types", + "jsonrpsee-types 0.22.5", "parking_lot 0.12.0", + "pin-project 1.1.5", "rand 0.8.3", "rustc-hash", "serde", "serde_json", - "soketto", "thiserror", "tokio", + "tokio-stream", "tracing", ] [[package]] name = "jsonrpsee-server" -version = "0.16.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" dependencies = [ - "futures-channel", "futures-util", "http 0.2.11", "hyper 0.14.28", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", + "pin-project 1.1.5", + "route-recognizer", "serde", "serde_json", "soketto", + "thiserror", "tokio", "tokio-stream", "tokio-util", @@ -2090,16 +2075,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "jsonrpsee-ws-client" -version = "0.16.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" +checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070" dependencies = [ "http 0.2.11", "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", + "url", ] [[package]] @@ -2177,7 +2176,7 @@ dependencies = [ "libp2p-yamux", "multiaddr", "parking_lot 0.11.2", - "pin-project 1.0.5", + "pin-project 1.1.5", "rand 0.7.3", "smallvec", ] @@ -2202,7 +2201,7 @@ dependencies = [ "multihash", "multistream-select", "parking_lot 0.11.2", - "pin-project 1.0.5", + "pin-project 1.1.5", "prost", "prost-build", "rand 0.8.3", @@ -2749,7 +2748,7 @@ dependencies = [ "bytes", "futures", "log", - "pin-project 1.0.5", + "pin-project 1.1.5", "smallvec", "unsigned-varint", ] @@ -2997,11 +2996,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.5" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.0.5", + "pin-project-internal 1.1.5", ] [[package]] @@ -3017,13 +3016,13 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.5" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.46", ] [[package]] @@ -3549,6 +3548,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rust_decimal" version = "1.30.0" @@ -3670,12 +3675,13 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.0", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "schannel", "security-framework", ] @@ -4485,7 +4491,7 @@ dependencies = [ "hyper 1.3.1", "itertools 0.13.0", "jsonrpsee", - "jsonrpsee-core", + "jsonrpsee-core 0.16.2", "libp2p", "mockito", "monero", @@ -4801,6 +4807,7 @@ dependencies = [ "futures-core", "pin-project-lite 0.2.13", "tokio", + "tokio-util", ] [[package]] @@ -4826,7 +4833,7 @@ checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" dependencies = [ "futures-util", "log", - "pin-project 1.0.5", + "pin-project 1.1.5", "rustls 0.19.0", "tokio", "tokio-rustls 0.22.0", @@ -4918,7 +4925,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "pin-project 1.0.5", + "pin-project 1.1.5", "pin-project-lite 0.2.13", "tokio", "tower-layer", @@ -4991,7 +4998,7 @@ checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ "futures", "futures-task", - "pin-project 1.0.5", + "pin-project 1.1.5", "tracing", ] diff --git a/swap/Cargo.toml b/swap/Cargo.toml index efcc736e7..de4b0886d 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -32,7 +32,7 @@ ed25519-dalek = "1" futures = { version = "0.3", default-features = false } hex = "0.4" itertools = "0.13" -jsonrpsee = { version = "0.16.2", features = [ "server" ] } +jsonrpsee = { version = "0.22.5", features = [ "server" ] } jsonrpsee-core = "0.16.2" libp2p = { version = "0.42.2", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response", "websocket", "ping", "rendezvous", "identify" ] } monero = { version = "0.12", features = [ "serde_support" ] } @@ -80,7 +80,7 @@ zip = "0.5" bitcoin-harness = { git = "https://github.com/delta1/bitcoin-harness-rs.git", rev = "80cc8d05db2610d8531011be505b7bee2b5cdf9f" } get-port = "3" hyper = "1.3" -jsonrpsee = { version = "0.16.2", features = [ "ws-client" ] } +jsonrpsee = { version = "0.22.5", features = [ "ws-client" ] } mockito = "1.3.0" monero-harness = { path = "../monero-harness" } port_check = "0.2"