fix(rust/cardano-chain-follower): cardano-chain-follower WASM refinement (#480)

* fix: deps

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

* fix: import

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

* fix: bump cat-type, rbac-reg,  and cardano-bc-type

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

---------

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

Author: bkioshn

rust/cardano-chain-follower/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cardano-chain-follower"
-version = "0.0.12"
+version = "0.0.13"
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
@@ -11,18 +11,13 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-pallas = { version = "0.33.0" }
-pallas-hardano = { version = "0.33.0" }
-pallas-crypto = { version = "0.33.0" }
-
 mithril-client = { version = "0.12.2", default-features = false, features = [
     "full",
     "num-integer-backend",
 ] }
 
-cardano-blockchain-types = { version = "0.0.5",  git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types-v0.0.5" }
-catalyst-types = { version = "0.0.5",  git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types-v0.0.5" }
-
+cardano-blockchain-types = { version = "0.0.6", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types/v0.0.6" }
+catalyst-types = { version = "0.0.6",  git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.6" }
 
 thiserror = "1.0.69"
 tokio = { version = "1.45.0", features = [
@@ -65,7 +60,7 @@ test-log = { version = "0.2.16", default-features = false, features = [
     "trace",
 ] }
 clap = "4.5.23"
-rbac-registration = { version = "0.0.6", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration-v0.0.6" }
+rbac-registration = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration/v0.0.8" }
 minicbor = { version = "2.0.0", features = ["alloc","half"]}
 
 # Note, these features are for support of features exposed by dependencies.

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

@@ -6,11 +6,12 @@
 //#![allow(clippy::unwrap_used)]
 
 use cardano_blockchain_types::{
-    Cip36, Fork, MetadatumLabel, MultiEraBlock, Network, Point, Slot, TransactionId, TxnIndex,
+    hashes::TransactionId, pallas_crypto, pallas_traverse, Cip36, Fork, MetadatumLabel,
+    MultiEraBlock, Network, Point, Slot, TxnIndex,
 };
 #[cfg(feature = "mimalloc")]
 use mimalloc::MiMalloc;
-use pallas::ledger::traverse::MultiEraTx;
+use pallas_traverse::MultiEraTx;
 use rbac_registration::cardano::cip509::Cip509;
 
 /// Use Mimalloc for the global allocator.
@@ -502,23 +503,23 @@ fn update_largest_metadata(
 
 /// Helper function for logging the raw box auxiliary data.
 fn raw_aux_info(
-    block: &pallas::ledger::traverse::MultiEraBlock,
+    block: &pallas_traverse::MultiEraBlock,
     network: Network,
 ) {
     match block {
-        pallas::ledger::traverse::MultiEraBlock::AlonzoCompatible(b, _) => {
+        pallas_traverse::MultiEraBlock::AlonzoCompatible(b, _) => {
             info!(
                 chain = network.to_string(),
                 "Raw Aux Data: {:02x?}", b.auxiliary_data_set
             );
         },
-        pallas::ledger::traverse::MultiEraBlock::Babbage(b) => {
+        pallas_traverse::MultiEraBlock::Babbage(b) => {
             info!(
                 chain = network.to_string(),
                 "Raw Aux Data: {:02x?}", b.auxiliary_data_set
             );
         },
-        pallas::ledger::traverse::MultiEraBlock::Conway(b) => {
+        pallas_traverse::MultiEraBlock::Conway(b) => {
             info!(
                 chain = network.to_string(),
                 "Raw Aux Data: {:02x?}", b.auxiliary_data_set
@@ -530,12 +531,12 @@ fn raw_aux_info(
 
 /// Helper function for updating the largest auxiliary data.
 fn update_largest_aux(
-    block: &pallas::ledger::traverse::MultiEraBlock,
+    block: &pallas_traverse::MultiEraBlock,
     network: Network,
     largest_metadata_size: &mut usize,
 ) {
     match block {
-        pallas::ledger::traverse::MultiEraBlock::AlonzoCompatible(ref b, _) => {
+        pallas_traverse::MultiEraBlock::AlonzoCompatible(ref b, _) => {
             b.auxiliary_data_set.iter().for_each(|(txn_idx, aux_data)| {
                 compare_and_log_aux(
                     aux_data.raw_cbor().len(),
@@ -546,7 +547,7 @@ fn update_largest_aux(
                 );
             });
         },
-        pallas::ledger::traverse::MultiEraBlock::Babbage(ref b) => {
+        pallas_traverse::MultiEraBlock::Babbage(ref b) => {
             b.auxiliary_data_set.iter().for_each(|(txn_idx, aux_data)| {
                 compare_and_log_aux(
                     aux_data.raw_cbor().len(),
@@ -557,7 +558,7 @@ fn update_largest_aux(
                 );
             });
         },
-        pallas::ledger::traverse::MultiEraBlock::Conway(ref b) => {
+        pallas_traverse::MultiEraBlock::Conway(ref b) => {
             b.auxiliary_data_set.iter().for_each(|(txn_idx, aux_data)| {
                 compare_and_log_aux(
                     aux_data.raw_cbor().len(),

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

@@ -6,13 +6,13 @@
 use std::time::Duration;
 
 use anyhow::Context;
-use cardano_blockchain_types::{Fork, MultiEraBlock, Network, Point};
-use pallas::{
-    ledger::traverse::MultiEraHeader,
-    network::{
-        facades::PeerClient,
+use cardano_blockchain_types::{
+    pallas_network::{
+        facades,
         miniprotocols::chainsync::{self, HeaderContent, Tip},
     },
+    pallas_traverse::MultiEraHeader,
+    Fork, MultiEraBlock, Network, Point,
 };
 use tokio::{
     spawn,
@@ -51,12 +51,12 @@ const MAX_NODE_CONNECT_RETRIES: u64 = 5;
 async fn retry_connect(
     addr: &str,
     magic: u64,
-) -> std::result::Result<PeerClient, pallas::network::facades::Error> {
+) -> std::result::Result<facades::PeerClient, facades::Error> {
     let mut retries = MAX_NODE_CONNECT_RETRIES;
     loop {
         match timeout(
             Duration::from_secs(MAX_NODE_CONNECT_TIME_SECS),
-            PeerClient::connect(addr, magic),
+            facades::PeerClient::connect(addr, magic),
         )
         .await
         {
@@ -75,9 +75,9 @@ async fn retry_connect(
             Err(error) => {
                 retries = retries.saturating_sub(1);
                 if retries == 0 {
-                    return Err(pallas::network::facades::Error::ConnectFailure(
-                        tokio::io::Error::other(format!("failed to connect to {addr} : {error}")),
-                    ));
+                    return Err(facades::Error::ConnectFailure(tokio::io::Error::other(
+                        format!("failed to connect to {addr} : {error}"),
+                    )));
                 }
                 debug!("retrying {retries} connect to {addr} : {error:?}");
             },
@@ -87,7 +87,7 @@ async fn retry_connect(
 
 /// Purge the live chain, and intersect with TIP.
 async fn purge_and_intersect_tip(
-    client: &mut PeerClient,
+    client: &mut facades::PeerClient,
     chain: Network,
 ) -> Result<Point> {
     if let Err(error) = purge_live_chain(chain, &Point::TIP) {
@@ -105,7 +105,7 @@ async fn purge_and_intersect_tip(
 
 /// Resynchronize to the live tip in memory.
 async fn resync_live_tip(
-    client: &mut PeerClient,
+    client: &mut facades::PeerClient,
     chain: Network,
 ) -> Result<Point> {
     let sync_points = get_intersect_points(chain);
@@ -127,7 +127,7 @@ async fn resync_live_tip(
 
 /// Fetch a single block from the Peer, and decode it.
 async fn fetch_block_from_peer(
-    peer: &mut PeerClient,
+    peer: &mut facades::PeerClient,
     chain: Network,
     point: Point,
     previous_point: Point,
@@ -150,7 +150,7 @@ async fn fetch_block_from_peer(
 /// Fetch the rollback block, and try and insert it into the live-chain.
 /// If its a real rollback, it will purge the chain ahead of the block automatically.
 async fn process_rollback_actual(
-    peer: &mut PeerClient,
+    peer: &mut facades::PeerClient,
     chain: Network,
     point: Point,
     tip: &Tip,
@@ -198,7 +198,7 @@ async fn process_rollback_actual(
 
 /// Process a rollback detected from the peer.
 async fn process_rollback(
-    peer: &mut PeerClient,
+    peer: &mut facades::PeerClient,
     chain: Network,
     point: Point,
     tip: &Tip,
@@ -230,7 +230,7 @@ async fn process_rollback(
 
 /// Process a rollback detected from the peer.
 async fn process_next_block(
-    peer: &mut PeerClient,
+    peer: &mut facades::PeerClient,
     chain: Network,
     header: HeaderContent,
     tip: &Tip,
@@ -278,7 +278,7 @@ async fn process_next_block(
 ///
 /// We take ownership of the client because of that.
 async fn follow_chain(
-    peer: &mut PeerClient,
+    peer: &mut facades::PeerClient,
     chain: Network,
     fork_count: &mut Fork,
 ) -> anyhow::Result<()> {
@@ -341,7 +341,7 @@ const PEER_FAILURE_RECONNECT_DELAY: Duration = Duration::from_secs(10);
 async fn persistent_reconnect(
     addr: &str,
     chain: Network,
-) -> PeerClient {
+) -> facades::PeerClient {
     // Not yet connected to the peer.
     stats::peer_connected(chain, false, addr);
 

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

@@ -6,7 +6,7 @@ use std::{
     time::Duration,
 };
 
-use cardano_blockchain_types::{Fork, MultiEraBlock, Network, Point, Slot};
+use cardano_blockchain_types::{pallas_primitives, Fork, MultiEraBlock, Network, Point, Slot};
 use crossbeam_skiplist::SkipMap;
 use rayon::prelude::*;
 use strum::IntoEnumIterator;
@@ -364,7 +364,7 @@ impl ProtectedLiveChainBlockList {
     }
 
     /// Get chain sync intersection points for communicating with peer node.
-    fn get_intersect_points(&self) -> Vec<pallas::network::miniprotocols::Point> {
+    fn get_intersect_points(&self) -> Vec<pallas_primitives::types::point::Point> {
         let mut intersect_points = Vec::new();
 
         let Ok(chain) = self.0.read() else {
@@ -562,7 +562,7 @@ pub(crate) fn purge_live_chain(
 
 /// Get intersection points to try and find best point to connect to the node on
 /// reconnect.
-pub(crate) fn get_intersect_points(chain: Network) -> Vec<pallas::network::miniprotocols::Point> {
+pub(crate) fn get_intersect_points(chain: Network) -> Vec<pallas_primitives::types::point::Point> {
     let live_chain = get_live_chain(chain);
     live_chain.get_intersect_points()
 }

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

@@ -2,8 +2,11 @@
 
 use std::{io, path::PathBuf};
 
-use cardano_blockchain_types::Network;
-use pallas::network::miniprotocols::chainsync;
+use cardano_blockchain_types::{
+    pallas_hardano,
+    pallas_network::{self, miniprotocols::chainsync},
+    pallas_traverse, Network,
+};
 use thiserror::Error;
 
 /// Crate error type.
@@ -14,10 +17,10 @@ pub enum Error {
     Codec(String),
     /// Client connection error.
     #[error("Client error: {0:?}")]
-    Client(pallas::network::facades::Error),
+    Client(pallas_network::facades::Error),
     /// Blockfetch protocol error.
     #[error("Blockfetch error: {0:?}")]
-    Blockfetch(pallas::network::miniprotocols::blockfetch::ClientError),
+    Blockfetch(pallas_network::miniprotocols::blockfetch::ClientError),
     /// Chainsync protocol error.
     #[error("Chainsync error: {0:?}")]
     Chainsync(chainsync::ClientError),
@@ -47,7 +50,7 @@ pub enum Error {
     MithrilSnapshotChunk(pallas_hardano::storage::immutable::chunk::Error),
     /// Mithril snapshot traversal error.
     #[error("Failed to traverse block(s) from Mithril snapshot")]
-    MithrilSnapshotTraverse(pallas::ledger::traverse::Error),
+    MithrilSnapshotTraverse(pallas_traverse::Error),
     /// Failed to parse network error.
     #[error("Failed to parse network")]
     ParseNetwork,

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

@@ -1,7 +1,9 @@
 //! Cardano chain follow module.
 
-use cardano_blockchain_types::{Fork, MultiEraBlock, Network, Point};
-use pallas::network::miniprotocols::txmonitor::{TxBody, TxId};
+use cardano_blockchain_types::{
+    pallas_network::miniprotocols::txmonitor::{TxBody, TxId},
+    Fork, MultiEraBlock, Network, Point,
+};
 use tokio::sync::broadcast::{self};
 use tracing::{debug, error, warn};
 
@@ -409,13 +411,15 @@ impl ChainFollower {
 
 #[cfg(test)]
 mod tests {
+    use cardano_blockchain_types::pallas_traverse;
+
     use super::*;
 
     fn mock_block() -> MultiEraBlock {
         let raw_block = hex::decode(include_str!("./../test_data/shelley.block"))
             .expect("Failed to decode hex block.");
 
-        let pallas_block = pallas::ledger::traverse::MultiEraBlock::decode(raw_block.as_slice())
+        let pallas_block = pallas_traverse::MultiEraBlock::decode(raw_block.as_slice())
             .expect("cannot decode block");
 
         let previous_point = Point::new(

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

@@ -2,8 +2,10 @@
 
 use std::path::Path;
 
-use cardano_blockchain_types::{Network, Point};
-use pallas_hardano::storage::immutable::FallibleBlock;
+use cardano_blockchain_types::{
+    pallas_hardano::{self},
+    Network, Point,
+};
 use tokio::task;
 
 use crate::{
@@ -12,7 +14,8 @@ use crate::{
 };
 
 /// Synchronous Immutable block iterator.
-pub(crate) type ImmutableBlockIterator = Box<dyn Iterator<Item = FallibleBlock> + Send + Sync>;
+pub(crate) type ImmutableBlockIterator =
+    Box<dyn Iterator<Item = pallas_hardano::storage::immutable::FallibleBlock> + Send + Sync>;
 
 /// Get a mithril snapshot iterator.
 pub(crate) async fn make_mithril_iterator(

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

@@ -6,7 +6,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use cardano_blockchain_types::{Fork, MultiEraBlock, Network, Point};
+use cardano_blockchain_types::{pallas_traverse, Fork, MultiEraBlock, Network, Point};
 use logcall::logcall;
 use tokio::task;
 use tracing::{debug, error};
@@ -104,8 +104,7 @@ impl MithrilSnapshotIterator {
 
             match next {
                 Some(Ok(raw_block)) => {
-                    let Ok(block) = pallas::ledger::traverse::MultiEraBlock::decode(&raw_block)
-                    else {
+                    let Ok(block) = pallas_traverse::MultiEraBlock::decode(&raw_block) else {
                         return None;
                     };
 
@@ -267,9 +266,7 @@ impl Iterator for MithrilSnapshotIteratorInner {
 
                 // We cannot fully decode this block because we don't know its previous point,
                 // So this MUST be the first block in iteration, so use it as the previous.
-                if let Ok(raw_decoded_block) =
-                    pallas::ledger::traverse::MultiEraBlock::decode(&block)
-                {
+                if let Ok(raw_decoded_block) = pallas_traverse::MultiEraBlock::decode(&block) {
                     // debug!("Pre Previous update 2 : {:?}", self.previous);
                     self.previous = Point::new(
                         raw_decoded_block.slot().into(),