apollo_batcher: remove revert config (#11278)

Author: amosStarkware

Cargo.lock

@@ -251,7 +251,6 @@ impl Batcher {
         &mut self,
         propose_block_input: ProposeBlockInput,
     ) -> BatcherResult<()> {
-        self.assert_not_in_revert_mode();
         let block_number = propose_block_input.block_info.block_number;
         let proposal_metrics_handle = ProposalMetricsHandle::new();
         let active_height = self.active_height.ok_or(BatcherError::NoActiveHeight)?;
@@ -378,7 +377,6 @@ impl Batcher {
         &mut self,
         validate_block_input: ValidateBlockInput,
     ) -> BatcherResult<()> {
-        self.assert_not_in_revert_mode();
         let proposal_metrics_handle = ProposalMetricsHandle::new();
         let active_height = self.active_height.ok_or(BatcherError::NoActiveHeight)?;
         verify_block_input(
@@ -617,7 +615,6 @@ impl Batcher {
 
     #[instrument(skip(self, sync_block), err)]
     pub async fn add_sync_block(&mut self, sync_block: SyncBlock) -> BatcherResult<()> {
-        self.assert_not_in_revert_mode();
         trace!("Received sync block: {:?}", sync_block);
         // TODO(AlonH): Use additional data from the sync block.
         let SyncBlock {
@@ -1069,7 +1066,6 @@ impl Batcher {
     #[instrument(skip(self), err)]
     // This function will panic if there is a storage failure to revert the block.
     pub async fn revert_block(&mut self, input: RevertBlockInput) -> BatcherResult<()> {
-        self.assert_in_revert_mode();
         info!("Reverting block at height {}.", input.height);
         let height = self.get_height_from_storage()?.prev().ok_or(
             BatcherError::StorageHeightMarkerMismatch {
@@ -1203,24 +1199,6 @@ impl Batcher {
 
         Ok(())
     }
-
-    #[track_caller]
-    fn assert_not_in_revert_mode(&self) {
-        assert!(
-            !self.config.revert_config.should_revert,
-            "Batcher can't perform this operation when in revert mode. Turn OFF revert mode in \
-             config and restart the Batcher."
-        );
-    }
-
-    #[track_caller]
-    fn assert_in_revert_mode(&self) {
-        assert!(
-            self.config.revert_config.should_revert,
-            "Batcher can only perform this operation when in revert mode. Turn ON revert mode in \
-             config and restart the Batcher."
-        );
-    }
 }
 
 /// Logs the result of the transactions execution in the proposal.

crates/apollo_batcher/src/batcher.rs

@@ -853,9 +853,6 @@ async fn multiple_proposals_with_l1_every_n_proposals() {
     batcher.config.propose_l1_txs_every = PROPOSALS_L1_MODULATOR.try_into().unwrap();
 
     for i in 0..N_PROPOSALS {
-        // The revert config shouldn't be toggled without restarting the Batcher. But in the context
-        // of the test it should be ok.
-        batcher.config.revert_config.should_revert = false;
         batcher.start_height(StartHeightInput { height: INITIAL_HEIGHT }).await.unwrap();
         batcher.propose_block(propose_block_input(PROPOSAL_ID)).await.unwrap();
         let content = batcher
@@ -872,7 +869,6 @@ async fn multiple_proposals_with_l1_every_n_proposals() {
         }
 
         batcher.await_active_proposal(DUMMY_FINAL_N_EXECUTED_TXS).await.unwrap();
-        batcher.config.revert_config.should_revert = true;
         batcher
             .revert_block(RevertBlockInput { height: INITIAL_HEIGHT.prev().unwrap() })
             .await
@@ -1356,8 +1352,7 @@ async fn revert_block() {
         .with(eq(LATEST_BLOCK_IN_STORAGE))
         .returning(|_| ());
 
-    let mut mock_dependencies = MockDependencies { storage_writer, ..Default::default() };
-    mock_dependencies.batcher_config.revert_config.should_revert = true;
+    let mock_dependencies = MockDependencies { storage_writer, ..Default::default() };
 
     let mut batcher = create_batcher(mock_dependencies).await;
 
@@ -1374,9 +1369,7 @@ async fn revert_block() {
 
 #[tokio::test]
 async fn revert_block_mismatch_block_number() {
-    let mut mock_dependencies = MockDependencies::default();
-    mock_dependencies.batcher_config.revert_config.should_revert = true;
-    let mut batcher = create_batcher(mock_dependencies).await;
+    let mut batcher = create_batcher(MockDependencies::default()).await;
 
     let revert_input = RevertBlockInput { height: INITIAL_HEIGHT };
     let result = batcher.revert_block(revert_input).await;
@@ -1394,8 +1387,7 @@ async fn revert_block_empty_storage() {
     let mut storage_reader = MockBatcherStorageReader::new();
     storage_reader.expect_height().returning(|| Ok(BlockNumber(0)));
     storage_reader.expect_global_root_height().returning(|| Ok(BlockNumber(0)));
-    let mut mock_dependencies = MockDependencies { storage_reader, ..Default::default() };
-    mock_dependencies.batcher_config.revert_config.should_revert = true;
+    let mock_dependencies = MockDependencies { storage_reader, ..Default::default() };
     let mut batcher = create_batcher(mock_dependencies).await;
 
     let revert_input = RevertBlockInput { height: BlockNumber(0) };

crates/apollo_batcher/src/batcher_test.rs

@@ -299,7 +299,8 @@ impl CommitmentManager {
             .expect("Failed to get block hash height from storage.");
         let mut commitment_manager = Self::new_or_none(
             commitment_manager_config,
-            &batcher_config.revert_config,
+            // TODO(Amos): Always return commitment manager.
+            &RevertConfig::default(),
             global_root_height,
             committer_client,
         );

crates/apollo_batcher/src/commitment_manager/mod.rs

@@ -8,7 +8,6 @@ description = "Configuration for Apollo batcher"
 
 [dependencies]
 apollo_config.workspace = true
-apollo_reverts.workspace = true
 apollo_storage.workspace = true
 blockifier.workspace = true
 serde = { workspace = true, features = ["derive"] }

crates/apollo_batcher_config/Cargo.toml

@@ -10,7 +10,6 @@ use apollo_config::dumping::{
 };
 use apollo_config::secrets::Sensitive;
 use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
-use apollo_reverts::RevertConfig;
 use apollo_storage::db::DbConfig;
 use apollo_storage::storage_reader_server::ServerConfig;
 use apollo_storage::{StorageConfig, StorageScope};
@@ -196,8 +195,6 @@ pub struct BatcherConfig {
     pub propose_l1_txs_every: u64,
     pub first_block_with_partial_block_hash: Option<FirstBlockWithPartialBlockHash>,
     pub storage_reader_server_config: ServerConfig,
-    // Used to verify the Batcher is restarted before switching to / from revert mode.
-    pub revert_config: RevertConfig,
 }
 
 impl SerializeConfig for BatcherConfig {
@@ -255,8 +252,6 @@ impl SerializeConfig for BatcherConfig {
             &self.first_block_with_partial_block_hash,
             "first_block_with_partial_block_hash",
         ));
-
-        dump.append(&mut prepend_sub_config_name(self.revert_config.dump(), "revert_config"));
         dump
     }
 }
@@ -284,7 +279,6 @@ impl Default for BatcherConfig {
             propose_l1_txs_every: 1, // Default is to propose L1 transactions every proposal.
             first_block_with_partial_block_hash: None,
             storage_reader_server_config: ServerConfig::default(),
-            revert_config: RevertConfig::default(),
         }
     }
 }

crates/apollo_batcher_config/src/config.rs

@@ -324,16 +324,6 @@
     "privacy": "Public",
     "value": 1
   },
-  "batcher_config.revert_config.revert_up_to_and_including": {
-    "description": "The component will revert blocks up to this block number (including).",
-    "pointer_target": "revert_config.revert_up_to_and_including",
-    "privacy": "Public"
-  },
-  "batcher_config.revert_config.should_revert": {
-    "description": "If set true, the component would revert blocks and do nothing else.",
-    "pointer_target": "revert_config.should_revert",
-    "privacy": "Public"
-  },
   "batcher_config.storage.db_config.chain_id": {
     "description": "The chain to follow. For more details see https://docs.starknet.io/documentation/architecture_and_concepts/Blocks/transactions/#chain-id.",
     "pointer_target": "chain_id",

crates/apollo_node/resources/config_schema.json

@@ -169,7 +169,6 @@ pub static CONFIG_POINTERS: LazyLock<ConfigPointers> = LazyLock::new(|| {
         &RevertConfig::default(),
         set_pointing_param_paths(&[
             "state_sync_config.revert_config",
-            "batcher_config.revert_config",
             "consensus_manager_config.revert_config",
         ]),
     );