From c7338593aa898b1cc82ca5a467997f6962139305 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Fri, 7 Jun 2024 03:21:22 +0200
Subject: [PATCH] chore: reintroduce receipts verification debug log (#8662)

---
 Cargo.lock                                  | 2 ++
 crates/ethereum/consensus/Cargo.toml        | 2 ++
 crates/ethereum/consensus/src/validation.rs | 7 ++++++-
 crates/optimism/consensus/Cargo.toml        | 6 +++---
 crates/optimism/consensus/src/validation.rs | 7 +++++--
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 20af7e060..21d733e98 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6768,6 +6768,7 @@ dependencies = [
  "reth-consensus",
  "reth-consensus-common",
  "reth-primitives",
+ "tracing",
 ]
 
 [[package]]
@@ -7391,6 +7392,7 @@ dependencies = [
  "reth-consensus",
  "reth-consensus-common",
  "reth-primitives",
+ "tracing",
 ]
 
 [[package]]
diff --git a/crates/ethereum/consensus/Cargo.toml b/crates/ethereum/consensus/Cargo.toml
index 984fb1ec6..f1ee25085 100644
--- a/crates/ethereum/consensus/Cargo.toml
+++ b/crates/ethereum/consensus/Cargo.toml
@@ -16,5 +16,7 @@ reth-consensus-common.workspace = true
 reth-primitives.workspace = true
 reth-consensus.workspace = true
 
+tracing.workspace = true
+
 [features]
 optimism = ["reth-primitives/optimism"]
diff --git a/crates/ethereum/consensus/src/validation.rs b/crates/ethereum/consensus/src/validation.rs
index 50d01a0d1..631be1519 100644
--- a/crates/ethereum/consensus/src/validation.rs
+++ b/crates/ethereum/consensus/src/validation.rs
@@ -19,7 +19,12 @@ pub fn validate_block_post_execution(
     // transaction This was replaced with is_success flag.
     // See more about EIP here: https://eips.ethereum.org/EIPS/eip-658
     if chain_spec.is_byzantium_active_at_block(block.header.number) {
-        verify_receipts(block.header.receipts_root, block.header.logs_bloom, receipts)?;
+        if let Err(error) =
+            verify_receipts(block.header.receipts_root, block.header.logs_bloom, receipts)
+        {
+            tracing::debug!(%error, ?receipts, "receipts verification failed");
+            return Err(error)
+        }
     }
 
     // Check if gas used matches the value set in header.
diff --git a/crates/optimism/consensus/Cargo.toml b/crates/optimism/consensus/Cargo.toml
index a2a5edb5d..56e67ebca 100644
--- a/crates/optimism/consensus/Cargo.toml
+++ b/crates/optimism/consensus/Cargo.toml
@@ -17,7 +17,7 @@ reth-consensus-common.workspace = true
 reth-primitives.workspace = true
 reth-consensus.workspace = true
 
+tracing.workspace = true
+
 [features]
-optimism = [
-    "reth-primitives/optimism",
-]
+optimism = ["reth-primitives/optimism"]
diff --git a/crates/optimism/consensus/src/validation.rs b/crates/optimism/consensus/src/validation.rs
index cf9b849af..07f405cda 100644
--- a/crates/optimism/consensus/src/validation.rs
+++ b/crates/optimism/consensus/src/validation.rs
@@ -18,13 +18,16 @@ pub fn validate_block_post_execution(
     // transaction This was replaced with is_success flag.
     // See more about EIP here: https://eips.ethereum.org/EIPS/eip-658
     if chain_spec.is_byzantium_active_at_block(block.header.number) {
-        verify_receipts(
+        if let Err(error) = verify_receipts(
             block.header.receipts_root,
             block.header.logs_bloom,
             receipts,
             chain_spec,
             block.timestamp,
-        )?;
+        ) {
+            tracing::debug!(%error, ?receipts, "receipts verification failed");
+            return Err(error)
+        }
     }
 
     // Check if gas used matches the value set in header.