fix: validators use timetable to calculate re-execution deadline

Author: danielntmd

yarn-project/foundation/src/config/env_var.ts

@@ -305,7 +305,6 @@ export type EnvVar =
   | 'K8S_POD_NAME'
   | 'K8S_POD_UID'
   | 'K8S_NAMESPACE_NAME'
-  | 'VALIDATOR_REEXECUTE_DEADLINE_MS'
   | 'AUTO_UPDATE'
   | 'AUTO_UPDATE_URL'
   | 'WEB3_SIGNER_URL'

yarn-project/p2p/src/client/p2p_client.ts

@@ -22,6 +22,7 @@ import {
   type CheckpointProposal,
   type P2PClientType,
 } from '@aztec/stdlib/p2p';
+import { getCheckpointFinalizationTimeMs } from '@aztec/stdlib/timetable';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
 import { Attributes, type TelemetryClient, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 
@@ -116,10 +117,17 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     // validator-client code into here so we can validate a proposal is reasonable.
     this.registerBlockProposalHandler(async (block, sender) => {
       this.log.debug(`Received block proposal from ${sender.toString()}`);
-      // TODO(palla/txs): Need to subtract validatorReexecuteDeadlineMs from this deadline (see ValidatorClient.getReexecutionDeadline)
       const constants = this.txCollection.getConstants();
       const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(block.slotNumber + 1), constants));
-      const deadline = new Date(nextSlotTimestampSeconds * 1000);
+      const deadline = new Date(
+        nextSlotTimestampSeconds * 1000 -
+          getCheckpointFinalizationTimeMs({
+            ethereumSlotDuration: constants.ethereumSlotDuration,
+            // default mirrors sequencer defaults
+            l1PublishingTime: this.config.l1PublishingTime,
+            p2pPropagationTime: this.config.attestationPropagationTime,
+          }),
+      );
       const parentBlock = await this.l2BlockSource.getBlockHeaderByArchive(block.blockHeader.lastArchive.root);
       if (!parentBlock) {
         this.log.debug(`Cannot collect txs for proposal as parent block not found`);

yarn-project/p2p/src/config.ts

@@ -167,6 +167,12 @@ export interface P2PConfig extends P2PReqRespConfig, ChainConfig, TxCollectionCo
 
   /** Whether to run in fisherman mode: validates all proposals and attestations but does not broadcast attestations or participate in consensus */
   fishermanMode: boolean;
+
+  /** One-way p2p propagation time (seconds). */
+  attestationPropagationTime?: number;
+
+  /** Time reserved for L1 publishing (seconds). */
+  l1PublishingTime?: number;
 }
 
 export const DEFAULT_P2P_PORT = 40400;
@@ -431,6 +437,12 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
       'Whether to run in fisherman mode: validates all proposals and attestations but does not broadcast attestations or participate in consensus.',
     ...booleanConfigHelper(false),
   },
+  attestationPropagationTime: {
+    description: 'One-way p2p propagation time (seconds).',
+  },
+  l1PublishingTime: {
+    description: 'Time reserved for L1 publishing (seconds).',
+  },
   ...p2pReqRespConfigMappings,
   ...chainConfigMappings,
   ...txCollectionConfigMappings,

yarn-project/sequencer-client/src/config.ts

@@ -13,6 +13,7 @@ import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type ChainConfig, type SequencerConfig, chainConfigMappings } from '@aztec/stdlib/config';
 import type { ResolvedSequencerConfig } from '@aztec/stdlib/interfaces/server';
