@lodestar/beacon-node 1.42.0-dev.b10dfaca8d → 1.42.0-dev.bc0be71fb0

package/lib/network/processor/extractSlotRootFns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractSlotRootFns.d.ts","sourceRoot":"","sources":["../../../src/network/processor/extractSlotRootFns.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAC;AAE9C;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI,kBAAkB,CAuDlE"}
+{"version":3,"file":"extractSlotRootFns.d.ts","sourceRoot":"","sources":["../../../src/network/processor/extractSlotRootFns.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAC;AAE9C;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI,kBAAkB,CA+ElE"}

package/lib/network/processor/extractSlotRootFns.js

@@ -1,9 +1,9 @@
-import { isForkPostGloas } from "@lodestar/params";
-import { getBeaconBlockRootFromDataColumnSidecarSerialized, getBeaconBlockRootFromExecutionPayloadEnvelopeSerialized, getBlockRootFromBeaconAttestationSerialized, getBlockRootFromSignedAggregateAndProofSerialized, getSlotFromBeaconAttestationSerialized, getSlotFromBlobSidecarSerialized, getSlotFromDataColumnSidecarSerialized, getSlotFromExecutionPayloadEnvelopeSerialized, getSlotFromSignedAggregateAndProofSerialized, getSlotFromSignedBeaconBlockSerialized, } from "../../util/sszBytes.js";
+import { ForkSeq } from "@lodestar/params";
+import { getBeaconBlockRootFromDataColumnSidecarSerialized, getBlockRootFromBeaconAttestationSerialized, getBlockRootFromPayloadAttestationMessageSerialized, getBlockRootFromSignedAggregateAndProofSerialized, getSlotFromBeaconAttestationSerialized, getSlotFromBlobSidecarSerialized, getSlotFromDataColumnSidecarSerialized, getSlotFromExecutionPayloadEnvelopeSerialized, getSlotFromPayloadAttestationMessageSerialized, getSlotFromSignedAggregateAndProofSerialized, getSlotFromSignedBeaconBlockSerialized, getSlotFromSignedExecutionPayloadBidSerialized, } from "../../util/sszBytes.js";
 import { GossipType } from "../gossip/index.js";
 /**
  * Extract the slot and block root of a gossip message form serialized data.
- * Not applicable for all topics.
+ * Only do it for messages that have a slot and block root, and we want to await the block if the block root is not known.
  */
 export function createExtractBlockSlotRootFns() {
     return {
@@ -42,17 +42,37 @@ export function createExtractBlockSlotRootFns() {
             if (slot === null) {
                 return null;
             }
-            const root = isForkPostGloas(fork) ? getBeaconBlockRootFromDataColumnSidecarSerialized(data) : null;
+            if (ForkSeq[fork] < ForkSeq.gloas) {
+                return { slot };
+            }
+            const root = getBeaconBlockRootFromDataColumnSidecarSerialized(data);
+            // null root means the message is invalid here and will be ignored in gossip handler later
+            // returning the slot here helps check the earliest permissable slot in the network processor
             return root !== null ? { slot, root } : { slot };
         },
         [GossipType.execution_payload]: (data) => {
             const slot = getSlotFromExecutionPayloadEnvelopeSerialized(data);
-            const root = getBeaconBlockRootFromExecutionPayloadEnvelopeSerialized(data);
+            // Do not extract the root here; the network processor will extract it in the 2nd round to trigger block search without awaiting.
+            if (slot === null) {
+                return null;
+            }
+            return { slot };
+        },
+        [GossipType.payload_attestation_message]: (data) => {
+            const slot = getSlotFromPayloadAttestationMessageSerialized(data);
+            const root = getBlockRootFromPayloadAttestationMessageSerialized(data);
             if (slot === null || root === null) {
                 return null;
             }
             return { slot, root };
         },
+        [GossipType.execution_payload_bid]: (data) => {
+            const slot = getSlotFromSignedExecutionPayloadBidSerialized(data);
+            if (slot === null) {
+                return null;
+            }
+            return { slot };
+        },
     };
 }
 //# sourceMappingURL=extractSlotRootFns.js.map

package/lib/network/processor/extractSlotRootFns.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractSlotRootFns.js","sourceRoot":"","sources":["../../../src/network/processor/extractSlotRootFns.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extractSlotRootFns.js","sourceRoot":"","sources":["../../../src/network/processor/extractSlotRootFns.ts"],"names":[],"mappings":"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"}

package/lib/network/processor/gossipHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gossipHandlers.d.ts","sourceRoot":"","sources":["../../../src/network/processor/gossipHandlers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAkB,MAAM,kBAAkB,CAAC;AAW/D,OAAO,EACL,IAAI,EAGJ,IAAI,EAOL,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAW,MAAM,EAAgC,MAAM,iBAAiB,CAAC;AA2BhF,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAuBtD,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAG/C,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EAGL,cAAc,EAGf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,wDAAwD;IACxD,sCAAsC,CAAC,EAAE,OAAO,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAKF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAE1G;AAg4BD;;GAEG;AACH,wBAAsB,gCAAgC,CAAC,CAAC,EACtD,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,IAAI,GACd,OAAO,CAAC,CAAC,CAAC,CA6BZ"}
+{"version":3,"file":"gossipHandlers.d.ts","sourceRoot":"","sources":["../../../src/network/processor/gossipHandlers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAkB,MAAM,kBAAkB,CAAC;AAc/D,OAAO,EACL,IAAI,EAGJ,IAAI,EASL,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAW,MAAM,EAAgC,MAAM,iBAAiB,CAAC;AA2BhF,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AA0BtD,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAG/C,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EAGL,cAAc,EAGf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,wDAAwD;IACxD,sCAAsC,CAAC,EAAE,OAAO,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAKF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAE1G;AAkmCD;;GAEG;AACH,wBAAsB,gCAAgC,CAAC,CAAC,EACtD,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,IAAI,GACd,OAAO,CAAC,CAAC,CAAC,CA6BZ"}

package/lib/network/processor/gossipHandlers.js

@@ -1,7 +1,8 @@
 import { routes } from "@lodestar/api";
-import { ForkSeq, NUMBER_OF_COLUMNS, isForkPostElectra, } from "@lodestar/params";
+import { PayloadStatus } from "@lodestar/fork-choice";
+import { ForkSeq, NUMBER_OF_COLUMNS, isForkPostElectra, isForkPostGloas, } from "@lodestar/params";
 import { computeTimeAtSlot } from "@lodestar/state-transition";
-import { ssz, sszTypesFor, } from "@lodestar/types";
+import { isGloasDataColumnSidecar, ssz, sszTypesFor, } from "@lodestar/types";
 import { LogLevel, prettyBytes, toHex, toRootHex } from "@lodestar/utils";
 import { BlockInputSource, isBlockInputColumns, } from "../../chain/blocks/blockInput/index.js";
 import { PayloadEnvelopeInputSource } from "../../chain/blocks/payloadEnvelopeInput/index.js";
@@ -9,7 +10,7 @@ import { BlobSidecarValidation } from "../../chain/blocks/types.js";
 import { ChainEvent } from "../../chain/emitter.js";
 import { AttestationError, AttestationErrorCode, BlobSidecarErrorCode, BlobSidecarGossipError, BlockError, BlockErrorCode, BlockGossipError, DataColumnSidecarErrorCode, DataColumnSidecarGossipError, ExecutionPayloadEnvelopeError, ExecutionPayloadEnvelopeErrorCode, GossipAction, GossipActionError, SyncCommitteeError, } from "../../chain/errors/index.js";
 import { validateGossipBlobSidecar } from "../../chain/validation/blobSidecar.js";
-import { validateGossipDataColumnSidecar } from "../../chain/validation/dataColumnSidecar.js";
+import { validateGossipFuluDataColumnSidecar, validateGossipGloasDataColumnSidecar, } from "../../chain/validation/dataColumnSidecar.js";
 import { validateGossipExecutionPayloadBid } from "../../chain/validation/executionPayloadBid.js";
 import { validateGossipExecutionPayloadEnvelope } from "../../chain/validation/executionPayloadEnvelope.js";
 import { toElectraSingleAttestation, validateGossipAggregateAndProof, validateGossipAttestationsSameAttData, validateGossipAttesterSlashing, validateGossipBlock, validateGossipBlsToExecutionChange, validateGossipProposerSlashing, validateGossipSyncCommittee, validateGossipVoluntaryExit, validateSyncCommitteeGossipContributionAndProof, } from "../../chain/validation/index.js";
@@ -18,7 +19,7 @@ import { validateLightClientOptimisticUpdate } from "../../chain/validation/ligh
 import { validateGossipPayloadAttestationMessage } from "../../chain/validation/payloadAttestationMessage.js";
 import { OpSource } from "../../chain/validatorMonitor.js";
 import { kzgCommitmentToVersionedHash } from "../../util/blobs.js";
-import { getBlobKzgCommitments } from "../../util/dataColumns.js";
+import { getBlobKzgCommitments, getDataColumnSidecarSlot } from "../../util/dataColumns.js";
 import { GossipType, } from "../gossip/interface.js";
 import { sszDeserialize } from "../gossip/topic.js";
 import { PeerAction } from "../peers/index.js";
@@ -64,16 +65,19 @@ function getSequentialHandlers(modules, options) {
             recvToValLatency,
         };
         logger.debug("Received gossip block", { ...logCtx });
-        let blockInput;
+        // optimistically add gossip block to the seen cache
+        // if validation fails, we will NOT forward this gossip block to peers
+        //   - if PARENT_UNKNOWN error, blockInput will then be queued inside BlockInputSync. If the gossip block is really invalid, it will be pruned there
+        //   - if other validator errors, blockInput will stay in the seen cache and will be pruned on finalization
+        const blockInput = chain.seenBlockInputCache.getByBlock({
+            block: signedBlock,
+            blockRootHex,
+            source: BlockInputSource.gossip,
+            seenTimestampSec,
+            peerIdStr,
+        });
         try {
             await validateGossipBlock(config, chain, signedBlock, fork);
-            blockInput = chain.seenBlockInputCache.getByBlock({
-                block: signedBlock,
-                blockRootHex,
-                source: BlockInputSource.gossip,
-                seenTimestampSec,
-                peerIdStr,
-            });
             const blockInputMeta = blockInput.getLogMeta();
             const recvToValidation = Date.now() / 1000 - seenTimestampSec;
             const validationTime = recvToValidation - recvToValLatency;
@@ -85,9 +89,9 @@ function getSequentialHandlers(modules, options) {
         }
         catch (e) {
             if (e instanceof BlockGossipError) {
+                logger.debug("Gossip block has error", { slot, root: blockShortHex, code: e.type.code });
                 if (e.type.code === BlockErrorCode.PARENT_UNKNOWN && blockInput) {
-                    logger.debug("Gossip block has error", { slot, root: blockShortHex, code: e.type.code });
-                    chain.emitter.emit(ChainEvent.unknownParent, {
+                    chain.emitter.emit(ChainEvent.blockUnknownParent, {
                         blockInput,
                         peer: peerIdStr,
                         source: BlockInputSource.gossip,
@@ -196,7 +200,7 @@ function getSequentialHandlers(modules, options) {
             const blockInput = chain.seenBlockInputCache.get(blockRootHex);
             if (blockInput && isBlockInputColumns(blockInput) && blockInput.hasColumn(dataColumnSidecar.index)) {
                 metrics?.peerDas.dataColumnSidecarProcessingSkip.inc();
-                logger.debug("Already have column sidecar, skipping processing", {
+                logger.debug("Already have column sidecar in BlockInput, skipping processing", {
                     ...blockInput.getLogMeta(),
                     index: dataColumnSidecar.index,
                 });
@@ -209,9 +213,10 @@ function getSequentialHandlers(modules, options) {
         }
         const verificationTimer = metrics?.peerDas.dataColumnSidecarGossipVerificationTime.startTimer();
         const delaySec = chain.clock.secFromSlot(slot, seenTimestampSec);
+        const secFromSlot = chain.clock.secFromSlot(slot);
         const recvToValLatency = Date.now() / 1000 - seenTimestampSec;
         try {
-            await validateGossipDataColumnSidecar(chain, dataColumnSidecar, gossipSubnet, metrics);
+            await validateGossipFuluDataColumnSidecar(chain, dataColumnSidecar, gossipSubnet, metrics);
             const blockInput = chain.seenBlockInputCache.getByColumn({
                 blockRootHex,
                 columnSidecar: dataColumnSidecar,
@@ -237,6 +242,7 @@ function getSequentialHandlers(modules, options) {
                 currentSlot: chain.clock.currentSlot,
                 peerId: peerIdStr,
                 delaySec,
+                secFromSlot,
                 gossipSubnet,
                 columnIndex: dataColumnSidecar.index,
                 recvToValLatency,
@@ -261,6 +267,108 @@ function getSequentialHandlers(modules, options) {
             verificationTimer?.();
         }
     }
+    async function validatePayloadDataColumn(dataColumnSidecar, gossipSubnet, peerIdStr, seenTimestampSec) {
+        metrics?.peerDas.dataColumnSidecarProcessingRequests.inc();
+        const slot = dataColumnSidecar.slot;
+        const blockRootHex = toRootHex(dataColumnSidecar.beaconBlockRoot);
+        // check to see if payload has already been processed and PayloadEnvelopeInput has been deleted (column received via reqresp or other means)
+        if (chain.forkChoice.getBlockHex(blockRootHex, PayloadStatus.FULL) !== null) {
+            metrics?.peerDas.dataColumnSidecarProcessingSkip.inc();
+            logger.debug("Already processed payload for column sidecar, skipping processing", {
+                slot,
+                blockRoot: blockRootHex,
+                index: dataColumnSidecar.index,
+            });
+            throw new DataColumnSidecarGossipError(GossipAction.IGNORE, {
+                code: DataColumnSidecarErrorCode.ALREADY_KNOWN,
+                columnIndex: dataColumnSidecar.index,
+                slot,
+            });
+        }
+        const payloadInput = chain.seenPayloadEnvelopeInputCache.get(blockRootHex);
+        if (!payloadInput) {
+            // This should not happen for gossip because the network processor queues `data_column_sidecar`
+            // until block import creates the corresponding PayloadEnvelopeInput.
+            throw new DataColumnSidecarGossipError(GossipAction.IGNORE, {
+                code: DataColumnSidecarErrorCode.PAYLOAD_ENVELOPE_INPUT_MISSING,
+                slot,
+                blockRoot: blockRootHex,
+            });
+        }
+        // [IGNORE] The sidecar is the first sidecar for the tuple
+        // (sidecar.beacon_block_root, sidecar.index) with valid kzg proof.
+        if (payloadInput.hasColumn(dataColumnSidecar.index)) {
+            metrics?.peerDas.dataColumnSidecarProcessingSkip.inc();
+            logger.debug("Already have column sidecar in PayloadEnvelopeInput, skipping processing", {
+                ...payloadInput.getLogMeta(),
+                index: dataColumnSidecar.index,
+            });
+            throw new DataColumnSidecarGossipError(GossipAction.IGNORE, {
+                code: DataColumnSidecarErrorCode.ALREADY_KNOWN,
+                columnIndex: dataColumnSidecar.index,
+                slot,
+            });
+        }
+        const verificationTimer = metrics?.peerDas.dataColumnSidecarGossipVerificationTime.startTimer();
+        const delaySec = chain.clock.secFromSlot(slot, seenTimestampSec);
+        const secFromSlot = chain.clock.secFromSlot(slot);
+        const recvToValLatency = Date.now() / 1000 - seenTimestampSec;
+        try {
+            await validateGossipGloasDataColumnSidecar(chain, payloadInput, dataColumnSidecar, gossipSubnet, metrics);
+            const addedColumn = payloadInput.addColumn({
+                columnSidecar: dataColumnSidecar,
+                source: PayloadEnvelopeInputSource.gossip,
+                seenTimestampSec,
+                peerIdStr,
+            });
+            if (!addedColumn) {
+                metrics?.peerDas.dataColumnSidecarProcessingSkip.inc();
+                logger.debug("Already have column sidecar in PayloadEnvelopeInput, skipping processing", {
+                    ...payloadInput.getLogMeta(),
+                    index: dataColumnSidecar.index,
+                });
+                throw new DataColumnSidecarGossipError(GossipAction.IGNORE, {
+                    code: DataColumnSidecarErrorCode.ALREADY_KNOWN,
+                    columnIndex: dataColumnSidecar.index,
+                    slot,
+                });
+            }
+            const recvToValidation = Date.now() / 1000 - seenTimestampSec;
+            const validationTime = recvToValidation - recvToValLatency;
+            metrics?.peerDas.dataColumnSidecarProcessingSuccesses.inc();
+            metrics?.gossipBlob.recvToValidation.observe(recvToValidation);
+            metrics?.gossipBlob.validationTime.observe(validationTime);
+            if (chain.emitter.listenerCount(routes.events.EventType.dataColumnSidecar)) {
+                chain.emitter.emit(routes.events.EventType.dataColumnSidecar, {
+                    blockRoot: blockRootHex,
+                    slot,
+                    index: dataColumnSidecar.index,
+                });
+            }
+            logger.debug("Received gossip dataColumn", {
+                ...payloadInput.getLogMeta(),
+                currentSlot: chain.clock.currentSlot,
+                peerId: peerIdStr,
+                delaySec,
+                secFromSlot,
+                gossipSubnet,
+                columnIndex: dataColumnSidecar.index,
+                recvToValLatency,
+                recvToValidation,
+                validationTime,
+            });
+            return payloadInput;
+        }
+        catch (e) {
+            if (e instanceof DataColumnSidecarGossipError && e.action === GossipAction.REJECT) {
+                chain.persistInvalidSszValue(sszTypesFor(payloadInput.forkName).DataColumnSidecar, dataColumnSidecar, `gossip_reject_slot_${slot}_index_${dataColumnSidecar.index}`);
+            }
+            throw e;
+        }
+        finally {
+            verificationTimer?.();
+        }
+    }
     function handleValidBeaconBlock(blockInput, peerIdStr, seenTimestampSec) {
         const signedBlock = blockInput.getBlock();
         const slot = signedBlock.message.slot;
@@ -382,65 +490,110 @@ function getSequentialHandlers(modules, options) {
             }
         },
         [GossipType.data_column_sidecar]: async ({ gossipData, topic, peerIdStr, seenTimestampSec, }) => {
+            const { fork } = topic.boundary;
             const { serializedData } = gossipData;
-            // TODO GLOAS: handle gloas.DataColumnSidecar
             const dataColumnSidecar = sszDeserialize(topic, serializedData);
-            const dataColumnSlot = dataColumnSidecar.signedBlockHeader.message.slot;
+            const dataColumnSlot = getDataColumnSidecarSlot(dataColumnSidecar);
             const index = dataColumnSidecar.index;
-            if (config.getForkSeq(dataColumnSlot) < ForkSeq.fulu) {
-                throw new GossipActionError(GossipAction.REJECT, { code: "PRE_FULU_BLOCK" });
-            }
             const delaySec = chain.clock.secFromSlot(dataColumnSlot, seenTimestampSec);
-            const blockInput = await validateBeaconDataColumn(dataColumnSidecar, serializedData, topic.subnet, peerIdStr, seenTimestampSec);
-            chain.serializedCache.set(dataColumnSidecar, serializedData);
-            const blockInputMeta = blockInput.getLogMeta();
-            const { receivedColumns } = blockInputMeta;
-            // it's not helpful to track every single column received
-            // instead of that, track 1st, 8th, 16th 32th, 64th, and 128th column
-            switch (receivedColumns) {
-                case 1:
-                case config.SAMPLES_PER_SLOT:
-                case 2 * config.SAMPLES_PER_SLOT:
-                case NUMBER_OF_COLUMNS / 4:
-                case NUMBER_OF_COLUMNS / 2:
-                case NUMBER_OF_COLUMNS:
-                    metrics?.dataColumns.elapsedTimeTillReceived.observe({ receivedOrder: receivedColumns }, delaySec);
-                    break;
-            }
-            if (!blockInput.hasComputedAllData()) {
-                // immediately attempt fetch of data columns from execution engine
-                chain.getBlobsTracker.triggerGetBlobs(blockInput);
-                // if we've received at least half of the columns, trigger reconstruction of the rest
-                if (blockInput.columnCount >= NUMBER_OF_COLUMNS / 2) {
-                    chain.columnReconstructionTracker.triggerColumnReconstruction(blockInput);
+            if (isForkPostGloas(fork)) {
+                if (!isGloasDataColumnSidecar(dataColumnSidecar)) {
+                    throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
+                        code: DataColumnSidecarErrorCode.INCORRECT_TYPE,
+                        slot: dataColumnSlot,
+                        columnIndex: index,
+                        fork,
+                    });
                 }
-            }
-            if (!blockInput.hasBlockAndAllData()) {
-                const cutoffTimeMs = getCutoffTimeMs(chain, dataColumnSlot, BLOCK_AVAILABILITY_CUTOFF_MS);
-                chain.logger.debug("Received gossip data column, waiting for full data availability", {
-                    msToWait: cutoffTimeMs,
-                    dataColumnIndex: index,
-                    ...blockInputMeta,
+                // After gloas, data columns are tracked in PayloadEnvelopeInput
+                const payloadInput = await validatePayloadDataColumn(dataColumnSidecar, topic.subnet, peerIdStr, seenTimestampSec);
+                chain.serializedCache.set(dataColumnSidecar, serializedData);
+                const payloadInputMeta = payloadInput.getLogMeta();
+                const { receivedColumns } = payloadInputMeta;
+                // it's not helpful to track every single column received
+                // instead of that, track 1st, 8th, 16th 32th, 64th, and 128th column
+                switch (receivedColumns) {
+                    case 1:
+                    case config.SAMPLES_PER_SLOT:
+                    case 2 * config.SAMPLES_PER_SLOT:
+                    case NUMBER_OF_COLUMNS / 4:
+                    case NUMBER_OF_COLUMNS / 2:
+                    case NUMBER_OF_COLUMNS:
+                        metrics?.dataColumns.elapsedTimeTillReceived.observe({ receivedOrder: receivedColumns }, delaySec);
+                        break;
+                }
+                if (!payloadInput.hasComputedAllData()) {
+                    // if we've received at least half of the columns, trigger reconstruction of the rest
+                    if (receivedColumns >= NUMBER_OF_COLUMNS / 2) {
+                        chain.columnReconstructionTracker.triggerColumnReconstruction(payloadInput);
+                    }
+                    chain.logger.debug("Received gossip data column, payload envelope input not yet complete", {
+                        dataColumnIndex: index,
+                        ...payloadInputMeta,
+                    });
+                }
+                chain.processExecutionPayload(payloadInput, { validSignature: true }).catch((e) => {
+                    chain.logger.debug("Error processing execution payload from gossip data column", { slot: dataColumnSlot, root: payloadInput.blockRootHex }, e);
                 });
-                // do not await here to not delay gossip validation
-                blockInput.waitForBlockAndAllData(cutoffTimeMs).catch((_e) => {
-                    chain.logger.debug("Waited for data after receiving gossip column. Cut-off reached so attempting to fetch remainder of BlockInput", {
+            }
+            else {
+                if (config.getForkSeq(dataColumnSlot) < ForkSeq.fulu) {
+                    throw new GossipActionError(GossipAction.REJECT, { code: "PRE_FULU_BLOCK" });
+                }
+                if (isGloasDataColumnSidecar(dataColumnSidecar)) {
+                    throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
+                        code: DataColumnSidecarErrorCode.INCORRECT_TYPE,
+                        slot: dataColumnSlot,
+                        columnIndex: index,
+                        fork,
+                    });
+                }
+                // Before gloas, data columns are tracked in BlockInput
+                const blockInput = await validateBeaconDataColumn(dataColumnSidecar, serializedData, topic.subnet, peerIdStr, seenTimestampSec);
+                chain.serializedCache.set(dataColumnSidecar, serializedData);
+                const blockInputMeta = blockInput.getLogMeta();
+                const { receivedColumns } = blockInputMeta;
+                // it's not helpful to track every single column received
+                // instead of that, track 1st, 8th, 16th 32th, 64th, and 128th column
+                switch (receivedColumns) {
+                    case 1:
+                    case config.SAMPLES_PER_SLOT:
+                    case 2 * config.SAMPLES_PER_SLOT:
+                    case NUMBER_OF_COLUMNS / 4:
+                    case NUMBER_OF_COLUMNS / 2:
+                    case NUMBER_OF_COLUMNS:
+                        metrics?.dataColumns.elapsedTimeTillReceived.observe({ receivedOrder: receivedColumns }, delaySec);
+                        break;
+                }
+                if (!blockInput.hasComputedAllData()) {
+                    // immediately attempt fetch of data columns from execution engine
+                    chain.getBlobsTracker.triggerGetBlobs(blockInput);
+                    // if we've received at least half of the columns, trigger reconstruction of the rest
+                    if (blockInput.columnCount >= NUMBER_OF_COLUMNS / 2) {
+                        chain.columnReconstructionTracker.triggerColumnReconstruction(blockInput);
+                    }
+                }
+                if (!blockInput.hasBlockAndAllData()) {
+                    const cutoffTimeMs = getCutoffTimeMs(chain, dataColumnSlot, BLOCK_AVAILABILITY_CUTOFF_MS);
+                    chain.logger.debug("Received gossip data column, waiting for full data availability", {
+                        msToWait: cutoffTimeMs,
                         dataColumnIndex: index,
                         ...blockInputMeta,
                     });
-                    chain.emitter.emit(ChainEvent.incompleteBlockInput, {
-                        blockInput,
-                        peer: peerIdStr,
-                        source: BlockInputSource.gossip,
+                    // do not await here to not delay gossip validation
+                    blockInput.waitForBlockAndAllData(cutoffTimeMs).catch((_e) => {
+                        chain.logger.debug("Waited for data after receiving gossip column. Cut-off reached so attempting to fetch remainder of BlockInput", {
+                            dataColumnIndex: index,
+                            ...blockInputMeta,
+                        });
+                        chain.emitter.emit(ChainEvent.incompleteBlockInput, {
+                            blockInput,
+                            peer: peerIdStr,
+                            source: BlockInputSource.gossip,
+                        });
                     });
-                });
+                }
             }
-            // TODO GLOAS: In Gloas, also add column to PayloadEnvelopeInput and notify the payload processor:
-            // const payloadInput = chain.seenPayloadEnvelopeInput.get(blockRootHex);
-            // if (payloadInput) {
-            //   payloadInput.addColumn({columnSidecar, source: BlockInputSource.gossip, seenTimestampSec, peerIdStr});
-            //   chain.processExecutionPayload(payloadInput, {validSignature: true});
-            // }
         },
         [GossipType.beacon_aggregate_and_proof]: async ({ gossipData, topic, seenTimestampSec, }) => {
             const { serializedData } = gossipData;
@@ -584,14 +737,38 @@ function getSequentialHandlers(modules, options) {
         },
         [GossipType.execution_payload]: async ({ gossipData, topic, peerIdStr, seenTimestampSec, }) => {
             const { serializedData } = gossipData;
-            const executionPayloadEnvelope = sszDeserialize(topic, serializedData);
-            // TODO GLOAS: handle BLOCK_ROOT_UNKNOWN error to trigger sync
-            await validateGossipExecutionPayloadEnvelope(chain, executionPayloadEnvelope);
-            const slot = executionPayloadEnvelope.message.slot;
+            const signedEnvelope = sszDeserialize(topic, serializedData);
+            const envelope = signedEnvelope.message;
+            // TODO GLOAS: consider optimistically create PayloadEnvelopeInput here similar to how we do that for beacon_block
+            // so that UnknownBlockSync can handle backward sync
+            // the problem now is we cannot create a PayloadEnvelopeInput without the beacon block being known, we need at least the proposer index
+            // we can achieve that by looking into the EpochCache
+            try {
+                await validateGossipExecutionPayloadEnvelope(chain, signedEnvelope);
+            }
+            catch (e) {
+                if (e instanceof ExecutionPayloadEnvelopeError) {
+                    const { slot, beaconBlockRoot } = signedEnvelope.message;
+                    logger.debug("Gossip envelope has error", { slot, root: toRootHex(beaconBlockRoot), code: e.type.code });
+                    if (e.type.code === ExecutionPayloadEnvelopeErrorCode.BLOCK_ROOT_UNKNOWN) {
+                        // TODO GLOAS: UnknownBlockSync to handle this
+                        chain.emitter.emit(ChainEvent.envelopeUnknownBlock, {
+                            envelope: signedEnvelope,
+                            peer: peerIdStr,
+                            source: BlockInputSource.gossip,
+                        });
+                    }
+                    if (e.action === GossipAction.REJECT) {
+                        chain.persistInvalidSszValue(ssz.gloas.SignedExecutionPayloadEnvelope, signedEnvelope, `gossip_reject_slot_${slot}`);
+                    }
+                }
+                throw e;
+            }
+            const slot = envelope.slot;
             const delaySec = seenTimestampSec - computeTimeAtSlot(config, slot, chain.genesisTime);
             metrics?.gossipExecutionPayloadEnvelope.elapsedTimeTillReceived.observe({ source: OpSource.gossip }, delaySec);
-            chain.validatorMonitor?.registerExecutionPayloadEnvelope(OpSource.gossip, delaySec, executionPayloadEnvelope);
-            const blockRootHex = toRootHex(executionPayloadEnvelope.message.beaconBlockRoot);
+            chain.validatorMonitor?.registerExecutionPayloadEnvelope(OpSource.gossip, delaySec, signedEnvelope);
+            const blockRootHex = toRootHex(envelope.beaconBlockRoot);
             const payloadInput = chain.seenPayloadEnvelopeInputCache.get(blockRootHex);
             if (!payloadInput) {
                 // This shouldn't happen because beacon block should have been imported and thus payload input should have been created.
@@ -600,14 +777,20 @@ function getSequentialHandlers(modules, options) {
                     blockRoot: blockRootHex,
                 });
             }
-            chain.serializedCache.set(executionPayloadEnvelope, serializedData);
+            chain.serializedCache.set(signedEnvelope, serializedData);
             payloadInput.addPayloadEnvelope({
-                envelope: executionPayloadEnvelope,
+                envelope: signedEnvelope,
                 source: PayloadEnvelopeInputSource.gossip,
                 seenTimestampSec,
                 peerIdStr,
             });
-            // TODO GLOAS: Emit execution_payload_gossip event for gossip receipt.
+            chain.emitter.emit(routes.events.EventType.executionPayloadGossip, {
+                slot,
+                builderIndex: envelope.builderIndex,
+                blockHash: toRootHex(envelope.payload.blockHash),
+                blockRoot: blockRootHex,
+                stateRoot: toRootHex(envelope.stateRoot),
+            });
             chain.processExecutionPayload(payloadInput, { validSignature: true }).catch((e) => {
                 chain.logger.debug("Error processing execution payload from gossip", { slot, root: blockRootHex }, e);
             });