[WIP] Notifications and pubsub transports

crates/json-rpc/Cargo.toml

@@ -12,5 +12,6 @@ exclude.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+alloy-primitives.workspace = true
 serde = { workspace = true, features = ["derive"] }
-serde_json = { version = "1.0.103", features = ["raw_value"] }
+serde_json = { version = "1.0.103", features = ["raw_value"] }

crates/json-rpc/src/common.rs

@@ -9,6 +9,30 @@ pub enum Id {
     None,
 }
 
+impl PartialOrd for Id {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        // numbers < strings
+        // strings < null
+        // null == null
+        match (self, other) {
+            (Id::Number(a), Id::Number(b)) => a.partial_cmp(b),
+            (Id::Number(_), _) => Some(std::cmp::Ordering::Less),
+
+            (Id::String(_), Id::Number(_)) => Some(std::cmp::Ordering::Greater),
+            (Id::String(a), Id::String(b)) => a.partial_cmp(b),
+            (Id::String(_), Id::None) => Some(std::cmp::Ordering::Less),
+
+            (Id::None, Id::None) => Some(std::cmp::Ordering::Equal),
+            (Id::None, _) => Some(std::cmp::Ordering::Greater),
+        }
+    }
+}
+impl Ord for Id {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.partial_cmp(other).unwrap()
+    }
+}
+
 impl Id {
     /// Returns `true` if the ID is a number.
     pub fn is_number(&self) -> bool {

crates/json-rpc/src/lib.rs

@@ -11,6 +11,9 @@
 
 use serde::{de::DeserializeOwned, Serialize};
 
+mod notification;
+pub use notification::EthNotification;
+
 mod request;
 pub use request::Request;
 

crates/json-rpc/src/notification.rs

@@ -0,0 +1,23 @@
+use alloy_primitives::U256;
+use serde::{ser::SerializeMap, Deserialize, Serialize, Serializer};
+
+#[derive(Debug, Deserialize)]
+pub struct EthNotification<T = Box<serde_json::value::RawValue>> {
+    pub subscription: U256,
+    pub result: T,
+}
+
+impl<T> Serialize for EthNotification<T>
+where
+    T: Serialize,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut state = serializer.serialize_map(Some(2))?;
+        state.serialize_entry("subscription", &self.subscription)?;
+        state.serialize_entry("result", &self.result)?;
+        state.end()
+    }
+}

crates/json-rpc/src/request.rs

@@ -32,7 +32,7 @@ where
         map.serialize_entry("method", self.method)?;
 
         // Params may be omitted if it is 0-sized
-        if !is_zst::<Params>() {
+        if std::mem::size_of::<Params>() != 0 {
             map.serialize_entry("params", &self.params)?;
         }
 
@@ -41,7 +41,3 @@ where
         map.end()
     }
 }
-
-fn is_zst<T>() -> bool {
-    std::mem::size_of::<T>() == 0
-}