status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't prematurely process blocks waiting for blobs; fix cosmetic head block opt/non-opt logging (#5363)

This commit is contained in:
tersec 2023-08-27 07:45:24 +00:00 committed by GitHub
parent 060e89a07d
commit 29dbab916c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_chain/consensus_object_pools/blob_quarantine.nim
View File

@ -70,7 +70,7 @@ func removeBlobs*(quarantine: var BlobQuarantine, digest: Eth2Digest) =
func hasBlobs*(quarantine: BlobQuarantine, blck: deneb.SignedBeaconBlock): func hasBlobs*(quarantine: BlobQuarantine, blck: deneb.SignedBeaconBlock):
bool = bool =
let idxs = quarantine.blobIndices(blck.root) 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 return false
for i in 0..<len(idxs): for i in 0..<len(idxs):
if idxs[i] != uint64(i): if idxs[i] != uint64(i):

2
beacon_chain/consensus_object_pools/blockchain_dag.nim
View File

@ -2426,7 +2426,7 @@ proc updateHead*(
justified = shortLog(getStateField( justified = shortLog(getStateField(
dag.headState, current_justified_checkpoint)), dag.headState, current_justified_checkpoint)),
finalized = shortLog(getStateField(dag.headState, finalized_checkpoint)), finalized = shortLog(getStateField(dag.headState, finalized_checkpoint)),
isOptHead = newHead.executionValid isOptHead = not newHead.executionValid
if not(isNil(dag.onHeadChanged)): if not(isNil(dag.onHeadChanged)):
let let

3
beacon_chain/gossip_processing/gossip_validation.nim
View File

@ -301,8 +301,7 @@ template validateBeaconBlockBellatrix(
# cannot occur here, because Nimbus's optimistic sync waits for either # cannot occur here, because Nimbus's optimistic sync waits for either
# `ACCEPTED` or `SYNCING` from the EL to get this far. # `ACCEPTED` or `SYNCING` from the EL to get this far.
# https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.1/specs/deneb/p2p-interface.md#blob_sidecar_subnet_id
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/p2p-interface.md#blob_sidecar_index
proc validateBlobSidecar*( proc validateBlobSidecar*(
dag: ChainDAGRef, quarantine: ref Quarantine, dag: ChainDAGRef, quarantine: ref Quarantine,
blobQuarantine: ref BlobQuarantine,sbs: SignedBlobSidecar, blobQuarantine: ref BlobQuarantine,sbs: SignedBlobSidecar,