fix(anvil): preserve OP receipt fields in convert_to_anvil_receipt (#12396)

* fix(anvil): preserve OP receipt fields in convert_to_anvil_receipt

* test(anvil): add test for OP receipt fields preservation

* fix(anvil): adapt receipt handling for WithOtherFields wrapper

* chore(anvil): removed unrelated snapshot state save

* test(anvil): use Bloom::default() instead manual zero hex

* chore(anvil): updated to fit linter format

Author: Syzygy106

crates/anvil/core/src/eth/transaction/mod.rs

@@ -1462,7 +1462,7 @@ impl Decodable2718 for TypedReceipt {
     }
 }
 
-pub type ReceiptResponse = TransactionReceipt<TypedReceiptRpc>;
+pub type ReceiptResponse = WithOtherFields<TransactionReceipt<TypedReceiptRpc>>;
 
 pub fn convert_to_anvil_receipt(receipt: AnyTransactionReceipt) -> Option<ReceiptResponse> {
     let WithOtherFields {
@@ -1484,51 +1484,56 @@ pub fn convert_to_anvil_receipt(receipt: AnyTransactionReceipt) -> Option<Receip
         other,
     } = receipt;
 
-    Some(TransactionReceipt {
-        transaction_hash,
-        transaction_index,
-        block_hash,
-        block_number,
-        gas_used,
-        contract_address,
-        effective_gas_price,
-        from,
-        to,
-        blob_gas_price,
-        blob_gas_used,
-        inner: match r#type {
-            0x00 => TypedReceiptRpc::Legacy(receipt_with_bloom),
-            0x01 => TypedReceiptRpc::EIP2930(receipt_with_bloom),
-            0x02 => TypedReceiptRpc::EIP1559(receipt_with_bloom),
-            0x03 => TypedReceiptRpc::EIP4844(receipt_with_bloom),
-            0x04 => TypedReceiptRpc::EIP7702(receipt_with_bloom),
-            0x7E => TypedReceiptRpc::Deposit(OpDepositReceiptWithBloom {
-                receipt: OpDepositReceipt {
-                    inner: Receipt {
-                        status: alloy_consensus::Eip658Value::Eip658(receipt_with_bloom.status()),
-                        cumulative_gas_used: receipt_with_bloom.cumulative_gas_used(),
-                        logs: receipt_with_bloom
-                            .receipt
-                            .logs
-                            .into_iter()
-                            .map(|l| l.inner)
-                            .collect(),
+    Some(WithOtherFields {
+        inner: TransactionReceipt {
+            transaction_hash,
+            transaction_index,
+            block_hash,
+            block_number,
+            gas_used,
+            contract_address,
+            effective_gas_price,
+            from,
+            to,
+            blob_gas_price,
+            blob_gas_used,
+            inner: match r#type {
+                0x00 => TypedReceiptRpc::Legacy(receipt_with_bloom),
+                0x01 => TypedReceiptRpc::EIP2930(receipt_with_bloom),
+                0x02 => TypedReceiptRpc::EIP1559(receipt_with_bloom),
+                0x03 => TypedReceiptRpc::EIP4844(receipt_with_bloom),
+                0x04 => TypedReceiptRpc::EIP7702(receipt_with_bloom),
+                0x7E => TypedReceiptRpc::Deposit(OpDepositReceiptWithBloom {
+                    receipt: OpDepositReceipt {
+                        inner: Receipt {
+                            status: alloy_consensus::Eip658Value::Eip658(
+                                receipt_with_bloom.status(),
+                            ),
+                            cumulative_gas_used: receipt_with_bloom.cumulative_gas_used(),
+                            logs: receipt_with_bloom
+                                .receipt
+                                .logs
+                                .into_iter()
+                                .map(|l| l.inner)
+                                .collect(),
+                        },
+                        deposit_nonce: other
+                            .get_deserialized::<U64>("depositNonce")
+                            .transpose()
+                            .ok()?
+                            .map(|v| v.to()),
+                        deposit_receipt_version: other
+                            .get_deserialized::<U64>("depositReceiptVersion")
+                            .transpose()
+                            .ok()?
+                            .map(|v| v.to()),
                     },
-                    deposit_nonce: other
-                        .get_deserialized::<U64>("depositNonce")
-                        .transpose()
-                        .ok()?
-                        .map(|v| v.to()),
-                    deposit_receipt_version: other
-                        .get_deserialized::<U64>("depositReceiptVersion")
-                        .transpose()
-                        .ok()?
-                        .map(|v| v.to()),
-                },
-                logs_bloom: receipt_with_bloom.logs_bloom,
-            }),
-            _ => return None,
+                    logs_bloom: receipt_with_bloom.logs_bloom,
+                }),
+                _ => return None,
+            },
         },
+        other,
     })
 }
 

crates/anvil/src/eth/api.rs

@@ -2655,6 +2655,7 @@ impl EthApi {
                     {
                         // insert revert reason if failure
                         if !receipt
+                            .inner
                             .inner
                             .inner
                             .as_receipt_with_bloom()

crates/anvil/src/eth/backend/mem/mod.rs

@@ -3207,6 +3207,7 @@ impl Backend {
             blob_gas_used,
         };
 
+        let inner = WithOtherFields { inner, other: Default::default() };
         Some(MinedTransactionReceipt { inner, out: info.out })
     }
 

crates/anvil/src/eth/otterscan/api.rs

@@ -85,7 +85,7 @@ impl EthApi {
         node_info!("ots_getTransactionError");
 
         if let Some(receipt) = self.backend.mined_transaction_receipt(hash)
-            && !receipt.inner.inner.as_receipt_with_bloom().receipt.status.coerce_status()
+            && !receipt.inner.inner.inner.as_receipt_with_bloom().receipt.status.coerce_status()
         {
             return Ok(receipt.out.unwrap_or_default());
         }
@@ -379,7 +379,7 @@ impl EthApi {
             if let Ok(Some(r)) = r.await {
                 let block = self.block_by_number(r.block_number.unwrap().into()).await?;
                 let timestamp = block.ok_or(BlockchainError::BlockNotFound)?.header.timestamp;
-                let receipt = r.map_inner(OtsReceipt::from);
+                let receipt = r.inner.clone().map_inner(OtsReceipt::from);
                 Ok(OtsTransactionReceipt { receipt, timestamp: Some(timestamp) })
             } else {
                 Err(BlockchainError::BlockNotFound)
@@ -420,7 +420,7 @@ impl EthApi {
             if let Ok(Some(r)) = r.await {
                 let block = self.block_by_number(r.block_number.unwrap().into()).await?;
                 let timestamp = block.ok_or(BlockchainError::BlockNotFound)?.header.timestamp;
-                let receipt = r.map_inner(OtsReceipt::from);
+                let receipt = r.inner.clone().map_inner(OtsReceipt::from);
                 Ok(OtsTransactionReceipt { receipt, timestamp: Some(timestamp) })
             } else {
                 Err(BlockchainError::BlockNotFound)

crates/anvil/tests/it/optimism.rs

@@ -3,14 +3,15 @@
 use crate::utils::{http_provider, http_provider_with_signer};
 use alloy_eips::eip2718::Encodable2718;
 use alloy_network::{EthereumWallet, TransactionBuilder};
-use alloy_primitives::{Address, TxHash, TxKind, U256, b256};
+use alloy_primitives::{Address, Bloom, TxHash, TxKind, U256, b256};
 use alloy_provider::Provider;
 use alloy_rpc_types::TransactionRequest;
 use alloy_serde::WithOtherFields;
 use anvil::{NodeConfig, spawn};
 use foundry_evm_networks::NetworkConfigs;
 use op_alloy_consensus::TxDeposit;
 use op_alloy_rpc_types::OpTransactionFields;
+use serde_json::{Value, json};
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_deposits_not_supported_if_optimism_disabled() {
@@ -224,3 +225,48 @@ async fn test_deposit_tx_checks_sufficient_funds_after_applying_deposited_value(
     // recipient should've received the entire deposited value
     assert_eq!(recipient_new_balance, U256::from(send_value));
 }
+
+#[test]
+fn preserves_op_fields_in_convert_to_anvil_receipt() {
+    let receipt_json = json!({
+        "status": "0x1",
+        "cumulativeGasUsed": "0x74e483",
+        "logs": [],
+        "logsBloom": Bloom::default(),
+        "type": "0x2",
+        "transactionHash": "0x91181b0dca3b29aa136eeb2f536be5ce7b0aebc949be1c44b5509093c516097d",
+        "transactionIndex": "0x10",
+        "blockHash": "0x54bafb12e8cea9bb355fbf03a4ac49e42a2a1a80fa6cf4364b342e2de6432b5d",
+        "blockNumber": "0x7b1ab93",
+        "gasUsed": "0xc222",
+        "effectiveGasPrice": "0x18961",
+        "from": "0x2d815240a61731c75fa01b2793e1d3ed09f289d0",
+        "to":   "0x4200000000000000000000000000000000000000",
+        "contractAddress": Value::Null,
+        "l1BaseFeeScalar":     "0x146b",
+        "l1BlobBaseFee":       "0x6a83078",
+        "l1BlobBaseFeeScalar": "0xf79c5",
+        "l1Fee":               "0x51a9af7fd3",
+        "l1GasPrice":          "0x972fe4acc",
+        "l1GasUsed":           "0x640",
+    });
+
+    let receipt: alloy_network::AnyTransactionReceipt =
+        serde_json::from_value(receipt_json).expect("valid receipt json");
+
+    let converted = anvil_core::eth::transaction::convert_to_anvil_receipt(receipt)
+        .expect("conversion should succeed");
+    let converted_json = serde_json::to_value(&converted).expect("serialize to json");
+
+    for (key, expected) in [
+        ("l1Fee", "0x51a9af7fd3"),
+        ("l1GasPrice", "0x972fe4acc"),
+        ("l1GasUsed", "0x640"),
+        ("l1BaseFeeScalar", "0x146b"),
+        ("l1BlobBaseFee", "0x6a83078"),
+        ("l1BlobBaseFeeScalar", "0xf79c5"),
+    ] {
+        let got = converted_json.get(key).and_then(Value::as_str);
+        assert_eq!(got, Some(expected), "field `{key}` mismatch");
+    }
+}