avoid perpetually sending blobs to peers (#5563)

Fix regression from #4808 where blobs that are already known are issued
ACCEPT verdict, propagating them to peers over and over again.

`validateBlobSidecar` contains the correct IGNORE logic. Moved it above
the expensive checks to retain the performance of the check.
This commit is contained in:
Etan Kissling 2023-11-04 20:36:12 +01:00 committed by GitHub
parent 8d46809a5c
commit f14389bb84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions

View File

@ -287,11 +287,6 @@ proc processSignedBlobSidecar*(
# Potential under/overflows are fine; would just create odd metrics and logs # Potential under/overflows are fine; would just create odd metrics and logs
let delay = wallTime - signedBlobSidecar.message.slot.start_beacon_time let delay = wallTime - signedBlobSidecar.message.slot.start_beacon_time
if self.blobQuarantine[].hasBlob(signedBlobSidecar.message):
debug "Blob received, already in quarantine", delay
return ValidationRes.ok
else:
debug "Blob received", delay debug "Blob received", delay
let v = let v =

View File

@ -331,6 +331,12 @@ proc validateBlobSidecar*(
if not (sbs.message.slot > dag.finalizedHead.slot): if not (sbs.message.slot > dag.finalizedHead.slot):
return errIgnore("SignedBlobSidecar: slot already finalized") return errIgnore("SignedBlobSidecar: slot already finalized")
# [IGNORE] The sidecar is the only sidecar with valid signature
# received for the tuple (sidecar.block_root, sidecar.index).
if blobQuarantine[].hasBlob(sbs.message):
return errIgnore(
"SignedBlobSidecar: already have blob with valid signature")
# [IGNORE] The block's parent (defined by block.parent_root) has # [IGNORE] The block's parent (defined by block.parent_root) has
# been seen (via both gossip and non-gossip sources) (a client MAY # been seen (via both gossip and non-gossip sources) (a client MAY
# queue blocks for processing once the parent block is retrieved). # queue blocks for processing once the parent block is retrieved).
@ -376,12 +382,6 @@ proc validateBlobSidecar*(
sbs.signature): sbs.signature):
return dag.checkedReject("SignedBlobSidecar: invalid blob signature") return dag.checkedReject("SignedBlobSidecar: invalid blob signature")
# [IGNORE] The sidecar is the only sidecar with valid signature
# received for the tuple (sidecar.block_root, sidecar.index).
if blobQuarantine[].hasBlob(sbs.message):
return errIgnore(
"SignedBlobSidecar: already have blob with valid signature")
ok() ok()