Merge remote-tracking branch 'origin/unstable' into tree-states

2026-03-19 21:04:41 +00:00 · 2022-03-01 16:03:41 +11:00
parent 98629ce741 a1b730c043
commit ebe8e30171
209 changed files with 6107 additions and 1362 deletions
--- a/consensus/state_processing/src/per_block_processing/errors.rs
+++ b/consensus/state_processing/src/per_block_processing/errors.rs
@@ -59,8 +59,8 @@ pub enum BlockProcessingError {
    InconsistentBlockFork(InconsistentFork),
    InconsistentStateFork(InconsistentFork),
    ExecutionHashChainIncontiguous {
-        expected: Hash256,
-        found: Hash256,
+        expected: ExecutionBlockHash,
+        found: ExecutionBlockHash,
    },
    ExecutionRandaoMismatch {
        expected: Hash256,