feat(node): NodeState owns BlockTree; apply_block inserts header into tree

Op: extend

Author: metaphorics

crates/node/src/import.rs

@@ -162,6 +162,34 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn two_block_import_grows_block_tree_to_two_headers() -> Result<()> {
+        let genesis_bytes = hex_decode(REGTEST_GENESIS_HEX)?;
+        let mut cursor = std::io::Cursor::new(genesis_bytes.as_slice());
+        let mut follow_up = Block::consensus_decode(&mut cursor)?;
+        follow_up.header.prev_blockhash = follow_up.block_hash();
+        follow_up.txdata[0].input[0].script_sig = bitcoin::ScriptBuf::from_bytes(vec![1, 1]);
+        follow_up.header.merkle_root = follow_up
+            .compute_merkle_root()
+            .ok_or_else(|| anyhow::anyhow!("follow-up block should have merkle root"))?;
+        mine_block_to_declared_target(&mut follow_up)?;
+
+        let mut follow_up_bytes = Vec::new();
+        follow_up.consensus_encode(&mut follow_up_bytes)?;
+
+        let dir = tempdir()?;
+        let mut config = crate::Config::default_for_network(crate::Network::Regtest);
+        config.data_dir = dir.path().join("node");
+        config.p2p_listen.clear();
+        let state = NodeState::open(config)?;
+
+        let _genesis = import_block(&state, &genesis_bytes)?;
+        let _follow_up = import_block(&state, &follow_up_bytes)?;
+
+        assert_eq!(state.block_tree().read().len(), 2);
+        Ok(())
+    }
+
     #[test]
     fn import_rejects_block_with_no_coinbase() -> Result<()> {
         let genesis_bytes = hex_decode(REGTEST_GENESIS_HEX)?;

crates/node/src/state.rs

@@ -48,6 +48,9 @@ pub enum ApplyError {
     /// Consensus validation rejected the block.
     #[error("consensus: {0}")]
     Consensus(#[from] bitcoin_rs_consensus::ConsensusError),
+    /// Block-tree insertion rejected the header.
+    #[error("chain: {0}")]
+    Chain(#[from] bitcoin_rs_chain::ChainError),
     /// UTXO commit failed during block apply.
     #[error("utxo commit: {0}")]
     UtxoCommit(#[from] bitcoin_rs_utxo::UtxoError),
@@ -157,6 +160,7 @@ pub struct NodeState {
     utxo: Arc<UtxoSet>,
     mempool: Arc<RwLock<Mempool>>,
     chain_tip: Arc<ArcSwapOption<TipSnapshot>>,
+    block_tree: Arc<RwLock<bitcoin_rs_chain::BlockTree>>,
     blocks: Arc<RwLock<Vec<BlockRecord>>>,
     transactions: Arc<RwLock<HashMap<Txid, Transaction>>>,
     network: Arc<RwLock<NetworkState>>,
@@ -175,6 +179,7 @@ impl NodeState {
         let utxo = Arc::new(UtxoSet::new());
         let mempool = Arc::new(RwLock::new(Mempool::new(MempoolLimits::default())));
         let chain_tip = Arc::new(ArcSwapOption::empty());
+        let block_tree = Arc::new(RwLock::new(bitcoin_rs_chain::BlockTree::new()));
         let blocks = Arc::new(RwLock::new(Vec::new()));
         let transactions = Arc::new(RwLock::new(HashMap::new()));
         let network = Arc::new(RwLock::new(NetworkState::default()));
@@ -192,6 +197,7 @@ impl NodeState {
             utxo,
             mempool,
             chain_tip,
+            block_tree,
             blocks,
             transactions,
             network,
@@ -236,6 +242,12 @@ impl NodeState {
         Arc::clone(&self.chain_tip)
     }
 
+    /// Returns the shared block-tree handle.
+    #[must_use]
+    pub fn block_tree(&self) -> Arc<RwLock<bitcoin_rs_chain::BlockTree>> {
+        Arc::clone(&self.block_tree)
+    }
+
     /// Returns the shared block-records handle exposed to RPC handlers.
     #[must_use]
     pub fn blocks(&self) -> Arc<RwLock<Vec<BlockRecord>>> {
@@ -352,6 +364,11 @@ impl NodeState {
         // Contextual consensus checks (BIP30 + BIP34) using the resolved height.
         self.check_bip30_and_bip34(block, height)?;
 
+        // Persist the header into the in-memory block tree; it is the source of
+        // truth for header height, chainwork, and parent linkage. We dual-write
+        // `chain_tip` below until readers migrate to `block_tree()`.
+        self.insert_active_header(block)?;
+
         let mut changes = BlockChanges::default();
         for tx in &block.txdata {
             let txid = tx.compute_txid();
@@ -411,6 +428,13 @@ impl NodeState {
         Ok(tip)
     }
 
+    fn insert_active_header(&self, block: &bitcoin::Block) -> core::result::Result<(), ApplyError> {
+        self.block_tree
+            .write()
+            .insert_header(block.header, bitcoin_rs_chain::node::NodeStatus::Active)?;
+        Ok(())
+    }
+
     fn check_bip30_and_bip34(
         &self,
         block: &bitcoin::Block,
@@ -491,6 +515,24 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn open_constructs_empty_block_tree() -> anyhow::Result<()> {
+        use tempfile::tempdir;
+
+        let dir = tempdir()?;
+        let mut config = crate::Config::default_for_network(crate::Network::Regtest);
+        config.data_dir = dir.path().join("node");
+        config.p2p_listen.clear();
+        let state = NodeState::open(config)?;
+        let tree = state.block_tree();
+
+        assert!(
+            tree.read().is_empty(),
+            "freshly opened tree has zero headers"
+        );
+        Ok(())
+    }
+
     #[test]
     fn open_constructs_full_rpc_handle_set() -> anyhow::Result<()> {
         use tempfile::tempdir;