fix: Use magic from source in daemon bootstrap (#166)

src/bin/oura/daemon.rs

@@ -10,6 +10,7 @@ use oura::{
         BootstrapResult, FilterProvider, PartialBootstrapResult, SinkProvider, SourceProvider,
         StageReceiver,
     },
+    sources::MagicArg,
     utils::{cursor, metrics, ChainWellKnownInfo, Utils, WithUtils},
     Error,
 };
@@ -51,6 +52,13 @@ fn bootstrap_source(config: Source, utils: Arc<Utils>) -> PartialBootstrapResult
     }
 }
 
+fn infer_magic_from_source(config: &Source) -> Option<MagicArg> {
+    match config {
+        Source::N2C(config) => config.magic.clone(),
+        Source::N2N(config) => config.magic.clone(),
+    }
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(tag = "type")]
 enum Filter {
@@ -151,13 +159,22 @@ impl ConfigRoot {
     }
 }
 
+fn define_chain_info(
+    explicit: Option<ChainWellKnownInfo>,
+    magic: &MagicArg,
+) -> Result<ChainWellKnownInfo, Error> {
+    match explicit {
+        Some(x) => Ok(x),
+        None => ChainWellKnownInfo::try_from_magic(**magic),
+    }
+}
+
 fn bootstrap_utils(
-    chain: Option<ChainWellKnownInfo>,
+    chain: ChainWellKnownInfo,
     cursor: Option<cursor::Config>,
     metrics: Option<metrics::Config>,
 ) -> Utils {
-    let well_known = chain.unwrap_or_default();
-    let mut utils = Utils::new(well_known);
+    let mut utils = Utils::new(chain);
 
     if let Some(cursor) = cursor {
         utils = utils.with_cursor(cursor);
@@ -181,6 +198,10 @@ fn bootstrap(config: ConfigRoot) -> Result<Vec<JoinHandle<()>>, Error> {
         metrics,
     } = config;
 
+    let magic = infer_magic_from_source(&source).unwrap_or_default();
+
+    let chain = define_chain_info(chain, &magic)?;
+
     let utils = Arc::new(bootstrap_utils(chain, cursor, metrics));
 
     let mut threads = Vec::with_capacity(10);

src/sources/common.rs

@@ -71,7 +71,7 @@ impl ToString for PointArg {
     }
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct MagicArg(pub u64);
 
 impl Deref for MagicArg {