apollo_consensus_orchestrator: split consensus config into static and dynamic configs

Author: guy-starkware

config/papyrus/default_config.json

@@ -239,67 +239,67 @@
     "privacy": "TemporaryValue",
     "value": true
   },
-  "context.block_timestamp_window_seconds": {
+  "context.static_config.block_timestamp_window_seconds": {
     "description": "Maximum allowed deviation (seconds) of a proposed block's timestamp from the current time.",
     "privacy": "Public",
     "value": 1
   },
-  "context.build_proposal_margin_millis": {
+  "context.static_config.build_proposal_margin_millis": {
     "description": "Safety margin (in ms) to make sure that the batcher completes building the proposal with enough time for the Fin to be checked by validators.",
     "privacy": "Public",
     "value": 1000
   },
-  "context.build_proposal_time_ratio_for_retrospective_block_hash": {
+  "context.static_config.build_proposal_time_ratio_for_retrospective_block_hash": {
     "description": "The fraction (0.0 - 1.0) of the total build time allocated to waiting for the retrospective block hash to be available. The remaining time is used to build the proposal.",
     "privacy": "Public",
     "value": 0.7
   },
-  "context.builder_address": {
+  "context.static_config.builder_address": {
     "description": "The address of the contract that builds the block.",
     "privacy": "Public",
     "value": "0x0"
   },
-  "context.chain_id": {
+  "context.static_config.chain_id": {
     "description": "The chain id of the Starknet chain.",
     "pointer_target": "chain_id",
     "privacy": "Public"
   },
-  "context.l1_da_mode": {
+  "context.dynamic_config.l1_da_mode": {
     "description": "The data availability mode, true: Blob, false: Calldata.",
     "privacy": "Public",
     "value": true
   },
-  "context.l1_data_gas_price_multiplier_ppt": {
+  "context.dynamic_config.l1_data_gas_price_multiplier_ppt": {
     "description": "Part per thousand of multiplicative factor to apply to the data gas price, to enable fine-tuning of the price charged to end users.",
     "privacy": "Public",
     "value": 135
   },
-  "context.l1_gas_tip_wei": {
+  "context.dynamic_config.l1_gas_tip_wei": {
     "description": "This additional gas is added to the L1 gas price.",
     "privacy": "Public",
     "value": 1000000000
   },
-  "context.max_l1_data_gas_price_wei": {
+  "context.dynamic_config.max_l1_data_gas_price_wei": {
     "description": "The maximum L1 data gas price in wei.",
     "privacy": "Public",
     "value": 1000000000000000000
   },
-  "context.max_l1_gas_price_wei": {
+  "context.dynamic_config.max_l1_gas_price_wei": {
     "description": "The maximum L1 gas price in wei.",
     "privacy": "Public",
     "value": 200000000000
   },
-  "context.min_l1_data_gas_price_wei": {
+  "context.dynamic_config.min_l1_data_gas_price_wei": {
     "description": "The minimum L1 data gas price in wei.",
     "privacy": "Public",
     "value": 1
   },
-  "context.min_l1_gas_price_wei": {
+  "context.dynamic_config.min_l1_gas_price_wei": {
     "description": "The minimum L1 gas price in wei.",
     "privacy": "Public",
     "value": 1000000000
   },
-  "context.num_validators": {
+  "context.static_config.num_validators": {
     "description": "The number of validators.",
     "privacy": "Public",
     "value": 1
@@ -314,57 +314,57 @@
     "privacy": "TemporaryValue",
     "value": true
   },
-  "context.override_l1_data_gas_price_wei": {
+  "context.dynamic_config.override_l1_data_gas_price_wei": {
     "description": "Replace the L1 data gas price (wei) with this value.",
     "privacy": "Public",
     "value": 0
   },
-  "context.override_l1_data_gas_price_wei.#is_none": {
+  "context.dynamic_config.override_l1_data_gas_price_wei.#is_none": {
     "description": "Flag for an optional field.",
     "privacy": "TemporaryValue",
     "value": true
   },
-  "context.override_l1_gas_price_wei": {
+  "context.dynamic_config.override_l1_gas_price_wei": {
     "description": "Replace the L1 gas price (wei) with this value.",
     "privacy": "Public",
     "value": 0
   },
-  "context.override_l1_gas_price_wei.#is_none": {
+  "context.dynamic_config.override_l1_gas_price_wei.#is_none": {
     "description": "Flag for an optional field.",
     "privacy": "TemporaryValue",
     "value": true
   },
-  "context.override_l2_gas_price_fri": {
+  "context.dynamic_config.override_l2_gas_price_fri": {
     "description": "Replace the L2 gas price (fri) with this value.",
     "privacy": "Public",
     "value": 0
   },
-  "context.override_l2_gas_price_fri.#is_none": {
+  "context.dynamic_config.override_l2_gas_price_fri.#is_none": {
     "description": "Flag for an optional field.",
     "privacy": "TemporaryValue",
     "value": true
   },
-  "context.proposal_buffer_size": {
+  "context.static_config.proposal_buffer_size": {
     "description": "The buffer size for streaming outbound proposals.",
     "privacy": "Public",
     "value": 100
   },
-  "context.retrospective_block_hash_retry_interval_millis": {
+  "context.static_config.retrospective_block_hash_retry_interval_millis": {
     "description": "The interval between retrospective block hash retries.",
     "privacy": "Public",
     "value": 500
   },
-  "context.validate_proposal_margin_millis": {
+  "context.static_config.validate_proposal_margin_millis": {
     "description": "Safety margin (in ms) to make sure that consensus determines when to timeout validating a proposal.",
     "privacy": "Public",
     "value": 10000
   },
-  "context.validator_ids": {
+  "context.static_config.validator_ids": {
     "description": "Optional explicit set of validator IDs (comma separated).",
     "privacy": "Public",
     "value": ""
   },
-  "context.validator_ids.#is_none": {
+  "context.static_config.validator_ids.#is_none": {
     "description": "Flag for an optional field.",
     "privacy": "TemporaryValue",
     "value": true

crates/apollo_consensus_manager/src/consensus_manager.rs

@@ -270,7 +270,7 @@ impl ConsensusManager {
             SequencerConsensusContextDeps {
                 transaction_converter: Arc::new(TransactionConverter::new(
                     Arc::clone(&self.class_manager_client),
-                    self.config.context_config.chain_id.clone(),
+                    self.config.context_config.static_config.chain_id.clone(),
                 )),
                 state_sync_client: Arc::clone(&self.state_sync_client),
                 batcher: Arc::clone(&self.batcher_client),

crates/apollo_consensus_orchestrator/src/build_proposal_test.rs

@@ -101,7 +101,7 @@ fn create_proposal_build_arguments() -> (TestProposalBuildArguments, mpsc::Recei
     let stream_sender = StreamSender { proposal_sender };
     let context_config = ContextConfig::default();
 
-    let gas_price_params = make_gas_price_params(&context_config);
+    let gas_price_params = make_gas_price_params(&context_config.dynamic_config);
     let valid_proposals = Arc::new(Mutex::new(BuiltProposals::new()));
     let proposal_id = ProposalId(1);
     let cende_write_success = AbortOnDropHandle::new(tokio::spawn(async { true }));

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -198,13 +198,13 @@ enum ReproposeError {
 impl SequencerConsensusContext {
     pub fn new(config: ContextConfig, deps: SequencerConsensusContextDeps) -> Self {
         register_metrics();
-        let num_validators = config.num_validators;
-        let l1_da_mode = if config.l1_da_mode {
+        let num_validators = config.static_config.num_validators;
+        let l1_da_mode = if config.static_config.l1_da_mode {
             L1DataAvailabilityMode::Blob
         } else {
             L1DataAvailabilityMode::Calldata
         };
-        let validators = if let Some(ids) = config.validator_ids.clone() {
+        let validators = if let Some(ids) = config.static_config.validator_ids.clone() {
             ids.into_iter().collect()
         } else {
             (0..num_validators).map(|i| ValidatorId::from(DEFAULT_VALIDATOR_ID + i)).collect()
@@ -227,7 +227,8 @@ impl SequencerConsensusContext {
     }
 
     async fn start_stream(&mut self, stream_id: HeightAndRound) -> StreamSender {
-        let (proposal_sender, proposal_receiver) = mpsc::channel(self.config.proposal_buffer_size);
+        let (proposal_sender, proposal_receiver) =
+            mpsc::channel(self.config.static_config.proposal_buffer_size);
         self.deps
             .outbound_proposal_sender
             .send((stream_id, proposal_receiver))
@@ -318,7 +319,7 @@ impl SequencerConsensusContext {
 
     fn update_l2_gas_price(&mut self, l2_gas_used: GasAmount) {
         let gas_target = VersionedConstants::latest_constants().gas_target;
-        if let Some(override_value) = self.config.override_l2_gas_price_fri {
+        if let Some(override_value) = self.config.dynamic_config.override_l2_gas_price_fri {
             info!(
                 "L2 gas price ({}) is not updated, remains on override value of {override_value} \
                  fri",
@@ -476,30 +477,32 @@ impl ConsensusContext for SequencerConsensusContext {
         let (fin_sender, fin_receiver) = oneshot::channel();
         let proposal_id = ProposalId(self.proposal_id);
         self.proposal_id += 1;
-        assert!(timeout > self.config.build_proposal_margin_millis);
+        assert!(timeout > self.config.static_config.build_proposal_margin_millis);
         let stream_id = HeightAndRound(proposal_init.height.0, proposal_init.round);
         let stream_sender = self.start_stream(stream_id).await;
 
         info!(?proposal_init, ?timeout, %proposal_id, "Start building proposal");
         let cancel_token = CancellationToken::new();
         let cancel_token_clone = cancel_token.clone();
-        let gas_price_params = make_gas_price_params(&self.config);
+        let gas_price_params = make_gas_price_params(&self.config.dynamic_config);
         let mut l2_gas_price = self.l2_gas_price;
-        if let Some(override_value) = self.config.override_l2_gas_price_fri {
+        if let Some(override_value) = self.config.dynamic_config.override_l2_gas_price_fri {
             info!("Overriding L2 gas price to {override_value} fri");
             l2_gas_price = GasPrice(override_value);
         }
 
         // The following calculations will panic on overflow/negative result.
-        let total_build_proposal_time = timeout - self.config.build_proposal_margin_millis;
+        let total_build_proposal_time =
+            timeout - self.config.static_config.build_proposal_margin_millis;
         let time_now = self.deps.clock.now();
         let batcher_deadline = time_now + total_build_proposal_time;
         let retrospective_block_hash_deadline = time_now
-            + total_build_proposal_time
-                .mul_f32(self.config.build_proposal_time_ratio_for_retrospective_block_hash);
+            + total_build_proposal_time.mul_f32(
+                self.config.static_config.build_proposal_time_ratio_for_retrospective_block_hash,
+            );
 
         let use_state_sync_block_timestamp =
-            self.config.deployment_mode.use_state_sync_block_timestamp();
+            self.config.static_config.deployment_mode.use_state_sync_block_timestamp();
 
         let args = ProposalBuildArguments {
             deps: self.deps.clone(),
@@ -512,13 +515,14 @@ impl ConsensusContext for SequencerConsensusContext {
             proposal_id,
             cende_write_success,
             l2_gas_price,
-            builder_address: self.config.builder_address,
+            builder_address: self.config.static_config.builder_address,
             cancel_token,
             previous_block_info: self.previous_block_info.clone(),
             proposal_round: self.current_round,
             retrospective_block_hash_deadline,
             retrospective_block_hash_retry_interval_millis: self
                 .config
+                .static_config
                 .retrospective_block_hash_retry_interval_millis,
             use_state_sync_block_timestamp,
         };
@@ -580,11 +584,15 @@ impl ConsensusContext for SequencerConsensusContext {
             std::cmp::Ordering::Equal => {
                 let block_info_validation = BlockInfoValidation {
                     height: proposal_init.height,
-                    block_timestamp_window_seconds: self.config.block_timestamp_window_seconds,
+                    block_timestamp_window_seconds: self
+                        .config
+                        .static_config
+                        .block_timestamp_window_seconds,
                     previous_block_info: self.previous_block_info.clone(),
                     l1_da_mode: self.l1_da_mode,
                     l2_gas_price_fri: self
                         .config
+                        .dynamic_config
                         .override_l2_gas_price_fri
                         .map(GasPrice)
                         .unwrap_or(self.l2_gas_price),
@@ -593,7 +601,7 @@ impl ConsensusContext for SequencerConsensusContext {
                     block_info_validation,
                     proposal_init.proposer,
                     timeout,
-                    self.config.validate_proposal_margin_millis,
+                    self.config.static_config.validate_proposal_margin_millis,
                     content_receiver,
                     fin_sender,
                 )
@@ -726,15 +734,15 @@ impl ConsensusContext for SequencerConsensusContext {
         let now: u64 = self.deps.clock.unix_now();
         if !(block_number == height
             && timestamp.0 >= last_block_timestamp
-            && timestamp.0 <= now + self.config.block_timestamp_window_seconds)
+            && timestamp.0 <= now + self.config.static_config.block_timestamp_window_seconds)
         {
             warn!(
                 "Invalid block info: expected block number {}, got {}, expected timestamp range \
                  [{}, {}], got {}",
                 height,
                 block_number,
                 last_block_timestamp,
-                now + self.config.block_timestamp_window_seconds,
+                now + self.config.static_config.block_timestamp_window_seconds,
                 timestamp.0,
             );
             return false;
@@ -809,16 +817,24 @@ impl ConsensusContext for SequencerConsensusContext {
         };
         let block_info_validation = BlockInfoValidation {
             height,
-            block_timestamp_window_seconds: self.config.block_timestamp_window_seconds,
+            block_timestamp_window_seconds: self
+                .config
+                .static_config
+                .block_timestamp_window_seconds,
             previous_block_info: self.previous_block_info.clone(),
             l1_da_mode: self.l1_da_mode,
-            l2_gas_price_fri: self.l2_gas_price,
+            l2_gas_price_fri: self
+                .config
+                .dynamic_config
+                .override_l2_gas_price_fri
+                .map(GasPrice)
+                .unwrap_or(self.l2_gas_price),
         };
         self.validate_current_round_proposal(
             block_info_validation,
             validator,
             timeout,
-            self.config.validate_proposal_margin_millis,
+            self.config.static_config.validate_proposal_margin_millis,
             content,
             fin_sender,
         )
@@ -843,7 +859,7 @@ impl SequencerConsensusContext {
 
         let cancel_token = CancellationToken::new();
         let cancel_token_clone = cancel_token.clone();
-        let gas_price_params = make_gas_price_params(&self.config);
+        let gas_price_params = make_gas_price_params(&self.config.dynamic_config);
         let args = ProposalValidateArguments {
             deps: self.deps.clone(),
             block_info_validation,