deps: reth 1.4.8

Cargo.toml

@@ -48,85 +48,85 @@ codegen-units = 1
 incremental = false
 
 [workspace.dependencies]
-reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12", features = [
+reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8", features = [
     "test-utils",
 ] }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
 
 # reth optimism
-reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
-reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
+reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
+reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
 
-# compatible with reth "v1.3.12 dependencies
-revm = { version = "22.0.1", features = [
+# compatible with reth v1.4.8 dependencies
+revm = { version = "24.0.1", features = [
     "std",
     "secp256k1",
     "optional_balance_check",
 ], default-features = false }
-revm-inspectors = { version = "0.19.0", default-features = false }
-op-revm = { version = "3.0.2", default-features = false }
+revm-inspectors = { version = "0.23.0", default-features = false }
+op-revm = { version = "5.0.0", default-features = false }
 
 ethereum_ssz_derive = "0.9.0"
 ethereum_ssz = "0.9.0"
 
-alloy-primitives = { version = "1.0.0", default-features = false }
+alloy-primitives = { version = "1.1.0", default-features = false }
 alloy-rlp = "0.3.10"
 alloy-chains = "0.2.0"
-alloy-evm = { version = "0.5.0", default-features = false }
-alloy-provider = { version = "0.14.0", features = ["ipc", "pubsub"] }
-alloy-pubsub = { version = "0.14.0" }
-alloy-eips = { version = "0.14.0" }
-alloy-rpc-types = { version = "0.14.0" }
-alloy-json-rpc = { version = "0.14.0" }
-alloy-transport-http = { version = "0.14.0" }
-alloy-network = { version = "0.14.0" }
-alloy-network-primitives = { version = "0.14.0" }
-alloy-transport = { version = "0.14.0" }
-alloy-node-bindings = { version = "0.14.0" }
-alloy-consensus = { version = "0.14.0", features = ["kzg"] }
-alloy-serde = { version = "0.14.0" }
-alloy-rpc-types-beacon = { version = "0.14.0", features = ["ssz"] }
-alloy-rpc-types-engine = { version = "0.14.0", features = ["ssz"] }
-alloy-rpc-types-eth = { version = "0.14.0" }
-alloy-signer-local = { version = "0.14.0" }
-alloy-rpc-client = { version = "0.14.0" }
-alloy-genesis = { version = "0.14.0" }
+alloy-evm = { version = "0.10", default-features = false }
+alloy-provider = { version = "1.0.9", features = ["ipc", "pubsub"] }
+alloy-pubsub = { version = "1.0.9" }
+alloy-eips = { version = "1.0.9" }
+alloy-rpc-types = { version = "1.0.9" }
+alloy-json-rpc = { version = "1.0.9" }
+alloy-transport-http = { version = "1.0.9" }
+alloy-network = { version = "1.0.9" }
+alloy-network-primitives = { version = "1.0.9" }
+alloy-transport = { version = "1.0.9" }
+alloy-node-bindings = { version = "1.0.9" }
+alloy-consensus = { version = "1.0.9", features = ["kzg"] }
+alloy-serde = { version = "1.0.9" }
+alloy-rpc-types-beacon = { version = "1.0.9", features = ["ssz"] }
+alloy-rpc-types-engine = { version = "1.0.9", features = ["ssz"] }
+alloy-rpc-types-eth = { version = "1.0.9" }
+alloy-signer-local = { version = "1.0.9" }
+alloy-rpc-client = { version = "1.0.9" }
+alloy-genesis = { version = "1.0.9" }
 alloy-trie = { version = "0.8.1" }
 
 # optimism

crates/rbuilder/src/building/block_orders/prioritized_order_store.rs

@@ -16,11 +16,11 @@ use super::{OrderPriority, SimulatedOrderSink};
 /// Order must implement BlockOrdersOrder which has priority(). This priority is used to sort the simulated orders.
 /// Usage:
 /// - Add new order (a little bit complex):
-///     ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order
-///     call insert_order
+///   ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order
+///   call insert_order
 /// - Get best order to execute
-///     call pop_order to get the best order
-///     if the order is executed call update_onchain_nonces to update all the changed nonces.
+///   call pop_order to get the best order
+///   if the order is executed call update_onchain_nonces to update all the changed nonces.
 /// - Remove orders: remove_orders. This is useful if we think this orders are no really good (failed to execute to often)
 #[derive(Debug, Clone)]
 pub struct PrioritizedOrderStore<OrderPriorityType> {

crates/rbuilder/src/building/builders/parallel_builder/conflict_task_generator.rs

@@ -68,7 +68,7 @@ impl ConflictTaskGenerator {
             self.add_processed_groups(&new_group, &mut processed_groups);
 
             // Remove all subset groups
-            if new_group.conflicting_group_ids.len() > 0 {
+            if !new_group.conflicting_group_ids.is_empty() {
                 self.remove_conflicting_subset_groups(&new_group);
             }
         }

crates/rbuilder/src/building/precompile_cache.rs

@@ -61,7 +61,7 @@ impl<CTX: ContextTr, P: PrecompileProvider<CTX, Output = InterpreterResult>> Pre
         is_static: bool,
         gas_limit: u64,
     ) -> Result<Option<Self::Output>, String> {
-        let key = (self.spec, inputs.input.clone(), gas_limit);
+        let key = (self.spec, inputs.input.bytes(context), gas_limit);
 
         // get the result if it exists
         if let Some(precompiles) = self.cache.lock().get_mut(address) {

crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs

@@ -31,11 +31,11 @@ pub async fn subscribe_to_txpool_with_blobs(
     let provider = match mempool {
         MempoolSource::Ipc(path) => {
             let ipc = IpcConnect::new(path);
-            ProviderBuilder::new().on_ipc(ipc).await?
+            ProviderBuilder::new().connect_ipc(ipc).await?
         }
         MempoolSource::Ws(url) => {
             let ws_conn = alloy_provider::WsConnect::new(url);
-            ProviderBuilder::new().on_ws(ws_conn).await?
+            ProviderBuilder::new().connect_ws(ws_conn).await?
         }
     };
 

crates/rbuilder/src/primitives/mod.rs

@@ -26,6 +26,7 @@ use reth_primitives::{
     kzg::{BYTES_PER_BLOB, BYTES_PER_COMMITMENT, BYTES_PER_PROOF},
     PooledTransaction, Recovered, Transaction, TransactionSigned,
 };
+use reth_primitives_traits::SignerRecoverable;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::{cmp::Ordering, collections::HashMap, fmt::Display, hash::Hash, str::FromStr, sync::Arc};
@@ -704,10 +705,10 @@ impl TransactionSignedEcRecoveredWithBlobs {
         metadata: Option<Metadata>,
     ) -> Result<Self, TxWithBlobsCreateError> {
         // Check for an eip4844 tx passed without blobs
-        if tx.transaction().blob_versioned_hashes().is_some() && blob_sidecar.is_none() {
+        if tx.inner().blob_versioned_hashes().is_some() && blob_sidecar.is_none() {
             Err(TxWithBlobsCreateError::Eip4844MissingBlobSidecar)
         // Check for a non-eip4844 tx passed with blobs
-        } else if blob_sidecar.is_some() && tx.transaction().blob_versioned_hashes().is_none() {
+        } else if blob_sidecar.is_some() && tx.inner().blob_versioned_hashes().is_none() {
             Err(TxWithBlobsCreateError::BlobsMissingEip4844)
         // Groovy!
         } else {
@@ -741,7 +742,9 @@ impl TransactionSignedEcRecoveredWithBlobs {
         T: TransactionOrdering<Transaction = <V as TransactionValidator>::Transaction>,
         S: BlobStore,
     {
-        let blob_sidecar = pool.get_blob(*tx.inner().hash())?.map(|b| (*b).clone());
+        let blob_sidecar = pool
+            .get_blob(*tx.inner().hash())?
+            .and_then(|b| b.as_eip4844().cloned());
         Self::new(tx, blob_sidecar, None)
     }
 
@@ -814,8 +817,11 @@ impl TransactionSignedEcRecoveredWithBlobs {
             PooledTransaction::Eip4844(blob_tx) => {
                 let (blob_tx, signature, hash) = blob_tx.into_parts();
                 let (blob_tx, sidecar) = blob_tx.into_parts();
-                let tx_signed =
-                    TransactionSigned::new(Transaction::Eip4844(blob_tx), signature, hash);
+                let tx_signed = TransactionSigned::new_unchecked(
+                    Transaction::Eip4844(blob_tx),
+                    signature,
+                    hash,
+                );
                 Ok(TransactionSignedEcRecoveredWithBlobs {
                     tx: tx_signed.with_signer(signer),
                     blobs_sidecar: Arc::new(sidecar),
@@ -830,8 +836,7 @@ impl TransactionSignedEcRecoveredWithBlobs {
     ) -> Result<TransactionSignedEcRecoveredWithBlobs, TxWithBlobsCreateError> {
         let decoded = TransactionSigned::decode_2718(&mut raw_tx.as_ref())
             .map_err(TxWithBlobsCreateError::FailedToDecodeTransaction)?;
-        let tx = decoded
-            .try_into_recovered()
+        let tx = SignerRecoverable::try_into_recovered(decoded)
             .map_err(|_| TxWithBlobsCreateError::InvalidTransactionSignature)?;
         let mut fake_sidecar = BlobTransactionSidecar::default();
         for _ in 0..tx.blob_versioned_hashes().map_or(0, |hashes| hashes.len()) {

crates/rbuilder/src/primitives/test_data_generator.rs

@@ -22,7 +22,7 @@ impl TestDataGenerator {
 
     pub fn create_tx_nonce(&mut self, sender_nonce: AccountNonce) -> Recovered<TransactionSigned> {
         Recovered::new_unchecked(
-            TransactionSigned::new(
+            TransactionSigned::new_unchecked(
                 Transaction::Legacy(TxLegacy {
                     nonce: sender_nonce.nonce,
                     ..TxLegacy::default()

crates/rbuilder/src/telemetry/servers/mod.rs

@@ -1,9 +1,9 @@
 //! Telemetry contains two servers.
 //!
 //! - [full]: verbose server exposing detailed operational information about the
-//!          builder.
+//!   builder.
 //! - [redacted]: deliberately redacted server serves information suitable for
-//!           tdx builders to expose in real-time.
+//!   tdx builders to expose in real-time.
 //!
 //! The redacted server is seperate from the debug server because it may be desirable
 //! to expose debug and redacted data differently in tdx builders. e.g. redacted data

crates/rbuilder/src/utils/tx_signer.rs

@@ -53,6 +53,7 @@ mod test {
     use alloy_consensus::TxEip1559;
     use alloy_primitives::{address, fixed_bytes, TxKind as TransactionKind};
     use reth_node_core::primitives::SignedTransaction;
+    use reth_primitives_traits::SignerRecoverable;
     #[test]
     fn test_sign_transaction() {
         let secret =

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.85.0"
+channel = "1.86.0"
 components = ["rustfmt", "clippy"]