chore(rpc): remove use of extensible transaction + receipt types

Cargo.toml

@@ -431,6 +431,7 @@ alloy-rpc-client = { version = "0.2", default-features = false }
 
 # op
 op-alloy-rpc-types = "0.1"
+op-alloy-network = "0.1"
 
 # misc
 auto_impl = "1"

crates/optimism/cli/src/commands/import_receipts.rs

@@ -270,7 +270,6 @@ mod test {
     /// No receipts for genesis block
     const EMPTY_RECEIPTS_GENESIS_BLOCK: &[u8] = &hex!("c0");
 
-    #[ignore]
     #[tokio::test]
     async fn filter_out_genesis_block_receipts() {
         let mut f: File = tempfile().unwrap().into();

crates/optimism/primitives/Cargo.toml

@@ -9,4 +9,4 @@ repository.workspace = true
 description = "OP primitive types"
 
 [lints]
-workspace = true
+workspace = true

crates/optimism/rpc/Cargo.toml

@@ -27,9 +27,12 @@ reth-tasks = { workspace = true, features = ["rayon"] }
 reth-transaction-pool.workspace = true
 reth-rpc.workspace = true
 reth-node-api.workspace = true
+reth-rpc-types-compat.workspace = true
 
 # ethereum
 alloy-primitives.workspace = true
+alloy-rpc-types.workspace = true
+op-alloy-network.workspace = true
 revm.workspace = true
 
 # async

crates/optimism/rpc/src/eth/mod.rs

@@ -10,6 +10,8 @@ mod pending_block;
 use std::{future::Future, sync::Arc};
 
 use alloy_primitives::{Address, U64};
+use alloy_rpc_types::optimism::OptimismTransactionFields;
+use op_alloy_network::Optimism;
 use reth_chainspec::{ChainInfo, ChainSpec};
 use reth_errors::RethResult;
 use reth_evm::ConfigureEvm;
@@ -25,6 +27,7 @@ use reth_rpc_eth_api::{
 };
 use reth_rpc_eth_types::EthStateCache;
 use reth_rpc_types::SyncStatus;
+use reth_rpc_types_compat::TransactionBuilder;
 use reth_tasks::{pool::BlockingTaskPool, TaskSpawner};
 use reth_transaction_pool::TransactionPool;
 use tokio::sync::{AcquireError, OwnedSemaphorePermit};
@@ -58,6 +61,30 @@ where
     Eth: Send + Sync,
 {
     type Error = OpEthApiError;
+    type NetworkTypes = Optimism;
+}
+
+impl TransactionBuilder for OpEthApi<Eth> {
+    type Transaction = <Self::NetworkTypes as Network>::TransactionResponse;
+
+    fn fill(
+        tx: TransactionSignedEcRecovered,
+        block_hash: Option<B256>,
+        block_number: Option<BlockNumber>,
+        base_fee: Option<u64>,
+        transaction_index: Option<usize>,
+    ) -> Self::Transaction {
+        let mut resp = Eth::fill(tx, block_hash, block_number, base_fee, transaction_index);
+
+        resp.other = OptimismTransactionFields {
+            source_hash: signed_tx.source_hash(),
+            mint: signed_tx.mint(),
+            is_system_tx: signed_tx.is_deposit().then_some(signed_tx.is_system_transaction()),
+        }
+        .into();
+
+        resp
+    }
 }
 
 impl<Eth: EthApiSpec> EthApiSpec for OpEthApi<Eth> {

crates/rpc/rpc-eth-api/Cargo.toml

@@ -32,6 +32,7 @@ reth-rpc-server-types.workspace = true
 
 # ethereum
 alloy-dyn-abi = { workspace = true, features = ["eip712"] }
+alloy-network.workspace = true
 
 # rpc
 jsonrpsee = { workspace = true, features = ["server", "macros"] }

crates/rpc/rpc-eth-api/src/core.rs

@@ -28,7 +28,7 @@ impl<T> FullEthApiServer for T where T: EthApiServer + FullEthApi + UpdateRawTxF
 /// Eth rpc interface: <https://ethereum.github.io/execution-apis/api-documentation/>
 #[cfg_attr(not(feature = "client"), rpc(server, namespace = "eth"))]
 #[cfg_attr(feature = "client", rpc(server, client, namespace = "eth"))]
-pub trait EthApi {
+pub trait EthApi: EthApiTypes {
     /// Returns the protocol version encoded as a string.
     #[method(name = "protocolVersion")]
     async fn protocol_version(&self) -> RpcResult<U64>;

crates/rpc/rpc-eth-api/src/helpers/transaction.rs

@@ -4,6 +4,7 @@
 use std::{fmt, ops::Deref, sync::Arc};
 
 use alloy_dyn_abi::TypedData;
+use alloy_network::Network;
 use futures::Future;
 use reth_primitives::{
     Address, BlockId, Bytes, FromRecoveredPooledTransaction, IntoRecoveredTransaction, Receipt,
@@ -21,7 +22,7 @@ use reth_rpc_types::{
     },
     AnyTransactionReceipt, Transaction, TransactionRequest, TypedTransactionRequest,
 };
-use reth_rpc_types_compat::transaction::from_recovered_with_block_context;
+use reth_rpc_types_compat::{transaction::from_recovered_with_block_context, TransactionBuilder};
 use reth_transaction_pool::{TransactionOrigin, TransactionPool};
 
 use crate::{FromEthApiError, IntoEthApiError};
@@ -53,7 +54,10 @@ use super::{
 /// See also <https://github.com/paradigmxyz/reth/issues/6240>
 ///
 /// This implementation follows the behaviour of Geth and disables the basefee check for tracing.
-pub trait EthTransactions: LoadTransaction {
+pub trait EthTransactions:
+    LoadTransaction
+    + TransactionBuilder<Transaction = <Self::NetworkTypes as Network>::TransactionResponse>
+{
     /// Returns a handle for reading data from disk.
     ///
     /// Data access in default (L1) trait method implementations.
@@ -197,7 +201,7 @@ pub trait EthTransactions: LoadTransaction {
         &self,
         block_id: BlockId,
         index: usize,
-    ) -> impl Future<Output = Result<Option<Transaction>, Self::Error>> + Send
+    ) -> impl Future<Output = Result<Option<Self::Transaction>, Self::Error>> + Send
     where
         Self: LoadBlock,
     {

crates/rpc/rpc-eth-api/src/helpers/types.rs

@@ -2,6 +2,8 @@
 
 use std::error::Error;
 
+use alloy_network::Network;
+
 use crate::{AsEthApiError, FromEthApiError, FromEvmError};
 
 /// Network specific `eth` API types.
@@ -14,4 +16,6 @@ pub trait EthApiTypes: Send + Sync {
         + Error
         + Send
         + Sync;
+    /// Blockchain data types, specific to network, e.g. block and transaction.
+    type NetworkTypes: Network;
 }

crates/rpc/rpc-types-compat/Cargo.toml

@@ -15,8 +15,12 @@ workspace = true
 reth-primitives.workspace = true
 reth-rpc-types.workspace = true
 reth-trie-common.workspace = true
+
+# ethereum
+alloy-network.workspace = true
 alloy-rlp.workspace = true
 alloy-rpc-types.workspace = true
+op-alloy-network.workspace = true
 
 [dev-dependencies]
 serde_json.workspace = true

crates/rpc/rpc-types-compat/src/lib.rs

@@ -14,3 +14,5 @@ pub mod block;
 pub mod engine;
 pub mod proof;
 pub mod transaction;
+
+pub use transaction::TransactionBuilder;