deps: update reth from main (2026-04-01)

Cargo.toml

@@ -120,56 +120,56 @@ tempo-telemetry-util = { path = "crates/telemetry-util", default-features = fals
 tempo-transaction-pool = { path = "crates/transaction-pool", default-features = false }
 tempo-validator-config = { path = "crates/validator-config", default-features = false }
 
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", default-features = false }
-reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", default-features = false }
+reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
 reth-codecs = { version = "0.1.0", default-features = false }
-reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-etl = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", default-features = false }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", default-features = false }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
+reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-etl = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", default-features = false }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", default-features = false }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
 reth-primitives-traits = { version = "0.1.0", default-features = false }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" }
 
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", features = [
+reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", features = [
   "std",
   "optional-checks",
 ] }
@@ -179,8 +179,8 @@ alloy = { version = "1.8.2", default-features = false }
 alloy-consensus = { version = "1.8.2", default-features = false }
 alloy-contract = { version = "1.8.2", default-features = false }
 alloy-eips = { version = "1.8.2", default-features = false }
-alloy-evm = { version = "0.29.2", default-features = false }
-revm-inspectors = "0.36.1"
+alloy-evm = { version = "0.30.0", default-features = false }
+revm-inspectors = "0.36.0"
 alloy-genesis = { version = "1.8.2", default-features = false }
 alloy-hardforks = "0.4.7"
 alloy-network = { version = "1.8.2", default-features = false }

bin/tempo/src/defaults.rs

@@ -10,6 +10,7 @@ use tempo_chainspec::hardfork::TempoHardfork;
 use url::Url;
 
 pub(crate) const DEFAULT_DOWNLOAD_URL: &str = "https://snapshots.tempoxyz.dev/4217";
+const SNAPSHOT_API_URL: &str = "https://snapshots.tempoxyz.dev/api/snapshots";
 
 /// Default OTLP logs filter level for telemetry.
 const DEFAULT_LOGS_OTLP_FILTER: &str = "debug";
@@ -155,6 +156,7 @@ fn init_download_urls() {
         ],
         default_base_url: Cow::Borrowed(DEFAULT_DOWNLOAD_URL),
         default_chain_aware_base_url: None,
+        snapshot_api_url: Cow::Borrowed(SNAPSHOT_API_URL),
         long_help: None,
     };
 

crates/alloy/src/rpc/reth_compat.rs

@@ -5,8 +5,7 @@ use alloy_primitives::{Address, B256, Bytes, Signature};
 use reth_evm::EvmEnv;
 use reth_primitives_traits::SealedHeader;
 use reth_rpc_convert::{
-    SignTxRequestError, SignableTxRequest, TryIntoSimTx, TryIntoTxEnv,
-    transaction::FromConsensusHeader,
+    FromConsensusHeader, SignTxRequestError, SignableTxRequest, TryIntoSimTx, TryIntoTxEnv,
 };
 use reth_rpc_eth_types::EthApiError;
 use tempo_chainspec::hardfork::TempoHardfork;

crates/commonware-node/src/feed/state.rs

