Merge branch 'refs/heads/testnet' into merge_testnet_into_staging

# Conflicts:
#	batcher/aligned-sdk/src/core/types.rs
#	batcher/aligned-sdk/src/sdk.rs
#	batcher/aligned/src/main.rs

Author: JuArce

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

@@ -410,6 +410,7 @@ pub enum Network {
     Holesky,
     HoleskyStage,
     Mainnet,
+    MainnetStage,
     Custom(String, String, String),
 }
 
@@ -420,6 +421,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 +434,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 +447,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,
         }
     }
 }