feat(anvil): support for op-stack deposit transactions

Cargo.toml

@@ -189,16 +189,16 @@ tower-http = "0.4"
 #ethers-solc = { path = "../ethers-rs/ethers-solc" }
 
 [patch.crates-io]
-ethers = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-addressbook = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-core = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-contract = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-contract-abigen = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-providers = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-signers = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-etherscan = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
-ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "4e09be88730045dd6c4ed8a4e198a9956931e7bd" }
+ethers = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f" }
+ethers-core = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f"  }
+ethers-contract = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f"  }
+ethers-contract-abigen = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f"  }
+ethers-providers = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f"  }
+ethers-signers = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f"  }
+ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f"  }
+ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "546ea029362a7502365667c6f99fac92ad0aeb9f"  }
+
+foundry-block-explorers = { git = "https://github.com/foundry-rs/block-explorers" }
 
 alloy-dyn-abi = { git = "https://github.com/alloy-rs/core/" }
 alloy-json-abi = { git = "https://github.com/alloy-rs/core/" }

crates/anvil/Cargo.toml

@@ -31,7 +31,7 @@ foundry-evm.workspace = true
 bytes = "1.4.0"
 # needed as documented in https://github.com/foundry-rs/foundry/pull/6358
 k256 = "=0.13.1"
-ethers = { workspace = true, features = ["rustls", "ws", "ipc"] }
+ethers = { workspace = true, features = ["rustls", "ws", "ipc", "optimism"] }
 trie-db = "0.23"
 hash-db = "0.15"
 memory-db = "0.29"
@@ -75,6 +75,7 @@ ethereum-forkid = "0.12"
 
 [dev-dependencies]
 ethers = { workspace = true, features = ["abigen"] }
+ethers-core = { workspace = true, features = ["optimism"] }
 ethers-solc = { workspace = true, features = ["project-util", "full"] }
 pretty_assertions = "1.3.0"
 tokio = { version = "1", features = ["full"] }

crates/anvil/core/Cargo.toml

@@ -13,10 +13,14 @@ repository.workspace = true
 foundry-common.workspace = true
 foundry-evm.workspace = true
 
+alloy-primitives = { workspace = true, features = ["serde"] }
 revm = { workspace = true, default-features = false, features = ["std", "serde", "memory_limit"] }
+ethers-core = { workspace = true, features = ["optimism"] }
+# theses are not used by anvil-core, but are required by ethers, because pulled in via foundry-common
+ethers-contract = { workspace = true, features = ["optimism"] }
+ethers-providers = { workspace = true, features = ["optimism"] }
+ethers-middleware = { workspace = true, features = ["optimism"] }
 
-alloy-primitives = { workspace = true, features = ["serde"] }
-ethers-core.workspace = true
 serde = { workspace = true, optional = true }
 serde_json.workspace = true
 bytes = { version = "1.4" }
@@ -36,4 +40,4 @@ anvil-core = { path = ".", features = ["serde"] }
 default = ["serde"]
 impersonated-tx = []
 fastrlp = ["dep:open-fastrlp"]
-serde = ["dep:serde"]
+serde = ["dep:serde"]

crates/anvil/core/src/eth/receipt.rs

