fixed

Author: sanaica

minichain/block.py

@@ -73,7 +73,6 @@ def to_header_dict(self):
             "timestamp": self.timestamp,
             "difficulty": self.difficulty,
             "nonce": self.nonce,
-            "miner": self.miner,
         }
 
     # -------------------------
@@ -90,11 +89,11 @@ def to_body_dict(self):
     # FULL BLOCK
     # -------------------------
     def to_dict(self):
-        return {
-            **self.to_header_dict(),
-            **self.to_body_dict(),
-            "hash": self.hash,
-        }
+        data = self.to_header_dict()
+        data["transactions"] = [tx.to_dict() for tx in self.transactions]
+        data["hash"] = self.hash
+        data["miner"] = self.miner
+        return data
 
     # -------------------------
     # HASH CALCULATION

minichain/p2p.py

@@ -303,7 +303,6 @@ async def _listen_to_peer(
 
     async def _broadcast_raw(self, payload: dict):
         """Send a JSON message to every connected peer."""
-        line = (json.dumps(payload) + "\n").encode()
         line = (canonical_json_dumps(payload) + "\n").encode()
         disconnected = []
         for reader, writer in self._peers:
@@ -333,12 +332,16 @@ async def broadcast_transaction(self, tx):
         self._mark_seen("tx", payload["data"])
         await self._broadcast_raw(payload)
 
-    async def broadcast_block(self, block):
+    async def broadcast_block(self, block, miner=None):
         logger.info("Network: Broadcasting Block #%d", block.index)
+        
+        # Ensure the block object has the miner set if provided
+        if miner:
+            block.miner = miner
+
         payload = {
             "type": "block",
-            "data": json.loads(block.canonical_payload.decode('utf-8')),
-            "miner": block.miner
+            "data": json.loads(block.canonical_payload.decode('utf-8'))
         }
         self._mark_seen("block", payload["data"])
         await self._broadcast_raw(payload)