Map Bitcoin chain ID from node info

Derive the Bitcoin chain ID from the node's /api/ node info instead of reading a block hash. Add map_chain_id to state_mapper (using primitives::Asset/BitcoinChain) and update get_chain_id to call get_node_info + mapper. Remove the unused BitcoinBlock model and obsolete fields (last_block_time, backend.chain), and drop get_block_info from the RPC client. Update state_mapper tests and testdata to reflect new blockbook fields (coin, network) and include a helper to construct BitcoinNodeInfo for tests.

Author: gemcoder21

core/crates/gem_bitcoin/src/models/block.rs

@@ -4,13 +4,6 @@ use crate::models::Transaction;
 
 type Int = u64;
 
-// Domain models
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BitcoinBlock {
-    pub previous_block_hash: Option<String>,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct BitcoinNodeInfo {
     pub blockbook: BitcoinBlockbook,
@@ -20,16 +13,15 @@ pub struct BitcoinNodeInfo {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BitcoinBlockbook {
+    pub network: Option<String>,
     pub in_sync: bool,
-    pub last_block_time: String,
     pub best_height: Int,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BitcoinBackend {
     pub blocks: Option<Int>,
-    pub chain: Option<String>,
     pub consensus: Option<Consensus>,
 }
 

core/crates/gem_bitcoin/src/provider/state.rs

@@ -9,8 +9,8 @@ use crate::{provider::state_mapper, rpc::client::BitcoinClient};
 #[async_trait]
 impl<C: Client> ChainState for BitcoinClient<C> {
     async fn get_chain_id(&self) -> Result<String, Box<dyn Error + Sync + Send>> {
-        let block = self.get_block_info(1).await?;
-        block.previous_block_hash.ok_or_else(|| "Unable to get block hash".into())
+        let node_info = self.get_node_info().await?;
+        Ok(state_mapper::map_chain_id(self.chain, &node_info)?)
     }
 
     async fn get_node_status(&self) -> Result<NodeSyncStatus, Box<dyn Error + Sync + Send>> {
@@ -46,7 +46,7 @@ mod chain_integration_tests {
         let chain_id = client.get_chain_id().await?;
 
         assert!(!chain_id.is_empty());
-        assert!(chain_id.len() == 64); // Bitcoin block hashes are 64 characters
+        assert_eq!(chain_id, primitives::Chain::Bitcoin.network_id());
         println!("Bitcoin chain ID: {}", chain_id);
 
         Ok(())

core/crates/gem_bitcoin/src/provider/state_mapper.rs

@@ -1,5 +1,16 @@
 use crate::models::block::BitcoinNodeInfo;
-use primitives::NodeSyncStatus;
+use primitives::{Asset, BitcoinChain, NodeSyncStatus};
+
+pub fn map_chain_id(chain: BitcoinChain, node_info: &BitcoinNodeInfo) -> Result<String, &'static str> {
+    let chain = chain.get_chain();
+    let asset = Asset::from_chain(chain);
+
+    if node_info.blockbook.network.as_deref() == Some(asset.symbol.as_str()) {
+        Ok(chain.network_id().to_string())
+    } else {
+        Err("Invalid Bitcoin network")
+    }
+}
 
 pub fn map_node_status(node_info: &BitcoinNodeInfo) -> NodeSyncStatus {
     let latest_block_number = node_info.backend.blocks;
@@ -16,21 +27,21 @@ pub fn map_latest_block_number(node_info: &BitcoinNodeInfo) -> u64 {
 mod tests {
     use super::*;
     use crate::models::block::{BitcoinBackend, BitcoinBlockbook, BitcoinNodeInfo};
+    use primitives::{Asset, Chain};
+
+    #[test]
+    fn test_map_chain_id() {
+        let bitcoin = node_info(Some(Asset::from_chain(Chain::Bitcoin).symbol), true, 1, Some(1));
+        assert_eq!(map_chain_id(BitcoinChain::Bitcoin, &bitcoin).unwrap(), Chain::Bitcoin.network_id());
+
+        let doge = node_info(Some(Asset::from_chain(Chain::Doge).symbol), true, 1, Some(1));
+        assert_eq!(map_chain_id(BitcoinChain::Doge, &doge).unwrap(), Chain::Doge.network_id());
+        assert_eq!(map_chain_id(BitcoinChain::Bitcoin, &doge), Err("Invalid Bitcoin network"));
+    }
 
     #[test]
     fn test_map_node_status_returns_flag_and_block_numbers() {
-        let node_info = BitcoinNodeInfo {
-            blockbook: BitcoinBlockbook {
-                in_sync: false,
-                last_block_time: "2024-01-01T00:00:00Z".to_string(),
-                best_height: 123,
-            },
-            backend: BitcoinBackend {
-                blocks: Some(456),
-                chain: Some("main".to_string()),
-                consensus: None,
-            },
-        };
+        let node_info = node_info(Some(Asset::from_chain(Chain::Bitcoin).symbol), false, 123, Some(456));
 
         let status = map_node_status(&node_info);
 
@@ -41,19 +52,14 @@ mod tests {
 
     #[test]
     fn test_map_latest_block_number_returns_best_height() {
-        let node_info = BitcoinNodeInfo {
-            blockbook: BitcoinBlockbook {
-                in_sync: true,
-                last_block_time: "2024-01-01T00:00:00Z".to_string(),
-                best_height: 1_000,
-            },
-            backend: BitcoinBackend {
-                blocks: Some(2_000),
-                chain: Some("main".to_string()),
-                consensus: None,
-            },
-        };
-
+        let node_info = node_info(Some(Asset::from_chain(Chain::Bitcoin).symbol), true, 1_000, Some(2_000));
         assert_eq!(map_latest_block_number(&node_info), 1_000);
     }
+
+    fn node_info(network: Option<String>, in_sync: bool, best_height: u64, blocks: Option<u64>) -> BitcoinNodeInfo {
+        BitcoinNodeInfo {
+            blockbook: BitcoinBlockbook { network, in_sync, best_height },
+            backend: BitcoinBackend { blocks, consensus: None },
+        }
+    }
 }

core/crates/gem_bitcoin/src/rpc/client.rs

@@ -1,7 +1,7 @@
 use std::error::Error;
 
 use crate::models::account::BitcoinAccount;
-use crate::models::block::{BitcoinBlock, BitcoinNodeInfo, Block, Status};
+use crate::models::block::{BitcoinNodeInfo, Block, Status};
 use crate::models::fee::BitcoinFeeResult;
 use crate::models::transaction::{AddressDetails, BitcoinTransactionBroacastResult, BitcoinUTXO, Transaction};
 use chain_traits::{ChainAddressStatus, ChainPerpetual, ChainStaking, ChainToken, ChainTraits};
@@ -44,10 +44,6 @@ impl<C: Client> BitcoinClient<C> {
         Ok(self.client.get(&format!("/api/v2/address/{address}")).await?)
     }
 
-    pub async fn get_block_info(&self, block_number: u64) -> Result<BitcoinBlock, Box<dyn Error + Send + Sync>> {
-        Ok(self.client.get(&format!("/api/v2/block/{block_number}")).await?)
-    }
-
     pub async fn get_node_info(&self) -> Result<BitcoinNodeInfo, Box<dyn Error + Send + Sync>> {
         Ok(self.client.get("/api/").await?)
     }

core/crates/gem_bitcoin/testdata/node_info_no_blocks.json

@@ -1,11 +1,10 @@
 {
   "blockbook": {
+    "network": "ZEC",
     "inSync": true,
-    "lastBlockTime": "2026-06-03T00:00:00Z",
     "bestHeight": 2700000
   },
   "backend": {
-    "chain": "main",
     "consensus": {
       "chaintip": "c2d6d0b4"
     }