Merge pull request #372 from input-output-hk/sg/update-caryatid

SupernaviX · web-flow · commit c8d34b4e8b3c · 2025-11-21T07:33:21.000-05:00
Sg/update caryatid
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,11 +39,11 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-caryatid_sdk = "0.12"
-caryatid_process = "0.12"
-caryatid_module_rest_server = "0.14"
-caryatid_module_clock = "0.12"
-caryatid_module_spy = "0.12"
+caryatid_sdk = "0.13"
+caryatid_process = "0.13"
+caryatid_module_rest_server = "0.15"
+caryatid_module_clock = "0.13"
+caryatid_module_spy = "0.13"
 anyhow = "1.0"
 chrono = "0.4"
 clap = { version = "4.5", features = ["derive", "string"] }
diff --git a/common/tests/loc_over_bus.rs b/common/tests/loc_over_bus.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use serde::{Deserialize, Serialize};
 use tempfile::NamedTempFile;
 use tokio::{sync::watch, time::timeout};
diff --git a/modules/accounts_state/src/accounts_state.rs b/modules/accounts_state/src/accounts_state.rs
@@ -9,7 +9,7 @@ use acropolis_common::{
 };
 use anyhow::Result;
 use bigdecimal::Zero;
-use caryatid_sdk::{message_bus::Subscription, module, Context, Module};
+use caryatid_sdk::{message_bus::Subscription, module, Context};
 use config::Config;
 use std::sync::Arc;
 use tokio::{join, sync::Mutex};
diff --git a/modules/address_state/src/address_state.rs b/modules/address_state/src/address_state.rs
@@ -17,7 +17,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use tokio::sync::{mpsc, Mutex};
 use tracing::{error, info};
diff --git a/modules/assets_state/src/assets_state.rs b/modules/assets_state/src/assets_state.rs
@@ -16,7 +16,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/block_kes_validator/src/block_kes_validator.rs b/modules/block_kes_validator/src/block_kes_validator.rs
@@ -7,7 +7,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/block_unpacker/src/block_unpacker.rs b/modules/block_unpacker/src/block_unpacker.rs
@@ -3,7 +3,7 @@
 
 use acropolis_common::messages::{CardanoMessage, Message, RawTxsMessage};
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use pallas::ledger::traverse::MultiEraBlock;
 use std::sync::Arc;
diff --git a/modules/block_vrf_validator/src/block_vrf_validator.rs b/modules/block_vrf_validator/src/block_vrf_validator.rs
@@ -7,7 +7,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/chain_store/Cargo.toml b/modules/chain_store/Cargo.toml
@@ -7,7 +7,7 @@ description = "Chain Store Tracker"
 license = "Apache-2.0"
 
 [dependencies]
-caryatid_sdk = "0.12"
+caryatid_sdk = { workspace = true }
 acropolis_common = { path = "../../common" }
 acropolis_codec = { path = "../../codec" }
 anyhow = "1.0"
diff --git a/modules/chain_store/src/chain_store.rs b/modules/chain_store/src/chain_store.rs
@@ -20,7 +20,7 @@ use acropolis_common::{
     BechOrdAddress, BlockHash, GenesisDelegate, HeavyDelegate, PoolId, TxHash,
 };
 use anyhow::{bail, Result};
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use std::collections::{BTreeMap, HashMap};
 use std::sync::Arc;
