From 29dbab916c02da0dab6b0509b18dc5c8cc405e25 Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Sun, 27 Aug 2023 07:45:24 +0000
Subject: [PATCH] don't prematurely process blocks waiting for blobs; fix
 cosmetic head block opt/non-opt logging (#5363)

---
 beacon_chain/consensus_object_pools/blob_quarantine.nim | 2 +-
 beacon_chain/consensus_object_pools/blockchain_dag.nim  | 2 +-
 beacon_chain/gossip_processing/gossip_validation.nim    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/beacon_chain/consensus_object_pools/blob_quarantine.nim b/beacon_chain/consensus_object_pools/blob_quarantine.nim
index 1af0ae7dc..82d6a5ce2 100644
--- a/beacon_chain/consensus_object_pools/blob_quarantine.nim
+++ b/beacon_chain/consensus_object_pools/blob_quarantine.nim
@@ -70,7 +70,7 @@ func removeBlobs*(quarantine: var BlobQuarantine, digest: Eth2Digest) =
 func hasBlobs*(quarantine: BlobQuarantine, blck: deneb.SignedBeaconBlock):
      bool =
   let idxs = quarantine.blobIndices(blck.root)
-  if len(blck.message.body.blob_kzg_commitments) < len(idxs):
+  if len(blck.message.body.blob_kzg_commitments) != len(idxs):
     return false
   for i in 0..<len(idxs):
     if idxs[i] != uint64(i):
diff --git a/beacon_chain/consensus_object_pools/blockchain_dag.nim b/beacon_chain/consensus_object_pools/blockchain_dag.nim
index 35764206f..416c70286 100644
--- a/beacon_chain/consensus_object_pools/blockchain_dag.nim
+++ b/beacon_chain/consensus_object_pools/blockchain_dag.nim
@@ -2426,7 +2426,7 @@ proc updateHead*(
       justified = shortLog(getStateField(
         dag.headState, current_justified_checkpoint)),
       finalized = shortLog(getStateField(dag.headState, finalized_checkpoint)),
-      isOptHead = newHead.executionValid
+      isOptHead = not newHead.executionValid
 
     if not(isNil(dag.onHeadChanged)):
       let
diff --git a/beacon_chain/gossip_processing/gossip_validation.nim b/beacon_chain/gossip_processing/gossip_validation.nim
index dd9a335c7..f7d65d3fe 100644
--- a/beacon_chain/gossip_processing/gossip_validation.nim
+++ b/beacon_chain/gossip_processing/gossip_validation.nim
@@ -301,8 +301,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.3.0/specs/deneb/p2p-interface.md#blob_sidecar_index
+# https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.1/specs/deneb/p2p-interface.md#blob_sidecar_subnet_id
 proc validateBlobSidecar*(
     dag: ChainDAGRef, quarantine: ref Quarantine,
     blobQuarantine: ref BlobQuarantine,sbs: SignedBlobSidecar,