Merge branch 'main' into fix/eth-subscribe

Author: qj0r9j0vc2

Cargo.toml

@@ -83,10 +83,11 @@ tower-http = { version = "0.6", features = ["full"] }
 dashmap = "6.1"
 
 # Alloy types (v1.x for reth v1.10.0 compatibility)
+# IMPORTANT: serde feature required for proper hex serialization in JSON-RPC responses
 alloy-primitives = { version = "1", features = ["serde", "rlp"] }
 alloy-rpc-types = { version = "1" }
-alloy-rpc-types-eth = { version = "1" }
-alloy-consensus = { version = "1" }
+alloy-rpc-types-eth = { version = "1", features = ["serde"] }
+alloy-consensus = { version = "1", features = ["serde"] }
 
 # Networking
 futures = "0.3"

crates/node/src/execution_bridge.rs

@@ -16,6 +16,22 @@ use std::sync::RwLock as StdRwLock;
 use tokio::sync::RwLock;
 use tracing::{debug, info, warn};
 
+/// Result of block execution with computed block hash and parent hash.
+///
+/// This extends `ExecutionResult` with the properly computed block hash
+/// and parent hash needed for RPC responses and chain connectivity.
+#[derive(Debug, Clone)]
+pub struct BlockExecutionResult {
+    /// The underlying execution result
+    pub execution_result: ExecutionResult,
+    /// The computed block hash (keccak256 of block header fields)
+    pub block_hash: B256,
+    /// The parent block hash (hash of the previous block)
+    pub parent_hash: B256,
+    /// The block timestamp
+    pub timestamp: u64,
+}
+
 /// Bridge between consensus and execution layers
 ///
 /// Maintains the connection between the consensus layer and the execution layer,
