Merge pull request #113 from namada-net/tiago/serde-json-fixes

Serde json fixes

Author: sug0

Cargo.lock

@@ -8,7 +8,7 @@ members = [
 
 
 [workspace.package]
-version = "3.0.10"
+version = "3.0.11"
 
 [profile.release]
 lto = true

Cargo.toml

@@ -89,6 +89,7 @@ criterion = "0.5"
 proptest = "1.0.0"
 assert_matches = "1.3.0"
 rand_xorshift = "0.3"
+serde_json = "1.0.149"
 
 [features]
 serde = ["dep:serde", "dep:serde-hex"]

masp_primitives/Cargo.toml

@@ -92,6 +92,7 @@ pub fn merkle_hash(depth: usize, lhs: &[u8; 32], rhs: &[u8; 32]) -> [u8; 32] {
 #[derive(Clone, Copy, Debug, PartialEq, Eq, BorshSerialize, BorshDeserialize, Default)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(transparent))]
 #[repr(transparent)]
 pub struct Node {
     #[cfg_attr(feature = "serde", serde(with = "SerHex::<Strict>"))]
@@ -1033,14 +1034,31 @@ pub mod testing {
 
 #[cfg(test)]
 mod tests {
+    use super::Node;
     use crate::{
         sapling::Note,
         sapling::testing::{arb_note, arb_positive_note_value},
         transaction::components::amount::MAX_MONEY,
     };
     use borsh::BorshDeserialize;
+    use incrementalmerkletree::Hashable;
     use proptest::prelude::*;
 
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde_node_roundtrip() {
+        let empty = Node::empty_leaf();
+
+        let ser = serde_json::to_string(&empty).unwrap();
+        assert_eq!(
+            ser,
+            r#""0100000000000000000000000000000000000000000000000000000000000000""#
+        );
+
+        let de: Node = serde_json::from_str(&ser).unwrap();
+        assert_eq!(empty, de);
+    }
+
     proptest! {
         #![proptest_config(ProptestConfig::with_cases(10))]
         #[test]