fix: pre-audit fixes and correctness improvements

Cargo.toml

@@ -9,6 +9,7 @@ publish = false
 resolver = "3"
 members = [
     "bin/morph-reth",
+    "bin/state-root-check",
     "crates/chainspec",
     "crates/consensus",
     "crates/engine-api",
@@ -54,59 +55,60 @@ morph-rpc = { path = "crates/rpc" }
 morph-revm = { path = "crates/revm", default-features = false }
 morph-txpool = { path = "crates/txpool", default-features = false }
 
-reth-basic-payload-builder = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-chain-state = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-chainspec = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-cli = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-cli-commands = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-cli-util = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-codecs = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-codecs-derive = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-consensus = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-consensus-common = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-db = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-db-api = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-e2e-test-utils = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-engine-local = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-engine-primitives = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-engine-tree = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-errors = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-eth-wire-types = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-ethereum = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-ethereum-cli = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-ethereum-consensus = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-ethereum-engine-primitives = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-ethereum-primitives = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1", default-features = false }
-reth-evm = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-evm-ethereum = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-execution-types = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-metrics = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-network-peers = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-node-api = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-node-builder = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-node-core = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-node-ethereum = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-node-metrics = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-payload-builder = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-payload-primitives = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-payload-util = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-primitives-traits = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1", default-features = false }
-reth-provider = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-rpc = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-rpc-api = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-rpc-builder = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-rpc-convert = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-rpc-eth-api = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-rpc-eth-types = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-rpc-server-types = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-storage-api = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-tasks = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-tracing = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-trie = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-transaction-pool = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1" }
-reth-zstd-compressors = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1", default-features = false }
+reth-basic-payload-builder = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-chain-state = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-chainspec = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-cli = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-cli-commands = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-cli-util = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-codecs = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-codecs-derive = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-consensus = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-consensus-common = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-db = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-db-api = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-e2e-test-utils = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-engine-local = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-engine-primitives = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-engine-tree = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-errors = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-eth-wire-types = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-ethereum = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-ethereum-cli = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-ethereum-consensus = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-ethereum-engine-primitives = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-ethereum-primitives = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e", default-features = false }
+reth-evm = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-evm-ethereum = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-execution-types = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-metrics = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-network-peers = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-node-api = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-node-builder = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-node-core = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-node-ethereum = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-node-metrics = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-payload-builder = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-payload-primitives = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-payload-util = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-primitives-traits = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e", default-features = false }
+reth-provider = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-rpc = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-rpc-api = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-rpc-builder = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-rpc-convert = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-rpc-eth-api = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-rpc-eth-types = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-rpc-server-types = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-storage-api = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-tasks = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-tracing = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-trie = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-trie-db = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-transaction-pool = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e" }
+reth-zstd-compressors = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e", default-features = false }
 
-reth-revm = { git = "https://github.com/morph-l2/reth", rev = "8057627ac9f169a0da4de44b616006a9e30382c1", features = [
+reth-revm = { git = "https://github.com/morph-l2/reth", rev = "f13757781d2f6b0c1ec1c3e38f3ac32004bff24e", features = [
   "std",
   "optional-checks",
 ] }

bin/morph-reth/src/main.rs

@@ -18,7 +18,9 @@ fn main() {
     // Install signal handler for segmentation faults
     sigsegv_handler::install();
 
-    // Enable backtraces by default
+    // Enable backtraces by default.
+    // SAFETY: Called at process startup before any other threads are spawned,
+    // so there are no concurrent readers of the environment.
     if std::env::var_os("RUST_BACKTRACE").is_none() {
         unsafe { std::env::set_var("RUST_BACKTRACE", "1") };
     }

bin/state-root-check/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "state-root-check"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+publish.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+alloy-primitives.workspace = true
+clap.workspace = true
+eyre.workspace = true
+morph-chainspec.workspace = true
+morph-node.workspace = true
+reth-provider.workspace = true
+reth-storage-api.workspace = true
+reth-trie.workspace = true
+
+[[bin]]
+name = "state-root-check"
+path = "src/main.rs"

bin/state-root-check/src/lib.rs

@@ -0,0 +1,76 @@
+use alloy_primitives::B256;
+use eyre::{Result, ensure};
+
+#[cfg(test)]
+mod tests {
+    use super::find_first_mismatch;
+    use eyre::Result;
+
+    #[test]
+    fn returns_first_divergent_block_for_monotonic_range() -> Result<()> {
+        let mismatch_from = 103_u64;
+
+        let got = find_first_mismatch(100, 105, |block| Ok(block < mismatch_from))?;
+
+        assert_eq!(got, Some(mismatch_from));
+        Ok(())
+    }
+
+    #[test]
+    fn returns_none_when_everything_matches() -> Result<()> {
+        let got = find_first_mismatch(100, 105, |_block| Ok(true))?;
+
+        assert_eq!(got, None);
+        Ok(())
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BlockRootComparison {
+    pub block_number: u64,
+    pub reth_root: B256,
+    pub geth_disk_root: B256,
+}
+
+impl BlockRootComparison {
+    pub fn is_match(&self) -> bool {
+        self.reth_root == self.geth_disk_root
+    }
+}
+
+pub fn find_first_mismatch<F>(from: u64, to: u64, mut matches: F) -> Result<Option<u64>>
+where
+    F: FnMut(u64) -> Result<bool>,
+{
+    ensure!(
+        from <= to,
+        "invalid range: from-block {from} is greater than to-block {to}"
+    );
+
+    if !matches(from)? {
+        return Ok(Some(from));
+    }
+
+    if matches(to)? {
+        return Ok(None);
+    }
+
+    let mut low = from.saturating_add(1);
+    let mut high = to;
+    let mut first = to;
+
+    while low <= high {
+        let mid = low + (high - low) / 2;
+        if matches(mid)? {
+            low = mid.saturating_add(1);
+        } else {
+            first = mid;
+            if mid == 0 {
+                break;
+            }
+            high = mid - 1;
+        }
+    }
+
+    Ok(Some(first))
+}