diff --git a/Cargo.lock b/Cargo.lock index 223f5bd9..5ffbd2d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1445,9 +1445,9 @@ checksum = "6236364b88b9b6d0bc181ba374cf1ab55ba3ef97a1cb6f8cddad48a273767fb5" [[package]] name = "caryatid_macros" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c681bdd1364a75fc129d0c91f03619deacb6d543735c152b9e34d050c31a9ca" +checksum = "64e4a0dac20a800a5b3b5dd90e019096d644724dcf96a780807680632f71d60a" dependencies = [ "anyhow", "async-trait", @@ -1458,9 +1458,9 @@ dependencies = [ [[package]] name = "caryatid_module_clock" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d35333c6c24e401b3cbf9e4169b863fa9771d98371614142bad4f1f70ab053" +checksum = "951c0ab316e5557315c10b75011b30faeeb032f96c88507946ec154c7f9d4ddd" dependencies = [ "anyhow", "caryatid_sdk", @@ -1475,9 +1475,9 @@ dependencies = [ [[package]] name = "caryatid_module_rest_server" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04b3369fd37cc7c395feea110e0fc60075cb9fbc3c3470a4d3b0988da1606b72" +checksum = "9c82ea79ce5ede49ce0dde01d204f21d39165d0abd8213281a7ce163a01519df" dependencies = [ "anyhow", "axum", @@ -1494,9 +1494,9 @@ dependencies = [ [[package]] name = "caryatid_module_spy" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a722a3a815c9f5d0868eaf7f7d208568ffc142c800310679de95365a586d9e2" +checksum = "e53b7ce84ba23710e42d1fc497b2bb36463cbcb0af8aab39b7f14942b4682763" dependencies = [ "anyhow", "caryatid_sdk", @@ -1509,14 +1509,15 @@ dependencies = [ [[package]] name = "caryatid_process" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b75c2e960f783c2dc3879d632aa4643f2e21b41572313e7e22b878ecc8b4642" +checksum = "c7b38bc5f68d7f2400987524d50300597b607f5f2d76773fdc40a0216d296b01" dependencies = [ "anyhow", "async-trait", "caryatid_sdk", "config", + "dashmap", "futures", "lapin", "minicbor-serde", @@ -1530,9 +1531,9 @@ dependencies = [ [[package]] name = "caryatid_sdk" -version = "0.12.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5226f72f658ec71e48c3e74a1bfa001798a08dc66179eabb9b70573c9ae72a" +checksum = "b81e3dc1a35c175c7fc27f564b9ba9840fa25d24f08785a9cdfe2c2182965c77" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index f5b46041..736a8233 100644 --- 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 index 9cba1896..0ed8965a 100644 --- 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 index 98e1bcb4..f5eee598 100644 --- 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 index 57a82774..ec746b0e 100644 --- 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 index b4b59011..06bd7ccd 100644 --- 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 index 3f88f45f..4de71696 100644 --- 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 index 098d67b4..7e605db1 100644 --- 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 index 8519b936..ccfeb3f0 100644 --- 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 index abebe8cd..dbee7ae5 100644 --- 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 index e7a38a7f..2dabfff4 100644 --- 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 index b2c97c26..69f91c23 100644 --- 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 index 056b8495..8d919aba 100644 --- 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 index 9425396c..b1de308d 100644 --- 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 index 59f61aa0..17a13017 100644 --- 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 index d5ba9dfa..fb096bdd 100644 --- 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 index a593f27a..80d36fc5 100644 --- 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 index 16b25d45..64382af1 100644 --- 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 index 5aa182f5..6a97f39b 100644 --- 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 index 8e623365..5df5cd22 100644 --- 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 index a64eed7a..20db783a 100644 --- 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 index bea47e78..bcb86683 100644 --- 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 index 0a6ae340..ffa718eb 100644 --- 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 index 459a222b..9f22c356 100644 --- 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 index 02d635fa..c1a9e448 100644 --- 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 index 7bc56188..d9ca05c6 100644 --- 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 index 9db34f3f..b2d42fb0 100644 --- 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 index a8237380..8113d638 100644 --- 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 index 95b083e6..296be7e3 100644 --- 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 index 77fe6256..bcd93b27 100644 --- 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 index 3b00adac..cea7c49a 100644 --- 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 index 82521bf0..744c0caf 100644 --- 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 index 069ad834..95428994 100644 --- 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 index 538b352a..2aa55248 100644 --- 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 index ed20543b..b462e68f 100644 --- 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};