Allow Serde-serialisation of Streamable

Cargo.toml

@@ -130,6 +130,7 @@ rcgen = "0.13.1"
 rsa = "0.9.5"
 time = "0.3.22"
 rusqlite = "0.31.0"
+serde = { version = "1.0.198", features = ["derive"] }
 clap = "4.5.8"
 zstd = "0.13.2"
 blocking-threadpool = "1.0.1"

crates/chia-bls/Cargo.toml

@@ -14,6 +14,7 @@ workspace = true
 [features]
 py-bindings = ["dep:pyo3", "chia_py_streamable_macro", "chia-traits/py-bindings"]
 arbitrary = ["dep:arbitrary"]
+serde = ["dep:serde"]
 
 [dependencies]
 chia-traits = { workspace = true }
@@ -27,6 +28,7 @@ thiserror = { workspace = true }
 pyo3 = { workspace = true, features = ["multiple-pymethods"], optional = true }
 arbitrary = { workspace = true, optional = true }
 lru = { workspace = true }
+serde = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
 rand = { workspace = true }

crates/chia-bls/src/public_key.rs

@@ -26,6 +26,16 @@ impl<'a> arbitrary::Arbitrary<'a> for PublicKey {
     }
 }
 
+#[cfg(feature = "serde")]
+impl serde::Serialize for PublicKey {
+    fn serialize<S: serde::Serializer>(
+        &self,
+        serializer: S,
+    ) -> std::result::Result<S::Ok, S::Error> {
+        serializer.serialize_str(&hex::encode(self.to_bytes()))
+    }
+}
+
 impl PublicKey {
     pub fn from_bytes_unchecked(bytes: &[u8; 48]) -> Result<Self> {
         // check if the element is canonical

crates/chia-bls/src/signature.rs

@@ -28,6 +28,16 @@ impl<'a> arbitrary::Arbitrary<'a> for Signature {
     }
 }
 
+#[cfg(feature = "serde")]
+impl serde::Serialize for Signature {
+    fn serialize<S: serde::Serializer>(
+        &self,
+        serializer: S,
+    ) -> std::result::Result<S::Ok, S::Error> {
+        serializer.serialize_str(&hex::encode(self.to_bytes()))
+    }
+}
+
 impl Signature {
     pub fn from_bytes_unchecked(buf: &[u8; 96]) -> Result<Self> {
         let p2 = unsafe {

crates/chia-protocol/Cargo.toml

@@ -14,6 +14,7 @@ workspace = true
 [features]
 py-bindings = ["dep:pyo3", "dep:chia_py_streamable_macro", "chia-traits/py-bindings", "chia-bls/py-bindings"]
 arbitrary = ["dep:arbitrary", "chia-bls/arbitrary"]
+serde = ["dep:serde", "chia-bls/serde"]
 
 [dependencies]
 pyo3 = { workspace = true, features = ["multiple-pymethods", "num-bigint"], optional = true }
@@ -27,6 +28,7 @@ clvm-traits = { workspace = true, features = ["derive"] }
 clvm-utils = { workspace = true }
 chia-bls = { workspace = true }
 arbitrary = { workspace = true, features = ["derive"], optional = true }
+serde = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
 rstest = { workspace = true }

crates/chia-protocol/src/bytes.rs

@@ -20,6 +20,7 @@ use pyo3::types::PyBytes;
 
 #[derive(Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 pub struct Bytes(Vec<u8>);
 
 impl Bytes {
@@ -371,6 +372,13 @@ impl<const N: usize> Deref for BytesImpl<N> {
     }
 }
 
+#[cfg(feature = "serde")]
+impl<const N: usize> serde::Serialize for BytesImpl<N> {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(&hex::encode(self.0))
+    }
+}
+
 pub type Bytes32 = BytesImpl<32>;
 pub type Bytes48 = BytesImpl<48>;
 pub type Bytes96 = BytesImpl<96>;

crates/chia-protocol/src/chia_protocol.rs

@@ -8,6 +8,7 @@ use chia_py_streamable_macro::{PyJsonDict, PyStreamable};
 #[repr(u8)]
 #[cfg_attr(feature = "py-bindings", derive(PyJsonDict, PyStreamable))]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 #[derive(Streamable, Hash, Debug, Copy, Clone, Eq, PartialEq)]
 pub enum ProtocolMessageTypes {
     // Shared protocol (all services)
@@ -151,6 +152,7 @@ pub trait ChiaProtocolMessage {
 #[repr(u8)]
 #[cfg_attr(feature = "py-bindings", derive(PyJsonDict, PyStreamable))]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 #[derive(Streamable, Hash, Debug, Copy, Clone, Eq, PartialEq)]
 pub enum NodeType {
     FullNode = 1,

crates/chia-protocol/src/program.rs

@@ -16,6 +16,7 @@ use std::io::Cursor;
 use std::ops::Deref;
 
 #[cfg_attr(feature = "py-bindings", pyclass, derive(PyStreamable))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Program(Bytes);
 

crates/chia-protocol/src/wallet_protocol.rs

@@ -292,6 +292,7 @@ use chia_py_streamable_macro::{PyJsonDict, PyStreamable};
 #[cfg_attr(feature = "py-bindings", derive(PyJsonDict, PyStreamable))]
 #[derive(Streamable, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 pub enum RejectStateReason {
     Reorg = 0,
     ExceededSubscriptionLimit = 1,

crates/chia_streamable_macro/src/lib.rs

@@ -106,6 +106,7 @@ pub fn streamable(attr: TokenStream, item: TokenStream) -> TokenStream {
             )]
             #main_derives
             #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+            #[cfg_attr(feature = "serde", derive(serde::Serialize))]
         }
     } else {
         main_derives