diff --git a/.github/workflows/test-deploy-network.yml b/.github/workflows/test-deploy-network.yml index 04996133bb9..819da5744f9 100644 --- a/.github/workflows/test-deploy-network.yml +++ b/.github/workflows/test-deploy-network.yml @@ -89,7 +89,7 @@ jobs: { "1" = { type = "unverified-cardano-passive-norelay", - pool_id = "pool1y0uxkqyplyx6ld25e976t0s35va3ysqcscatwvy2sd2cwcareq7", + pool_id = "pool13zafxlpfgymf474uv52qt557z5k5frn9p83yr55zp267wj5mpu4", }, } mithril_leader_aggregator_endpoint: https://aggregator.dev-preview.api.mithril.network/aggregator diff --git a/internal/mithril-dmq/src/model/network.rs b/internal/mithril-dmq/src/model/network.rs index 5924037a1cc..d72ab2b55dd 100644 --- a/internal/mithril-dmq/src/model/network.rs +++ b/internal/mithril-dmq/src/model/network.rs @@ -27,9 +27,9 @@ impl DmqNetwork { /// Preprod magic ID pub const PREPROD_MAGIC_ID: MagicId = 1; // TODO: Update magic ids for networks /// Preview magic ID - pub const PREVIEW_MAGIC_ID: MagicId = 2; // TODO: Update magic ids for networks + pub const PREVIEW_MAGIC_ID: MagicId = 3141592; // TODO: Update magic ids for networks /// Devnet magic ID - pub(crate) const DEVNET_MAGIC_ID: MagicId = 3141592; // TODO: Update magic ids for networks + pub(crate) const DEVNET_MAGIC_ID: MagicId = 0; // TODO: Update magic ids for networks /// Instantiates a DmqNetwork from its code and magic id pub fn from_code( diff --git a/mithril-aggregator/src/services/signature_processor.rs b/mithril-aggregator/src/services/signature_processor.rs index 5f3c63a2b65..5530b96f63b 100644 --- a/mithril-aggregator/src/services/signature_processor.rs +++ b/mithril-aggregator/src/services/signature_processor.rs @@ -1,7 +1,7 @@ use std::{sync::Arc, time::Duration}; use anyhow::anyhow; -use slog::{Logger, error, trace, warn}; +use slog::{Logger, debug, error, trace, warn}; use mithril_common::{ StdResult, @@ -10,7 +10,7 @@ use mithril_common::{ }; use tokio::{select, sync::watch::Receiver}; -use crate::MetricsService; +use crate::{MetricsService, services::CertifierServiceError}; use super::{CertifierService, SignatureConsumer}; @@ -90,13 +90,24 @@ impl SignatureProcessor for SequentialSignatureProcessor { .get_signature_registration_total_successful_since_startup() .increment(&[&origin_network]); } - Err(e) => { - total_import_errors += 1; - error!( - self.logger, "Error dispatching single signature"; - "full_payload" => #?signature, "error" => ?e - ); - } + Err(err) => match err.downcast_ref::() { + Some(CertifierServiceError::AlreadyCertified(signed_entity_type)) => { + debug!(self.logger, "process_signatures::open_message_already_certified"; "signed_entity_type" => ?signed_entity_type, "party_id" => &signature.party_id); + } + Some(CertifierServiceError::Expired(signed_entity_type)) => { + debug!(self.logger, "process_signatures::open_message_expired"; "signed_entity_type" => ?signed_entity_type, "party_id" => &signature.party_id); + } + Some(CertifierServiceError::NotFound(signed_entity_type)) => { + debug!(self.logger, "process_signatures::not_found"; "signed_entity_type" => ?signed_entity_type, "party_id" => &signature.party_id); + } + Some(_) | None => { + total_import_errors += 1; + error!( + self.logger, "Error dispatching single signature"; + "full_payload" => #?signature, "error" => ?err + ); + } + }, } } } diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml index a804954dc5e..04b63d448c2 100644 --- a/mithril-common/Cargo.toml +++ b/mithril-common/Cargo.toml @@ -19,7 +19,7 @@ rustdoc-args = ["--cfg", "docsrs"] ignored = ["serde_bytes"] [features] -default = ["rug-backend"] +default = ["rug-backend", "allow_skip_signer_certification"] # Enables `rug-backend` features for `mithril-stm` dependency rug-backend = ["mithril-stm/rug-backend"]