refactor: remove validator empty stage, add default to p2p_proto::common::L1DataAvailabilityMode

Author: CHr15F0x

crates/p2p_proto/src/common.rs

@@ -85,8 +85,9 @@ pub struct BlockId {
     pub hash: Hash,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Dummy)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Dummy)]
 pub enum L1DataAvailabilityMode {
+    #[default]
     Calldata,
     Blob,
 }

crates/pathfinder/src/consensus/inner/consensus_task.rs

@@ -444,12 +444,11 @@ pub(crate) fn create_empty_proposal(
         // TODO keep the value from the last block as per spec
         next_l2_gas_price_fri: 0,
         // Equivalent to zero on the wire
-        l1_da_mode: L1DataAvailabilityMode::Calldata,
+        l1_da_mode: L1DataAvailabilityMode::default(),
     };
 
     let validator = ValidatorBlockInfoStage::new(chain_id, proposal_init.clone())?
-        .verify_proposal_commitment(&proposal_commitment)?
-        .consensus_finalize();
+        .verify_proposal_commitment(&proposal_commitment)?;
     let mut db_conn = storage
         .connection()
         .context("Creating database connection")?;

crates/pathfinder/src/consensus/inner/p2p_task.rs

@@ -928,8 +928,7 @@ fn handle_incoming_proposal_part<E: BlockExecutorExt, T: TransactionExt>(
                     let validator_stage = validator_cache.remove(&height_and_round)?;
                     let validator = validator_stage.try_into_block_info_stage()?;
                     let validator = validator.verify_proposal_commitment(proposal_commitment)?;
-                    let validator =
-                        ValidatorStage::Finalize(Box::new(validator.consensus_finalize()));
+                    let validator = ValidatorStage::Finalize(Box::new(validator));
                     validator_cache.insert(height_and_round, validator);
                     Ok(None)
                 }

crates/pathfinder/src/consensus/inner/p2p_task/handler_proptest.rs

@@ -196,7 +196,7 @@ fn create_structurally_valid_empty_proposal(seed: u64) -> Vec<ProposalPart> {
     proposal_commitment.l1_data_gas_price_fri = 0;
     proposal_commitment.l2_gas_price_fri = 0;
     proposal_commitment.l2_gas_used = 0;
-    proposal_commitment.l1_da_mode = L1DataAvailabilityMode::Calldata;
+    proposal_commitment.l1_da_mode = L1DataAvailabilityMode::default();
     let proposal_commitment = ProposalPart::ProposalCommitment(proposal_commitment);
     proposal_parts.push(proposal_commitment);
 

crates/pathfinder/src/consensus/inner/p2p_task/p2p_task_tests.rs

@@ -440,7 +440,7 @@ fn create_proposal_commitment_part(
         l2_gas_price_fri: 0,
         l2_gas_used: 0,
         next_l2_gas_price_fri: 0,
-        l1_da_mode: p2p_proto::common::L1DataAvailabilityMode::Calldata,
+        l1_da_mode: p2p_proto::common::L1DataAvailabilityMode::default(),
     })
 }
 

crates/pathfinder/src/consensus/inner/test_helpers.rs

@@ -80,7 +80,7 @@ pub fn create_test_proposal(
         block_number: height,
         timestamp,
         builder: proposer_address,
-        l1_da_mode: L1DataAvailabilityMode::Calldata,
+        l1_da_mode: L1DataAvailabilityMode::default(),
         l2_gas_price_fri: 1,
         l1_gas_price_wei: 1_000_000_000,
         l1_data_gas_price_wei: 1,

crates/pathfinder/src/validator.rs

@@ -154,7 +154,7 @@ impl ValidatorBlockInfoStage {
     pub fn verify_proposal_commitment(
         self,
         proposal_commitment: &p2p_proto::consensus::ProposalCommitment,
-    ) -> anyhow::Result<ValidatorEmptyProposalStage> {
+    ) -> anyhow::Result<ValidatorFinalizeStage> {
         if proposal_commitment.state_diff_commitment != Hash::ZERO {
             return Err(anyhow::anyhow!(
                 "Empty proposal commitment should have zero state_diff_commitment, got: {}",
@@ -250,36 +250,13 @@ impl ValidatorBlockInfoStage {
             state_diff_commitment: StateDiffCommitment::ZERO,
             state_diff_length: 0,
         };
-        Ok(ValidatorEmptyProposalStage {
-            expected_block_header,
-        })
-    }
-}
-
-/// An empty proposal contains the following: Init, Commitment, Fin. This
-/// stage occurs after the ValidatorBlockInfoStage ingests the Commitment and is
-/// specific only to the empty proposal path.
-pub struct ValidatorEmptyProposalStage {
-    expected_block_header: BlockHeader,
-}
-
-impl ValidatorEmptyProposalStage {
-    /// Finalizes the empty proposal, producing a header with all commitments
-    /// except the state commitment and block hash, which are computed in the
-    /// last stage. Also verifies that the computed proposal commitment matches
-    /// the expected one.
-    pub fn consensus_finalize(self) -> ValidatorFinalizeStage {
-        let Self {
-            expected_block_header,
-        } = self;
-
-        ValidatorFinalizeStage {
+        Ok(ValidatorFinalizeStage {
             header: expected_block_header,
             state_update: StateUpdateData::default(),
             transactions: Vec::new(),
             receipts: Vec::new(),
             events: Vec::new(),
-        }
+        })
     }
 }