chore(trie): Use trie changesets for engine unwinding

Author: mediocregopher

crates/cli/commands/src/stage/unwind.rs

@@ -60,54 +60,35 @@ impl<C: ChainSpecParser<ChainSpec: EthChainSpec + EthereumHardforks>> Command<C>
 
         let components = components(provider_factory.chain_spec());
 
-        let highest_static_file_block = provider_factory
-            .static_file_provider()
-            .get_highest_static_files()
-            .max_block_num()
-            .filter(|highest_static_file_block| *highest_static_file_block > target);
-
-        // Execute a pipeline unwind if the start of the range overlaps the existing static
-        // files. If that's the case, then copy all available data from MDBX to static files, and
-        // only then, proceed with the unwind.
-        //
-        // We also execute a pipeline unwind if `offline` is specified, because we need to only
-        // unwind the data associated with offline stages.
-        if highest_static_file_block.is_some() || self.offline {
-            if self.offline {
-                info!(target: "reth::cli", "Performing an unwind for offline-only data!");
-            }
-
-            if let Some(highest_static_file_block) = highest_static_file_block {
-                info!(target: "reth::cli", ?target, ?highest_static_file_block, "Executing a pipeline unwind.");
-            } else {
-                info!(target: "reth::cli", ?target, "Executing a pipeline unwind.");
-            }
-            info!(target: "reth::cli", prune_config=?config.prune, "Using prune settings");
-
-            // This will build an offline-only pipeline if the `offline` flag is enabled
-            let mut pipeline =
-                self.build_pipeline(config, provider_factory, components.evm_config().clone())?;
+        // Sanity check that we have static files available to unwind to the target block.
+        let highest_static_file_block =
+            provider_factory.static_file_provider().get_highest_static_files().max_block_num();
+        if highest_static_file_block
+            .filter(|highest_static_file_block| *highest_static_file_block > target)
+            .is_none()
+        {
+            return Err(eyre::eyre!("static files not available for target block {target}, highest is {highest_static_file_block:?}"));
+        }
 
-            // Move all applicable data from database to static files.
-            pipeline.move_to_static_files()?;
+        if self.offline {
+            info!(target: "reth::cli", "Performing an unwind for offline-only data!");
+        }
 
-            pipeline.unwind(target, None)?;
+        if let Some(highest_static_file_block) = highest_static_file_block {
+            info!(target: "reth::cli", ?target, ?highest_static_file_block, "Executing a pipeline unwind.");
         } else {
-            info!(target: "reth::cli", ?target, "Executing a database unwind.");
-            let provider = provider_factory.provider_rw()?;
+            info!(target: "reth::cli", ?target, "Executing a pipeline unwind.");
+        }
+        info!(target: "reth::cli", prune_config=?config.prune, "Using prune settings");
 
-            provider
-                .remove_block_and_execution_above(target)
-                .map_err(|err| eyre::eyre!("Transaction error on unwind: {err}"))?;
+        // This will build an offline-only pipeline if the `offline` flag is enabled
+        let mut pipeline =
+            self.build_pipeline(config, provider_factory, components.evm_config().clone())?;
 
-            // update finalized block if needed
-            let last_saved_finalized_block_number = provider.last_finalized_block_number()?;
-            if last_saved_finalized_block_number.is_none_or(|f| f > target) {
-                provider.save_finalized_block_number(target)?;
-            }
+        // Move all applicable data from database to static files.
+        pipeline.move_to_static_files()?;
 
-            provider.commit()?;
-        }
+        pipeline.unwind(target, None)?;
 
         info!(target: "reth::cli", ?target, "Unwound blocks");
 

crates/ethereum/node/tests/e2e/p2p.rs

@@ -91,7 +91,6 @@ async fn e2e_test_send_transactions() -> eyre::Result<()> {
     Ok(())
 }
 
-#[ignore] // TODO(mediocregopher): re-enable as part of https://github.com/paradigmxyz/reth/issues/18517
 #[tokio::test]
 async fn test_long_reorg() -> eyre::Result<()> {
     reth_tracing::init_test_tracing();

crates/storage/db-api/src/models/accounts.rs

@@ -145,6 +145,44 @@ impl Decode for BlockNumberHashedAddress {
     }
 }
 
+/// A [`RangeBounds`] over a range of [`BlockNumberHashedAddress`]s. Used to conveniently convert
+/// from a range of [`BlockNumber`]s.
+#[derive(Debug)]
+pub struct BlockNumberHashedAddressRange {
+    /// Starting bound of the range.
+    pub start: Bound<BlockNumberHashedAddress>,
+    /// Ending bound of the range.
+    pub end: Bound<BlockNumberHashedAddress>,
+}
+
+impl RangeBounds<BlockNumberHashedAddress> for BlockNumberHashedAddressRange {
+    fn start_bound(&self) -> Bound<&BlockNumberHashedAddress> {
+        self.start.as_ref()
+    }
+
+    fn end_bound(&self) -> Bound<&BlockNumberHashedAddress> {
+        self.end.as_ref()
+    }
+}
+
+impl<R: RangeBounds<BlockNumber>> From<R> for BlockNumberHashedAddressRange {
+    fn from(r: R) -> Self {
+        let start = match r.start_bound() {
+            Bound::Included(n) => Bound::Included(BlockNumberHashedAddress((*n, B256::ZERO))),
+            Bound::Excluded(n) => Bound::Included(BlockNumberHashedAddress((n + 1, B256::ZERO))),
+            Bound::Unbounded => Bound::Unbounded,
+        };
+
+        let end = match r.end_bound() {
+            Bound::Included(n) => Bound::Excluded(BlockNumberHashedAddress((n + 1, B256::ZERO))),
+            Bound::Excluded(n) => Bound::Excluded(BlockNumberHashedAddress((*n, B256::ZERO))),
+            Bound::Unbounded => Bound::Unbounded,
+        };
+
+        Self { start, end }
+    }
+}
+
 /// [`Address`] concatenated with [`StorageKey`]. Used by `reth_etl` and history stages.
 ///
 /// Since it's used as a key, it isn't compressed when encoding it.