Merge remote-tracking branch 'origin/main' into fix/replace-ulid-with-uuidv7

Author: saibatizoku

rust/cardano-blockchain-types/src/fork.rs

@@ -6,13 +6,40 @@
 //!
 //! Note: This fork terminology is different from fork in blockchain.
 
+use std::fmt;
+
 use crate::conversion::from_saturating;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd)]
 /// Counter that is incremented every time there is a roll-back in live-chain.
 pub struct Fork(u64);
 
 impl Fork {
+    /// Fork for data that read from the blockchain during a backfill on initial sync
+    pub const BACKFILL: Self = Self(1);
+    /// Fork count for the first live block.
+    pub const FIRST_LIVE: Self = Self(2);
+    /// Fork for immutable data. This indicates that there is no roll-back.
+    pub const IMMUTABLE: Self = Self(0);
+
+    /// Is the fork for immutable data.
+    #[must_use]
+    pub fn is_immutable(&self) -> bool {
+        self == &Self::IMMUTABLE
+    }
+
+    /// Is the fork for backfill data.
+    #[must_use]
+    pub fn is_backfill(&self) -> bool {
+        self == &Self::BACKFILL
+    }
+
+    /// Is the fork for live data.
+    #[must_use]
+    pub fn is_live(&self) -> bool {
+        self >= &Self::FIRST_LIVE
+    }
+
     /// Convert an `<T>` to `Fork` (saturate if out of range).
     pub fn from_saturating<
         T: Copy
@@ -38,6 +65,17 @@ impl Fork {
     }
 }
 
+impl fmt::Display for Fork {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.0 {
+            0 => write!(f, "IMMUTABLE"),
+            1 => write!(f, "BACKFILL"),
+            // For live forks: 2 maps to LIVE:1, 3 maps to LIVE:2 etc.
+            2..=u64::MAX => write!(f, "LIVE:{}", self.0 - 1),
+        }
+    }
+}
+
 impl From<u64> for Fork {
     fn from(value: u64) -> Self {
         Self(value)

rust/cardano-blockchain-types/src/multi_era_block_data.rs

@@ -281,6 +281,12 @@ impl MultiEraBlock {
 
         None
     }
+
+    /// Get the auxiliary data of the block.
+    #[must_use]
+    pub fn aux_data(&self) -> &BlockAuxData {
+        &self.inner.aux_data
+    }
 }
 
 impl Display for MultiEraBlock {

rust/cardano-chain-follower/Cargo.toml

@@ -15,13 +15,12 @@ pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalys
 pallas-hardano = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 pallas-crypto = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 
-# mithril-client = { version = "0.10.4", git = "https://github.com/input-output-hk/mithril", rev = "c6c7ebafae0158b2c1672eb96f6ef832fd542f93", default-features = false, features = [
 mithril-client = { version = "0.10.4", default-features = false, features = [
     "full",
     "num-integer-backend",
 ] }
-
-rbac-registration = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "v0.0.8" }
+cardano-blockchain-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250114-00" }
+catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250108-00" }
 
 thiserror = "1.0.69"
 tokio = { version = "1.42.0", features = [
@@ -37,26 +36,20 @@ url = "2.5.4"
 anyhow = "1.0.95"
 chrono = "0.4.39"
 async-trait = "0.1.83"
-dirs = "5.0.1"
 futures = "0.3.31"
 humantime = "2.1.0"
 crossbeam-skiplist = "0.1.3"
 crossbeam-channel = "0.5.14"
 crossbeam-epoch = "0.9.18"
 strum = "0.26.3"
-ouroboros = "0.18.4"
 hex = "0.4.3"
 rayon = "1.10.0"
 serde = "1.0.217"
 serde_json = "1.0.134"
 mimalloc = { version = "0.1.43", optional = true }
 memx = "0.1.32"
 fmmap = { version = "0.3.3", features = ["sync", "tokio-async"] }
-minicbor = { version = "0.25.1", features = ["alloc", "derive", "half"] }
 zstd = "0.13.2"
-ed25519-dalek = "2.1.1"
-blake2b_simd = "1.0.2"
-num-traits = "0.2.19"
 logcall = "0.1.11"
 tar = "0.4.43"
 ureq = { version = "2.12.1", features = ["native-certs"] }
@@ -65,12 +58,12 @@ hickory-resolver = { version = "0.24.2", features = ["dns-over-rustls"] }
 moka = { version = "0.12.9", features = ["sync"] }
 
 [dev-dependencies]
-hex = "0.4.3"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 test-log = { version = "0.2.16", default-features = false, features = [
     "trace",
 ] }
 clap = "4.5.23"
+# rbac-registration = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "v0.0.8" }
 
 # Note, these features are for support of features exposed by dependencies.
 [features]