feat(phase5): improve error handling with graceful lock recovery

Author: Steake

crates/bitcell-node/src/blockchain.rs

@@ -82,17 +82,26 @@ impl Blockchain {
 
     /// Get current chain height
     pub fn height(&self) -> u64 {
-        *self.height.read().unwrap()
+        *self.height.read().unwrap_or_else(|e| {
+            eprintln!("Lock poisoned in height(): {}", e);
+            e.into_inner()
+        })
     }
 
     /// Get latest block hash
     pub fn latest_hash(&self) -> Hash256 {
-        *self.latest_hash.read().unwrap()
+        *self.latest_hash.read().unwrap_or_else(|e| {
+            eprintln!("Lock poisoned in latest_hash(): {}", e);
+            e.into_inner()
+        })
     }
 
     /// Get block by height
     pub fn get_block(&self, height: u64) -> Option<Block> {
-        self.blocks.read().unwrap().get(&height).cloned()
+        self.blocks.read().unwrap_or_else(|e| {
+            eprintln!("Lock poisoned in get_block(): {}", e);
+            e.into_inner()
+        }).get(&height).cloned()
     }
 
     /// Get state manager (read-only access)

crates/bitcell-node/src/lib.rs

@@ -36,6 +36,9 @@ pub enum Error {
 
     #[error("Network error: {0}")]
     Network(String),
+    
+    #[error("Lock error: {0}")]
+    Lock(String),
 }
 
 impl From<String> for Error {

crates/bitcell-node/src/rpc.rs

@@ -357,7 +357,11 @@ async fn eth_get_balance(state: &RpcState, params: Option<Value>) -> Result<Valu
     // Fetch balance from blockchain state
     let balance = {
         let state_lock = state.blockchain.state();
-        let state = state_lock.read().unwrap();
+        let state = state_lock.read().map_err(|_| JsonRpcError {
+            code: -32603,
+            message: "Failed to acquire state lock".to_string(),
+            data: None,
+        })?;
         state.get_account(&address)
             .map(|account| account.balance)
             .unwrap_or(0)
@@ -422,7 +426,11 @@ async fn eth_send_raw_transaction(state: &RpcState, params: Option<Value>) -> Re
     // Validate nonce and balance
     {
         let state_lock = state.blockchain.state();
-        let state_guard = state_lock.read().unwrap();
+        let state_guard = state_lock.read().map_err(|_| JsonRpcError {
+            code: -32603,
+            message: "Failed to acquire state lock".to_string(),
+            data: None,
+        })?;
 
         if let Some(account) = state_guard.get_account(tx.from.as_bytes()) {
             if tx.nonce != account.nonce {