chore(e2e): use 'DmqNetwork' model

Author: jpraynaud

mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs

@@ -15,7 +15,7 @@ use mithril_common::{CardanoNetwork, StdResult, entities};
 
 use crate::utils::MithrilCommand;
 use crate::{
-    ANCILLARY_MANIFEST_SECRET_KEY, DEVNET_MAGIC_ID, ERA_MARKERS_SECRET_KEY,
+    ANCILLARY_MANIFEST_SECRET_KEY, DEVNET_DMQ_MAGIC_ID, DEVNET_MAGIC_ID, ERA_MARKERS_SECRET_KEY,
     ERA_MARKERS_VERIFICATION_KEY, FullNode, GENESIS_SECRET_KEY, GENESIS_VERIFICATION_KEY,
     RetryableDevnetError,
 };
@@ -58,6 +58,7 @@ pub struct Aggregator {
 impl Aggregator {
     pub fn new(aggregator_config: &AggregatorConfig) -> StdResult<Self> {
         let magic_id = DEVNET_MAGIC_ID.to_string();
+        let dmq_magic_id = DEVNET_DMQ_MAGIC_ID.to_string();
         let server_port_parameter = aggregator_config.server_port.to_string();
         let era_reader_adapter_params =
             if aggregator_config.mithril_era_reader_adapter == "cardano-chain" {
@@ -79,6 +80,7 @@ impl Aggregator {
         let mut env = HashMap::from([
             ("NETWORK", "devnet"),
             ("NETWORK_MAGIC", &magic_id),
+            ("DMQ_NETWORK_MAGIC", &dmq_magic_id),
             ("RUN_INTERVAL", &mithril_run_interval),
             ("SERVER_IP", "0.0.0.0"),
             ("SERVER_PORT", &server_port_parameter),

mithril-test-lab/mithril-end-to-end/src/mithril/mod.rs

@@ -18,6 +18,7 @@ pub use relay_signer::RelaySigner;
 pub use signer::Signer;
 
 pub const DEVNET_MAGIC_ID: mithril_common::MagicId = 42;
+pub const DEVNET_DMQ_MAGIC_ID: mithril_common::MagicId = 3141592;
 
 pub const GENESIS_VERIFICATION_KEY: &str = "5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d";
 pub const GENESIS_SECRET_KEY: &str = "5b3131382c3138342c3232342c3137332c3136302c3234312c36312c3134342c36342c39332c3130362c3232392c38332c3133342c3138392c34302c3138392c3231302c32352c3138342c3136302c3134312c3233372c32362c3136382c35342c3233392c3230342c3133392c3131392c31332c3139395d";

mithril-test-lab/mithril-end-to-end/src/mithril/relay_aggregator.rs

@@ -1,5 +1,5 @@
 use crate::utils::MithrilCommand;
-use crate::{Aggregator, DEVNET_MAGIC_ID};
+use crate::{Aggregator, DEVNET_DMQ_MAGIC_ID};
 use mithril_common::StdResult;
 use std::collections::HashMap;
 use std::path::Path;
@@ -25,11 +25,11 @@ impl RelayAggregator {
     ) -> StdResult<Self> {
         let name = Aggregator::name_suffix(index);
         let listen_port_str = format!("{listen_port}");
-        let magic_id = DEVNET_MAGIC_ID.to_string();
+        let dmq_magic_id = DEVNET_DMQ_MAGIC_ID.to_string();
         let mut env = HashMap::from([
             ("LISTEN_PORT", listen_port_str.as_str()),
             ("NETWORK", "devnet"),
-            ("NETWORK_MAGIC", &magic_id),
+            ("DMQ_NETWORK_MAGIC", &dmq_magic_id),
             ("AGGREGATOR_ENDPOINT", aggregator_endpoint),
         ]);
         if let Some(dial_to) = &dial_to {

mithril-test-lab/mithril-end-to-end/src/mithril/relay_signer.rs

@@ -1,4 +1,4 @@
-use crate::DEVNET_MAGIC_ID;
+use crate::DEVNET_DMQ_MAGIC_ID;
 use crate::utils::MithrilCommand;
 use mithril_common::StdResult;
 use mithril_common::entities::PartyId;
@@ -35,7 +35,7 @@ impl RelaySigner {
         let listen_port_str = format!("{}", configuration.listen_port);
         let server_port_str = format!("{}", configuration.server_port);
 
-        let magic_id = DEVNET_MAGIC_ID.to_string();
+        let dmq_magic_id = DEVNET_DMQ_MAGIC_ID.to_string();
         let relay_signer_registration_mode =
             configuration.relay_signer_registration_mode.to_string();
         let relay_signature_registration_mode =
@@ -44,7 +44,7 @@ impl RelaySigner {
             ("LISTEN_PORT", listen_port_str.as_str()),
             ("SERVER_PORT", server_port_str.as_str()),
             ("NETWORK", "devnet"),
-            ("NETWORK_MAGIC", &magic_id),
+            ("DMQ_NETWORK_MAGIC", &dmq_magic_id),
             ("AGGREGATOR_ENDPOINT", configuration.aggregator_endpoint),
             ("SIGNER_REPEATER_DELAY", "100"),
             (

mithril-test-lab/mithril-end-to-end/src/mithril/signer.rs

@@ -11,7 +11,7 @@ use tokio::sync::RwLock;
 
 use crate::devnet::PoolNode;
 use crate::utils::MithrilCommand;
-use crate::{DEVNET_MAGIC_ID, ERA_MARKERS_VERIFICATION_KEY};
+use crate::{DEVNET_DMQ_MAGIC_ID, DEVNET_MAGIC_ID, ERA_MARKERS_VERIFICATION_KEY};
 
 #[derive(Debug)]
 pub struct SignerConfig<'a> {
@@ -44,6 +44,7 @@ impl Signer {
     pub fn new(signer_config: &SignerConfig) -> StdResult<Self> {
         let party_id = signer_config.pool_node.party_id()?;
         let magic_id = DEVNET_MAGIC_ID.to_string();
+        let dmq_magic_id = DEVNET_DMQ_MAGIC_ID.to_string();
         let era_reader_adapter_params =
             if signer_config.mithril_era_reader_adapter == "cardano-chain" {
                 format!(
@@ -65,6 +66,7 @@ impl Signer {
         let mut env = HashMap::from([
             ("NETWORK", "devnet"),
             ("NETWORK_MAGIC", &magic_id),
+            ("DMQ_NETWORK_MAGIC", &dmq_magic_id),
             ("RUN_INTERVAL", &mithril_run_interval),
             ("AGGREGATOR_ENDPOINT", &signer_config.aggregator_endpoint),
             (