chore(apollo_deployments): unify deployment functions

Itay-Tsabary-Starkware · Itay-Tsabary-Starkware · commit e7ba6f8bbb87 · 2025-05-07T14:38:55.000+03:00
diff --git a/crates/apollo_deployments/src/deployment.rs b/crates/apollo_deployments/src/deployment.rs
@@ -21,6 +21,8 @@ const DEPLOYMENT_CONFIG_DIR_NAME: &str = "deployment_configs/";
 const DEPLOYMENT_FILE_NAME: &str = "deployment_config_override.json";
 const INSTANCE_FILE_NAME: &str = "instance_config_override.json";
 
+const MAX_NODE_ID: usize = 9; // Currently supporting up to 9 nodes, to avoid more complicated string manipulations.
+
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct Deployment {
     chain_id: ChainId,
@@ -252,13 +254,13 @@ pub struct InstanceConfigOverride {
 
 impl InstanceConfigOverride {
     pub fn new(
-        consensus_bootstrap_peer_multiaddr: &'static str,
+        consensus_bootstrap_peer_multiaddr: impl ToString,
         consensus_bootstrap_peer_multiaddr_is_none: bool,
-        consensus_secret_key: &'static str,
-        mempool_bootstrap_peer_multiaddr: &'static str,
+        consensus_secret_key: impl ToString,
+        mempool_bootstrap_peer_multiaddr: impl ToString,
         mempool_bootstrap_peer_multiaddr_is_none: bool,
-        mempool_secret_key: &'static str,
-        validator_id: &'static str,
+        mempool_secret_key: impl ToString,
+        validator_id: impl ToString,
     ) -> Self {
         Self {
             consensus_bootstrap_peer_multiaddr: consensus_bootstrap_peer_multiaddr.to_string(),
@@ -271,3 +273,54 @@ impl InstanceConfigOverride {
         }
     }
 }
+
+pub(crate) fn create_hybrid_instance_config_override(
+    id: usize,
+    namespace: &'static str,
+) -> InstanceConfigOverride {
+    let accepted_node_id_range = 1..=MAX_NODE_ID;
+    assert!(
+        accepted_node_id_range.contains(&id),
+        "Node id {} is out of range {:?}",
+        id,
+        accepted_node_id_range
+    );
+
+    // TODO(Tsabary): these should be derived from the hybrid deployment module, and used
+    // consistently throughout the code.
+
+    const FIRST_NODE_ADDRESS: &str = "12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5";
+    const CORE_SERVICE_NAME: &str = "sequencer-core-service";
+    const CORE_SERVICE_PORT: u16 = 53080;
+
+    const MEMPOOL_SERVICE_NAME: &str = "sequencer-mempool-service";
+    const MEMPOOL_SERVICE_PORT: u16 = 53200;
+
+    if id == 1 {
+        InstanceConfigOverride::new(
+            "",
+            true,
+            "0x0101010101010101010101010101010101010101010101010101010101010101",
+            "",
+            true,
+            "0x0101010101010101010101010101010101010101010101010101010101010101",
+            "0x1",
+        )
+    } else {
+        InstanceConfigOverride::new(
+            format!(
+                "/dns/{}.{}.svc.cluster.local/tcp/{}/p2p/{}",
+                CORE_SERVICE_NAME, namespace, CORE_SERVICE_PORT, FIRST_NODE_ADDRESS
+            ),
+            false,
+            format!("0x010101010101010101010101010101010101010101010101010101010101010{}", id),
+            format!(
+                "/dns/{}.{}.svc.cluster.local/tcp/{}/p2p/{}",
+                MEMPOOL_SERVICE_NAME, namespace, MEMPOOL_SERVICE_PORT, FIRST_NODE_ADDRESS
+            ),
+            false,
+            format!("0x010101010101010101010101010101010101010101010101010101010101010{}", id),
+            format!("0x{}", id),
+        )
+    }
+}
diff --git a/crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs b/crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs
@@ -3,10 +3,10 @@ use std::path::PathBuf;
 use starknet_api::core::ChainId;
 
 use crate::deployment::{
+    create_hybrid_instance_config_override,
     ConfigOverride,
     Deployment,
     DeploymentConfigOverride,
-    InstanceConfigOverride,
 };
 use crate::deployment_definitions::{Environment, BASE_APP_CONFIG_PATH};
 use crate::service::{DeploymentName, ExternalSecret};
@@ -20,82 +20,30 @@ const SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE: DeploymentConfigOverride =
         "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
     );
 
-fn sepolia_integration_node_0_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "",
-        true,
-        "0x0101010101010101010101010101010101010101010101010101010101010101",
-        "",
-        true,
-        "0x0101010101010101010101010101010101010101010101010101010101010101",
-        "0x1",
-    )
-}
-
-fn sepolia_integration_node_1_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010102",
-        "/dns/sequencer-mempool-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53200/\
-         p2p/12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010102",
-        "0x2",
-    )
-}
-
-fn sepolia_integration_node_2_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010103",
-        "/dns/sequencer-mempool-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53200/\
-         p2p/12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010103",
-        "0x3",
-    )
-}
-
-fn sepolia_integration_node_3_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010104",
-        "/dns/sequencer-mempool-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53200/\
-         p2p/12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010104",
-        "0x4",
-    )
-}
+const FIRST_NODE_NAMESPACE: &str = "apollo-sepolia-integration-0";
 
 fn sepolia_integration_node_0_config_override() -> ConfigOverride {
     ConfigOverride::new(
         SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
-        sepolia_integration_node_0_instance_config_override(),
+        create_hybrid_instance_config_override(1, FIRST_NODE_NAMESPACE),
     )
 }
 fn sepolia_integration_node_1_config_override() -> ConfigOverride {
     ConfigOverride::new(
         SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
-        sepolia_integration_node_1_instance_config_override(),
+        create_hybrid_instance_config_override(2, FIRST_NODE_NAMESPACE),
     )
 }
 fn sepolia_integration_node_2_config_override() -> ConfigOverride {
     ConfigOverride::new(
         SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
-        sepolia_integration_node_2_instance_config_override(),
+        create_hybrid_instance_config_override(3, FIRST_NODE_NAMESPACE),
     )
 }
 fn sepolia_integration_node_3_config_override() -> ConfigOverride {
     ConfigOverride::new(
         SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
-        sepolia_integration_node_3_instance_config_override(),
+        create_hybrid_instance_config_override(4, FIRST_NODE_NAMESPACE),
     )
 }
 
