chore: remove jsonrpsee dependencies (#3690)

gakonst · ampcode-com · mattsse · web-flow · commit af47f738c7ef · 2026-02-14T16:45:26.000+01:00
* chore: remove jsonrpsee dependencies - Remove jsonrpsee and jsonrpsee-types workspace deps - Remove FilterId <-> jsonrpsee SubscriptionId conversions (rpc-types-eth) - Remove ForkchoiceUpdateError -> jsonrpsee ErrorObject conversion (rpc-types-engine) - Remove jsonrpsee-types feature from rpc-types, rpc-types-eth, rpc-types-engine - Remove rpc-types-json feature from alloy meta-crate - Rewrite test_subscription_race_condition to use tokio-tungstenite mock server - Rewrite serde_json_header test to use local deserialization structs Amp-Thread-ID: https://ampcode.com/threads/T-019c5c46-90c3-7619-9be3-555766617985 Co-authored-by: Amp <amp@ampcode.com> * fix: add dead_code allow on test-only deserialization structs Amp-Thread-ID: https://ampcode.com/threads/T-019c5c46-90c3-7619-9be3-555766617985 Co-authored-by: Amp <amp@ampcode.com> --------- Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
diff --git a/Cargo.toml b/Cargo.toml
@@ -163,8 +163,6 @@ semver = "1.0"
 strum = { version = "0.27", default-features = false }
 thiserror = { version = "2.0", default-features = false }
 url = "2.5"
-jsonrpsee = { version = "0.25", default-features = false }
-jsonrpsee-types = "0.25"
 
 # misc-testing
 arbitrary = "1.3"
diff --git a/crates/alloy/Cargo.toml b/crates/alloy/Cargo.toml
@@ -251,7 +251,6 @@ rpc-types-engine = [
     "alloy-provider?/engine-api",
 ]
 rpc-types-eth = ["rpc-types", "alloy-rpc-types?/eth"]
-rpc-types-json = ["rpc-types", "alloy-rpc-types?/jsonrpsee-types"]
 rpc-types-mev = ["rpc-types", "alloy-rpc-types?/mev"]
 rpc-types-trace = [
     "rpc-types",
diff --git a/crates/provider/Cargo.toml b/crates/provider/Cargo.toml
@@ -99,7 +99,7 @@ http.workspace = true
 alloy-rpc-types-engine = { workspace = true, features = ["jwt"] }
 ci_info.workspace = true
 similar-asserts.workspace = true
-jsonrpsee = { workspace = true, features = ["server"] }
+tokio-tungstenite.workspace = true
 
 [features]
 default = ["reqwest", "reqwest-default-tls"]
diff --git a/crates/provider/tests/it/ws.rs b/crates/provider/tests/it/ws.rs
@@ -41,41 +41,48 @@ async fn ws_retry_pubsub() -> Result<(), Box<dyn std::error::Error>> {
 // <https://github.com/alloy-rs/alloy/issues/1601>
 #[tokio::test]
 async fn test_subscription_race_condition() -> Result<(), Box<dyn std::error::Error>> {
-    async fn run_server() -> Result<std::net::SocketAddr, Box<dyn std::error::Error>> {
-        use jsonrpsee::server::{RpcModule, Server, SubscriptionMessage};
-
-        let server = Server::builder().build("127.0.0.1:0").await?;
-        let mut module = RpcModule::new(());
-        module
-            .register_subscription(
-                "subscribe_hello",
-                "s_hello",
-                "unsubscribe_hello",
-                |_, pending, _, _| async move {
-                    let sub = pending.accept().await.unwrap();
-
-                    for i in 0..usize::MAX {
-                        let raw = serde_json::value::to_raw_value(&i).unwrap();
-                        let msg = SubscriptionMessage::from(raw);
-                        sub.send(msg).await.unwrap();
-                        tokio::time::sleep(std::time::Duration::from_millis(10)).await;
-                    }
-
-                    Ok(())
-                },
-            )
-            .unwrap();
-        let addr = server.local_addr()?;
-
-        let handle = server.start(module);
-
-        tokio::spawn(handle.stopped());
-
-        Ok(addr)
-    }
-    use alloy_provider::{Provider, ProviderBuilder};
+    use futures::{SinkExt, StreamExt};
+    use tokio::net::TcpListener;
+    use tokio_tungstenite::tungstenite::Message;
+
+    let listener = TcpListener::bind("127.0.0.1:0").await?;
+    let addr = listener.local_addr()?;
+
+    tokio::spawn(async move {
+        let (stream, _) = listener.accept().await.unwrap();
+        let mut ws = tokio_tungstenite::accept_async(stream).await.unwrap();
+
+        // Read the subscribe request.
+        let msg = ws.next().await.unwrap().unwrap();
+        let req: serde_json::Value = serde_json::from_str(msg.to_text().unwrap()).unwrap();
+        let id = req["id"].clone();
+
+        // Respond with a subscription ID.
+        let resp = serde_json::json!({
+            "jsonrpc": "2.0",
+            "id": id,
+            "result": "0x1"
+        });
+        ws.send(Message::Text(resp.to_string().into())).await.unwrap();
+
+        // Send subscription notifications.
+        for i in 0..usize::MAX {
+            let notif = serde_json::json!({
+                "jsonrpc": "2.0",
+                "method": "s_hello",
+                "params": {
+                    "subscription": "0x1",
+                    "result": i
+                }
+            });
+            if ws.send(Message::Text(notif.to_string().into())).await.is_err() {
+                break;
+            }
+            tokio::time::sleep(std::time::Duration::from_millis(10)).await;
+        }
+    });
 
-    let addr = run_server().await?;
+    use alloy_provider::{Provider, ProviderBuilder};
 
     let ws_provider = ProviderBuilder::new().connect(format!("ws://{addr}").as_str()).await?;
     let mut request = ws_provider.client().request("subscribe_hello", ());
diff --git a/crates/rpc-types-engine/Cargo.toml b/crates/rpc-types-engine/Cargo.toml
@@ -41,9 +41,6 @@ serde = { workspace = true, features = ["derive"], optional = true }
 ethereum_ssz_derive = { workspace = true, optional = true }
 ethereum_ssz = { workspace = true, optional = true }
 
-# jsonrpsee
-jsonrpsee-types = { workspace = true, optional = true }
-
 # arbitrary
 arbitrary = { workspace = true, features = ["derive"], optional = true }
 
@@ -72,7 +69,6 @@ serde = [
 	"rand?/serde",
 ]
 jwt = ["std", "dep:jsonwebtoken", "dep:rand"]
-jsonrpsee-types = ["dep:jsonrpsee-types"]
 ssz = ["std", "dep:ethereum_ssz", "dep:ethereum_ssz_derive", "alloy-eips/ssz"]
 kzg = ["alloy-consensus/kzg", "alloy-eips/kzg"]
 arbitrary = ["dep:arbitrary", "std", "alloy-primitives/arbitrary", "alloy-serde/arbitrary", "alloy-consensus/arbitrary", "alloy-eips/arbitrary"]
diff --git a/crates/rpc-types-engine/src/forkchoice.rs b/crates/rpc-types-engine/src/forkchoice.rs
@@ -100,28 +100,6 @@ pub enum ForkchoiceUpdateError {
 
 impl core::error::Error for ForkchoiceUpdateError {}
 
-#[cfg(feature = "jsonrpsee-types")]
-impl From<ForkchoiceUpdateError> for jsonrpsee_types::error::ErrorObject<'static> {
-    fn from(value: ForkchoiceUpdateError) -> Self {
-        match value {
-            ForkchoiceUpdateError::UpdatedInvalidPayloadAttributes => {
-                jsonrpsee_types::error::ErrorObject::owned(
-                    INVALID_PAYLOAD_ATTRIBUTES_ERROR,
-                    INVALID_PAYLOAD_ATTRIBUTES_ERROR_MSG,
-                    None::<()>,
-                )
-            }
-            ForkchoiceUpdateError::InvalidState | ForkchoiceUpdateError::UnknownFinalBlock => {
-                jsonrpsee_types::error::ErrorObject::owned(
-                    INVALID_FORK_CHOICE_STATE_ERROR,
-                    INVALID_FORK_CHOICE_STATE_ERROR_MSG,
-                    None::<()>,
-                )
-            }
-        }
-    }
-}
-
 /// Represents a successfully _processed_ forkchoice state update.
 ///
 /// Note: this can still be INVALID if the provided payload was invalid.
diff --git a/crates/rpc-types-eth/Cargo.toml b/crates/rpc-types-eth/Cargo.toml
@@ -42,8 +42,6 @@ serde_json = { workspace = true, optional = true }
 # arbitrary
 arbitrary = { version = "1.3", features = ["derive"], optional = true }
 
-# jsonrpsee
-jsonrpsee-types = { workspace = true, optional = true }
 alloy-sol-types.workspace = true
 
 [dev-dependencies]
@@ -99,6 +97,5 @@ arbitrary = [
 	"alloy-consensus-any/arbitrary",
 	"alloy-sol-types/arbitrary"
 ]
-jsonrpsee-types = ["dep:jsonrpsee-types"]
 k256 = ["alloy-consensus/k256", "alloy-eips/k256"]
 serde-bincode-compat = ["serde", "dep:serde_with", "alloy-eips/serde-bincode-compat"]
diff --git a/crates/rpc-types-eth/src/block.rs b/crates/rpc-types-eth/src/block.rs
@@ -831,14 +831,24 @@ mod tests {
     }
 
     #[test]
-    #[cfg(all(feature = "jsonrpsee-types", feature = "serde"))]
+    #[cfg(feature = "serde")]
     fn serde_json_header() {
-        use jsonrpsee_types::SubscriptionResponse;
+        #[derive(serde::Deserialize)]
+        #[allow(dead_code)]
+        struct SubParams<T> {
+            result: T,
+        }
+        #[derive(serde::Deserialize)]
+        #[allow(dead_code)]
+        struct SubNotification<T> {
+            params: SubParams<T>,
+        }
+
         let resp = r#"{"jsonrpc":"2.0","method":"eth_subscribe","params":{"subscription":"0x7eef37ff35d471f8825b1c8f67a5d3c0","result":{"hash":"0x7a7ada12e140961a32395059597764416499f4178daf1917193fad7bd2cc6386","parentHash":"0xdedbd831f496e705e7f2ec3c8dcb79051040a360bf1455dbd7eb8ea6ad03b751","sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","miner":"0x0000000000000000000000000000000000000000","stateRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","number":"0x8","gasUsed":"0x0","gasLimit":"0x1c9c380","extraData":"0x","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","timestamp":"0x642aa48f","difficulty":"0x0","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000"}}}"#;
-        let _header: SubscriptionResponse<'_, Header> = serde_json::from_str(resp).unwrap();
+        let _header: SubNotification<Header> = serde_json::from_str(resp).unwrap();
 
         let resp = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"subscription":"0x1a14b6bdcf4542fabf71c4abee244e47","result":{"author":"0x000000568b9b5a365eaa767d42e74ed88915c204","difficulty":"0x1","extraData":"0x4e65746865726d696e6420312e392e32322d302d6463373666616366612d32308639ad8ff3d850a261f3b26bc2a55e0f3a718de0dd040a19a4ce37e7b473f2d7481448a1e1fd8fb69260825377c0478393e6055f471a5cf839467ce919a6ad2700","gasLimit":"0x7a1200","gasUsed":"0x0","hash":"0xa4856602944fdfd18c528ef93cc52a681b38d766a7e39c27a47488c8461adcb0","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000","number":"0x434822","parentHash":"0x1a9bdc31fc785f8a95efeeb7ae58f40f6366b8e805f47447a52335c95f4ceb49","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x261","stateRoot":"0xf38c4bf2958e541ec6df148e54ce073dc6b610f8613147ede568cb7b5c2d81ee","totalDifficulty":"0x633ebd","timestamp":"0x604726b0","transactions":[],"transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","uncles":[]}}}"#;
-        let _header: SubscriptionResponse<'_, Header> = serde_json::from_str(resp).unwrap();
+        let _header: SubNotification<Header> = serde_json::from_str(resp).unwrap();
     }
 
     #[test]
diff --git a/crates/rpc-types-eth/src/filter.rs b/crates/rpc-types-eth/src/filter.rs
@@ -1351,26 +1351,6 @@ impl From<String> for FilterId {
     }
 }
 
-#[cfg(feature = "jsonrpsee-types")]
-impl From<FilterId> for jsonrpsee_types::SubscriptionId<'_> {
-    fn from(value: FilterId) -> Self {
-        match value {
-            FilterId::Num(n) => jsonrpsee_types::SubscriptionId::Num(n),
-            FilterId::Str(s) => jsonrpsee_types::SubscriptionId::Str(s.into()),
-        }
-    }
-}
-
-#[cfg(feature = "jsonrpsee-types")]
-impl From<jsonrpsee_types::SubscriptionId<'_>> for FilterId {
-    fn from(value: jsonrpsee_types::SubscriptionId<'_>) -> Self {
-        match value {
-            jsonrpsee_types::SubscriptionId::Num(n) => n.into(),
-            jsonrpsee_types::SubscriptionId::Str(s) => s.into_owned().into(),
-        }
-    }
-}
-
 /// Specifies the kind of information you wish to receive from the `eth_newPendingTransactionFilter`
 /// RPC endpoint.
 ///
diff --git a/crates/rpc-types/Cargo.toml b/crates/rpc-types/Cargo.toml
@@ -68,10 +68,6 @@ arbitrary = [
 	"alloy-primitives/arbitrary",
     "alloy-rpc-types-engine?/arbitrary"
 ]
-jsonrpsee-types = [
-    "alloy-rpc-types-eth?/jsonrpsee-types",
-    "alloy-rpc-types-engine?/jsonrpsee-types",
-]
 ssz = ["alloy-rpc-types-beacon?/ssz", "alloy-rpc-types-engine?/ssz"]
 k256 = ["alloy-rpc-types-eth?/k256"]
 kzg = ["alloy-rpc-types-engine?/kzg"]

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,6 @@ rpc-types-engine = [`
`251`	`251`	`"alloy-provider?/engine-api",`
`252`	`252`	`]`
`253`	`253`	`rpc-types-eth = ["rpc-types", "alloy-rpc-types?/eth"]`
`254`		`-rpc-types-json = ["rpc-types", "alloy-rpc-types?/jsonrpsee-types"]`
`255`	`254`	`rpc-types-mev = ["rpc-types", "alloy-rpc-types?/mev"]`
`256`	`255`	`rpc-types-trace = [`
`257`	`256`	`"rpc-types",`