@@ -94,6 +94,7 @@ impl Decodable for EIP658Receipt {
 // same underlying data structure
 pub type EIP2930Receipt = EIP658Receipt;
 pub type EIP1559Receipt = EIP658Receipt;
+pub type DepositReceipt = EIP658Receipt;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -104,6 +105,8 @@ pub enum TypedReceipt {
     EIP2930(EIP2930Receipt),
     /// EIP-1559 receipt
     EIP1559(EIP1559Receipt),
+    /// op-stack deposit receipt
+    Deposit(DepositReceipt),
 }
 
 // == impl TypedReceipt ==
@@ -112,18 +115,20 @@ impl TypedReceipt {
     /// Returns the gas used by the transactions
     pub fn gas_used(&self) -> U256 {
         match self {
-            TypedReceipt::Legacy(r) | TypedReceipt::EIP2930(r) | TypedReceipt::EIP1559(r) => {
-                r.gas_used
-            }
+            TypedReceipt::Legacy(r) |
+            TypedReceipt::EIP2930(r) |
+            TypedReceipt::EIP1559(r) |
+            TypedReceipt::Deposit(r) => r.gas_used,
         }
     }
 
     /// Returns the gas used by the transactions
     pub fn logs_bloom(&self) -> &Bloom {
         match self {
-            TypedReceipt::Legacy(r) | TypedReceipt::EIP2930(r) | TypedReceipt::EIP1559(r) => {
-                &r.logs_bloom
-            }
+            TypedReceipt::Legacy(r) |
+            TypedReceipt::EIP2930(r) |
+            TypedReceipt::EIP1559(r) |
+            TypedReceipt::Deposit(r) => &r.logs_bloom,
         }
     }
 }
@@ -134,6 +139,7 @@ impl Encodable for TypedReceipt {
             TypedReceipt::Legacy(r) => r.rlp_append(s),
             TypedReceipt::EIP2930(r) => enveloped(1, r, s),
             TypedReceipt::EIP1559(r) => enveloped(2, r, s),
+            TypedReceipt::Deposit(r) => enveloped(0x7E, r, s),
         }
     }
 }
@@ -158,6 +164,10 @@ impl Decodable for TypedReceipt {
             return rlp::decode(s).map(TypedReceipt::EIP1559)
         }
 
+        if first == 0x7E {
+            return rlp::decode(s).map(TypedReceipt::Deposit)
+        }
+
         Err(DecoderError::Custom("unknown receipt type"))
     }
 }
@@ -171,6 +181,7 @@ impl open_fastrlp::Encodable for TypedReceipt {
                 let payload_len = match receipt {
                     TypedReceipt::EIP2930(r) => r.length() + 1,
                     TypedReceipt::EIP1559(r) => r.length() + 1,
+                    TypedReceipt::Deposit(r) => r.length() + 1,
                     _ => unreachable!("receipt already matched"),
                 };
 
@@ -188,6 +199,7 @@ impl open_fastrlp::Encodable for TypedReceipt {
                 let payload_len = match receipt {
                     TypedReceipt::EIP2930(r) => r.length() + 1,
                     TypedReceipt::EIP1559(r) => r.length() + 1,
+                    TypedReceipt::Deposit(r) => r.length() + 1,
                     _ => unreachable!("receipt already matched"),
                 };
 
@@ -208,6 +220,14 @@ impl open_fastrlp::Encodable for TypedReceipt {
                         out.put_u8(0x02);
                         r.encode(out);
                     }
+                    TypedReceipt::Deposit(r) => {
+                        let receipt_string_header =
+                            Header { list: false, payload_length: payload_len };
+
+                        receipt_string_header.encode(out);
+                        out.put_u8(0x7E);
+                        r.encode(out);
+                    }
                     _ => unreachable!("receipt already matched"),
                 }
             }
@@ -244,6 +264,10 @@ impl open_fastrlp::Decodable for TypedReceipt {
                     buf.advance(1);
                     <EIP1559Receipt as open_fastrlp::Decodable>::decode(buf)
                         .map(TypedReceipt::EIP1559)
+                } else if receipt_type == 0x7E {
+                    buf.advance(1);
+                    <DepositReceipt as open_fastrlp::Decodable>::decode(buf)
+                        .map(TypedReceipt::Deposit)
                 } else {
                     Err(open_fastrlp::DecodeError::Custom("invalid receipt type"))
                 }
@@ -264,6 +288,7 @@ impl From<TypedReceipt> for EIP658Receipt {
             TypedReceipt::Legacy(receipt) => receipt,
             TypedReceipt::EIP2930(receipt) => receipt,
             TypedReceipt::EIP1559(receipt) => receipt,
+            TypedReceipt::Deposit(receipt) => receipt,
         }
     }
 }