chore(deps): weekly cargo update (#13866)

Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>

Cargo.toml

@@ -472,7 +472,7 @@ alloy-transport-ws = { version = "0.9.2", default-features = false }
 # op
 op-alloy-rpc-types = { version = "0.9.0", default-features = false }
 op-alloy-rpc-types-engine = { version =  "0.9.0", default-features = false }
-op-alloy-rpc-jsonrpsee = { version =  "0.9.0", default-features = false }
+maili-rpc = { version =  "0.1.6", default-features = false }
 op-alloy-network = { version =  "0.9.0", default-features = false }
 op-alloy-consensus = { version =  "0.9.0", default-features = false }
 

crates/optimism/evm/src/execute.rs

@@ -8,7 +8,7 @@ use alloc::{boxed::Box, sync::Arc, vec::Vec};
 use alloy_consensus::{BlockHeader, Eip658Value, Receipt, Transaction as _};
 use alloy_eips::eip7685::Requests;
 use core::fmt::Display;
-use op_alloy_consensus::{DepositTransaction, OpDepositReceipt};
+use op_alloy_consensus::OpDepositReceipt;
 use reth_chainspec::EthereumHardforks;
 use reth_consensus::ConsensusError;
 use reth_evm::{
@@ -24,7 +24,9 @@ use reth_evm::{
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_consensus::validate_block_post_execution;
 use reth_optimism_forks::OpHardfork;
-use reth_optimism_primitives::{DepositReceipt, OpPrimitives, OpReceipt};
+use reth_optimism_primitives::{
+    transaction::signed::OpTransaction, DepositReceipt, OpPrimitives, OpReceipt,
+};
 use reth_primitives::{NodePrimitives, RecoveredBlock};
 use reth_primitives_traits::{BlockBody, SignedTransaction};
 use reth_revm::{Database, State};
@@ -69,7 +71,7 @@ where
     N: NodePrimitives<
         BlockHeader = alloy_consensus::Header,
         Receipt = OpReceipt,
-        SignedTx: DepositTransaction,
+        SignedTx: OpTransaction,
     >,
     EvmConfig: Clone
         + Unpin
@@ -146,7 +148,7 @@ where
     DB: Database<Error: Into<ProviderError> + Display>,
     N: NodePrimitives<
         BlockHeader = alloy_consensus::Header,
-        SignedTx: DepositTransaction,
+        SignedTx: OpTransaction,
         Receipt: DepositReceipt,
     >,
     EvmConfig: ConfigureEvm<Header = N::BlockHeader, Transaction = N::SignedTx>,

crates/optimism/primitives/src/transaction/signed.rs

@@ -121,6 +121,19 @@ impl SignedTransaction for OpTransactionSigned {
     }
 }
 
+/// A trait that represents an optimism transaction, mainly used to indicate whether or not the
+/// transaction is a deposit transaction.
+pub trait OpTransaction {
+    /// Whether or not the transaction is a dpeosit transaction.
+    fn is_deposit(&self) -> bool;
+}
+
+impl OpTransaction for OpTransactionSigned {
+    fn is_deposit(&self) -> bool {
+        self.is_deposit()
+    }
+}
+
 #[cfg(feature = "optimism")]
 impl reth_primitives_traits::FillTxEnv for OpTransactionSigned {
     fn fill_tx_env(&self, tx_env: &mut revm_primitives::TxEnv, sender: Address) {
@@ -616,10 +629,6 @@ impl DepositTransaction for OpTransactionSigned {
     fn is_system_transaction(&self) -> bool {
         self.is_deposit()
     }
-
-    fn is_deposit(&self) -> bool {
-        self.is_deposit()
-    }
 }
 
 /// Bincode-compatible transaction type serde implementations.

crates/optimism/rpc/Cargo.toml

@@ -46,7 +46,7 @@ alloy-consensus.workspace = true
 op-alloy-network.workspace = true
 op-alloy-rpc-types.workspace = true
 op-alloy-rpc-types-engine.workspace = true
-op-alloy-rpc-jsonrpsee.workspace = true
+maili-rpc = { workspace = true, features = ["jsonrpsee"] }
 op-alloy-consensus.workspace = true
 revm.workspace = true
 

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

@@ -119,7 +119,7 @@ where
             block_hash, block_number, index: transaction_index, base_fee, ..
         } = tx_info;
 
-        let effective_gas_price = if inner.is_deposit() {
+        let effective_gas_price = if matches!(inner, OpTxEnvelope::Deposit(_)) {
             // For deposits, we must always set the `gasPrice` field to 0 in rpc
             // deposit tx don't have a gas price field, but serde of `Transaction` will take care of
             // it

crates/optimism/rpc/src/miner.rs

@@ -2,7 +2,7 @@
 
 use alloy_primitives::U64;
 use jsonrpsee_core::{async_trait, RpcResult};
-pub use op_alloy_rpc_jsonrpsee::traits::MinerApiExtServer;
+pub use maili_rpc::MinerApiExtServer;
 use reth_optimism_payload_builder::config::OpDAConfig;
 use tracing::debug;