update reth remove alloy-rpc-types and use reth-rpc-types

Cargo.toml

@@ -132,26 +132,23 @@ ethers-providers = { version = "2.0", default-features = false }
 ethers-signers = { version = "2.0", default-features = false }
 ethers-middleware = { version = "2.0", default-features = false }
 
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-interfaces = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" }
-revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "d7317c7" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-interfaces = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" }
+revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "0ad0338" }
 
-revm = { version = "7.1.0", features = [
+revm = { version = "7.2.0", features = [
     "std",
     "secp256k1",
 ], default-features = false }
-alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "9ac2c90", features = [
-    "jsonrpsee-types",
-] }
 alloy-primitives = "0.6"
 alloy-sol-types = "0.6"
 secp256k1 = { version = "0.27.0", default-features = false, features = [

crates/ethereum-rpc/Cargo.toml

@@ -27,8 +27,6 @@ reth-primitives = { workspace = true }
 reth-rpc-types = { workspace = true }
 reth-rpc-types-compat = { workspace = true }
 
-alloy-rpc-types = { workspace = true }
-
 ethers = { workspace = true }
 tokio = { workspace = true }
 schnellru = "0.2.1"

crates/evm/Cargo.toml

@@ -43,7 +43,6 @@ ethers = { workspace = true }
 
 alloy-primitives = { workspace = true, features = ["rand", "rlp", "serde"] }
 alloy-sol-types = { workspace = true }
-alloy-rpc-types = { workspace = true }
 alloy-rlp = { workspace = true }
 revm = { workspace = true, features = [
     "optional_block_gas_limit",

crates/evm/src/evm/call.rs

@@ -216,7 +216,7 @@ pub(crate) fn prepare_call_env(
         transact_to: to.map(TransactTo::Call).unwrap_or_else(TransactTo::create),
         value: value.unwrap_or_default(),
         data: input.try_into_unique_input()?.unwrap_or_default(),
-        chain_id: chain_id.map(|c| c.to::<u64>()),
+        chain_id,
         access_list: access_list
             .map(reth_rpc_types::AccessList::into_flattened)
             .unwrap_or_default(),

crates/evm/src/query.rs

@@ -10,6 +10,7 @@ use reth_primitives::TransactionKind::{Call, Create};
 use reth_primitives::{
     Block, BlockId, BlockNumberOrTag, SealedHeader, TransactionSignedEcRecovered, U128, U256, U64,
 };
+use reth_revm::access_list::AccessListInspector;
 use reth_revm::tracing::{TracingInspector, TracingInspectorConfig};
 use reth_rpc_types::other::OtherFields;
 use reth_rpc_types::trace::geth::{GethDebugTracingOptions, GethTrace};
@@ -20,7 +21,6 @@ use revm::primitives::{
     TxEnv, KECCAK_EMPTY,
 };
 use revm::{Database, DatabaseCommit};
-use revm_inspectors::access_list::AccessListInspector;
 use sov_modules_api::macros::rpc_gen;
 use sov_modules_api::prelude::*;
 use sov_modules_api::WorkingSet;

crates/evm/src/rpc_helpers/tracing_utils.rs

@@ -1,6 +1,7 @@
 use reth_primitives::revm::env::{fill_tx_env, fill_tx_env_with_recovered};
 use reth_primitives::revm_primitives::TxEnv;
 use reth_primitives::{TransactionSigned, TransactionSignedEcRecovered, TxHash, U256};
+use reth_revm::tracing::{FourByteInspector, TracingInspector, TracingInspectorConfig};
 use reth_rpc_types::trace::geth::{
     FourByteFrame, GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions,
     GethTrace, NoopFrame,
@@ -9,7 +10,6 @@ use revm::precompile::{PrecompileSpecId, Precompiles};
 use revm::primitives::db::Database;
 use revm::primitives::{Address, BlockEnv, CfgEnvWithHandlerCfg, EVMError, ResultAndState, SpecId};
 use revm::{inspector_handle_register, Inspector};
-use revm_inspectors::tracing::{FourByteInspector, TracingInspector, TracingInspectorConfig};
 
 use crate::error::rpc::{EthApiError, EthResult};
 use crate::evm::db::EvmDb;

crates/evm/src/tests/call_tests.rs

@@ -1,8 +1,8 @@
 use std::str::FromStr;
 
-use alloy_rpc_types::request::{TransactionInput, TransactionRequest};
 use reth_primitives::constants::ETHEREUM_BLOCK_GAS_LIMIT;
 use reth_primitives::{Address, BlockNumberOrTag, Bytes, TransactionKind, U64};
+use reth_rpc_types::request::{TransactionInput, TransactionRequest};
 use revm::primitives::{SpecId, KECCAK_EMPTY, U256};
 use sov_modules_api::default_context::DefaultContext;
 use sov_modules_api::utils::generate_address;
@@ -438,7 +438,7 @@ fn test_block_hash_in_evm() {
             ),
         },
         nonce: Some(U64::from(0u64)),
-        chain_id: Some(U64::from(DEFAULT_CHAIN_ID)),
+        chain_id: Some(DEFAULT_CHAIN_ID),
         access_list: None,
         max_fee_per_blob_gas: None,
         blob_versioned_hashes: None,

crates/evm/src/tests/queries/basic_queries.rs

@@ -2,9 +2,9 @@ use std::collections::BTreeMap;
 use std::str::FromStr;
 
 use alloy_primitives::FixedBytes;
-use alloy_rpc_types::request::{TransactionInput, TransactionRequest};
 use hex::FromHex;
 use reth_primitives::{Address, BlockId, BlockNumberOrTag, U64};
+use reth_rpc_types::request::{TransactionInput, TransactionRequest};
 use reth_rpc_types::{Block, Rich, TransactionReceipt};
 use revm::primitives::{B256, U256};
 use serde_json::json;
@@ -204,7 +204,7 @@ fn call_test() {
             value: Some(U256::from(100000000)),
             input: None.into(),
             nonce: Some(U64::from(7)),
-            chain_id: Some(U64::from(1u64)),
+            chain_id: Some(1u64),
             access_list: None,
             max_fee_per_blob_gas: None,
             blob_versioned_hashes: None,
@@ -235,7 +235,7 @@ fn call_test() {
             value: Some(U256::from(100000000)),
             input: TransactionInput::new(alloy_primitives::Bytes::from_str(&call_data).unwrap()),
             nonce: Some(U64::from(7)),
-            chain_id: Some(U64::from(1u64)),
+            chain_id: Some(1u64),
             access_list: None,
             max_fee_per_blob_gas: None,
             blob_versioned_hashes: None,
@@ -266,7 +266,7 @@ fn call_test() {
                     alloy_primitives::Bytes::from_str(&call_data).unwrap(),
                 ),
                 nonce: None,
-                chain_id: Some(U64::from(1u64)),
+                chain_id: Some(1u64),
                 access_list: None,
                 max_fee_per_blob_gas: None,
                 blob_versioned_hashes: None,

crates/evm/src/tests/queries/estimate_gas_tests.rs

@@ -1,12 +1,12 @@
 use std::str::FromStr;
 
 use alloy_primitives::{FixedBytes, Uint};
-use alloy_rpc_types::request::{TransactionInput, TransactionRequest};
 use hex::FromHex;
 use jsonrpsee::core::RpcResult;
 use reth_primitives::hex::ToHexExt;
 use reth_primitives::{AccessList, AccessListItem, Address, BlockNumberOrTag, Bytes, U64};
 use reth_rpc::eth::error::RpcInvalidTransactionError;
+use reth_rpc_types::request::{TransactionInput, TransactionRequest};
 use reth_rpc_types::AccessListWithGasUsed;
 use revm::primitives::U256;
 use sov_modules_api::default_context::DefaultContext;
@@ -36,7 +36,7 @@ fn payable_contract_value_test() {
             data: None,
         },
         nonce: Some(U64::from(1)),
-        chain_id: Some(U64::from(1u64)),
+        chain_id: Some(1u64),
         access_list: None,
         max_fee_per_blob_gas: None,
         blob_versioned_hashes: None,
@@ -66,7 +66,7 @@ fn test_tx_request_fields_gas() {
             data: None,
         },
         nonce: Some(U64::from(1)),
-        chain_id: Some(U64::from(1u64)),
+        chain_id: Some(1u64),
         access_list: None,
         max_fee_per_blob_gas: None,
         blob_versioned_hashes: None,
@@ -161,7 +161,7 @@ fn test_tx_request_fields_gas() {
     working_set.unset_archival_version();
 
     let tx_req_invalid_chain_id = TransactionRequest {
-        chain_id: Some(U64::from(3u64)),
+        chain_id: Some(3u64),
         ..tx_req_contract_call.clone()
     };
 
@@ -297,7 +297,7 @@ fn test_access_list() {
         value: None,
         input: TransactionInput::new(input_data),
         nonce: Some(U64::from(3)),
-        chain_id: Some(U64::from(1u64)),
+        chain_id: Some(1u64),
         access_list: None,
         max_fee_per_blob_gas: None,
         blob_versioned_hashes: None,

crates/evm/src/tests/queries/evm_call_tests.rs

@@ -1,10 +1,10 @@
 use std::str::FromStr;
 
-use alloy_rpc_types::request::{TransactionInput, TransactionRequest};
 use hex::FromHex;
 use jsonrpsee::core::RpcResult;
 use reth_primitives::{Address, BlockNumberOrTag, Bytes, U64};
 use reth_rpc::eth::error::RpcInvalidTransactionError;
+use reth_rpc_types::request::{TransactionInput, TransactionRequest};
 use revm::primitives::U256;
 use sov_modules_api::WorkingSet;
 
@@ -333,7 +333,7 @@ fn eth_call_eip1559(
         value: None,
         input: TransactionInput::new(contract.get_call_data().to_vec().into()),
         nonce: Some(U64::from(9)),
-        chain_id: Some(U64::from(1u64)),
+        chain_id: Some(1u64),
         ..Default::default()
     };
 
@@ -357,7 +357,7 @@ fn gas_price_call_test() {
         value: Some(U256::from(1000)),
         input: None.into(),
         nonce: Some(U64::from(1u64)),
-        chain_id: Some(U64::from(1u64)),
+        chain_id: Some(1u64),
         access_list: None,
         max_fee_per_blob_gas: None,
         blob_versioned_hashes: None,

crates/evm/src/tests/tx_tests.rs

@@ -1,11 +1,11 @@
 use std::str::FromStr;
 
-use alloy_rpc_types::request::{TransactionInput, TransactionRequest};
 use ethers_core::types::transaction::eip2718::TypedTransaction;
 use ethers_core::types::{Bytes, Eip1559TransactionRequest};
 use ethers_core::utils::rlp::Rlp;
 use ethers_signers::{LocalWallet, Signer};
 use reth_primitives::{Address, TransactionSignedEcRecovered, U256, U64, U8};
+use reth_rpc_types::request::{TransactionInput, TransactionRequest};
 use revm::primitives::{TransactTo, TxEnv};
 
 use crate::evm::prepare_call_env;
@@ -83,7 +83,7 @@ fn prepare_call_env_conversion() {
         value: Some(U256::from(300u64)),
         input: TransactionInput::default(),
         nonce: Some(U64::from(1u64)),
-        chain_id: Some(U64::from(1u64)),
+        chain_id: Some(1u64),
         access_list: None,
         transaction_type: Some(U8::from(2u8)),
         blob_versioned_hashes: None,

crates/sequencer/Cargo.toml

@@ -35,6 +35,8 @@ reth-db = { workspace = true }
 reth-trie = { workspace = true }
 reth-rpc-types-compat = { workspace = true }
 
+revm = { workspace = true }
+
 ethers = { workspace = true }
 tokio = { workspace = true }
 schnellru = "0.2.1"

crates/sequencer/src/db_provider/mod.rs

@@ -7,12 +7,12 @@ use reth_primitives::{
 };
 use reth_provider::{
     AccountReader, BlockHashReader, BlockIdReader, BlockNumReader, BlockReader, BlockReaderIdExt,
-    BundleStateWithReceipts, ChainSpecProvider, HeaderProvider, ReceiptProvider,
-    ReceiptProviderIdExt, StateProvider, StateProviderFactory, StateRootProvider,
-    TransactionsProvider, WithdrawalsProvider,
+    ChainSpecProvider, HeaderProvider, ReceiptProvider, ReceiptProviderIdExt, StateProvider,
+    StateProviderFactory, StateRootProvider, TransactionsProvider, WithdrawalsProvider,
 };
 use reth_rpc_types::{Block, BlockTransactions};
 use reth_trie::updates::TrieUpdates;
+use revm::db::states::bundle_state::BundleState;
 use sov_modules_api::WorkingSet;
 
 #[derive(Clone)]
@@ -525,15 +525,12 @@ impl<C: sov_modules_api::Context> StateProviderFactory for DbProvider<C> {
 
 impl<C: sov_modules_api::Context> StateRootProvider for DbProvider<C> {
     #[doc = r" Returns the state root of the BundleState on top of the current state."]
-    fn state_root(
-        &self,
-        _bundle_state: &BundleStateWithReceipts,
-    ) -> ProviderResult<reth_primitives::B256> {
+    fn state_root(&self, _bundle_state: &BundleState) -> ProviderResult<reth_primitives::B256> {
         unimplemented!("state_root")
     }
     fn state_root_with_updates(
         &self,
-        _bundle_state: &BundleStateWithReceipts,
+        _bundle_state: &BundleState,
     ) -> reth_interfaces::provider::ProviderResult<(reth_primitives::B256, TrieUpdates)> {
         unimplemented!("state_root_with_updates")
     }