Merge branch 'unstable' into off-4844

2026-03-20 21:34:46 +00:00 · 2023-03-02 15:38:00 -05:00
parent 55753f8bc8 17d9a620cf
commit d93753cc88
86 changed files with 1224 additions and 316 deletions
--- a/beacon_node/store/src/errors.rs
+++ b/beacon_node/store/src/errors.rs
@@ -46,9 +46,8 @@ pub enum Error {
    },
    BlockReplayError(BlockReplayError),
    AddPayloadLogicError,
-    ResyncRequiredForExecutionPayloadSeparation,
    SlotClockUnavailableForMigration,
-    V9MigrationFailure(Hash256),
+    UnableToDowngrade,
    InconsistentFork(InconsistentFork),
 }