@lodestar/beacon-node 1.43.0-dev.2740f92909 → 1.43.0-dev.5f9285892c

package/src/chain/validation/aggregateAndProof.ts

@@ -90,6 +90,19 @@ async function validateAggregateAndProof(
       });
     }
 
+    // [REJECT] If `aggregate.data.index == 1` (payload present for a past
+    //   block), the execution payload for `block` passes validation.
+    // [IGNORE] When `aggregate.data.index == 1` (payload present for a past block),
+    // the corresponding execution payload for `block` has been seen (a client MAY queue
+    // attestations for processing once the payload is retrieved and SHOULD request the
+    // payload envelope via `ExecutionPayloadEnvelopesByRoot`).
+    if (block !== null && attData.index === 1 && !chain.seenPayloadEnvelope(toRootHex(attData.beaconBlockRoot))) {
+      throw new AttestationError(GossipAction.IGNORE, {
+        code: AttestationErrorCode.EXECUTION_PAYLOAD_NOT_SEEN,
+        beaconBlockRoot: toRootHex(attData.beaconBlockRoot),
+      });
+    }
+
     // [REJECT] len(committee_indices) == 1, where committee_indices = get_committee_indices(aggregate)
     committeeIndex = (aggregate as electra.Attestation).committeeBits.getSingleTrueBit();
     if (committeeIndex === null) {

package/src/chain/validation/attestation.ts

@@ -315,6 +315,19 @@ async function validateAttestationNoSignatureCheck(
             code: AttestationErrorCode.PREMATURELY_INDICATED_PAYLOAD_PRESENT,
           });
         }
+
+        // [REJECT] If `attestation.data.index == 1` (payload present for a past
+        //   block), the execution payload for `block` passes validation.
+        // [IGNORE] When `attestation.data.index == 1` (payload present for a past block),
+        // the corresponding execution payload for `block` has been seen (a client MAY queue
+        // attestations for processing once the payload is retrieved and SHOULD request the
+        // payload envelope via `ExecutionPayloadEnvelopesByRoot`).
+        if (block !== null && attData.index === 1 && !chain.seenPayloadEnvelope(toRootHex(attData.beaconBlockRoot))) {
+          throw new AttestationError(GossipAction.IGNORE, {
+            code: AttestationErrorCode.EXECUTION_PAYLOAD_NOT_SEEN,
+            beaconBlockRoot: toRootHex(attData.beaconBlockRoot),
+          });
+        }
       } else {
         // [REJECT] attestation.data.index == 0
         if (attData.index !== 0) {

package/src/chain/validation/executionPayloadEnvelope.ts

@@ -32,7 +32,7 @@ async function validateExecutionPayloadEnvelope(
   const {payload} = envelope;
   const blockRootHex = toRootHex(envelope.beaconBlockRoot);
 
-  // [IGNORE] The envelope's block root `envelope.block_root` has been seen (via
+  // [IGNORE] The envelope's block root `envelope.beacon_block_root` has been seen (via
   // gossip or non-gossip sources) (a client MAY queue payload for processing once
   // the block is retrieved).
   // TODO GLOAS: Need to review this, we should queue the envelope for later