diff --git a/Cargo.toml b/Cargo.toml index e334bae893..223ad1135d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,14 +31,64 @@ keywords = ["jsonrpc", "json", "http", "websocket", "WASM"] readme = "README.md" [workspace.dependencies] -jsonrpsee-types = { path = "types", version = "0.24.7" } +# Internal jsonrpsee crates +jsonrpsee-client-transport = { path = "client/transport", version = "0.24.7" } jsonrpsee-core = { path = "core", version = "0.24.7" } -jsonrpsee-server = { path = "server", version = "0.24.7" } -jsonrpsee-ws-client = { path = "client/ws-client", version = "0.24.7" } jsonrpsee-http-client = { path = "client/http-client", version = "0.24.7" } -jsonrpsee-wasm-client = { path = "client/wasm-client", version = "0.24.7" } -jsonrpsee-client-transport = { path = "client/transport", version = "0.24.7" } jsonrpsee-proc-macros = { path = "proc-macros", version = "0.24.7" } +jsonrpsee-server = { path = "server", version = "0.24.7" } +jsonrpsee-types = { path = "types", version = "0.24.7" } +jsonrpsee-wasm-client = { path = "client/wasm-client", version = "0.24.7" } +jsonrpsee-ws-client = { path = "client/ws-client", version = "0.24.7" } +# Deps used by the jsonrpsee crates. +async-trait = "0.1" +base64 = { version = "0.22", default-features = false, features = ["alloc"] } +bytes = "1.6" +futures-channel = { version = "0.3.14", default-features = false } +futures-timer = "3" +futures-util = { version = "0.3.14", default-features = false } +gloo-net = { version = "0.6.0", default-features = false } +heck = "0.5.0" +http = "1" +http-body = "1" +http-body-util = "0.1.0" +hyper = "1.5" +hyper-rustls = { version = "0.27", default-features = false } +hyper-util = "0.1" +parking_lot = "0.12" +pin-project = "1.1.3" +proc-macro-crate = "3" +proc-macro2 = "1" +quote = "1" +rand = "0.8" +route-recognizer = "0.3.1" +rustc-hash = "2" +rustls = { version = "0.23", default-features = false } +rustls-pki-types = "1" +rustls-platform-verifier = "0.5" +serde = { version = "1", default-features = false, features = ["derive"] } +serde_json = { version = "1", default-features = false, features = ["alloc", "raw_value"] } +soketto = "0.8.1" +syn = { version = "2", default-features = false } +thiserror = "2" +tokio = "1.23.1" +tokio-rustls = { version = "0.26", default-features = false } +tokio-stream = "0.1.7" +tokio-util = "0.7" tower = "0.5" tower-http = "0.6" +tracing = "0.1.34" +url = "2.4" +wasm-bindgen-futures = "0.4.19" + +# Dev dependencies +anyhow = "1" +console-subscriber = "0.4" +criterion = { version = "0.5", features = ["async_tokio", "html_reports"] } +fast-socks5 = "0.10" +futures = { version = "0.3.14", default-features = false, features = ["std"] } +pprof = { version = "0.14", features = ["flamegraph", "criterion"] } +socket2 = "0.5.1" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } +trybuild = "1.0.97" diff --git a/benches/Cargo.toml b/benches/Cargo.toml index f821c180fe..c2ae9c3890 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -8,9 +8,9 @@ license.workspace = true publish = false [dependencies] -pprof = { version = "0.14", features = ["flamegraph", "criterion"] } -criterion = { version = "0.5", features = ["async_tokio", "html_reports"] } -futures-util = "0.3.15" +pprof = { workspace = true } +criterion = { workspace = true } +futures-util = { workspace = true } jsonrpsee = { path = "../jsonrpsee", features = ["server"] } jsonrpsee_v0_20 = { package = "jsonrpsee", version = "=0.20.0", features = ["ws-client", "client-ws-transport-native-tls"] } # Disable TLS for benches @@ -18,9 +18,9 @@ jsonrpsee_v0_20_http_client = { package = "jsonrpsee-http-client", version = "=0 jsonrpc-ws-server = { version = "18.0.0", optional = true } jsonrpc-http-server = { version = "18.0.0", optional = true } jsonrpc-pubsub = { version = "18.0.0", optional = true } -serde_json = "1" -tokio = { version = "1.16", features = ["rt-multi-thread"] } -console-subscriber = "0.4.0" +serde_json = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread"] } +console-subscriber = { workspace = true } [[bench]] name = "bench" diff --git a/client/http-client/Cargo.toml b/client/http-client/Cargo.toml index 00349c45c2..3f668d6d5e 100644 --- a/client/http-client/Cargo.toml +++ b/client/http-client/Cargo.toml @@ -14,32 +14,31 @@ readme.workspace = true publish = true [dependencies] -async-trait = "0.1" -base64 = { version = "0.22", default-features = false, features = ["alloc"] } -hyper = { version = "1.3", features = ["client", "http1", "http2"] } -hyper-rustls = { version = "0.27.1", default-features = false, features = ["http1", "http2", "tls12", "logging", "ring"], optional = true } -hyper-util = { version = "0.1.1", features = ["client", "client-legacy", "tokio", "http1", "http2"] } -http-body = "1" +async-trait = { workspace = true } +base64 = { workspace = true } +hyper = { workspace = true, features = ["client", "http1", "http2"] } +hyper-rustls = { workspace = true, features = ["http1", "http2", "tls12", "logging", "ring"], optional = true } +hyper-util = { workspace = true, features = ["client", "client-legacy", "tokio", "http1", "http2"] } +http-body = { workspace = true } jsonrpsee-types = { workspace = true } jsonrpsee-core = { workspace = true, features = ["client", "http-helpers"] } -rustls = { version = "0.23.7", default-features = false, optional = true, features = ["logging", "std", "tls12", "ring"] } -rustls-platform-verifier = { version = "0.5", optional = true } -serde = { version = "1.0", default-features = false, features = ["derive"] } -serde_json = "1" -thiserror = "2" -tokio = { version = "1.23.1", features = ["time"] } -tracing = "0.1.34" +rustls = { workspace = true, optional = true, features = ["logging", "std", "tls12", "ring"] } +rustls-platform-verifier = { workspace = true, optional = true } +serde = { workspace = true } +serde_json = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["time"] } +tracing = { workspace = true } tower = { workspace = true, features = ["util"] } -url = "2.4.0" +url = { workspace = true } [dev-dependencies] -tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } +tracing-subscriber = { workspace = true } jsonrpsee-test-utils = { path = "../../test-utils" } -tokio = { version = "1.23.1", features = ["net", "rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros"] } [features] default = ["tls"] - tls = ["hyper-rustls", "rustls", "rustls-platform-verifier"] [package.metadata.docs.rs] diff --git a/client/transport/Cargo.toml b/client/transport/Cargo.toml index f82b16cdb1..e722b2f952 100644 --- a/client/transport/Cargo.toml +++ b/client/transport/Cargo.toml @@ -15,31 +15,31 @@ publish = true [dependencies] jsonrpsee-core = { workspace = true, features = ["client"] } -tracing = "0.1.34" +tracing = { workspace = true } # optional -thiserror = { version = "2", optional = true } -futures-util = { version = "0.3.14", default-features = false, features = ["alloc"], optional = true } -http = { version = "1", optional = true } -tokio-util = { version = "0.7", features = ["compat"], optional = true } -tokio = { version = "1.23.1", features = ["net", "time", "macros"], optional = true } -pin-project = { version = "1", optional = true } -url = { version = "2.4.0", optional = true } -base64 = { version = "0.22", default-features = false, features = ["alloc"], optional = true } +thiserror = { workspace = true, optional = true } +futures-util = { workspace = true, features = ["alloc"], optional = true } +http = { workspace = true, optional = true } +tokio-util = { workspace = true, features = ["compat"], optional = true } +tokio = { workspace = true, features = ["net", "time", "macros"], optional = true } +pin-project = { workspace = true, optional = true } +url = { workspace = true, optional = true } +base64 = { workspace = true, optional = true } # tls -tokio-rustls = { version = "0.26", default-features = false, optional = true, features = ["logging", "tls12", "ring"] } -rustls-pki-types = { version = "1", optional = true } -rustls-platform-verifier = { version = "0.5.0", optional = true } -rustls = { version = "0.23", default-features = false, optional = true } +tokio-rustls = { workspace = true, optional = true, features = ["logging", "tls12", "ring"] } +rustls-pki-types = { workspace = true, optional = true } +rustls-platform-verifier = { workspace = true, optional = true } +rustls = { workspace = true, default-features = false, optional = true } # ws -soketto = { version = "0.8.1", optional = true } +soketto = { workspace = true, optional = true } # web-sys [target.'cfg(target_arch = "wasm32")'.dependencies] -gloo-net = { version = "0.6.0", default-features = false, features = ["json", "websocket"], optional = true } -futures-channel = { version = "0.3.14", default-features = false, optional = true } +gloo-net = { workspace = true, features = ["json", "websocket"], optional = true } +futures-channel = { workspace = true, optional = true } [features] tls = ["rustls", "tokio-rustls", "rustls-pki-types"] diff --git a/client/ws-client/Cargo.toml b/client/ws-client/Cargo.toml index 4a4641b15e..0439ec5a1b 100644 --- a/client/ws-client/Cargo.toml +++ b/client/ws-client/Cargo.toml @@ -14,19 +14,19 @@ readme.workspace = true publish = true [dependencies] -http = "1" +http = { workspace = true } jsonrpsee-types = { workspace = true } jsonrpsee-client-transport = { workspace = true, features = ["ws"] } jsonrpsee-core = { workspace = true, features = ["async-client"] } -url = "2.4.0" +url = { workspace = true } [dev-dependencies] -tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } +tracing-subscriber = { workspace = true } jsonrpsee-test-utils = { path = "../../test-utils" } -tokio = { version = "1.23.1", features = ["macros"] } -serde_json = "1" -serde = "1" -rustls = { version = "0.23.7", default-features = false, features = ["logging", "std", "tls12", "ring"] } +tokio = { workspace = true, features = ["macros"] } +serde_json = { workspace = true } +serde = { workspace = true } +rustls = { workspace = true, features = ["logging", "std", "tls12", "ring"] } [features] tls = ["jsonrpsee-client-transport/tls"] diff --git a/core/Cargo.toml b/core/Cargo.toml index 5ec5e8cda9..1e20c7c481 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -14,29 +14,29 @@ readme.workspace = true publish = true [dependencies] -async-trait = "0.1" +async-trait = { workspace = true } jsonrpsee-types = { workspace = true } -thiserror = "2" -serde = { version = "1.0", default-features = false, features = ["derive"] } -serde_json = { version = "1", features = ["raw_value"] } -tracing = "0.1.34" +thiserror = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true, features = ["std"] } +tracing = { workspace = true } # optional deps -futures-util = { version = "0.3.14", default-features = false, optional = true } -http = { version = "1.1", default-features = false, optional = true } -bytes = { version = "1.6", optional = true } -http-body = { version = "1", optional = true } -http-body-util = { version = "0.1.1", optional = true } -rustc-hash = { version = "2", optional = true } -rand = { version = "0.8", optional = true } -parking_lot = { version = "0.12", optional = true } -tokio = { version = "1.23.1", optional = true } -futures-timer = { version = "3", optional = true } -tokio-stream = { version = "0.1", optional = true } -pin-project = { version = "1", optional = true } +futures-util = { workspace = true, optional = true } +http = { workspace = true, optional = true } +bytes = { workspace = true, optional = true } +http-body = { workspace = true, optional = true } +http-body-util = { workspace = true, optional = true } +rustc-hash = { workspace = true, optional = true } +rand = { workspace = true, optional = true } +parking_lot = { workspace = true, optional = true } +tokio = { workspace = true, optional = true } +futures-timer = { workspace = true, optional = true } +tokio-stream = { workspace = true, optional = true } +pin-project = { workspace = true, optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen-futures = { version = "0.4.19", optional = true } +wasm-bindgen-futures = { workspace = true, optional = true } [features] default = [] @@ -66,10 +66,10 @@ async-wasm-client = [ ] [dev-dependencies] -serde_json = "1.0" -tokio = { version = "1.23.1", features = ["macros", "rt"] } +serde_json = { workspace = true } +tokio = { workspace = true, features = ["macros", "rt"] } jsonrpsee = { path = "../jsonrpsee", features = ["server", "macros"] } -http-body-util = "0.1.1" +http-body-util = { workspace = true } [package.metadata.docs.rs] all-features = true diff --git a/examples/Cargo.toml b/examples/Cargo.toml index e7319cfc03..1ae0e22265 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -8,18 +8,18 @@ license.workspace = true publish = false [dev-dependencies] -anyhow = "1" -http-body-util = "0.1" -http-body = "1" -futures = "0.3" +anyhow = { workspace = true } +http-body-util = { workspace = true } +http-body = { workspace = true } +futures = { workspace = true } jsonrpsee = { path = "../jsonrpsee", features = ["server", "http-client", "ws-client", "macros", "client-ws-transport-tls"] } -tracing = "0.1.34" -tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } -tokio = { version = "1.23.1", features = ["full"] } -tokio-stream = { version = "0.1", features = ["sync"] } -serde_json = { version = "1" } -tower-http = { version = "0.6.1", features = ["full"] } -tower = { workspace = true, features = ["full"] } -hyper = "1.3" -hyper-util = { version = "0.1.3", features = ["client", "client-legacy"]} -console-subscriber = "0.4.0" \ No newline at end of file +tracing = { workspace = true } +tracing-subscriber = { workspace = true, features = ["env-filter"] } +tokio = { workspace = true, features = ["rt-multi-thread", "time"] } +tokio-stream = { workspace = true, features = ["sync"] } +serde_json = { workspace = true } +tower-http = { workspace = true, features = ["cors", "compression-full", "sensitive-headers", "trace", "timeout"] } +tower = { workspace = true, features = ["timeout"] } +hyper = { workspace = true } +hyper-util = { workspace = true, features = ["client", "client-legacy"]} +console-subscriber = { workspace = true } \ No newline at end of file diff --git a/jsonrpsee/Cargo.toml b/jsonrpsee/Cargo.toml index 5211011d3d..cd269735d1 100644 --- a/jsonrpsee/Cargo.toml +++ b/jsonrpsee/Cargo.toml @@ -24,8 +24,8 @@ jsonrpsee-server = { workspace = true, optional = true } jsonrpsee-proc-macros = { workspace = true, optional = true } jsonrpsee-core = { workspace = true, optional = true } jsonrpsee-types = { workspace = true, optional = true } -tracing = { version = "0.1.34", optional = true } -tokio = { version = "1.23.1", optional = true } +tracing = { workspace = true, optional = true } +tokio = { workspace = true, optional = true } [features] client-ws-transport-tls = ["jsonrpsee-client-transport/ws", "jsonrpsee-client-transport/tls-rustls-platform-verifier"] diff --git a/proc-macros/Cargo.toml b/proc-macros/Cargo.toml index bfd1aaf4c1..bb112dd942 100644 --- a/proc-macros/Cargo.toml +++ b/proc-macros/Cargo.toml @@ -17,20 +17,20 @@ publish = true proc-macro = true [dependencies] -proc-macro2 = "1.0" -quote = "1.0" -syn = { version = "2.0", default-features = false, features = ["extra-traits", "full", "visit", "parsing", "printing", "clone-impls", "proc-macro"] } -proc-macro-crate = "3" -heck = "0.5.0" +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true, features = ["extra-traits", "full", "visit", "parsing", "printing", "clone-impls", "proc-macro"] } +proc-macro-crate = { workspace = true } +heck = { workspace = true } [dev-dependencies] jsonrpsee = { path = "../jsonrpsee", features = ["server", "client-core", "http-client", "ws-client", "macros"] } -hyper = "1.3" -hyper-util = { version = "0.1.3", features = ["client", "client-legacy"]} -futures-channel = { version = "0.3.14", default-features = false } -futures-util = { version = "0.3.14", default-features = false } -serde_json = "1" -serde = "1" -trybuild = "1.0.97" -tokio = { version = "1.23.1", features = ["rt", "macros"] } +hyper = { workspace = true } +hyper-util = { workspace = true, features = ["client", "client-legacy"]} +futures-channel = { workspace = true } +futures-util = { workspace = true } +serde_json = { workspace = true } +serde = { workspace = true } +trybuild = { workspace = true } +tokio = { workspace = true, features = ["rt", "macros"] } tower = { workspace = true } diff --git a/server/Cargo.toml b/server/Cargo.toml index b7fa4bd95e..c6756c02b9 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -14,12 +14,12 @@ readme.workspace = true publish = true [dependencies] -futures-util = { version = "0.3.14", default-features = false, features = ["io", "async-await-macro"] } -http = "1" -http-body = "1" -http-body-util = "0.1.0" -hyper = { version = "1.3", features = ["server", "http1", "http2"] } -hyper-util = { version = "0.1", features = ["tokio", "service", "tokio", "server-auto"] } +futures-util = { workspace = true, features = ["io", "async-await-macro"] } +http = { workspace = true } +http-body = { workspace = true } +http-body-util = { workspace = true } +hyper = { workspace = true, features = ["server", "http1", "http2"] } +hyper-util = { workspace = true, features = ["tokio", "service", "tokio", "server-auto"] } jsonrpsee-core = { workspace = true, features = ["server", "http-helpers"] } jsonrpsee-types = { workspace = true } pin-project = "1.1.3" @@ -32,10 +32,10 @@ tokio = { version = "1.23.1", features = ["net", "rt-multi-thread", "macros", "t tokio-util = { version = "0.7", features = ["compat"] } tokio-stream = { version = "0.1.7", features = ["sync"] } tower = { workspace = true, features = ["util"] } -tracing = "0.1.34" +tracing = { workspace = true } [dev-dependencies] jsonrpsee-test-utils = { path = "../test-utils" } -socket2 = "0.5.1" +socket2 = { workspace = true } tower = { workspace = true, features = ["timeout"] } -tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } +tracing-subscriber = { workspace = true } diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 61143b028f..7e74df2e1d 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -7,14 +7,14 @@ license.workspace = true publish = false [dependencies] -futures-channel = "0.3.14" -futures-util = "0.3.14" -hyper = { version = "1.3.1", features = [] } -hyper-util = { version = "0.1", features = ["server-auto", "tokio", "client-legacy"] } -http-body-util = "0.1.0" -tracing = "0.1.34" -serde = { version = "1", default-features = false, features = ["derive"] } -serde_json = "1" -soketto = { version = "0.8.1", features = ["http"] } -tokio = { version = "1.23.1", features = ["net", "rt-multi-thread", "macros", "time"] } -tokio-util = { version = "0.7", features = ["compat"] } +futures-channel = { workspace = true } +futures-util = { workspace = true, features = ["default"] } +hyper = { workspace = true } +hyper-util = { workspace = true, features = ["server-auto", "tokio", "client-legacy"] } +http-body-util = { workspace = true } +tracing = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +soketto = { workspace = true, features = ["http"] } +tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros", "time"] } +tokio-util = { workspace = true, features = ["compat"] } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index c243a29eb2..9c89343e9e 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -8,22 +8,22 @@ license.workspace = true publish = false [dev-dependencies] -anyhow = "1" -fast-socks5 = { version = "0.10.0" } -futures = { version = "0.3.14", default-features = false, features = ["std"] } -futures-util = { version = "0.3.14", default-features = false, features = ["alloc"]} -http-body-util = "0.1" -hyper = { version = "1.3" } -hyper-util = { version = "0.1.3", features = ["http1", "client", "client-legacy"] } +anyhow = { workspace = true } +fast-socks5 = { workspace = true } +futures = { workspace = true, features = ["std"] } +futures-util = { workspace = true, features = ["alloc"]} +http-body-util = { workspace = true } +hyper = { workspace = true } +hyper-util = { workspace = true, features = ["http1", "client", "client-legacy"] } jsonrpsee = { path = "../jsonrpsee", features = ["server", "client-core", "http-client", "ws-client", "macros"] } jsonrpsee-test-utils = { path = "../test-utils" } -serde = "1" -serde_json = "1" -tokio = { version = "1.23.1", features = ["full"] } -tokio-stream = "0.1" -tokio-util = { version = "0.7", features = ["compat"]} -tower = { workspace = true, features = ["full"] } -tower-http = { workspace = true, features = ["full"] } -tracing = "0.1.34" -tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } -pin-project = "1" +serde = { workspace = true } +serde_json = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread", "time"] } +tokio-stream = { workspace = true } +tokio-util = { workspace = true, features = ["compat"]} +tower = { workspace = true } +tower-http = { workspace = true, features = ["cors"] } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } +pin-project = { workspace = true } diff --git a/tests/proc-macro-core/Cargo.toml b/tests/proc-macro-core/Cargo.toml index 7178301bbb..ba7a44ad53 100644 --- a/tests/proc-macro-core/Cargo.toml +++ b/tests/proc-macro-core/Cargo.toml @@ -9,4 +9,4 @@ publish = false [dependencies] jsonrpsee = { path = "../../jsonrpsee", features = ["server-core", "client-core", "macros"] } -serde = "1.0" \ No newline at end of file +serde = { workspace = true } \ No newline at end of file diff --git a/tests/wasm-tests/Cargo.toml b/tests/wasm-tests/Cargo.toml index 7fd5c93c8e..0b00dbdcda 100644 --- a/tests/wasm-tests/Cargo.toml +++ b/tests/wasm-tests/Cargo.toml @@ -10,7 +10,7 @@ publish = false wasm-bindgen-test = "0.3.24" tracing-wasm = "0.2.1" console_error_panic_hook = "0.1.7" -serde_json = "1.0.57" +serde_json = { workspace = true } jsonrpsee-wasm-client = { path = "../../client/wasm-client" } jsonrpsee-core = { path = "../../core" , features = ["client"] } jsonrpsee-client-transport = { path = "../../client/transport", features = ["web"] } diff --git a/types/Cargo.toml b/types/Cargo.toml index 2a498007c8..5f35ab1d53 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -14,7 +14,7 @@ readme.workspace = true publish = true [dependencies] -serde = { version = "1", default-features = false, features = ["derive"] } -serde_json = { version = "1", default-features = false, features = ["alloc", "raw_value", "std"] } -thiserror = "2.0" -http = "1" +http = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +thiserror = { workspace = true }