@@ -11,7 +11,7 @@ use commonware_consensus::{
 use commonware_cryptography::bls12381::primitives::variant::{MinSig, Variant};
 use parking_lot::RwLock;
 use reth_provider::HeaderProvider as _;
-use reth_rpc_convert::transaction::FromConsensusHeader;
+use reth_rpc_convert::FromConsensusHeader;
 use std::sync::{Arc, OnceLock};
 use tempo_alloy::rpc::TempoHeaderResponse;
 use tempo_dkg_onchain_artifacts::OnchainDkgOutcome;

crates/evm/src/block.rs

@@ -103,6 +103,10 @@ impl<H> TxResult for TempoTxResult<H> {
     fn result(&self) -> &ResultAndState<Self::HaltReason> {
         self.inner.result()
     }
+
+    fn into_result(self) -> ResultAndState<Self::HaltReason> {
+        self.inner.into_result()
+    }
 }
 
 /// Block executor for Tempo.

crates/payload/builder/src/lib.rs

@@ -188,6 +188,8 @@ where
         self.build_payload(
             BuildArguments::new(
                 Default::default(),
+                None,
+                None,
                 config,
                 Default::default(),
                 Default::default(),
@@ -227,6 +229,7 @@ where
             config,
             cancel,
             best_payload,
+            ..
         } = args;
         let PayloadConfig {
             parent_header,
@@ -613,7 +616,7 @@ where
             block,
             hashed_state,
             trie_updates,
-        } = builder.finish(instrumented_provider)?;
+        } = builder.finish(instrumented_provider, None)?;
         drop(_finish_span);
         let builder_finish_elapsed = builder_finish_start.elapsed();
         self.metrics

crates/revm/src/exec.rs

@@ -4,8 +4,7 @@ use crate::{
     evm::{TempoContext, TempoEvm},
     handler::TempoEvmHandler,
 };
-use alloy_evm::Database;
-use reth_evm::TransactionEnv;
+use alloy_evm::{Database, TransactionEnvMut};
 use revm::{
     DatabaseCommit, ExecuteCommitEvm, ExecuteEvm,
     context::{ContextSetters, TxEnv, result::ExecResultAndState},

crates/revm/src/tx.rs

@@ -1,8 +1,7 @@
 use crate::TempoInvalidTransaction;
 use alloy_consensus::{EthereumTxEnvelope, TxEip4844, Typed2718, crypto::secp256k1};
-use alloy_evm::{FromRecoveredTx, FromTxWithEncoded, IntoTxEnv};
+use alloy_evm::{FromRecoveredTx, FromTxWithEncoded, IntoTxEnv, TransactionEnvMut};
 use alloy_primitives::{Address, B256, Bytes, TxKind, U256};
-use reth_evm::TransactionEnv;
 use revm::context::{
     Transaction, TxEnv,
     either::Either,
@@ -237,15 +236,11 @@ impl Transaction for TempoTxEnv {
     }
 }
 
-impl TransactionEnv for TempoTxEnv {
+impl TransactionEnvMut for TempoTxEnv {
     fn set_gas_limit(&mut self, gas_limit: u64) {
         self.inner.set_gas_limit(gas_limit);
     }
 
-    fn nonce(&self) -> u64 {
-        Transaction::nonce(&self.inner)
-    }
-
     fn set_nonce(&mut self, nonce: u64) {
         self.inner.set_nonce(nonce);
     }
@@ -618,7 +613,7 @@ mod tests {
 
     #[test]
     fn test_transaction_env_set_gas_limit() {
-        use reth_evm::TransactionEnv;
+        use alloy_evm::TransactionEnvMut;
 
         let mut tx_env = super::TempoTxEnv::default();
 
@@ -631,21 +626,22 @@ mod tests {
 
     #[test]
     fn test_transaction_env_nonce() {
-        use reth_evm::TransactionEnv;
+        use alloy_evm::TransactionEnvMut;
+        use revm::context::Transaction;
 
         let mut tx_env = super::TempoTxEnv::default();
-        assert_eq!(TransactionEnv::nonce(&tx_env), 0);
+        assert_eq!(Transaction::nonce(&tx_env), 0);
 
         tx_env.set_nonce(42);
-        assert_eq!(TransactionEnv::nonce(&tx_env), 42);
+        assert_eq!(Transaction::nonce(&tx_env), 42);
 
         tx_env.set_nonce(u64::MAX);
-        assert_eq!(TransactionEnv::nonce(&tx_env), u64::MAX);
+        assert_eq!(Transaction::nonce(&tx_env), u64::MAX);
     }
 
     #[test]
     fn test_transaction_env_set_access_list() {
-        use reth_evm::TransactionEnv;
+        use alloy_evm::TransactionEnvMut;
         use revm::context::transaction::{AccessList, AccessListItem};
 
         let mut tx_env = super::TempoTxEnv::default();
@@ -677,7 +673,7 @@ mod tests {
 
     #[test]
     fn test_transaction_env_combined_operations() {
-        use reth_evm::TransactionEnv;
+        use alloy_evm::TransactionEnvMut;
         use revm::context::transaction::{AccessList, AccessListItem};
 
         let mut tx_env = super::TempoTxEnv::default();
@@ -692,7 +688,7 @@ mod tests {
 
         // Verify all values are set correctly
         assert_eq!(tx_env.inner.gas_limit, 50_000);
-        assert_eq!(TransactionEnv::nonce(&tx_env), 100);
+        assert_eq!(revm::context::Transaction::nonce(&tx_env), 100);
         assert_eq!(tx_env.inner.access_list.0.len(), 1);
         assert_eq!(
             tx_env.inner.access_list.0[0].address,
@@ -702,8 +698,7 @@ mod tests {
 
     #[test]
     fn test_transaction_env_from_tx_env() {
-        use reth_evm::TransactionEnv;
-        use revm::context::TxEnv;
+        use revm::context::{Transaction, TxEnv};
 
         let inner = TxEnv {
             gas_limit: 75_000,
@@ -714,7 +709,7 @@ mod tests {
         let tx_env: super::TempoTxEnv = inner.into();
 
         assert_eq!(tx_env.inner.gas_limit, 75_000);
-        assert_eq!(TransactionEnv::nonce(&tx_env), 55);
+        assert_eq!(Transaction::nonce(&tx_env), 55);
         assert!(tx_env.fee_token.is_none());
         assert!(!tx_env.is_system_tx);
         assert!(tx_env.fee_payer.is_none());