Only invalidate post merge

ChainSafe · Jul 6, 2022 · 7373342 · 7373342
1 parent a73c8ee
commit 7373342
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/fork-choice/src/protoArray/protoArray.ts b/packages/fork-choice/src/protoArray/protoArray.ts
@@ -365,7 +365,12 @@ export class ProtoArray {
     while (nodeIndex < this.nodes.length) {
       const node = this.getNodeFromIndex(nodeIndex);
       const parent = node.parent !== undefined ? this.getNodeByIndex(node.parent) : undefined;
-      if (invalidateAll || parent?.executionStatus === ExecutionStatus.Invalid) {
+      // Only invalidate if this is post merge, and either parent is invalid or the
+      // concensus has failed
+      if (
+        node.executionStatus !== ExecutionStatus.PreMerge &&
+        (invalidateAll || parent?.executionStatus === ExecutionStatus.Invalid)
+      ) {
         node.executionStatus = ExecutionStatus.Invalid;
         node.bestChild = undefined;
         node.bestDescendant = undefined;