feat: Eip 6110

crates/ethereum/evm/Cargo.toml

@@ -25,6 +25,9 @@ revm-precompile = { version = "7.0.0", features = ["std"], default-features = fa
 
 # Alloy
 alloy-consensus.workspace = true
+alloy-eips.workspace = true
+alloy-rlp.workspace = true
+alloy-sol-types.workspace = true
 
 # misc
 tracing.workspace = true

crates/ethereum/evm/src/eip6110.rs

@@ -0,0 +1,75 @@
+//! EIP-6110 deposit requests parsing
+use alloy_consensus::Request;
+use alloy_eips::eip6110::{DepositRequest, MAINNET_DEPOSIT_CONTRACT_ADDRESS};
+use alloy_sol_types::{sol, SolEvent};
+use reth_interfaces::executor::BlockValidationError;
+use reth_primitives::Receipt;
+use revm_primitives::Log;
+
+pub(crate) fn parse_deposits_from_receipts(
+    receipts: &[Receipt],
+) -> Result<Vec<Request>, BlockValidationError> {
+    let res = receipts
+        .iter()
+        .flat_map(|receipt| receipt.logs.iter())
+        // No need to filter for topic because there's only one event and that's the Deposit event
+        // in the deposit contract.
+        .filter(|log| log.address == MAINNET_DEPOSIT_CONTRACT_ADDRESS)
+        .map(|log| DepositEvent::decode_log(log, false))
+        .map(|res| {
+            let deposit = parse_deposit_from_log(&res?);
+            Ok(Request::DepositRequest(deposit))
+        })
+        .collect::<Result<Vec<_>, _>>()
+        // todo: this is ugly, we should clean it up
+        .map_err(|err: alloy_sol_types::Error| {
+            BlockValidationError::DepositRequestDecode(err.to_string())
+        })?;
+    Ok(res)
+}
+
+sol! {
+    #[allow(missing_docs)]
+    event DepositEvent(
+        bytes pubkey,
+        bytes withdrawal_credentials,
+        bytes amount,
+        bytes signature,
+        bytes index
+    );
+}
+
+fn parse_deposit_from_log(log: &Log<DepositEvent>) -> DepositRequest {
+    // SAFETY: These `expect` https://github.com/ethereum/consensus-specs/blob/5f48840f4d768bf0e0a8156a3ed06ec333589007/solidity_deposit_contract/deposit_contract.sol#L107-L110
+    // are safe because the `DepositEvent` is the only event in the deposit contract and the length
+    // checks are done there.
+    DepositRequest {
+        pubkey: log
+            .pubkey
+            .as_ref()
+            .try_into()
+            .expect("pubkey length should be enforced in deposit contract"),
+        withdrawal_credentials: log
+            .withdrawal_credentials
+            .as_ref()
+            .try_into()
+            .expect("pubkey length should be enforced in deposit contract"),
+        amount: u64::from_le_bytes(
+            log.amount
+                .as_ref()
+                .try_into()
+                .expect("pubkey length should be enforced in deposit contract"),
+        ),
+        signature: log
+            .signature
+            .as_ref()
+            .try_into()
+            .expect("pubkey length should be enforced in deposit contract"),
+        index: u64::from_le_bytes(
+            log.index
+                .as_ref()
+                .try_into()
+                .expect("pubkey length should be enforced in deposit contract"),
+        ),
+    }
+}

crates/ethereum/evm/src/execute.rs

@@ -168,7 +168,7 @@ where
                     transaction_gas_limit: transaction.gas_limit(),
                     block_available_gas,
                 }
-                .into())
+                .into());
             }
 
             EvmConfig::fill_tx_env(evm.tx_mut(), transaction, *sender);
@@ -209,13 +209,17 @@ where
                 gas: GotExpected { got: cumulative_gas_used, expected: block.gas_used },
                 gas_spent_by_tx: receipts.gas_spent_by_tx()?,
             }
-            .into())
+            .into());
         }
 
+        // Collect all EIP-6110 deposits
+        let deposits = crate::eip6110::parse_deposits_from_receipts(&receipts)?;
+
         // Collect all EIP-7685 requests
         let withdrawal_requests =
             post_block_withdrawal_requests(&self.chain_spec, block.timestamp, &mut evm)?;
-        let requests = withdrawal_requests;
+        // TODO: Does order matter?
+        let requests = [deposits, withdrawal_requests].concat();
 
         Ok(EthExecuteOutput { receipts, requests, gas_used: cumulative_gas_used })
     }
@@ -311,7 +315,7 @@ where
                 receipts.iter(),
             ) {
                 debug!(target: "evm", %error, ?receipts, "receipts verification failed");
-                return Err(error)
+                return Err(error);
             };
         }
 

crates/ethereum/evm/src/lib.rs

@@ -22,6 +22,9 @@ pub mod verify;
 /// Ethereum DAO hardfork state change data.
 pub mod dao_fork;
 
+/// [EIP-6110](https://eips.ethereum.org/EIPS/eip-6110) handling.
+pub mod eip6110;
+
 mod instructions;
 
 /// Ethereum-related EVM configuration.

crates/interfaces/src/executor.rs

@@ -88,12 +88,21 @@ pub enum BlockValidationError {
         /// The error message.
         message: String,
     },
-    /// EVM error during withdrawal requests contract call
+    /// EVM error during withdrawal requests contract call [EIP-7002]
+    ///
+    /// [EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
     #[error("failed to apply withdrawal requests contract call: {message}")]
     WithdrawalRequestsContractCall {
         /// The error message.
         message: String,
     },
+    /// Error when decoding deposit requests from receipts [EIP-6110]
+    ///
+    /// [EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+    // TODO(gakonst): This is an RLP decoding error but we don't import alloy_rlp here,
+    // do we want to?
+    #[error("could not decode deposit request: {0}")]
+    DepositRequestDecode(String),
 }
 
 /// BlockExecutor Errors

crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs

@@ -158,11 +158,11 @@ impl BundleStateWithReceipts {
     /// Transform block number to the index of block.
     fn block_number_to_index(&self, block_number: BlockNumber) -> Option<usize> {
         if self.first_block > block_number {
-            return None
+            return None;
         }
         let index = block_number - self.first_block;
         if index >= self.receipts.len() as u64 {
-            return None
+            return None;
         }
         Some(index as usize)
     }
@@ -269,7 +269,7 @@ impl BundleStateWithReceipts {
     /// If the target block number is not included in the state block range.
     pub fn split_at(self, at: BlockNumber) -> (Option<Self>, Self) {
         if at == self.first_block {
-            return (None, self)
+            return (None, self);
         }
 
         let (mut lower_state, mut higher_state) = (self.clone(), self);