feat: gloas range sync #9242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

twoeths wants to merge 49 commits into nc/alpha.5-vibe from nc/alpha.5-vibe-te/range_sync

packages/api/src/beacon/routes/beacon/block.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -606,7 +606,7 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
  
          method: "POST",

          req: {

            writeReqJson: ({signedExecutionPayloadEnvelope}) => {

              const fork = config.getForkName(signedExecutionPayloadEnvelope.message.slot);

              const fork = config.getForkName(signedExecutionPayloadEnvelope.message.payload.slotNumber);

              return {

                body: getPostGloasForkTypes(fork).SignedExecutionPayloadEnvelope.toJson(signedExecutionPayloadEnvelope),

                headers: {

    @@ -621,7 +621,7 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
  
              };

            },

            writeReqSsz: ({signedExecutionPayloadEnvelope}) => {

              const fork = config.getForkName(signedExecutionPayloadEnvelope.message.slot);

              const fork = config.getForkName(signedExecutionPayloadEnvelope.message.payload.slotNumber);

              return {

                body: getPostGloasForkTypes(fork).SignedExecutionPayloadEnvelope.serialize(signedExecutionPayloadEnvelope),

                headers: {

packages/api/src/beacon/routes/events.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -186,15 +186,13 @@ export type EventData = { @@
         builderIndex: BuilderIndex;
         blockHash: RootHex;
         blockRoot: RootHex;
-        stateRoot: RootHex;
         executionOptimistic: boolean;
       };
       [EventType.executionPayloadGossip]: {
         slot: Slot;
         builderIndex: BuilderIndex;
         blockHash: RootHex;
         blockRoot: RootHex;
-        stateRoot: RootHex;
       };
       [EventType.executionPayloadAvailable]: {
         slot: Slot;
@@ Expand Down Expand Up @@
             builderIndex: ssz.BuilderIndex,
             blockHash: stringType,
             blockRoot: stringType,
-            stateRoot: stringType,
             executionOptimistic: ssz.Boolean,
           },
           {jsonCase: "eth2"}
@@ Expand All @@
             builderIndex: ssz.BuilderIndex,
             blockHash: stringType,
             blockRoot: stringType,
-            stateRoot: stringType,
           },
           {jsonCase: "eth2"}
         ),
@@ Expand Down @@

packages/api/test/unit/beacon/testData/events.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -279,15 +279,13 @@ export const eventTestData: EventData = { @@
         builderIndex: 42,
         blockHash: "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
         blockRoot: "0x9a2fefd2fdb57f74993c7780ea5b9030d2897b615b89f808011ca5aebed54eaf",
-        stateRoot: "0x600e852a08c1200654ddf11025f1ceacb3c2e74bdd5c630cde0838b2591b69f9",
         executionOptimistic: false,
       },
       [EventType.executionPayloadGossip]: {
         slot: 10,
         builderIndex: 42,
         blockHash: "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
         blockRoot: "0x9a2fefd2fdb57f74993c7780ea5b9030d2897b615b89f808011ca5aebed54eaf",
-        stateRoot: "0x600e852a08c1200654ddf11025f1ceacb3c2e74bdd5c630cde0838b2591b69f9",
       },
       [EventType.executionPayloadAvailable]: {
         slot: 10,
@@ Expand Down @@

packages/beacon-node/src/api/impl/beacon/blocks/index.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -234,7 +234,7 @@ export function getBeaconBlockApi({
  
              }

              try {

                await verifyBlocksInEpoch.call(chain as BeaconChain, parentBlock, [blockForImport], {

                await verifyBlocksInEpoch.call(chain as BeaconChain, parentBlock, [blockForImport], null, {

                  ...opts,

                  verifyOnly: true,

                  skipVerifyBlockSignatures: true,

    @@ -651,11 +651,11 @@ export function getBeaconBlockApi({
  
        async publishExecutionPayloadEnvelope({signedExecutionPayloadEnvelope}) {

          const seenTimestampSec = Date.now() / 1000;

          const envelope = signedExecutionPayloadEnvelope.message;

          const slot = envelope.slot;

          const slot = envelope.payload.slotNumber;

          const fork = config.getForkName(slot);

          const blockRootHex = toRootHex(envelope.beaconBlockRoot);

          const blockHashHex = toRootHex(envelope.payload.blockHash);

          const stateRootHex = toRootHex(envelope.stateRoot);

          // stateRoot removed from envelope in consensus-specs#5094

          if (!isForkPostGloas(fork)) {

            throw new ApiError(400, `publishExecutionPayloadEnvelope not supported for pre-gloas fork=${fork}`);

    @@ -740,7 +740,6 @@ export function getBeaconBlockApi({
  
            slot,

            blockRoot: blockRootHex,

            blockHash: blockHashHex,

            stateRoot: stateRootHex,

            builderIndex: envelope.builderIndex,

            isSelfBuild,

            dataColumns: dataColumnSidecars.length,

    @@ -768,7 +767,6 @@ export function getBeaconBlockApi({
  
            builderIndex: envelope.builderIndex,

            blockHash: blockHashHex,

            blockRoot: blockRootHex,

            stateRoot: stateRootHex,

          });

          const sentPeersArr = await publishPromise;

packages/beacon-node/src/api/impl/lodestar/index.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -118,7 +118,7 @@ export function getLodestarApi({ @@
           return {
             // biome-ignore lint/complexity/useLiteralKeys: The `blockProcessor` is a protected attribute
             data: (chain as BeaconChain)["blockProcessor"].jobQueue.getItems().map((item) => {
-              const [blockInputs, opts] = item.args;
+              const [blockInputs, _payloadEnvelopes, opts] = item.args;
               return {
                 blockSlots: blockInputs.map((blockInput) => blockInput.slot),
                 jobOpts: opts,
@@ Expand Down @@

packages/beacon-node/src/api/impl/validator/index.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -1648,10 +1648,6 @@ export function getValidatorApi( @@
             executionRequests: executionRequests,
             builderIndex: BUILDER_INDEX_SELF_BUILD,
             beaconBlockRoot,
-            slot,
-            // TODO GLOAS: stateRoot is no longer computed during block production.
-            // This field will be removed when we implement defer payload processing
-            stateRoot: ZERO_HASH,
           };
           logger.info("Produced execution payload envelope", {
@@ Expand Down @@

packages/beacon-node/src/chain/GetBlobsTracker.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ export class GetBlobsTracker { @@
         this.config = init.config;
       }
-      triggerGetBlobs(input: IBlockInput | PayloadEnvelopeInput, onComplete?: () => void): void {
+      triggerGetBlobs(input: IBlockInput | PayloadEnvelopeInput): void {
         if (this.activeReconstructions.has(input.blockRootHex)) {
           return;
         }
@@ Expand Down Expand Up / @@ -101,7 +101,6 @@ export class GetBlobsTracker { @@
             .then((result) => {
               this.logger.debug("getBlobsV2 result for block", {...logCtx, result});
               this.metrics?.dataColumns.dataColumnEngineResult.inc({result});
-              onComplete?.();
             })
             .catch((error) => {
               this.logger.debug("Error during getBlobsV2 for block", logCtx, error as Error);
@@ Expand Down @@

packages/beacon-node/src/chain/blocks/importBlock.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -128,15 +128,17 @@ export async function importBlock( @@
         blockDelaySec,
         currentSlot,
         fork >= ForkSeq.gloas ? ExecutionStatus.PayloadSeparated : executionStatus,
+        // TODO GLOAS: this is not useful post-gloas, may need to remove it?
         dataAvailabilityStatus
       );
       // This adds the state necessary to process the next block
       // Some block event handlers require state being in state cache so need to do this before emitting EventType.block
       this.regen.processState(blockRootHex, postState);
-      // For Gloas blocks, create PayloadEnvelopeInput so it's available for later payload import
-      if (fork >= ForkSeq.gloas) {
+      // For range sync, PayloadEnvelope is created before reaching this
+      // we also don't need to trigger getBlobs() in that case
+      if (fork >= ForkSeq.gloas && !opts.fromRangeSync) {
         const payloadInput = this.seenPayloadEnvelopeInputCache.add({
           blockRootHex,
           block: block as SignedBeaconBlock<ForkPostGloas>,
@@ Expand All / @@ -152,21 +154,11 @@ export async function importBlock( @@
           ...(opts.seenTimestampSec !== undefined ? {recvToImport: Date.now() / 1000 - opts.seenTimestampSec} : {}),
         });
-        // Immediately attempt fetch of data columns from execution engine as the bid contains kzg commitments
-        // which is all the information we need so there is no reason to delay until execution payload arrives
-        // TODO GLOAS: If we want EL retries after this initial attempt, add an explicit retry policy here
-        // (for example later in the slot). Do not couple retries to incoming gossip columns.
-        this.getBlobsTracker.triggerGetBlobs(payloadInput, () => {
-          // TODO GLOAS: come up with a better mechanism to trigger processExecutionPayload after data becomes available,
-          // similar to how pre-gloas uses waitForBlockAndAllData with a cutoff timeout and incompleteBlockInput event
-          this.processExecutionPayload(payloadInput, {validSignature: true}).catch((e) => {
-            this.logger.debug(
-              "Error processing execution payload after getBlobs",
-              {slot: blockSlot, root: blockRootHex},
-              e as Error
-            );
-          });
-        });
+        // Gossip path: immediately attempt fetch of data columns from execution engine. The bid
+        // contains kzg commitments, which is all we need — no reason to delay until the execution
+        // payload arrives. Columns fetched here feed payloadInput.addColumn, which resolves
+        // waitForAllData for any in-flight importExecutionPayload.
+        this.getBlobsTracker.triggerGetBlobs(payloadInput);
       }
       this.metrics?.importBlock.bySource.inc({source: source.source});
@@ Expand Down @@

Navigation Menu

Uh oh!

Uh oh!

feat: gloas range sync #9242

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!