chore: Bump reth to v1.9.0 - release v0.1.16 (#177)

* chore: Bump reth to v1.9.0 - release v0.1.16

* Running just fix

* Cargo clippy fixes

* Fmt fixes

Author: tobidae-cb

Cargo.lock

@@ -1,7 +1,7 @@
 [workspace.package]
-version = "0.1.15"
-edition = "2021"
-rust-version = "1.85"
+version = "0.1.16"
+edition = "2024"
+rust-version = "1.88"
 license = "MIT"
 homepage = "https://github.com/base/node-reth"
 repository = "https://github.com/base/node-reth"
@@ -48,34 +48,34 @@ base-reth-transaction-tracing = { path = "crates/transaction-tracing" }
 tips-core = { git = "https://github.com/base/tips", rev = "27674ae051a86033ece61ae24434aeacdb28ce73", default-features = false }
 
 # reth
-reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
+reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
 
 # revm
-revm = { version = "29.0.0", default-features = false }
-revm-bytecode = { version = "6.2.2", default-features = false }
+revm = { version = "31.0.0", default-features = false }
+revm-bytecode = { version = "7.1.0", default-features = false }
 
 # alloy
-alloy-primitives = { version = "1.3.1", default-features = false, features = [
+alloy-primitives = { version = "1.4.1", default-features = false, features = [
     "map-foldhash",
 ] }
 alloy-genesis = { version = "1.0.41", default-features = false }
@@ -86,16 +86,16 @@ alloy-rpc-types-eth = { version = "1.0.41" }
 alloy-consensus = { version = "1.0.41" }
 alloy-trie = { version = "0.9.1", default-features = false }
 alloy-provider = { version = "1.0.41" }
-alloy-hardforks = "0.3.5"
+alloy-hardforks = "0.4.4"
 alloy-rpc-client = { version = "1.0.41" }
 alloy-serde = { version = "1.0.41" }
 
 # op-alloy
-op-alloy-rpc-types = { version = "0.20.0", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.20.0", default-features = false }
-op-alloy-rpc-jsonrpsee = { version = "0.20.0", default-features = false }
-op-alloy-network = { version = "0.20.0", default-features = false }
-op-alloy-consensus = { version = "0.20.0", default-features = false }
+op-alloy-rpc-types = { version = "0.22.0", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false }
+op-alloy-rpc-jsonrpsee = { version = "0.22.0", default-features = false }
+op-alloy-network = { version = "0.22.0", default-features = false }
+op-alloy-consensus = { version = "0.22.0", default-features = false }
 
 # rollup-boost
 rollup-boost = { git = "http://github.com/flashbots/rollup-boost", tag = "rollup-boost/v0.7.5" }

Cargo.toml

@@ -1,11 +1,11 @@
 use alloy_consensus::{Header, Sealed};
 use alloy_eips::BlockNumberOrTag;
 use alloy_primitives::{
+    Address, B256, BlockNumber, TxHash, U256,
     map::foldhash::{HashMap, HashMapExt},
-    Address, BlockNumber, TxHash, B256, U256,
 };
 use alloy_provider::network::TransactionResponse;
-use alloy_rpc_types::{state::StateOverride, BlockTransactions};
+use alloy_rpc_types::{BlockTransactions, state::StateOverride};
 use alloy_rpc_types_eth::{Filter, Header as RPCHeader, Log};
 use eyre::eyre;
 use op_alloy_network::Optimism;

crates/flashblocks-rpc/src/pending_blocks.rs

@@ -6,17 +6,17 @@ use crate::pending_blocks::PendingBlocks;
 use alloy_eips::{BlockId, BlockNumberOrTag};
 use alloy_primitives::map::foldhash::{HashSet, HashSetExt};
 use alloy_primitives::{Address, TxHash, U256};
+use alloy_rpc_types::BlockOverrides;
 use alloy_rpc_types::simulate::{SimBlock, SimulatePayload, SimulatedBlock};
 use alloy_rpc_types::state::{EvmOverrides, StateOverride, StateOverridesBuilder};
-use alloy_rpc_types::BlockOverrides;
 use alloy_rpc_types_eth::{Filter, Log};
 use arc_swap::Guard;
 use jsonrpsee::{
-    core::{async_trait, RpcResult},
+    core::{RpcResult, async_trait},
     proc_macros::rpc,
 };
-use jsonrpsee_types::error::INVALID_PARAMS_CODE;
 use jsonrpsee_types::ErrorObjectOwned;
+use jsonrpsee_types::error::INVALID_PARAMS_CODE;
 use op_alloy_network::Optimism;
 use op_alloy_rpc_types::OpTransactionRequest;
 use reth::providers::CanonStateSubscriptions;
@@ -25,13 +25,13 @@ use reth::rpc::server_types::eth::EthApiError;
 use reth_rpc_eth_api::helpers::EthState;
 use reth_rpc_eth_api::helpers::EthTransactions;
 use reth_rpc_eth_api::helpers::{EthBlocks, EthCall};
-use reth_rpc_eth_api::{helpers::FullEthApi, EthApiTypes, EthFilterApiServer, RpcBlock};
+use reth_rpc_eth_api::{EthApiTypes, EthFilterApiServer, RpcBlock, helpers::FullEthApi};
 use reth_rpc_eth_api::{RpcReceipt, RpcTransaction};
 use tokio::sync::broadcast;
 use tokio::sync::broadcast::error::RecvError;
 use tokio::time;
-use tokio_stream::wrappers::BroadcastStream;
 use tokio_stream::StreamExt;
+use tokio_stream::wrappers::BroadcastStream;
 use tracing::{debug, trace, warn};
 
 /// Max configured timeout for `eth_sendRawTransactionSync` in milliseconds.
@@ -89,7 +89,7 @@ pub trait EthApiOverride {
 
     #[method(name = "getBalance")]
     async fn get_balance(&self, address: Address, block_number: Option<BlockId>)
-        -> RpcResult<U256>;
+    -> RpcResult<U256>;
 
     #[method(name = "getTransactionCount")]
     async fn get_transaction_count(
@@ -292,10 +292,12 @@ where
             Some(ms) if ms > MAX_TIMEOUT_SEND_RAW_TX_SYNC_MS => {
                 return Err(ErrorObjectOwned::owned(
                     INVALID_PARAMS_CODE,
-                    format!("time out too long, timeout: {ms} ms, max: {MAX_TIMEOUT_SEND_RAW_TX_SYNC_MS} ms"),
+                    format!(
+                        "time out too long, timeout: {ms} ms, max: {MAX_TIMEOUT_SEND_RAW_TX_SYNC_MS} ms"
+                    ),
                     None::<()>,
-                ))
-            },
+                ));
+            }
             Some(ms) => ms,
             _ => MAX_TIMEOUT_SEND_RAW_TX_SYNC_MS,
         };

crates/flashblocks-rpc/src/rpc.rs

@@ -6,7 +6,7 @@ use alloy_consensus::transaction::{Recovered, SignerRecoverable, TransactionMeta
 use alloy_consensus::{Header, TxReceipt};
 use alloy_eips::BlockNumberOrTag;
 use alloy_primitives::map::foldhash::HashMap;
-use alloy_primitives::{Address, BlockNumber, Bytes, Sealable, B256, U256};
+use alloy_primitives::{Address, B256, BlockNumber, Bytes, Sealable, U256};
 use alloy_rpc_types::{TransactionTrait, Withdrawal};
 use alloy_rpc_types_engine::{ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3};
 use alloy_rpc_types_eth::state::StateOverride;
@@ -28,14 +28,14 @@ use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
 use reth_optimism_primitives::{DepositReceipt, OpBlock, OpPrimitives};
 use reth_optimism_rpc::OpReceiptBuilder;
 use reth_primitives::RecoveredBlock;
-use reth_rpc_convert::{transaction::ConvertReceiptInput, RpcTransaction};
+use reth_rpc_convert::{RpcTransaction, transaction::ConvertReceiptInput};
 use reth_rpc_eth_api::{RpcBlock, RpcReceipt};
 use std::collections::{BTreeMap, HashSet};
 use std::sync::Arc;
 use std::time::Instant;
+use tokio::sync::Mutex;
 use tokio::sync::broadcast::{self, Sender};
 use tokio::sync::mpsc::{self, UnboundedReceiver};
-use tokio::sync::Mutex;
 use tracing::{debug, error, info, warn};
 
 // Buffer 4s of flashblocks for flashblock_sender

crates/flashblocks-rpc/src/state.rs

@@ -229,10 +229,10 @@ fn try_decode_message(bytes: &[u8]) -> eyre::Result<Flashblock> {
 }
 
 fn try_parse_message(bytes: &[u8]) -> eyre::Result<String> {
-    if let Ok(text) = String::from_utf8(bytes.to_vec()) {
-        if text.trim_start().starts_with("{") {
-            return Ok(text);
-        }
+    if let Ok(text) = String::from_utf8(bytes.to_vec())
+        && text.trim_start().starts_with("{")
+    {
+        return Ok(text);
     }
 
     let mut decompressor = brotli::Decompressor::new(bytes, 4096);

crates/flashblocks-rpc/src/subscription.rs

@@ -1,9 +1,11 @@
-use alloy_primitives::{b256, bytes, Bytes, B256};
+use alloy_primitives::{B256, Bytes, b256, bytes};
 
 mod rpc;
 mod state;
 mod utils;
 
-const BLOCK_INFO_TXN: Bytes = bytes!("0x7ef90104a06c0c775b6b492bab9d7e81abdf27f77cafb698551226455a82f559e0f93fea3794deaddeaddeaddeaddeaddeaddeaddeaddead00019442000000000000000000000000000000000000158080830f424080b8b0098999be000008dd00101c1200000000000000020000000068869d6300000000015f277f000000000000000000000000000000000000000000000000000000000d42ac290000000000000000000000000000000000000000000000000000000000000001abf52777e63959936b1bf633a2a643f0da38d63deffe49452fed1bf8a44975d50000000000000000000000005050f69a9786f081509234f1a7f4684b5e5b76c9000000000000000000000000");
+const BLOCK_INFO_TXN: Bytes = bytes!(
+    "0x7ef90104a06c0c775b6b492bab9d7e81abdf27f77cafb698551226455a82f559e0f93fea3794deaddeaddeaddeaddeaddeaddeaddeaddead00019442000000000000000000000000000000000000158080830f424080b8b0098999be000008dd00101c1200000000000000020000000068869d6300000000015f277f000000000000000000000000000000000000000000000000000000000d42ac290000000000000000000000000000000000000000000000000000000000000001abf52777e63959936b1bf633a2a643f0da38d63deffe49452fed1bf8a44975d50000000000000000000000005050f69a9786f081509234f1a7f4684b5e5b76c9000000000000000000000000"
+);
 const BLOCK_INFO_TXN_HASH: B256 =
     b256!("0xba56c8b0deb460ff070f8fca8e2ee01e51a3db27841cc862fdd94cc1a47662b6");