+import { DEFAULT_ATTESTATION_PROPAGATION_TIME_SECONDS } from '@aztec/stdlib/timetable/constants';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 
 import {
@@ -25,7 +26,7 @@ import {
 export * from './publisher/config.js';
 export type { SequencerConfig };
 
-export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
+export const DEFAULT_ATTESTATION_PROPAGATION_TIME = DEFAULT_ATTESTATION_PROPAGATION_TIME_SECONDS;
 
 /**
  * Default values for SequencerConfig.

yarn-project/sequencer-client/src/sequencer/timetable.ts

@@ -1,4 +1,10 @@
 import { createLogger } from '@aztec/aztec.js/log';
+import { getCheckpointFinalizationTimeSeconds } from '@aztec/stdlib/timetable';
+import {
+  DEFAULT_CHECKPOINT_ASSEMBLE_TIME_SECONDS,
+  TEST_CHECKPOINT_ASSEMBLE_TIME_SECONDS,
+  TEST_FAST_TIMING_ETHEREUM_SLOT_THRESHOLD_SECONDS,
+} from '@aztec/stdlib/timetable/constants';
 
 import { DEFAULT_ATTESTATION_PROPAGATION_TIME as DEFAULT_P2P_PROPAGATION_TIME } from '../config.js';
 import { SequencerTooSlowError } from './errors.js';
@@ -7,7 +13,7 @@ import { SequencerState } from './utils.js';
 
 export const MIN_EXECUTION_TIME = 2;
 export const CHECKPOINT_INITIALIZATION_TIME = 1;
-export const CHECKPOINT_ASSEMBLE_TIME = 1;
+export const CHECKPOINT_ASSEMBLE_TIME = DEFAULT_CHECKPOINT_ASSEMBLE_TIME_SECONDS;
 
 export class SequencerTimetable {
   /**
@@ -89,9 +95,9 @@ export class SequencerTimetable {
     this.enforce = opts.enforce;
 
     // Assume zero-cost propagation time and faster runs in test environments where L1 slot duration is shortened
-    if (this.ethereumSlotDuration < 8) {
+    if (this.ethereumSlotDuration < TEST_FAST_TIMING_ETHEREUM_SLOT_THRESHOLD_SECONDS) {
       this.p2pPropagationTime = 0;
-      this.checkpointAssembleTime = 0.5;
+      this.checkpointAssembleTime = TEST_CHECKPOINT_ASSEMBLE_TIME_SECONDS;
       this.checkpointInitializationTime = 0.5;
       this.minExecutionTime = 1;
     }
@@ -106,10 +112,11 @@ export class SequencerTimetable {
     this.initializationOffset = this.checkpointInitializationTime;
 
     // Calculate total checkpoint finalization time (assembly + attestations + L1 publishing)
-    this.checkpointFinalizationTime =
-      this.checkpointAssembleTime +
-      this.p2pPropagationTime * 2 + // Round-trip propagation
-      this.l1PublishingTime; // L1 publishing
+    this.checkpointFinalizationTime = getCheckpointFinalizationTimeSeconds({
+      ethereumSlotDuration: this.ethereumSlotDuration,
+      l1PublishingTime: this.l1PublishingTime,
+      p2pPropagationTime: this.p2pPropagationTime,
+    });
 
     // Calculate maximum number of blocks that fit in this slot
     if (!this.blockDuration) {

yarn-project/stdlib/package.json

@@ -50,6 +50,8 @@
     "./interfaces/prover-config": "./dest/interfaces/prover-client.js",
     "./interfaces/api-limit": "./dest/interfaces/api_limit.js",
     "./epoch-helpers": "./dest/epoch-helpers/index.js",
+    "./timetable": "./dest/timetable/index.js",
+    "./timetable/constants": "./dest/timetable/constants.js",
     "./config": "./dest/config/index.js",
     "./testing/jest": "./dest/tests/jest.js",
     "./database-version": "./dest/database-version/index.js",

yarn-project/stdlib/src/interfaces/validator.ts

@@ -59,7 +59,10 @@ export type ValidatorClientConfig = ValidatorHASignerConfig & {
 };
 
 export type ValidatorClientFullConfig = ValidatorClientConfig &
-  Pick<SequencerConfig, 'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal'> &
+  Pick<
+    SequencerConfig,
+    'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal' | 'attestationPropagationTime' | 'l1PublishingTime'
+  > &
   Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'> & {
     /**
      * Whether transactions are disabled for this node
@@ -86,6 +89,8 @@ export const ValidatorClientFullConfigSchema = zodFor<Omit<ValidatorClientFullCo
   ValidatorClientConfigSchema.extend({
     txPublicSetupAllowList: z.array(AllowedElementSchema).optional(),
     broadcastInvalidBlockProposal: z.boolean().optional(),
+    attestationPropagationTime: z.number().optional(),
+    l1PublishingTime: z.number().optional(),
     slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
     disableTransactions: z.boolean().optional(),
   }),

yarn-project/stdlib/src/timetable/constants.ts

@@ -0,0 +1,21 @@
+/**
+ * Shared timing defaults used by the sequencer timetable and validator/p2p deadline cutoffs.
+ *
+ * Keep these in stdlib so components can agree on timing without importing sequencer-client
+ * (which would create dependency cycles).
+ */
+
+/** Default one-way p2p propagation time (seconds). */
+export const DEFAULT_ATTESTATION_PROPAGATION_TIME_SECONDS = 2;
+
+/** Default time spent assembling a checkpoint after building the last block (seconds). */
+export const DEFAULT_CHECKPOINT_ASSEMBLE_TIME_SECONDS = 1;
+
+/**
+ * In test environments we often shorten the L1 slot duration; the sequencer timetable assumes
+ * faster propagation/assembly in that case. This threshold matches that behavior.
+ */
+export const TEST_FAST_TIMING_ETHEREUM_SLOT_THRESHOLD_SECONDS = 8;
+
+/** Checkpoint assembly time (seconds) when running with shortened L1 slots (test mode). */
+export const TEST_CHECKPOINT_ASSEMBLE_TIME_SECONDS = 0.5;

yarn-project/stdlib/src/timetable/index.ts

@@ -0,0 +1,38 @@
+import {
+  DEFAULT_ATTESTATION_PROPAGATION_TIME_SECONDS,
+  DEFAULT_CHECKPOINT_ASSEMBLE_TIME_SECONDS,
+  TEST_CHECKPOINT_ASSEMBLE_TIME_SECONDS,
+  TEST_FAST_TIMING_ETHEREUM_SLOT_THRESHOLD_SECONDS,
+} from './constants.js';
+
+export * from './constants.js';
+
+/**
+ * Returns the amount of time reserved at the end of an Aztec slot (in seconds) for checkpoint finalization.
+ */
+export function getCheckpointFinalizationTimeSeconds(opts: {
+  ethereumSlotDuration: number;
+  l1PublishingTime?: number;
+  p2pPropagationTime?: number;
+}): number {
+  const l1PublishingTime = opts.l1PublishingTime ?? opts.ethereumSlotDuration;
+  let p2pPropagationTime = opts.p2pPropagationTime ?? DEFAULT_ATTESTATION_PROPAGATION_TIME_SECONDS;
+  let checkpointAssembleTime = DEFAULT_CHECKPOINT_ASSEMBLE_TIME_SECONDS;
+
+  // Assume zero-cost propagation and faster runs in test environments where L1 slot duration is shortened
+  if (opts.ethereumSlotDuration < TEST_FAST_TIMING_ETHEREUM_SLOT_THRESHOLD_SECONDS) {
+    p2pPropagationTime = 0;
+    checkpointAssembleTime = TEST_CHECKPOINT_ASSEMBLE_TIME_SECONDS;
+  }
+
+  return checkpointAssembleTime + p2pPropagationTime * 2 + l1PublishingTime;
+}
+
+/** Convenience helper: checkpoint finalization window in milliseconds. */
+export function getCheckpointFinalizationTimeMs(opts: {
+  ethereumSlotDuration: number;
+  l1PublishingTime?: number;
+  p2pPropagationTime?: number;
+}): number {
+  return Math.ceil(getCheckpointFinalizationTimeSeconds(opts) * 1000);
+}

yarn-project/validator-client/README.md

@@ -161,7 +161,6 @@ Time | Proposer                     | Validator
 | `fishermanMode`                       | Validate proposals but don't broadcast attestations (monitoring only) |
 | `alwaysReexecuteBlockProposals`       | Force re-execution even when not in committee                         |
 | `slashBroadcastedInvalidBlockPenalty` | Penalty amount for invalid proposals (0 = disabled)                   |
-| `validatorReexecuteDeadlineMs`        | Time reserved at end of slot for propagation/publishing               |
 | `attestationPollingIntervalMs`        | How often to poll for attestations when collecting                    |
 | `disabledValidators`                  | Validator addresses to exclude from duties                            |