diff --git a/modules/consensus/src/consensus.rs b/modules/consensus/src/consensus.rs
@@ -6,7 +6,7 @@ use acropolis_common::{
     validation::ValidationStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use futures::future::try_join_all;
 use std::sync::Arc;
diff --git a/modules/drdd_state/src/drdd_state.rs b/modules/drdd_state/src/drdd_state.rs
@@ -5,7 +5,7 @@ use acropolis_common::{
     rest_helper::handle_rest_with_query_parameters,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/drep_state/src/drep_state.rs b/modules/drep_state/src/drep_state.rs
@@ -12,7 +12,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/epochs_state/src/epochs_state.rs b/modules/epochs_state/src/epochs_state.rs
@@ -11,7 +11,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{message_bus::Subscription, module, Context, Module};
+use caryatid_sdk::{message_bus::Subscription, module, Context};
 use config::Config;
 use pallas::ledger::traverse::MultiEraHeader;
 use std::sync::Arc;
diff --git a/modules/genesis_bootstrapper/src/genesis_bootstrapper.rs b/modules/genesis_bootstrapper/src/genesis_bootstrapper.rs
@@ -14,7 +14,7 @@ use acropolis_common::{
 };
 use anyhow::Result;
 use blake2::{digest::consts::U32, Blake2b, Digest};
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use pallas::ledger::configs::{
     byron::{genesis_utxos, GenesisFile as ByronGenesisFile},
diff --git a/modules/governance_state/src/governance_state.rs b/modules/governance_state/src/governance_state.rs
@@ -14,7 +14,7 @@ use acropolis_common::{
     BlockInfo,
 };
 use anyhow::{anyhow, Result};
-use caryatid_sdk::{message_bus::Subscription, module, Context, Module};
+use caryatid_sdk::{message_bus::Subscription, module, Context};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/historical_accounts_state/src/historical_accounts_state.rs b/modules/historical_accounts_state/src/historical_accounts_state.rs
@@ -10,7 +10,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{message_bus::Subscription, module, Context, Module};
+use caryatid_sdk::{message_bus::Subscription, module, Context};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::{mpsc, Mutex};
diff --git a/modules/historical_epochs_state/src/historical_epochs_state.rs b/modules/historical_epochs_state/src/historical_epochs_state.rs
@@ -14,7 +14,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{message_bus::Subscription, module, Context, Module};
+use caryatid_sdk::{message_bus::Subscription, module, Context};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::{mpsc, Mutex};
diff --git a/modules/mithril_snapshot_fetcher/src/mithril_snapshot_fetcher.rs b/modules/mithril_snapshot_fetcher/src/mithril_snapshot_fetcher.rs
@@ -7,7 +7,7 @@ use acropolis_common::{
     BlockHash, BlockInfo, BlockStatus, Era,
 };
 use anyhow::{anyhow, bail, Result};
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use chrono::{Duration, Utc};
 use config::Config;
 use mithril_client::{
diff --git a/modules/parameters_state/src/parameters_state.rs b/modules/parameters_state/src/parameters_state.rs
@@ -11,7 +11,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus,
 };
 use anyhow::Result;
-use caryatid_sdk::{message_bus::Subscription, module, Context, Module};
+use caryatid_sdk::{message_bus::Subscription, module, Context};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/peer_network_interface/src/peer_network_interface.rs b/modules/peer_network_interface/src/peer_network_interface.rs
@@ -10,7 +10,7 @@ use acropolis_common::{
     upstream_cache::{UpstreamCache, UpstreamCacheRecord},
 };
 use anyhow::{Result, bail};
-use caryatid_sdk::{Context, Module, Subscription, module};
+use caryatid_sdk::{Context, Subscription, module};
 use config::Config;
 use pallas::network::miniprotocols::Point;
 use tokio::sync::mpsc;
diff --git a/modules/rest_blockfrost/src/rest_blockfrost.rs b/modules/rest_blockfrost/src/rest_blockfrost.rs
@@ -8,7 +8,7 @@ use acropolis_common::{
     rest_helper::{handle_rest_with_path_and_query_parameters, handle_rest_with_path_parameter},
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use tracing::info;
 
diff --git a/modules/snapshot_bootstrapper/src/snapshot_bootstrapper.rs b/modules/snapshot_bootstrapper/src/snapshot_bootstrapper.rs
@@ -15,7 +15,7 @@ use acropolis_common::{
     BlockHash, BlockInfo, BlockStatus, Era, GenesisDelegates,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use tokio::time::Instant;
 use tracing::{error, info, info_span, Instrument};
diff --git a/modules/spdd_state/src/spdd_state.rs b/modules/spdd_state/src/spdd_state.rs
@@ -7,7 +7,7 @@ use acropolis_common::{
     rest_helper::handle_rest_with_query_parameters,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
diff --git a/modules/spo_state/src/spo_state.rs b/modules/spo_state/src/spo_state.rs
@@ -17,7 +17,7 @@ use acropolis_common::{
     BlockInfo, BlockStatus, Era, PoolId,
 };
 use anyhow::Result;
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use pallas::ledger::traverse::MultiEraHeader;
 use std::sync::Arc;
diff --git a/modules/stake_delta_filter/src/stake_delta_filter.rs b/modules/stake_delta_filter/src/stake_delta_filter.rs
@@ -6,7 +6,7 @@ use acropolis_common::{
     NetworkId,
 };
 use anyhow::{anyhow, Result};
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use serde::Deserialize;
 use std::{path::Path, sync::Arc};
diff --git a/modules/tx_submitter/src/tx_submitter.rs b/modules/tx_submitter/src/tx_submitter.rs
@@ -8,7 +8,7 @@ use acropolis_common::{
     messages::{Command, CommandResponse, Message},
 };
 use anyhow::{Context as _, Result, bail};
-use caryatid_sdk::{Context, Module, module};
+use caryatid_sdk::{Context, module};
 use config::Config;
 use futures::stream::{FuturesUnordered, StreamExt};
 use peer::PeerConfig;
diff --git a/modules/tx_unpacker/src/tx_unpacker.rs b/modules/tx_unpacker/src/tx_unpacker.rs
@@ -9,7 +9,7 @@ use acropolis_common::{
     },
     *,
 };
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use std::{clone::Clone, fmt::Debug, sync::Arc};
 
 use anyhow::Result;
diff --git a/modules/utxo_state/src/utxo_state.rs b/modules/utxo_state/src/utxo_state.rs
@@ -5,7 +5,7 @@ use acropolis_common::{
     messages::{CardanoMessage, Message, StateQuery, StateQueryResponse},
     queries::utxos::{UTxOStateQuery, UTxOStateQueryResponse, DEFAULT_UTXOS_QUERY_TOPIC},
 };
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 
 use acropolis_common::queries::errors::QueryError;
 use anyhow::{anyhow, Result};
diff --git a/processes/golden_tests/src/test_module.rs b/processes/golden_tests/src/test_module.rs
@@ -7,7 +7,7 @@ use acropolis_common::{
     BlockHash, BlockInfo, BlockStatus, Era,
 };
 use anyhow::{Context as AnyhowContext, Result};
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use std::sync::Arc;
 
diff --git a/processes/replayer/src/playback.rs b/processes/replayer/src/playback.rs
@@ -8,7 +8,7 @@ use acropolis_common::{
     BlockHash, BlockInfo,
 };
 use anyhow::{anyhow, bail, ensure, Result};
-use caryatid_sdk::{module, Context, Module};
+use caryatid_sdk::{module, Context};
 use config::Config;
 use std::collections::HashMap;
 use std::fs::read_to_string;
diff --git a/processes/replayer/src/recorder.rs b/processes/replayer/src/recorder.rs
@@ -8,7 +8,7 @@ use acropolis_common::{
     BlockInfo,
 };
 use anyhow::{anyhow, Result};
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use std::{fs::File, io::Write, sync::Arc};
 use tracing::{error, info};
diff --git a/processes/replayer/src/recorder_alonzo_governance.rs b/processes/replayer/src/recorder_alonzo_governance.rs
@@ -5,7 +5,7 @@ use acropolis_common::{
     AlonzoBabbageUpdateProposal, BlockInfo, GenesisKeyhash, ProtocolParamUpdate,
 };
 use anyhow::{anyhow, Result};
-use caryatid_sdk::{module, Context, Module, Subscription};
+use caryatid_sdk::{module, Context, Subscription};
 use config::Config;
 use serde_with::{base64::Base64, serde_as};
 use std::{fs::File, io::Write, sync::Arc};
diff --git a/processes/tx_submitter_cli/src/main.rs b/processes/tx_submitter_cli/src/main.rs
@@ -7,7 +7,7 @@ use acropolis_common::{
 use acropolis_module_tx_submitter::TxSubmitter;
 use anyhow::{Result, bail};
 use caryatid_process::Process;
-use caryatid_sdk::{Context, Module, module};
+use caryatid_sdk::{Context, module};
 use clap::Parser;
 use config::{Config, File};
 use tokio::{fs, select, sync::mpsc};
