fix: update validations

Author: ahshum

beacon_chain/gossip_processing/gossip_validation.nim

@@ -400,7 +400,7 @@ template validateBeaconBlockBellatrix(
   # cannot occur here, because Nimbus's optimistic sync waits for either
   # `ACCEPTED` or `SYNCING` from the EL to get this far.
 
-# https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.1/specs/gloas/p2p-interface.md#beacon_block
+# https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/gloas/p2p-interface.md#beacon_block
 template validateBeaconBlockDeneb(
     _: ChainDAGRef,
     _:
@@ -432,44 +432,43 @@ template validateBeaconBlockGloas(
       phase0.SignedBeaconBlock | altair.SignedBeaconBlock |
       bellatrix.SignedBeaconBlock | capella.SignedBeaconBlock |
       deneb.SignedBeaconBlock | electra.SignedBeaconBlock |
-      fulu.SignedBeaconBlock,
-    _: BlockRef): untyped =
+      fulu.SignedBeaconBlock): untyped =
   discard
 
-# https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.1/specs/gloas/p2p-interface.md#beacon_block
+# https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/gloas/p2p-interface.md#beacon_block
 template validateBeaconBlockGloas(
     dag: ChainDAGRef,
-    signed_beacon_block: gloas.SignedBeaconBlock,
-    parent: BlockRef): untyped =
+    signed_beacon_block: gloas.SignedBeaconBlock): untyped =
   template blck: untyped = signed_beacon_block.message
   template bid: untyped = blck.body.signed_execution_payload_bid.message
 
-  # If `execution_payload` verification of block's execution payload parent by
-  # an execution node **is complete**
-  debugGloasComment("")
-  let isExecutionEnabled =
-    if signed_beacon_block.message.is_execution_block:
-      true
-    else:
-      # If we don't know whether the parent block had execution enabled,
-      # assume it didn't. This way, we don't reject here if the timestamp
-      # is invalid, and let state transition check the timestamp.
-      # This is an edge case, and may be hit in a pathological scenario with
-      # checkpoint sync, because the checkpoint block may be unavailable
-      # and it could already be the parent of the new block before backfill.
-      not dag.loadExecutionBlockHash(parent).get(ZERO_HASH).isZero
-  if isExecutionEnabled:
-    # [REJECT] The block's execution payload parent (defined by
-    # `bid.parent_block_hash`) passes all validation.
-    withState(dag.headState):
-      when consensusFork >= ConsensusFork.Gloas:
-        if bid.parent_block_hash != forkyState.data.latest_block_hash:
-          return dag.checkedReject("validateBeaconBlockGloas: invalid execution payload parent")
+  # If execution_payload verification of block's execution payload parent by an
+  # execution node is complete:
+  #
+  # - [REJECT] The block's execution payload parent (defined by
+  #   bid.parent_block_hash) passes all validation.
+  let
+    parentRef = dag.getBlockRef(bid.parent_block_root)
+    parentBlock =
+      block:
+        if parentRef.isSome():
+          dag.getForkedBlock(parentRef.get().bid)
+        else:
+          Opt.none(ForkedTrustedSignedBeaconBlock)
+  if parentBlock.isSome():
+    withBlck(parentBlock.get()):
+      if forkyBlck.message.is_execution_block:
+        let parentHash = dag.loadExecutionBlockHash(parentRef.get()).valueOr:
+          return dag.checkedReject(
+            "validateBeaconBlockGloas: invalid execution parent")
+        if not (bid.parent_block_hash == parentHash):
+          return dag.checkedReject(
+            "validateBeaconBlockGloas: invalid execution parent")
 
   # [REJECT] The bid's parent (defined by `bid.parent_block_root`) equals the
   # block's parent (defined by `block.parent_root`).
-  if bid.parent_block_root != blck.parent_root:
-    return dag.checkedReject("validateBeaconBlockGloas: parent block root mismatch")
+  if not (bid.parent_block_root == blck.parent_root):
+    return dag.checkedReject("validateBeaconBlockGloas: parent block mismatch")
 
 # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.4/specs/deneb/p2p-interface.md#blob_sidecar_subnet_id
 proc validateBlobSidecar*(
@@ -851,6 +850,7 @@ 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.1/specs/gloas/p2p-interface.md#beacon_block
 proc validateBeaconBlock*(
     dag: ChainDAGRef, quarantine: ref Quarantine,
     signed_beacon_block: ForkySignedBeaconBlock,
@@ -931,9 +931,10 @@ proc validateBeaconBlock*(
     quarantine[].addOrphan(dag.finalizedHead.slot, signed_beacon_block).isOkOr:
       # Queueing failed because the parent was unviable - this means this block
       # is unviable as well, for the same reason
-      return
-        case error
-        of UnviableKind.Invalid:
+      case error
+      of UnviableKind.Invalid:
+        when typeof(signed_beacon_block).kind <= ConsensusFork.Fulu:
+          # These checks are removed in Gloas.
           if signed_beacon_block.message.is_execution_block:
             # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/bellatrix/p2p-interface.md#beacon_block
             #
@@ -960,11 +961,11 @@ proc validateBeaconBlock*(
             #   whether it was marked unviable due to consensus (REJECT) or
             #   execution (IGNORE) verification failure. We err on the IGNORE side.
             #   TODO track this as a separate UnviableKind
-            errIgnore("BeaconBlock: parent invalid")
+            return errIgnore("BeaconBlock: parent invalid")
           else:
-            errReject("BeaconBlock: parent invalid")
-        of UnviableKind.UnviableFork:
-          errIgnore("BeaconBlock: parent from unviable fork")
+            return errReject("BeaconBlock: parent invalid")
+      of UnviableKind.UnviableFork:
+        return errIgnore("BeaconBlock: parent from unviable fork")
 
     debug "Block quarantined",
       blockRoot = shortLog(signed_beacon_block.root),
@@ -980,7 +981,7 @@ proc validateBeaconBlock*(
 
   dag.validateBeaconBlockDeneb(signed_beacon_block, wallTime)
 
-  dag.validateBeaconBlockGloas(signed_beacon_block, parent)
+  dag.validateBeaconBlockGloas(signed_beacon_block)
 
   # [REJECT] The block is from a higher slot than its parent.
   if not (signed_beacon_block.message.slot > parent.bid.slot):