@@ -173,11 +189,12 @@ impl ExecutionBridge {
     ///
     /// # Returns
     ///
-    /// Returns execution result with state root and receipts.
+    /// Returns `BlockExecutionResult` containing execution result with properly computed
+    /// block hash and parent hash for RPC responses.
     pub async fn execute_cut(
         &self,
         consensus_cut: cipherbft_data_chain::Cut,
-    ) -> anyhow::Result<ExecutionResult> {
+    ) -> anyhow::Result<BlockExecutionResult> {
         debug!(
             height = consensus_cut.height,
             cars = consensus_cut.cars.len(),
@@ -234,7 +251,12 @@ impl ExecutionBridge {
             "Block hash updated"
         );
 
-        Ok(result)
+        Ok(BlockExecutionResult {
+            execution_result: result,
+            block_hash: new_block_hash,
+            parent_hash,
+            timestamp,
+        })
     }
 
     /// Convert a consensus Cut to an execution Cut

crates/node/src/node.rs

@@ -16,7 +16,7 @@
 //! 5. Exit
 
 use crate::config::NodeConfig;
-use crate::execution_bridge::ExecutionBridge;
+use crate::execution_bridge::{BlockExecutionResult, ExecutionBridge};
 use crate::network::{TcpPrimaryNetwork, TcpWorkerNetwork};
 use crate::supervisor::NodeSupervisor;
 use anyhow::{Context, Result};
@@ -32,7 +32,7 @@ use cipherbft_data_chain::{
     Cut, DclMessage, WorkerMessage,
 };
 use cipherbft_execution::{
-    keccak256, ChainConfig, ExecutionResult, InMemoryProvider, Log as ExecutionLog,
+    keccak256, ChainConfig, InMemoryProvider, Log as ExecutionLog,
     TransactionReceipt as ExecutionReceipt,
 };
 use cipherbft_storage::{
@@ -941,11 +941,12 @@ impl Node {
                     // Then store the block to MDBX for RPC queries
                     if let Some(ref bridge) = execution_bridge {
                         match bridge.execute_cut(cut).await {
-                            Ok(result) => {
+                            Ok(block_result) => {
                                 info!(
-                                    "Cut executed successfully - state_root: {}, gas_used: {}",
-                                    result.state_root,
-                                    result.gas_used
+                                    "Cut executed successfully - state_root: {}, gas_used: {}, block_hash: {}",
+                                    block_result.execution_result.state_root,
+                                    block_result.execution_result.gas_used,
+                                    block_result.block_hash
                                 );
 
                                 // Store the block to MDBX for eth_getBlockByNumber queries
@@ -955,11 +956,11 @@ impl Node {
                                     debug!("Updated RPC block number to {}", height.0);
 
                                     // Create and store the block
-                                    let block = Self::execution_result_to_block(height.0, &result);
+                                    let block = Self::execution_result_to_block(height.0, &block_result);
                                     if let Err(e) = storage.block_store().put_block(&block).await {
                                         error!("Failed to store block {} to MDBX: {}", height.0, e);
                                     } else {
-                                        debug!("Stored block {} to MDBX", height.0);
+                                        debug!("Stored block {} to MDBX with hash {}", height.0, block_result.block_hash);
 
                                         // Broadcast to WebSocket subscribers (eth_subscribe("newHeads"))
                                         if let Some(ref sub_mgr) = subscription_manager {
@@ -971,8 +972,9 @@ impl Node {
                                     }
 
                                     // Store receipts for eth_getBlockReceipts queries
-                                    if !result.receipts.is_empty() {
-                                        let storage_receipts: Vec<StorageReceipt> = result
+                                    if !block_result.execution_result.receipts.is_empty() {
+                                        let storage_receipts: Vec<StorageReceipt> = block_result
+                                            .execution_result
                                             .receipts
                                             .iter()
                                             .map(Self::execution_receipt_to_storage)
@@ -1006,40 +1008,34 @@ impl Node {
         self.validator_id
     }
 
-    /// Convert an ExecutionResult to a storage Block for MDBX persistence.
+    /// Convert a BlockExecutionResult to a storage Block for MDBX persistence.
     ///
     /// This creates a Block struct suitable for storage from the execution result.
-    /// The block hash is derived from the execution result's block_hash field.
-    fn execution_result_to_block(block_number: u64, result: &ExecutionResult) -> Block {
-        // Get current timestamp
-        let timestamp = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap_or_default()
-            .as_secs();
+    /// The block hash and parent hash are properly computed by the ExecutionBridge.
+    fn execution_result_to_block(block_number: u64, result: &BlockExecutionResult) -> Block {
+        let exec = &result.execution_result;
 
         // Extract transaction hashes from receipts
-        let transaction_hashes: Vec<[u8; 32]> = result
-            .receipts
-            .iter()
-            .map(|r| r.transaction_hash.0)
-            .collect();
+        let transaction_hashes: Vec<[u8; 32]> =
+            exec.receipts.iter().map(|r| r.transaction_hash.0).collect();
         let transaction_count = transaction_hashes.len() as u32;
 
         // Create the block with execution results
+        // Use the properly computed block_hash and parent_hash from BlockExecutionResult
         Block {
             hash: result.block_hash.0,
             number: block_number,
-            parent_hash: [0u8; 32], // TODO: Track parent hash from previous block
+            parent_hash: result.parent_hash.0,
             ommers_hash: [0u8; 32], // Always empty in PoS
             beneficiary: [0u8; 20], // TODO: Set to validator address
-            state_root: result.state_root.0,
-            transactions_root: result.transactions_root.0,
-            receipts_root: result.receipts_root.0,
-            logs_bloom: result.logs_bloom.0.to_vec(),
+            state_root: exec.state_root.0,
+            transactions_root: exec.transactions_root.0,
+            receipts_root: exec.receipts_root.0,
+            logs_bloom: exec.logs_bloom.0.to_vec(),
             difficulty: [0u8; 32], // Always zero in PoS
             gas_limit: 30_000_000, // TODO: Get from config
-            gas_used: result.gas_used,
-            timestamp,
+            gas_used: exec.gas_used,
+            timestamp: result.timestamp,
             extra_data: Vec::new(),
             mix_hash: [0u8; 32],                   // prevrandao in PoS
             nonce: [0u8; 8],                       // Always zero in PoS