types: nest the block header and body in JSON

Cargo.toml

@@ -10,7 +10,7 @@ authors = ["Ash Manning <ash@layertwolabs.com>",
 edition = "2024"
 license-file = "LICENSE.txt"
 publish = false
-version = "0.17.0"
+version = "0.18.0"
 
 [workspace.dependencies]
 anyhow = "1.0.72"

lib/types/mod.rs

@@ -627,9 +627,7 @@ pub trait Verify {
 
 #[derive(Clone, Debug, Deserialize, Serialize, ToSchema)]
 pub struct Block {
-    #[serde(flatten)]
     pub header: Header,
-    #[serde(flatten)]
     pub body: Body,
     pub height: u32,
 }
@@ -842,3 +840,38 @@ mod withdrawal_bundle_order_regression {
         }
     }
 }
+
+#[cfg(test)]
+mod block_json_tests {
+    use bitcoin::hashes::Hash as _;
+
+    use super::{Block, Body, Header, MerkleRoot};
+
+    #[test]
+    fn block_json_nests_the_header_and_the_body() {
+        let block = Block {
+            header: Header {
+                merkle_root: MerkleRoot::from([1; 32]),
+                prev_side_hash: None,
+                prev_main_hash: bitcoin::BlockHash::from_byte_array([2; 32]),
+            },
+            body: Body {
+                coinbase: Vec::new(),
+                transactions: Vec::new(),
+                authorizations: Vec::new(),
+                actor_proofs: Vec::new(),
+            },
+            height: 7,
+        };
+        let json = serde_json::to_value(&block).unwrap();
+        assert_eq!(
+            json["header"]["prev_main_hash"],
+            serde_json::to_value(block.header.prev_main_hash).unwrap()
+        );
+        assert!(json["body"]["transactions"].is_array());
+        assert_eq!(json["height"], 7);
+        assert!(json.get("prev_main_hash").is_none());
+        let decoded: Block = serde_json::from_value(json.clone()).unwrap();
+        assert_eq!(serde_json::to_value(&decoded).unwrap(), json);
+    }
+}