chore(starknet_consensus_manager): add chain_id to config

starkware-libs · Dec 5, 2024 · 215b58a · 215b58a
1 parent a6a227b
commit 215b58a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/config/papyrus/default_config.json b/config/papyrus/default_config.json
@@ -79,6 +79,11 @@
     "privacy": "TemporaryValue",
     "value": true
   },
+  "consensus.chain_id": {
+    "description": "The chain id of the Starknet chain.",
+    "pointer_target": "chain_id",
+    "privacy": "Public"
+  },
   "consensus.consensus_delay": {
     "description": "Delay (seconds) before starting consensus to give time for network peering.",
     "privacy": "Public",

diff --git a/config/sequencer/default_config.json b/config/sequencer/default_config.json
@@ -614,6 +614,11 @@
     "privacy": "Public",
     "value": "0.0.0.0:8080"
   },
+  "consensus_manager_config.consensus_config.chain_id": {
+    "description": "The chain id of the Starknet chain.",
+    "pointer_target": "chain_id",
+    "privacy": "Public"
+  },
   "consensus_manager_config.consensus_config.consensus_delay": {
     "description": "Delay (seconds) before starting consensus to give time for network peering.",
     "privacy": "Public",

diff --git a/crates/papyrus_node/src/config/pointers.rs b/crates/papyrus_node/src/config/pointers.rs
@@ -57,6 +57,7 @@ pub static CONFIG_POINTERS: LazyLock<ConfigPointers> = LazyLock::new(|| {
                 "The chain to follow. For more details see https://docs.starknet.io/documentation/architecture_and_concepts/Blocks/transactions/#chain-id.",
             ),
             set_pointing_param_paths(&[
+                "consensus.chain_id",
                 "consensus.network_config.chain_id",
                 "network.chain_id",
                 "rpc.chain_id",

diff --git a/crates/sequencing/papyrus_consensus/src/config.rs b/crates/sequencing/papyrus_consensus/src/config.rs
@@ -14,6 +14,7 @@ use papyrus_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use papyrus_network::NetworkConfig;
 use serde::{Deserialize, Serialize};
 use starknet_api::block::BlockNumber;
+use starknet_api::core::ChainId;
 
 use super::types::ValidatorId;
 
@@ -23,6 +24,8 @@ const CONSENSUS_QUIC_PORT: u16 = 10101;
 /// Configuration for consensus.
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
 pub struct ConsensusConfig {
+    /// The chain id of the Starknet chain.
+    pub chain_id: ChainId,
     /// The validator ID of the node.
     pub validator_id: ValidatorId,
     /// The network topic of the consensus.
@@ -45,6 +48,12 @@ pub struct ConsensusConfig {
 impl SerializeConfig for ConsensusConfig {
     fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
         let mut config = BTreeMap::from_iter([
+            ser_param(
+                "chain_id",
+                &self.chain_id,
+                "The chain id of the Starknet chain.",
+                ParamPrivacyInput::Public,
+            ),
             ser_param(
                 "validator_id",
                 &self.validator_id,
@@ -90,6 +99,7 @@ impl Default for ConsensusConfig {
             ..Default::default()
         };
         Self {
+            chain_id: ChainId::Other("0x0".to_string()),
             validator_id: ValidatorId::default(),
             network_topic: "consensus".to_string(),
             start_height: BlockNumber::default(),

diff --git a/crates/starknet_sequencer_node/src/config/node_config.rs b/crates/starknet_sequencer_node/src/config/node_config.rs
@@ -41,11 +41,12 @@ pub static CONFIG_POINTERS: LazyLock<ConfigPointers> = LazyLock::new(|| {
             ser_pointer_target_required_param(
                 "chain_id",
                 SerializationType::String,
-                "The chain to follow.",
+                "The chain to follow. For more details see https://docs.starknet.io/documentation/architecture_and_concepts/Blocks/transactions/#chain-id.",
             ),
             set_pointing_param_paths(&[
                 "batcher_config.block_builder_config.chain_info.chain_id",
                 "batcher_config.storage.db_config.chain_id",
+                "consensus_manager_config.consensus_config.chain_id",
                 "consensus_manager_config.consensus_config.network_config.chain_id",
                 "gateway_config.chain_info.chain_id",
                 "mempool_p2p_config.network_config.chain_id",