Receipt roots

crates/primitives/src/proofs.rs

@@ -106,6 +106,27 @@ pub fn calculate_receipt_root_ref<T>(receipts: &[&T]) -> B256
 where
     for<'a> ReceiptWithBloomRef<'a>: From<&'a T>,
 {
+    #[cfg(feature = "optimism")]
+    {
+        // There is a minor bug in op-geth and op-erigon where in the Regolith hardfork,
+        // the receipt root calculation does not include the deposit nonce in the receipt
+        // encoding. This will be fixd in the next hardfork, however for now, we must strip
+        // the deposit nonce from the receipts before calculating the receipt root.
+        let receipts = receipts
+            .iter()
+            .map(|r| {
+                let mut r = r.clone();
+                r.receipt.deposit_nonce = None;
+                r
+            })
+            .collect::<Vec<_>>();
+
+        ordered_trie_root_with_encoder(&receipts, |r, buf| {
+            ReceiptWithBloomRef::from(r).encode_inner(buf, false)
+        })
+    }
+
+    #[cfg(not(feature = "optimism"))]
     ordered_trie_root_with_encoder(receipts, |r, buf| {
         ReceiptWithBloomRef::from(r).encode_inner(buf, false)
     })