Add mainnet block

- Allow specifying activation block height without its hash as it can be fetched from core
- Custom data dir now appends the chain in a sub directory
- Add mainnet and mainnet alpha blocks
- Report more helpful error messages for non successful http status codes

Author: buffrr

node/src/bin/spaced.rs

@@ -128,7 +128,7 @@ impl Composer {
     }
 
     async fn run(&mut self) -> anyhow::Result<()> {
-        let spaced = Args::configure()?;
+        let spaced = Args::configure().await?;
         self.setup_rpc_services(&spaced).await;
         self.setup_sync_service(spaced).await;
 

node/src/config.rs

@@ -79,6 +79,7 @@ pub struct Args {
 #[serde(rename_all = "lowercase")]
 pub enum ExtendedNetwork {
     Mainnet,
+    MainnetAlpha,
     Testnet,
     Testnet4,
     Signet,
@@ -88,7 +89,7 @@ pub enum ExtendedNetwork {
 impl ExtendedNetwork {
     pub fn fallback_network(&self) -> Network {
         match self {
-            ExtendedNetwork::Mainnet => Network::Bitcoin,
+            ExtendedNetwork::Mainnet | ExtendedNetwork::MainnetAlpha => Network::Bitcoin,
             ExtendedNetwork::Testnet => Network::Testnet,
             ExtendedNetwork::Signet => Network::Signet,
             ExtendedNetwork::Regtest => Network::Regtest,
@@ -100,7 +101,7 @@ impl ExtendedNetwork {
 impl Args {
     /// Configures spaced node by processing command line arguments
     /// and configuration files
-    pub fn configure() -> anyhow::Result<Spaced> {
+    pub async fn configure() -> anyhow::Result<Spaced> {
         let mut args = Args::merge_args_config(None);
         let default_dirs = get_default_node_dirs();
 
@@ -126,9 +127,9 @@ impl Args {
         }
 
         let data_dir = match args.data_dir {
-            None => default_dirs.data_dir().join(args.chain.to_string()),
+            None => default_dirs.data_dir().to_path_buf(),
             Some(data_dir) => data_dir,
-        };
+        }.join(args.chain.to_string());
 
         let default_port = args.rpc_port.unwrap();
         let rpc_bind_addresses: Vec<SocketAddr> = args
@@ -144,7 +145,7 @@ impl Args {
             })
             .collect();
 
-        let genesis = Spaced::genesis(args.chain);
+
         let bitcoin_rpc_auth = if let Some(cookie) = args.bitcoin_rpc_cookie {
             let cookie = std::fs::read_to_string(cookie)?;
             BitcoinRpcAuth::Cookie(cookie)
@@ -159,6 +160,8 @@ impl Args {
             bitcoin_rpc_auth,
         );
 
+        let genesis = Spaced::genesis(&rpc, args.chain).await?;
+
         fs::create_dir_all(data_dir.clone())?;
 
         let proto_db_path = data_dir.join("protocol.sdb");
@@ -261,7 +264,7 @@ pub fn safe_exit(code: i32) -> ! {
 
 fn default_bitcoin_rpc_url(network: &ExtendedNetwork) -> &'static str {
     match network {
-        ExtendedNetwork::Mainnet => "http://127.0.0.1:8332",
+        ExtendedNetwork::Mainnet | ExtendedNetwork::MainnetAlpha => "http://127.0.0.1:8332",
         ExtendedNetwork::Testnet4 => "http://127.0.0.1:48332",
         ExtendedNetwork::Signet => "http://127.0.0.1:38332",
         ExtendedNetwork::Testnet => "http://127.0.0.1:18332",
@@ -359,6 +362,7 @@ impl Display for ExtendedNetwork {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let str = match self {
             ExtendedNetwork::Mainnet => "mainnet".to_string(),
+            ExtendedNetwork::MainnetAlpha => "mainnet-alpha".to_string(),
             ExtendedNetwork::Testnet => "testnet".to_string(),
             ExtendedNetwork::Testnet4 => "testnet4".to_string(),
             ExtendedNetwork::Signet => "signet".to_string(),
@@ -371,6 +375,7 @@ impl Display for ExtendedNetwork {
 pub fn default_spaces_rpc_port(chain: &ExtendedNetwork) -> u16 {
     match chain {
         ExtendedNetwork::Mainnet => 7225,
+        ExtendedNetwork::MainnetAlpha => 7225,
         ExtendedNetwork::Testnet4 => 7224,
         ExtendedNetwork::Testnet => 7223,
         ExtendedNetwork::Signet => 7221,

node/src/source.rs

@@ -694,7 +694,8 @@ impl std::error::Error for BitcoinRpcError {
 
 impl ErrorForRpc for reqwest::Response {
     async fn error_for_rpc<T: DeserializeOwned>(self) -> Result<T, BitcoinRpcError> {
-        let rpc_res: JsonRpcResponse<T> = self.json().await?;
+        let res = self.error_for_status()?;
+        let rpc_res: JsonRpcResponse<T> = res.json().await?;
         if let Some(e) = rpc_res.error {
             return Err(BitcoinRpcError::Rpc(e));
         }
@@ -705,7 +706,8 @@ impl ErrorForRpc for reqwest::Response {
 
 impl ErrorForRpcBlocking for reqwest::blocking::Response {
     fn error_for_rpc<T: DeserializeOwned>(self) -> Result<T, BitcoinRpcError> {
-        let rpc_res: JsonRpcResponse<T> = self.json()?;
+        let res = self.error_for_status()?;
+        let rpc_res: JsonRpcResponse<T> = res.json()?;
         if let Some(e) = rpc_res.error {
             return Err(BitcoinRpcError::Rpc(e));
         }

node/src/sync.rs

@@ -8,7 +8,7 @@ use protocol::{
     hasher::BaseHash,
 };
 use tokio::sync::broadcast;
-
+use protocol::bitcoin::hashes::Hash;
 use crate::{
     config::ExtendedNetwork,
     node::{BlockMeta, BlockSource, Node},
@@ -190,12 +190,29 @@ impl Spaced {
         Ok(())
     }
 
-    pub fn genesis(network: ExtendedNetwork) -> ChainAnchor {
-        match network {
+    pub async fn genesis(rpc : &BitcoinRpc, network: ExtendedNetwork) -> anyhow::Result<ChainAnchor> {
+
+        let mut anchor = match network {
             ExtendedNetwork::Testnet => ChainAnchor::TESTNET(),
             ExtendedNetwork::Testnet4 => ChainAnchor::TESTNET4(),
             ExtendedNetwork::Regtest => ChainAnchor::REGTEST(),
+            ExtendedNetwork::Mainnet => ChainAnchor::MAINNET(),
+            ExtendedNetwork::MainnetAlpha => ChainAnchor::MAINNET_ALPHA(),
             _ => panic!("unsupported network"),
+        };
+
+        if anchor.hash == BlockHash::all_zeros() {
+            let client = reqwest::Client::new();
+
+            anchor.hash  = match rpc.send_json(&client, &rpc.get_block_hash(anchor.height)).await {
+                Ok(hash) => hash,
+                Err(e) => {
+                    return Err(anyhow!("Could not retrieve activation block at height {}: {}",
+                        anchor.height, e));
+                }
+            }
         }
+
+        Ok(anchor)
     }
 }

protocol/src/constants.rs

@@ -67,6 +67,20 @@ impl ChainAnchor {
         )
     };
 
+    pub const MAINNET_ALPHA: fn() -> Self = || {
+        ChainAnchor {
+            hash: BlockHash::all_zeros(),
+            height: 869_000,
+        }
+    };
+
+    pub const MAINNET: fn() -> Self = || {
+        ChainAnchor {
+            hash: BlockHash::all_zeros(),
+            height: 871_222,
+        }
+    };
+
     // Testnet activation block
     pub const TESTNET: fn() -> Self = || {
         Self::new(