From 7fda98f6a514c0d7ce9b0c44992ff679dca482ef Mon Sep 17 00:00:00 2001 From: theochap Date: Tue, 18 Nov 2025 17:15:07 -0500 Subject: [PATCH] chore(dep): bump jsonrpsee --- Cargo.lock | 147 ++++-------------------------- Cargo.toml | 1 + crates/flashblocks-rpc/Cargo.toml | 2 +- crates/rollup-boost/Cargo.toml | 8 +- 4 files changed, 22 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6b79548..6bb4e403 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3322,7 +3322,7 @@ dependencies = [ "clap", "eyre", "futures-util", - "jsonrpsee 0.26.0", + "jsonrpsee", "metrics", "metrics-derive", "op-alloy-consensus", @@ -4514,20 +4514,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpsee" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "jsonrpsee-core 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", - "jsonrpsee-http-client 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", - "jsonrpsee-proc-macros 0.25.1", - "jsonrpsee-server 0.25.1", - "jsonrpsee-types 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", - "tokio", - "tracing", -] - [[package]] name = "jsonrpsee" version = "0.26.0" @@ -4537,8 +4523,8 @@ dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core 0.26.0", "jsonrpsee-http-client 0.26.0", - "jsonrpsee-proc-macros 0.26.0", - "jsonrpsee-server 0.26.0", + "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types 0.26.0", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", @@ -4583,7 +4569,7 @@ dependencies = [ "http", "http-body", "http-body-util", - "jsonrpsee-types 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpsee-types 0.25.1", "pin-project", "serde", "serde_json", @@ -4593,30 +4579,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-core" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "jsonrpsee-types 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", - "parking_lot", - "pin-project", - "rand 0.9.2", - "rustc-hash 2.1.1", - "serde", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tower 0.5.2", - "tracing", -] - [[package]] name = "jsonrpsee-core" version = "0.26.0" @@ -4656,30 +4618,8 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "jsonrpsee-core 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpsee-types 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustls", - "rustls-platform-verifier", - "serde", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tower 0.5.2", - "url", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "base64 0.22.1", - "http-body", - "hyper", - "hyper-rustls", - "hyper-util", - "jsonrpsee-core 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", - "jsonrpsee-types 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", "rustls", "rustls-platform-verifier", "serde", @@ -4713,18 +4653,6 @@ dependencies = [ "url", ] -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "jsonrpsee-proc-macros" version = "0.26.0" @@ -4738,32 +4666,6 @@ dependencies = [ "syn 2.0.110", ] -[[package]] -name = "jsonrpsee-server" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "jsonrpsee-core 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", - "jsonrpsee-types 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", - "pin-project", - "route-recognizer", - "serde", - "serde_json", - "soketto", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-util", - "tower 0.5.2", - "tracing", -] - [[package]] name = "jsonrpsee-server" version = "0.26.0" @@ -4803,17 +4705,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "jsonrpsee-types" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "http", - "serde", - "serde_json", - "thiserror 2.0.17", -] - [[package]] name = "jsonrpsee-types" version = "0.26.0" @@ -5750,7 +5641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bdbb3c0453fe2605fb008851ea0b45f3f2ba607722c9f2e4ffd7198958ce501" dependencies = [ "alloy-primitives", - "jsonrpsee 0.26.0", + "jsonrpsee", ] [[package]] @@ -7524,7 +7415,7 @@ dependencies = [ "derive_more", "eyre", "futures-util", - "jsonrpsee 0.26.0", + "jsonrpsee", "reth-chainspec", "reth-cli-commands", "reth-config", @@ -8115,7 +8006,7 @@ dependencies = [ "alloy-rpc-types-debug", "eyre", "futures", - "jsonrpsee 0.26.0", + "jsonrpsee", "pretty_assertions", "reth-engine-primitives", "reth-evm", @@ -8141,7 +8032,7 @@ dependencies = [ "futures", "futures-util", "interprocess", - "jsonrpsee 0.26.0", + "jsonrpsee", "pin-project", "serde_json", "thiserror 2.0.17", @@ -8399,7 +8290,7 @@ dependencies = [ "eyre", "fdlimit", "futures", - "jsonrpsee 0.26.0", + "jsonrpsee", "rayon", "reth-basic-payload-builder", "reth-chain-state", @@ -8598,7 +8489,7 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea8 dependencies = [ "eyre", "http", - "jsonrpsee-server 0.26.0", + "jsonrpsee-server", "metrics", "metrics-exporter-prometheus 0.16.2", "metrics-process", @@ -8930,7 +8821,7 @@ dependencies = [ "derive_more", "eyre", "futures", - "jsonrpsee 0.26.0", + "jsonrpsee", "jsonrpsee-core 0.26.0", "jsonrpsee-types 0.26.0", "metrics", @@ -9271,7 +9162,7 @@ dependencies = [ "http-body", "hyper", "itertools 0.14.0", - "jsonrpsee 0.26.0", + "jsonrpsee", "jsonrpsee-types 0.26.0", "jsonwebtoken", "parking_lot", @@ -9336,7 +9227,7 @@ dependencies = [ "alloy-rpc-types-trace", "alloy-rpc-types-txpool", "alloy-serde", - "jsonrpsee 0.26.0", + "jsonrpsee", "reth-chain-state", "reth-engine-primitives", "reth-network-peers", @@ -9353,7 +9244,7 @@ dependencies = [ "alloy-provider", "dyn-clone", "http", - "jsonrpsee 0.26.0", + "jsonrpsee", "metrics", "pin-project", "reth-chain-state", @@ -9460,7 +9351,7 @@ dependencies = [ "auto_impl", "dyn-clone", "futures", - "jsonrpsee 0.26.0", + "jsonrpsee", "jsonrpsee-types 0.26.0", "parking_lot", "reth-chain-state", @@ -9538,7 +9429,7 @@ source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.4.7#dc7cb6e6670b0da dependencies = [ "alloy-rpc-types-engine", "http", - "jsonrpsee-http-client 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpsee-http-client 0.25.1", "pin-project", "tower 0.5.2", "tower-http", @@ -10321,7 +10212,7 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "jsonrpsee 0.25.1", + "jsonrpsee", "lru 0.16.2", "metrics", "metrics-derive", diff --git a/Cargo.toml b/Cargo.toml index 66b5e5fd..eac34881 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,4 +46,5 @@ op-alloy-consensus = "0.22.0" op-alloy-rpc-types = "0.22.0" tokio-tungstenite = { version = "0.26.2", features = ["native-tls"] } testcontainers = "0.23" +jsonrpsee = "0.26.0" testcontainers-modules = { version = "0.11", features = ["redis"] } diff --git a/crates/flashblocks-rpc/Cargo.toml b/crates/flashblocks-rpc/Cargo.toml index 3d230055..44e843ef 100644 --- a/crates/flashblocks-rpc/Cargo.toml +++ b/crates/flashblocks-rpc/Cargo.toml @@ -54,7 +54,7 @@ metrics-derive.workspace = true serde_json.workspace = true serde.workspace = true -jsonrpsee = { version = "0.26.0" } +jsonrpsee.workspace = true futures-util = "0.3.31" brotli = "8.0.1" arc-swap = "1.7.1" diff --git a/crates/rollup-boost/Cargo.toml b/crates/rollup-boost/Cargo.toml index d2b74850..0d2e3364 100644 --- a/crates/rollup-boost/Cargo.toml +++ b/crates/rollup-boost/Cargo.toml @@ -28,13 +28,7 @@ alloy-serde.workspace = true tokio-tungstenite.workspace = true metrics-derive.workspace = true -# TODO: update to latest release when it is published -# jsonrpsee = { version = "0.25.1", features = ["server", "http-client", "macros"] } -jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", rev = "f04afa740e55db60dce20d9839758792f035ffff", features = [ - "server", - "http-client", - "macros", -] } +jsonrpsee = { workspace = true, features = ["server", "http-client", "macros"] } moka = { version = "0.12.10", features = ["future"] } http = "1.1.0" dotenvy = "0.15.7"