apollo_batcher: remove block_header_commitments from DecisionReachedResponse

Author: asmaastarkware

crates/apollo_batcher/src/batcher.rs

@@ -783,7 +783,6 @@ impl Batcher {
             block_execution_artifacts.partial_block_hash_components();
         let state_diff_commitment =
             partial_block_hash_components.header_commitments.state_diff_commitment;
-        let block_header_commitments = partial_block_hash_components.header_commitments.clone();
         let parent_proposal_commitment = self.get_parent_proposal_commitment(height)?;
         self.commit_proposal_and_block(
             height,
@@ -834,7 +833,6 @@ impl Batcher {
                     .compiled_class_hashes_for_migration,
                 parent_proposal_commitment,
             },
-            block_header_commitments,
         })
     }
 

crates/apollo_batcher_types/src/batcher_types.rs

@@ -154,7 +154,6 @@ pub struct DecisionReachedResponse {
     pub state_diff: ThinStateDiff,
     pub l2_gas_used: GasAmount,
     pub central_objects: CentralObjects,
-    pub block_header_commitments: BlockHeaderCommitments,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -354,15 +354,10 @@ impl SequencerConsensusContext {
         // Accepts transactions as a vector of batches, as stored in the `BuiltProposals` map.
         transactions: Vec<Vec<InternalConsensusTransaction>>,
         decision_reached_response: DecisionReachedResponse,
+        block_header_commitments: BlockHeaderCommitments,
     ) {
-        let DecisionReachedResponse {
-            state_diff,
-            l2_gas_used,
-            central_objects,
-            // TODO(Asmaa): Remove once the context reads it from BuiltProposals
-            // (FinishedProposalInfo) instead of DecisionReachedResponse.
-            block_header_commitments,
-        } = decision_reached_response;
+        let DecisionReachedResponse { state_diff, l2_gas_used, central_objects } =
+            decision_reached_response;
 
         self.update_l2_gas_price(height, l2_gas_used);
 
@@ -683,12 +678,12 @@ impl ConsensusContext for SequencerConsensusContext {
         info!("Finished consensus for height: {height}. Agreed on block: {:#066x}", commitment.0);
 
         self.interrupt_active_proposal().await;
-        let (init, transactions, proposal_id) = {
+        let (init, transactions, proposal_id, finished_info) = {
             let mut proposals = self.valid_proposals.lock().unwrap();
-            let (init, transactions, proposal_id, _finished_info) =
+            let (init, transactions, proposal_id, finished_info) =
                 proposals.get_proposal(&height, &commitment).clone();
             proposals.remove_proposals_below_or_at_height(&height);
-            (init, transactions, proposal_id)
+            (init, transactions, proposal_id, finished_info)
         };
 
         let decision_reached_response =
@@ -698,8 +693,15 @@ impl ConsensusContext for SequencerConsensusContext {
         // unless the state is fully reverted, otherwise the node will be left in an
         // inconsistent state.
 
-        self.finalize_decision(height, &init, commitment, transactions, decision_reached_response)
-            .await;
+        self.finalize_decision(
+            height,
+            &init,
+            commitment,
+            transactions,
+            decision_reached_response,
+            finished_info.block_header_commitments,
+        )
+        .await;
 
         self.previous_block_info = Some(PreviousBlockInfo::from(&init));
 

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context_test.rs

@@ -757,7 +757,6 @@ async fn oracle_fails_on_second_block(#[case] l1_oracle_failure: bool) {
             state_diff: ThinStateDiff::default(),
             l2_gas_used: GasAmount::default(),
             central_objects: CentralObjects::default(),
-            block_header_commitments: BlockHeaderCommitments::default(),
         })
     });
 
@@ -942,7 +941,6 @@ async fn override_prices_behavior(
             state_diff: ThinStateDiff::default(),
             l2_gas_used: mock_l2_gas_used,
             central_objects: CentralObjects::default(),
-            block_header_commitments: BlockHeaderCommitments::default(),
         })
     });
 
@@ -1095,7 +1093,6 @@ async fn change_gas_price_overrides() {
             state_diff: ThinStateDiff::default(),
             l2_gas_used: GasAmount::default(),
             central_objects: CentralObjects::default(),
-            block_header_commitments: BlockHeaderCommitments::default(),
         })
     });