diff --git a/crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs b/crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs
@@ -3,10 +3,10 @@ use std::path::PathBuf;
 use starknet_api::core::ChainId;
 
 use crate::deployment::{
+    create_hybrid_instance_config_override,
     ConfigOverride,
     Deployment,
     DeploymentConfigOverride,
-    InstanceConfigOverride,
 };
 use crate::deployment_definitions::{Environment, BASE_APP_CONFIG_PATH};
 use crate::service::{DeploymentName, ExternalSecret};
@@ -20,82 +20,30 @@ const TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE: DeploymentConfigOverride =
         "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
     );
 
-fn testing_env_2_node_0_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "",
-        true,
-        "0x0101010101010101010101010101010101010101010101010101010101010101",
-        "",
-        true,
-        "0x0101010101010101010101010101010101010101010101010101010101010101",
-        "0x1",
-    )
-}
-
-fn testing_env_2_node_1_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010102",
-        "/dns/sequencer-mempool-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53200/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010102",
-        "0x2",
-    )
-}
-
-fn testing_env_2_node_2_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010103",
-        "/dns/sequencer-mempool-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53200/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010103",
-        "0x3",
-    )
-}
-
-fn testing_env_2_node_3_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010104",
-        "/dns/sequencer-mempool-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53200/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010104",
-        "0x4",
-    )
-}
+const FIRST_NODE_NAMESPACE: &str = "sequencer-test-sepolia-0";
 
 fn testing_env_2_node_0_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_2_node_0_instance_config_override(),
+        create_hybrid_instance_config_override(1, FIRST_NODE_NAMESPACE),
     )
 }
 fn testing_env_2_node_1_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_2_node_1_instance_config_override(),
+        create_hybrid_instance_config_override(2, FIRST_NODE_NAMESPACE),
     )
 }
 fn testing_env_2_node_2_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_2_node_2_instance_config_override(),
+        create_hybrid_instance_config_override(3, FIRST_NODE_NAMESPACE),
     )
 }
 fn testing_env_2_node_3_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_2_node_3_instance_config_override(),
+        create_hybrid_instance_config_override(4, FIRST_NODE_NAMESPACE),
     )
 }
 
diff --git a/crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs b/crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs
@@ -3,10 +3,10 @@ use std::path::PathBuf;
 use starknet_api::core::ChainId;
 
 use crate::deployment::{
+    create_hybrid_instance_config_override,
     ConfigOverride,
     Deployment,
     DeploymentConfigOverride,
-    InstanceConfigOverride,
 };
 use crate::deployment_definitions::{Environment, BASE_APP_CONFIG_PATH};
 use crate::service::{DeploymentName, ExternalSecret};
@@ -20,82 +20,30 @@ const TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE: DeploymentConfigOverride =
         "0x54a93d918d62b2fb62b25e77d9cb693bd277ab7e6fa236e53af263f1adb40e4",
     );
 
-fn testing_env_3_node_0_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "",
-        true,
-        "0x0101010101010101010101010101010101010101010101010101010101010101",
-        "",
-        true,
-        "0x0101010101010101010101010101010101010101010101010101010101010101",
-        "0x1",
-    )
-}
-
-fn testing_env_3_node_1_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010102",
-        "/dns/sequencer-mempool-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53200/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010102",
-        "0x2",
-    )
-}
-
-fn testing_env_3_node_2_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010103",
-        "/dns/sequencer-mempool-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53200/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010103",
-        "0x3",
-    )
-}
-
-fn testing_env_3_node_3_instance_config_override() -> InstanceConfigOverride {
-    InstanceConfigOverride::new(
-        "/dns/sequencer-core-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53080/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010104",
-        "/dns/sequencer-mempool-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53200/p2p/\
-         12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
-        false,
-        "0x0101010101010101010101010101010101010101010101010101010101010104",
-        "0x4",
-    )
-}
+const FIRST_NODE_NAMESPACE: &str = "sequencer-test-3-node-0";
 
 fn testing_env_3_node_0_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_3_node_0_instance_config_override(),
+        create_hybrid_instance_config_override(1, FIRST_NODE_NAMESPACE),
     )
 }
 fn testing_env_3_node_1_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_3_node_1_instance_config_override(),
+        create_hybrid_instance_config_override(2, FIRST_NODE_NAMESPACE),
     )
 }
 fn testing_env_3_node_2_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_3_node_2_instance_config_override(),
+        create_hybrid_instance_config_override(3, FIRST_NODE_NAMESPACE),
     )
 }
 fn testing_env_3_node_3_config_override() -> ConfigOverride {
     ConfigOverride::new(
         TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
-        testing_env_3_node_3_instance_config_override(),
+        create_hybrid_instance_config_override(4, FIRST_NODE_NAMESPACE),
     )
 }
 
