Merge testnet into staging

batcher/aligned-sdk/src/core/constants.rs

@@ -59,14 +59,21 @@ pub const BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY_STAGE: &str =
     "0x7577Ec4ccC1E6C529162ec8019A49C13F6DAd98b";
 pub const BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET: &str =
     "0xb0567184A52cB40956df6333510d6eF35B89C8de";
+pub const BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET_STAGE: &str =
+    "0x88ad27EfBeF16b6fC5b2E40c5155d61876f847c5";
+
 /// AlignedServiceManager
 pub const ALIGNED_SERVICE_MANAGER_DEVNET: &str = "0x851356ae760d987E095750cCeb3bC6014560891C";
 pub const ALIGNED_SERVICE_MANAGER_HOLESKY: &str = "0x58F280BeBE9B34c9939C3C39e0890C81f163B623";
 pub const ALIGNED_SERVICE_MANAGER_HOLESKY_STAGE: &str =
     "0x9C5231FC88059C086Ea95712d105A2026048c39B";
 pub const ALIGNED_SERVICE_MANAGER_MAINNET: &str = "0xeF2A435e5EE44B2041100EF8cbC8ae035166606c";
+pub const ALIGNED_SERVICE_MANAGER_MAINNET_STAGE: &str =
+    "0x96b6a29D7B98519Ae66E6398BD27A76B30a5dC3f";
+
 /// Batcher URL's
 pub const BATCHER_URL_DEVNET: &str = "ws://localhost:8080";
 pub const BATCHER_URL_HOLESKY: &str = "wss://batcher.alignedlayer.com";
 pub const BATCHER_URL_HOLESKY_STAGE: &str = "wss://stage.batcher.alignedlayer.com";
 pub const BATCHER_URL_MAINNET: &str = "wss://mainnet.batcher.alignedlayer.com";
+pub const BATCHER_URL_MAINNET_STAGE: &str = "wss://mainnetstage.batcher.alignedlayer.com";

batcher/aligned-sdk/src/core/types.rs

@@ -19,13 +19,7 @@ use lambdaworks_crypto::merkle_tree::{
 use serde::{Deserialize, Serialize};
 use sha3::{Digest, Keccak256};
 
-use super::constants::{
-    ALIGNED_SERVICE_MANAGER_DEVNET, ALIGNED_SERVICE_MANAGER_HOLESKY,
-    ALIGNED_SERVICE_MANAGER_HOLESKY_STAGE, ALIGNED_SERVICE_MANAGER_MAINNET,
-    BATCHER_PAYMENT_SERVICE_ADDRESS_DEVNET, BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY,
-    BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY_STAGE, BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET,
-    BATCHER_URL_DEVNET, BATCHER_URL_HOLESKY, BATCHER_URL_HOLESKY_STAGE, BATCHER_URL_MAINNET,
-};
+use super::constants::{ALIGNED_SERVICE_MANAGER_DEVNET, ALIGNED_SERVICE_MANAGER_HOLESKY, ALIGNED_SERVICE_MANAGER_HOLESKY_STAGE, ALIGNED_SERVICE_MANAGER_MAINNET, ALIGNED_SERVICE_MANAGER_MAINNET_STAGE, BATCHER_PAYMENT_SERVICE_ADDRESS_DEVNET, BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY, BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY_STAGE, BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET, BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET_STAGE, BATCHER_URL_DEVNET, BATCHER_URL_HOLESKY, BATCHER_URL_HOLESKY_STAGE, BATCHER_URL_MAINNET, BATCHER_URL_MAINNET_STAGE};
 use super::errors::VerifySignatureError;
 
 // VerificationData is a bytes32 instead of a VerificationData struct because in the BatcherPaymentService contract
@@ -410,6 +404,7 @@ pub enum Network {
     Holesky,
     HoleskyStage,
     Mainnet,
+    MainnetStage,
     Custom(String, String, String),
 }
 
@@ -420,6 +415,7 @@ impl Network {
             Self::Holesky => H160::from_str(ALIGNED_SERVICE_MANAGER_HOLESKY).unwrap(),
             Self::HoleskyStage => H160::from_str(ALIGNED_SERVICE_MANAGER_HOLESKY_STAGE).unwrap(),
             Self::Mainnet => H160::from_str(ALIGNED_SERVICE_MANAGER_MAINNET).unwrap(),
+            Self::MainnetStage => H160::from_str(ALIGNED_SERVICE_MANAGER_MAINNET_STAGE).unwrap(),
             Self::Custom(s, _, _) => H160::from_str(s.as_str()).unwrap(),
         }
     }
@@ -432,6 +428,9 @@ impl Network {
                 H160::from_str(BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY_STAGE).unwrap()
             }
             Self::Mainnet => H160::from_str(BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET).unwrap(),
+            Self::MainnetStage => {
+                            H160::from_str(BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET_STAGE).unwrap()
+                        }
             Self::Custom(_, s, _) => H160::from_str(s.as_str()).unwrap(),
         }
     }
@@ -442,6 +441,7 @@ impl Network {
             Self::Holesky => BATCHER_URL_HOLESKY,
             Self::HoleskyStage => BATCHER_URL_HOLESKY_STAGE,
             Self::Mainnet => BATCHER_URL_MAINNET,
+            Self::MainnetStage => BATCHER_URL_MAINNET_STAGE,
             Self::Custom(_, _, s) => s.as_str(),
         }
     }

batcher/aligned/src/main.rs

@@ -323,6 +323,7 @@ enum NetworkNameArg {
     Holesky,
     HoleskyStage,
     Mainnet,
+    MainnetStage,
 }
 
 impl FromStr for NetworkNameArg {
@@ -334,8 +335,9 @@ impl FromStr for NetworkNameArg {
             "holesky" => Ok(NetworkNameArg::Holesky),
             "holesky-stage" => Ok(NetworkNameArg::HoleskyStage),
             "mainnet" => Ok(NetworkNameArg::Mainnet),
+            "mainnet-stage" => Ok(NetworkNameArg::MainnetStage),
             _ => Err(
-                "Unknown network. Possible values: devnet, holesky, holesky-stage, mainnet"
+                "Unknown network. Possible values: devnet, holesky, holesky-stage, mainnet, mainnet-stage"
                     .to_string(),
             ),
         }
@@ -348,9 +350,10 @@ struct NetworkArg {
         name = "The working network's name",
         long = "network",
         default_value = "devnet",
-        help = "[possible values: devnet, holesky, holesky-stage, mainnet]"
+        help = "[possible values: devnet, holesky, holesky-stage, mainnet, mainnet-stage]"
     )]
     network: Option<NetworkNameArg>,
+
     #[arg(
         name = "Aligned Service Manager Contract Address",
         long = "aligned_service_manager",
@@ -400,6 +403,7 @@ impl From<NetworkArg> for Network {
             Some(NetworkNameArg::Holesky) => Network::Holesky,
             Some(NetworkNameArg::HoleskyStage) => Network::HoleskyStage,
             Some(NetworkNameArg::Mainnet) => Network::Mainnet,
+            Some(NetworkNameArg::MainnetStage) => Network::MainnetStage,
         }
     }
 }