revert: gloas beacon_block validation

Author: ahshum

beacon_chain/gossip_processing/gossip_validation.nim

@@ -780,7 +780,6 @@ proc validateDataColumnSidecar*(
 
 # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/phase0/p2p-interface.md#beacon_block
 # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/bellatrix/p2p-interface.md#beacon_block
-# https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.0/specs/gloas/p2p-interface.md#beacon_block
 proc validateBeaconBlock*(
     dag: ChainDAGRef, quarantine: ref Quarantine,
     signed_beacon_block: ForkySignedBeaconBlock,
@@ -856,47 +855,46 @@ proc validateBeaconBlock*(
   # [REJECT] The block's parent (defined by block.parent_root)
   # passes validation.
   let parent = dag.getBlockRef(signed_beacon_block.message.parent_root).valueOr:
-    when type(signed_beacon_block).kind <= ConsensusFork.Fulu:
-      if signed_beacon_block.message.parent_root in quarantine[].unviable:
-        quarantine[].addUnviable(signed_beacon_block.root)
-
-        # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/bellatrix/p2p-interface.md#beacon_block
-        # `is_execution_enabled(state, block.body)` check, but unlike in
-        # validateBeaconBlockBellatrix() don't have parent BlockRef.
-        if signed_beacon_block.message.is_execution_block:
-          # Blocks with execution enabled will be permitted to propagate
-          # regardless of the validity of the execution payload. This prevents
-          # network segregation between optimistic and non-optimistic nodes.
-          #
-          # If execution_payload verification of block's parent by an execution
-          # node is not complete:
-          #
-          # - [REJECT] The block's parent (defined by `block.parent_root`) passes
-          #   all validation (excluding execution node verification of the
-          #   `block.body.execution_payload`).
-          #
-          # otherwise:
-          #
-          # - [IGNORE] The block's parent (defined by `block.parent_root`) passes
-          #   all validation (including execution node verification of the
-          #   `block.body.execution_payload`).
-
-          # Implementation restrictions:
-          #
-          # - We don't know if the parent state had execution enabled.
-          #   If it had, and the block doesn't have it enabled anymore,
-          #   we end up in the pre-Merge path below (`else`) and REJECT.
-          #   Such a block is clearly invalid, though, without asking the EL.
-          #
-          # - We know that the parent was marked unviable, but don't know
-          #   whether it was marked unviable due to consensus (REJECT) or
-          #   execution (IGNORE) verification failure. We err on the IGNORE side.
-          return errIgnore("BeaconBlock: ignored, parent from unviable fork")
-        else:
-          # [REJECT] The block's parent (defined by `block.parent_root`) passes
-          # validation.
-          return dag.checkedReject(
-            "BeaconBlock: rejected, parent from unviable fork")
+    if signed_beacon_block.message.parent_root in quarantine[].unviable:
+      quarantine[].addUnviable(signed_beacon_block.root)
+
+      # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/bellatrix/p2p-interface.md#beacon_block
+      # `is_execution_enabled(state, block.body)` check, but unlike in
+      # validateBeaconBlockBellatrix() don't have parent BlockRef.
+      if signed_beacon_block.message.is_execution_block:
+        # Blocks with execution enabled will be permitted to propagate
+        # regardless of the validity of the execution payload. This prevents
+        # network segregation between optimistic and non-optimistic nodes.
+        #
+        # If execution_payload verification of block's parent by an execution
+        # node is not complete:
+        #
+        # - [REJECT] The block's parent (defined by `block.parent_root`) passes
+        #   all validation (excluding execution node verification of the
+        #   `block.body.execution_payload`).
+        #
+        # otherwise:
+        #
+        # - [IGNORE] The block's parent (defined by `block.parent_root`) passes
+        #   all validation (including execution node verification of the
+        #   `block.body.execution_payload`).
+
+        # Implementation restrictions:
+        #
+        # - We don't know if the parent state had execution enabled.
+        #   If it had, and the block doesn't have it enabled anymore,
+        #   we end up in the pre-Merge path below (`else`) and REJECT.
+        #   Such a block is clearly invalid, though, without asking the EL.
+        #
+        # - We know that the parent was marked unviable, but don't know
+        #   whether it was marked unviable due to consensus (REJECT) or
+        #   execution (IGNORE) verification failure. We err on the IGNORE side.
+        return errIgnore("BeaconBlock: ignored, parent from unviable fork")
+      else:
+        # [REJECT] The block's parent (defined by `block.parent_root`) passes
+        # validation.
+        return dag.checkedReject(
+          "BeaconBlock: rejected, parent from unviable fork")
 
     # When the parent is missing, we can't validate the block - we'll queue it
     # in the quarantine for later processing