fix(cardano-chain-follower): new fork

Signed-off-by: bkioshn <[email protected]>

Author: bkioshn

rust/cardano-chain-follower/Cargo.toml

@@ -19,7 +19,7 @@ mithril-client = { version = "0.10.4", default-features = false, features = [
     "full",
     "num-integer-backend",
 ] }
-cardano-blockchain-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250109-00" }
+cardano-blockchain-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "fix/fork" }
 catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250108-00" }
 
 thiserror = "1.0.69"

rust/cardano-chain-follower/examples/follow_chains.rs

@@ -190,7 +190,7 @@ async fn follow_for(network: Network, matches: ArgMatches) {
         // If these become true, we will show all blocks from the follower.
         follow_all = follow_all
             || (!chain_update.immutable() && all_live_blocks)
-            || ((chain_update.data.fork() > 1.into()) && all_tip_blocks);
+            || (chain_update.data.fork().is_live() && all_tip_blocks);
 
         // Don't know if this update will show or not, so say it didn't.
         last_update_shown = false;

rust/cardano-chain-follower/src/chain_sync.rs

@@ -368,7 +368,7 @@ async fn live_sync_backfill(
 
     while let Some(block_data) = peer.blockfetch().recv_while_streaming().await? {
         // Backfilled blocks get placed in the oldest fork currently on the live-chain.
-        let block = MultiEraBlock::new(cfg.chain, block_data, &previous_point, 1.into())
+        let block = MultiEraBlock::new(cfg.chain, block_data, &previous_point, Fork::BACKFILL)
             .with_context(|| {
                 format!(
                     "Failed to decode block data. previous: {previous_point:?}, range: {range_msg}"
@@ -534,7 +534,7 @@ pub(crate) async fn chain_sync(cfg: ChainSyncConfig, rx: mpsc::Receiver<MithrilU
     // Live Fill data starts at fork 1.
     // Immutable data from a mithril snapshot is fork 0.
     // Live backfill is always Fork 1.
-    let mut fork_count: Fork = 2.into();
+    let mut fork_count: Fork = Fork::FIRST_LIVE;
 
     loop {
         // We never have a connection if we end up around the loop, so make a new one.

rust/cardano-chain-follower/src/chain_sync_live_chains.rs

@@ -45,6 +45,9 @@ static PEER_TIP: LazyLock<SkipMap<Network, Point>> = LazyLock::new(|| {
     map
 });
 
+/// Initial slot age to probe.
+const INITIAL_SLOT_PROBE_AGE: u64 = 40;
+
 /// Set the last TIP received from the peer.
 fn update_peer_tip(chain: Network, tip: Point) {
     PEER_TIP.insert(chain, tip);
@@ -207,7 +210,7 @@ impl ProtectedLiveChainBlockList {
             let mut rollback_size: u64 = 0;
 
             // We are NOT contiguous, so check if we can become contiguous with a rollback.
-            debug!("Detected non-contiguous block, rolling back. Fork: {fork_count:?}");
+            debug!("Detected non-contiguous block, rolling back. Fork: {fork_count}");
 
             // First check if the previous is >= the earliest block in the live chain.
             // This is because when we start syncing we could rollback earlier than our
@@ -344,7 +347,7 @@ impl ProtectedLiveChainBlockList {
         }
 
         // Now find points based on an every increasing Slot age.
-        let mut slot_age: Slot = 40.into();
+        let mut slot_age: Slot = INITIAL_SLOT_PROBE_AGE.into();
         let reference_slot = entry.value().point().slot_or_default();
         let mut previous_point = entry.value().point();
 

rust/cardano-chain-follower/src/follow.rs

@@ -101,7 +101,7 @@ impl ChainFollower {
                     self.previous = self.current.clone();
                     // debug!("Post Previous update 3 : {:?}", self.previous);
                     self.current = next.point();
-                    self.fork = 0.into(); // Mithril Immutable data is always Fork 0.
+                    self.fork = Fork::IMMUTABLE; // Mithril Immutable data is always Fork 0.
                     let update = ChainUpdate::new(chain_update::Kind::Block, false, next);
                     return Some(update);
                 }