refactor: pass env quarantine into attestatn validation

Author: Tomi-3-0

beacon_chain/consensus_object_pools/attestation_pool.nim

@@ -13,7 +13,7 @@ import
   chronicles, stew/byteutils,
   # Internal
   ../spec/[eth2_merkleization, forks, validator],
-  ./[spec_cache, blockchain_dag, block_quarantine, envelope_quarantine],
+  ./[spec_cache, blockchain_dag, block_quarantine],
   ../fork_choice/fork_choice,
   ../beacon_clock
 
@@ -82,7 +82,6 @@ type
 
     dag*: ChainDAGRef
     quarantine*: ref Quarantine
-    envelopeQuarantine*: ref EnvelopeQuarantine
 
     forkChoice*: ForkChoice
 
@@ -122,7 +121,6 @@ func init(T: type AttestationData, entry: AttestationEntry): T =
 
 proc init*(T: type AttestationPool, dag: ChainDAGRef,
            quarantine: ref Quarantine,
-           envelopeQuarantine: ref EnvelopeQuarantine = nil,
            wallTime = default(BeaconTime),
            onSingleAttestation: OnSingleAttestationCallback = nil): T =
   ## Initialize an AttestationPool from the dag `headState`
@@ -200,7 +198,6 @@ proc init*(T: type AttestationPool, dag: ChainDAGRef,
   T(
     dag: dag,
     quarantine: quarantine,
-    envelopeQuarantine: envelopeQuarantine,
     forkChoice: forkChoice,
     onSingleAttestationAdded: onSingleAttestation
   )

beacon_chain/gossip_processing/eth2_processor.nim

@@ -575,7 +575,8 @@ proc processAttestation*(
 
   let v = (
     await self.attestationPool.validateAttestation(
-      self.batchCrypto, attestation, wallTime, subnet_id, checkSignature
+      self.batchCrypto, self.envelopeQuarantine, attestation,
+      wallTime, subnet_id, checkSignature
     )
   ).valueOr:
     debug "Dropping attestation", reason = $error
@@ -647,6 +648,7 @@ proc processSignedAggregateAndProof*(
   let v = (
     await self.attestationPool.validateAggregate(
       self.batchCrypto,
+      self.envelopeQuarantine,
       signedAggregateAndProof,
       wallTime,
       checkSignature = checkSignature,

beacon_chain/gossip_processing/gossip_validation.nim

@@ -1129,6 +1129,7 @@ proc validateExecutionPayload*(
 proc validateAttestation*(
     pool: ref AttestationPool,
     batchCrypto: ref BatchCrypto,
+    envelopeQuarantine: ref EnvelopeQuarantine,
     attestation: SingleAttestation,
     wallTime: BeaconTime,
     subnet_id: SubnetId,
@@ -1194,7 +1195,8 @@ proc validateAttestation*(
     if attestation.data.index == 1:
       template block_root: untyped = attestation.data.beacon_block_root
       if not pool.dag.db.containsExecutionPayloadEnvelope(block_root) and
-          block_root notin pool.envelopeQuarantine[].orphans:
+          (envelopeQuarantine.isNil or
+            block_root notin envelopeQuarantine[].orphans):
         return errIgnore(
           "SingleAttestation: execution payload not yet seen")
   else:
@@ -1312,6 +1314,7 @@ proc validateAttestation*(
 proc validateAggregate*(
     pool: ref AttestationPool,
     batchCrypto: ref BatchCrypto,
+    envelopeQuarantine: ref EnvelopeQuarantine,
     signedAggregateAndProof: electra.SignedAggregateAndProof,
     wallTime: BeaconTime,
     checkSignature = true,
@@ -1405,7 +1408,8 @@ proc validateAggregate*(
     if aggregate.data.index == 1:
       template block_root: untyped = aggregate.data.beacon_block_root
       if not pool.dag.db.containsExecutionPayloadEnvelope(block_root) and
-          block_root notin pool.envelopeQuarantine[].orphans:
+          (envelopeQuarantine.isNil or
+            block_root notin envelopeQuarantine[].orphans):
         return errIgnore(
           "Aggregate: execution payload not yet seen")
   else:

beacon_chain/nimbus_beacon_node.nim

@@ -557,7 +557,7 @@ proc initFullNode(
       Quarantine.init(dag.cfg))
     envelopeQuarantine = newClone(EnvelopeQuarantine.init(onEnvelopeAdded))
     attestationPool = newClone(AttestationPool.init(
-      dag, quarantine, envelopeQuarantine,
+      dag, quarantine,
       getBeaconTime(), onSingleAttestationReceived))
     syncCommitteeMsgPool = newClone(
       SyncCommitteeMsgPool.init(rng, dag.cfg, onSyncContribution))

tests/test_gossip_validation.nim

@@ -113,29 +113,29 @@ suite "Gossip validation " & preset():
       beaconTime = att_1_0.data.slot.start_beacon_time(cfg.timeParams)
 
     check:
-      validateAttestation(pool, batchCrypto, att_1_0, beaconTime, subnet, true).waitFor().isOk
+      validateAttestation(pool, batchCrypto, nil, att_1_0, beaconTime, subnet, true).waitFor().isOk
 
       # Same validator again
-      validateAttestation(pool, batchCrypto, att_1_0, beaconTime, subnet, true).waitFor().error()[0] ==
+      validateAttestation(pool, batchCrypto, nil, att_1_0, beaconTime, subnet, true).waitFor().error()[0] ==
         ValidationResult.Ignore
 
     pool[].nextAttestationEpoch.setLen(0) # reset for test
     check:
       # Wrong subnet
       validateAttestation(
-        pool, batchCrypto, att_1_0, beaconTime, SubnetId(subnet.uint8 + 1), true).waitFor().isErr
+        pool, batchCrypto, nil, att_1_0, beaconTime, SubnetId(subnet.uint8 + 1), true).waitFor().isErr
 
     pool[].nextAttestationEpoch.setLen(0) # reset for test
     check:
       # Too far in the future
       validateAttestation(
-        pool, batchCrypto, att_1_0, beaconTime - 1.seconds, subnet, true).waitFor().isErr
+        pool, batchCrypto, nil, att_1_0, beaconTime - 1.seconds, subnet, true).waitFor().isErr
 
     pool[].nextAttestationEpoch.setLen(0) # reset for test
     check:
       # Too far in the past
       validateAttestation(
-        pool, batchCrypto, att_1_0, beaconTime -
+        pool, batchCrypto, nil, att_1_0, beaconTime -
         cfg.timeParams.SLOT_DURATION * SLOTS_PER_EPOCH.int64 - 1.seconds,
         subnet, true).waitFor().isErr
 
@@ -146,7 +146,7 @@ suite "Gossip validation " & preset():
       check:
         # Invalid signature
         validateAttestation(
-          pool, batchCrypto, broken, beaconTime, subnet, true).waitFor().
+          pool, batchCrypto, nil, broken, beaconTime, subnet, true).waitFor().
             error()[0] == ValidationResult.Reject
 
     block:
@@ -156,9 +156,9 @@ suite "Gossip validation " & preset():
       # One invalid, one valid (batched)
       let
         fut_1_0 = validateAttestation(
-          pool, batchCrypto, broken, beaconTime, subnet, true)
+          pool, batchCrypto, nil, broken, beaconTime, subnet, true)
         fut_1_1 = validateAttestation(
-          pool, batchCrypto, att_1_1, beaconTime, subnet, true)
+          pool, batchCrypto, nil,att_1_1, beaconTime, subnet, true)
 
       check:
         fut_1_0.waitFor().error()[0] == ValidationResult.Reject
@@ -172,9 +172,9 @@ suite "Gossip validation " & preset():
       # One invalid, one valid (batched)
       let
         fut_1_0 = validateAttestation(
-          pool, batchCrypto, broken, beaconTime, subnet, true)
+          pool, batchCrypto, nil, broken, beaconTime, subnet, true)
         fut_1_1 = validateAttestation(
-          pool, batchCrypto, att_1_1, beaconTime, subnet, true)
+          pool, batchCrypto, nil,att_1_1, beaconTime, subnet, true)
 
       check:
         fut_1_0.waitFor().error()[0] == ValidationResult.Reject
@@ -194,9 +194,9 @@ suite "Gossip validation " & preset():
       # the individual attestations are invalid but their aggregate validates!
       let
         fut_1_0 = validateAttestation(
-          pool, batchCrypto, broken_1_0, beaconTime, subnet, true)
+          pool, batchCrypto, nil, broken_1_0, beaconTime, subnet, true)
         fut_1_1 = validateAttestation(
-          pool, batchCrypto, broken_1_1, beaconTime, subnet, true)
+          pool, batchCrypto, nil, broken_1_1, beaconTime, subnet, true)
 
       check:
         fut_1_0.waitFor().error()[0] == ValidationResult.Reject