Merge conflicts

2026-03-18 12:22:51 +00:00 · 2026-02-17 13:18:49 -08:00
parent 72fe22067c 4625cb6ab6
commit 64c30b84fd
69 changed files with 3480 additions and 498 deletions
--- a/beacon_node/beacon_chain/src/payload_envelope_verification/import.rs
+++ b/beacon_node/beacon_chain/src/payload_envelope_verification/import.rs
@@ -148,7 +148,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
            }
            // The block failed verification.
            Err(other) => {
-                warn!(reason = other.to_string(), "Execution payload envelope rejected");
+                warn!(
+                    reason = other.to_string(),
+                    "Execution payload envelope rejected"
+                );
                Err(other)
            }
        }