@aztec/validator-client 0.0.1-commit.2f68f620 → 0.0.1-commit.321f6a9

package/dest/validator.js

@@ -8,49 +8,23 @@ import { DateProvider } from '@aztec/foundation/timer';
 import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
 import { OffenseType, WANT_TO_CLEAR_SLASH_EVENT, WANT_TO_SLASH_EVENT, getOffenseTypeName } from '@aztec/slasher';
 import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
+import { ConsensusTimetable } from '@aztec/stdlib/timetable';
 import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { createHASigner, createLocalSignerWithProtection, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
 import { DutyType } from '@aztec/validator-ha-signer/types';
 import { EventEmitter } from 'events';
+import { DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS } from './config.js';
 import { ValidationService } from './duties/validation_service.js';
 import { HAKeyStore } from './key_store/ha_key_store.js';
 import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
 import { ValidatorMetrics } from './metrics.js';
-import { ProposalHandler } from './proposal_handler.js';
+import { ProposalHandler, SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT, SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT } from './proposal_handler.js';
 // We maintain a set of proposers who have proposed invalid blocks.
 // Just cap the set to avoid unbounded growth.
 const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
-const MAX_TRACKED_INVALID_PROPOSAL_SLOTS = 1000;
 const MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS = 1000;
 const MAX_TRACKED_BAD_ATTESTATIONS = 10_000;
-// What errors from the block proposal handler result in slashing
-const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
-    'state_mismatch',
-    'failed_txs',
-    'global_variables_mismatch',
-    'invalid_proposal',
-    'parent_block_wrong_slot',
-    'in_hash_mismatch'
-];
-const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
-    // enabled
-    ['invalid_fee_asset_price_modifier']: true,
-    ['checkpoint_header_mismatch']: true,
-    // These late mismatches should normally be caught by earlier checks, but if reached after validating the local
-    // checkpoint inputs, the proposer-signed payload disagrees with deterministic recomputation.
-    ['archive_mismatch']: true,
-    ['out_hash_mismatch']: true,
-    ['no_blocks_for_slot']: true,
-    ['too_many_blocks_in_checkpoint']: true,
-    ['checkpoint_validation_failed']: true,
-    ['last_block_archive_mismatch']: true,
-    // disabled
-    ['invalid_signature']: false,
-    ['last_block_not_found']: false,
-    ['block_fetch_error']: false,
-    ['checkpoint_already_published']: false
-};
 /**
  * Validator Client
  */ export class ValidatorClient extends EventEmitter {
@@ -78,13 +52,12 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
     epochCacheUpdateLoop;
     /** Tracks the last epoch in which each attester successfully submitted at least one attestation. */ lastAttestedEpochByAttester;
     proposersOfInvalidBlocks;
-    slotsWithInvalidProposals;
     invalidCheckpointProposalOffenseKeys;
+    oversizedProposalOffenseKeys;
     badAttestationOffenseKeys;
-    slotsWithProposalEquivocation;
     /** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */ lastAttestedProposal;
     constructor(keyStore, epochCache, p2pClient, proposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, slashingProtectionSigner, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
-        super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.proposalHandler = proposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.slashingProtectionSigner = slashingProtectionSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.lastAttestedEpochByAttester = new Map(), this.proposersOfInvalidBlocks = FifoSet.withLimit(MAX_PROPOSERS_OF_INVALID_BLOCKS), this.slotsWithInvalidProposals = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS), this.invalidCheckpointProposalOffenseKeys = FifoSet.withLimit(MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS), this.badAttestationOffenseKeys = FifoSet.withLimit(MAX_TRACKED_BAD_ATTESTATIONS), this.slotsWithProposalEquivocation = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS);
+        super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.proposalHandler = proposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.slashingProtectionSigner = slashingProtectionSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.lastAttestedEpochByAttester = new Map(), this.proposersOfInvalidBlocks = FifoSet.withLimit(MAX_PROPOSERS_OF_INVALID_BLOCKS), this.invalidCheckpointProposalOffenseKeys = FifoSet.withLimit(MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS), this.oversizedProposalOffenseKeys = FifoSet.withLimit(MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS), this.badAttestationOffenseKeys = FifoSet.withLimit(MAX_TRACKED_BAD_ATTESTATIONS);
         // Create child logger with fisherman prefix if in fisherman mode
         this.log = config.fishermanMode ? log.createChild('[FISHERMAN]') : log;
         this.tracer = telemetry.getTracer('Validator');
@@ -142,7 +115,11 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
     }
     static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, reexecutionTracker, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), slashingProtectionDb) {
         const metrics = new ValidatorMetrics(telemetry);
-        const blockProposalValidator = new BlockProposalValidator(epochCache, {
+        const consensusTimetable = new ConsensusTimetable({
+            l1Constants: epochCache.getL1Constants(),
+            blockDuration: config.blockDurationMs / 1000
+        });
+        const blockProposalValidator = new BlockProposalValidator(epochCache, consensusTimetable, {
             txsPermitted: !config.disableTransactions,
             maxTxsPerBlock: config.validateMaxTxsPerBlock,
             maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
@@ -150,9 +127,10 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
             signatureContext: {
                 chainId: config.l1ChainId,
                 rollupAddress: config.rollupAddress
-            }
+            },
+            clockDisparityMs: config.maxGossipClockDisparityMs ?? DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS
         });
-        const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, blobClient, reexecutionTracker, metrics, dateProvider, telemetry, undefined);
+        const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, consensusTimetable, config, blobClient, reexecutionTracker, metrics, dateProvider, telemetry, undefined);
         const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
         let slashingProtectionSigner;
         if (slashingProtectionDb) {
@@ -209,10 +187,10 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
         return this.config;
     }
     hasProposalEquivocation(slotNumber) {
-        return this.slotsWithProposalEquivocation.has(slotNumber);
+        return this.proposalHandler.hasProposalEquivocation(slotNumber);
     }
     hasInvalidProposals(slotNumber) {
-        return this.slotsWithInvalidProposals.has(slotNumber);
+        return this.proposalHandler.hasInvalidProposals(slotNumber);
     }
     updateConfig(config) {
         this.config = {
@@ -262,6 +240,10 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
             this.p2pClient.registerDuplicateProposalCallback((info)=>{
                 this.handleDuplicateProposal(info);
             });
+            // Oversized proposal handler - triggers slashing for proposals beyond the per-checkpoint block limit
+            this.p2pClient.registerOversizedProposalCallback((info)=>{
+                this.handleOversizedProposal(info);
+            });
             // Duplicate attestation handler - triggers slashing for attestation equivocation
             this.p2pClient.registerDuplicateAttestationCallback((info)=>{
                 this.handleDuplicateAttestation(info);
@@ -369,7 +351,7 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
         }
         // Ignore proposals from ourselves (may happen in HA setups)
         if (proposer && this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
-            this.log.debug(`Ignoring block proposal from self for slot ${proposalSlotNumber}`, {
+            this.log.debug(`Not attesting to block proposal from self for slot ${proposalSlotNumber}`, {
                 proposer: proposer.toString(),
                 proposalSlotNumber
             });
@@ -522,7 +504,8 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
         if (!SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT[result.reason]) {
             return;
         }
-        this.markInvalidProposalSlot(proposal.slotNumber);
+        // The slot is already marked invalid by the all-nodes checkpoint handler that invokes this callback,
+        // so we only emit the proposer slash event here.
         if (this.slashInvalidCheckpointProposal(proposal)) {
             this.log.info(`Detected invalid checkpoint proposal offense`, {
                 ...proposalInfo,
@@ -557,11 +540,11 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
         return true;
     }
     markInvalidProposalSlot(slotNumber) {
-        this.slotsWithInvalidProposals.add(slotNumber);
+        this.proposalHandler.markInvalidProposalSlot(slotNumber);
     }
     handleCheckpointAttestation(attestation) {
         const slotNumber = attestation.slotNumber;
-        if (!this.slotsWithInvalidProposals.has(slotNumber) || this.slotsWithProposalEquivocation.has(slotNumber)) {
+        if (!this.proposalHandler.hasInvalidProposals(slotNumber) || this.proposalHandler.hasProposalEquivocation(slotNumber)) {
             return;
         }
         const attester = attestation.getSender();
@@ -595,11 +578,37 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
         ]);
     }
     /**
+   * Handle detection of an oversized block proposal: one whose index within its checkpoint lands at or
+   * beyond the consensus per-checkpoint block limit. A single signed proposal at an illegal index is
+   * self-contained evidence, so emit an invalid-block-proposal slash event for the proposer, deduped per
+   * (proposer, slot) since the p2p layer reports every oversized proposal it stores.
+   */ handleOversizedProposal(info) {
+        const { slot, proposer } = info;
+        const offenseType = OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL;
+        if (!this.oversizedProposalOffenseKeys.addIfAbsent(`${proposer.toString()}:${offenseType}:${slot}`)) {
+            return;
+        }
+        this.log.info(`Detected oversized block proposal offense from ${proposer.toString()} at slot ${slot}`, {
+            proposer: proposer.toString(),
+            slot,
+            amount: this.config.slashBroadcastedInvalidBlockPenalty,
+            offenseType: getOffenseTypeName(offenseType)
+        });
+        this.emit(WANT_TO_SLASH_EVENT, [
+            {
+                validator: proposer,
+                amount: this.config.slashBroadcastedInvalidBlockPenalty,
+                offenseType,
+                epochOrSlot: BigInt(slot)
+            }
+        ]);
+    }
+    /**
    * Handle detection of a duplicate proposal (equivocation).
    * Emits a slash event when a proposer sends multiple proposals for the same position.
    */ handleDuplicateProposal(info) {
         const { slot, proposer, type } = info;
-        this.slotsWithProposalEquivocation.add(slot);
+        this.proposalHandler.markProposalEquivocation(slot);
         this.log.info(`Detected duplicate ${type} proposal offense from ${proposer.toString()} at slot ${slot}`, {
             proposer: proposer.toString(),
             slot,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/validator-client",
-  "version": "0.0.1-commit.2f68f620",
+  "version": "0.0.1-commit.321f6a9",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -64,30 +64,30 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-client": "0.0.1-commit.2f68f620",
-    "@aztec/blob-lib": "0.0.1-commit.2f68f620",
-    "@aztec/constants": "0.0.1-commit.2f68f620",
-    "@aztec/epoch-cache": "0.0.1-commit.2f68f620",
-    "@aztec/ethereum": "0.0.1-commit.2f68f620",
-    "@aztec/foundation": "0.0.1-commit.2f68f620",
-    "@aztec/node-keystore": "0.0.1-commit.2f68f620",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2f68f620",
-    "@aztec/p2p": "0.0.1-commit.2f68f620",
-    "@aztec/protocol-contracts": "0.0.1-commit.2f68f620",
-    "@aztec/prover-client": "0.0.1-commit.2f68f620",
-    "@aztec/simulator": "0.0.1-commit.2f68f620",
-    "@aztec/slasher": "0.0.1-commit.2f68f620",
-    "@aztec/stdlib": "0.0.1-commit.2f68f620",
-    "@aztec/telemetry-client": "0.0.1-commit.2f68f620",
-    "@aztec/validator-ha-signer": "0.0.1-commit.2f68f620",
+    "@aztec/blob-client": "0.0.1-commit.321f6a9",
+    "@aztec/blob-lib": "0.0.1-commit.321f6a9",
+    "@aztec/constants": "0.0.1-commit.321f6a9",
+    "@aztec/epoch-cache": "0.0.1-commit.321f6a9",
+    "@aztec/ethereum": "0.0.1-commit.321f6a9",
+    "@aztec/foundation": "0.0.1-commit.321f6a9",
+    "@aztec/node-keystore": "0.0.1-commit.321f6a9",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.321f6a9",
+    "@aztec/p2p": "0.0.1-commit.321f6a9",
+    "@aztec/protocol-contracts": "0.0.1-commit.321f6a9",
+    "@aztec/prover-client": "0.0.1-commit.321f6a9",
+    "@aztec/simulator": "0.0.1-commit.321f6a9",
+    "@aztec/slasher": "0.0.1-commit.321f6a9",
+    "@aztec/stdlib": "0.0.1-commit.321f6a9",
+    "@aztec/telemetry-client": "0.0.1-commit.321f6a9",
+    "@aztec/validator-ha-signer": "0.0.1-commit.321f6a9",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.1-commit.2f68f620",
-    "@aztec/world-state": "0.0.1-commit.2f68f620",
+    "@aztec/archiver": "0.0.1-commit.321f6a9",
+    "@aztec/world-state": "0.0.1-commit.321f6a9",
     "@electric-sql/pglite": "^0.3.14",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",

package/src/checkpoint_builder.ts

@@ -9,12 +9,13 @@ import { DateProvider, elapsed } from '@aztec/foundation/timer';
 import { createTxValidatorForBlockBuilding, getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
 import { LightweightCheckpointBuilder } from '@aztec/prover-client/light';
 import {
+  type AvmSimulator,
   GuardedMerkleTreeOperations,
   PublicContractsDB,
   PublicProcessor,
   createPublicTxSimulatorForBlockBuilding,
 } from '@aztec/simulator/server';
-import { L2Block } from '@aztec/stdlib/block';
+import { type BlockHash, L2Block } from '@aztec/stdlib/block';
 import { Checkpoint } from '@aztec/stdlib/checkpoint';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
@@ -57,6 +58,7 @@ export class CheckpointBuilder implements ICheckpointBlockBuilder {
     private contractDataSource: ContractDataSource,
     private dateProvider: DateProvider,
     private telemetryClient: TelemetryClient,
+    private avmSimulator: AvmSimulator,
     bindings?: LoggerBindings,
     private debugLogStore: DebugLogStore = new NullDebugLogStore(),
   ) {
@@ -219,10 +221,12 @@ export class CheckpointBuilder implements ICheckpointBlockBuilder {
     if (opts.isBuildingProposal) {
       const remainingBlocks = Math.max(1, opts.maxBlocksPerCheckpoint - existingBlocks.length);
       const multiplier = opts.perBlockAllocationMultiplier;
+      // DA gas and blob fields use a higher multiplier so the largest contract class deploy fits a block.
+      const daMultiplier = opts.perBlockDAAllocationMultiplier ?? multiplier;
 
       cappedL2Gas = Math.min(cappedL2Gas, Math.ceil((remainingMana / remainingBlocks) * multiplier));
-      cappedDAGas = Math.min(cappedDAGas, Math.ceil((remainingDAGas / remainingBlocks) * multiplier));
-      cappedBlobFields = Math.min(cappedBlobFields, Math.ceil((maxBlobFieldsForTxs / remainingBlocks) * multiplier));
+      cappedDAGas = Math.min(cappedDAGas, Math.ceil((remainingDAGas / remainingBlocks) * daMultiplier));
+      cappedBlobFields = Math.min(cappedBlobFields, Math.ceil((maxBlobFieldsForTxs / remainingBlocks) * daMultiplier));
       cappedMaxTransactions = Math.min(cappedMaxTransactions, Math.ceil((remainingTxs / remainingBlocks) * multiplier));
     }
 
@@ -241,16 +245,18 @@ export class CheckpointBuilder implements ICheckpointBlockBuilder {
     const contractsDB = this.contractsDB;
     const guardedFork = new GuardedMerkleTreeOperations(fork);
 
-    const collectDebugLogs = this.debugLogStore.isEnabled;
-
     const bindings = this.log.getBindings();
+    // Extract the WSDB fork ID so the C++ AVM can modify the same fork in-place; the simulator reads
+    // contract data from `contractsDB`, scoped to this fork for the duration of each simulation.
+    const wsdbForkId = fork.getRevision().forkId;
     const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(
-      guardedFork,
-      contractsDB,
+      this.avmSimulator,
       globalVariables,
+      contractsDB,
+      wsdbForkId,
       this.telemetryClient,
       bindings,
-      collectDebugLogs,
+      this.debugLogStore?.isEnabled ?? false,
     );
 
     const processor = new PublicProcessor(
@@ -289,6 +295,7 @@ export class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
     private worldState: WorldStateSynchronizer,
     private contractDataSource: ContractDataSource,
     private dateProvider: DateProvider,
+    private avmSimulator: AvmSimulator,
     private telemetryClient: TelemetryClient = getTelemetryClient(),
     private debugLogStore: DebugLogStore = new NullDebugLogStore(),
   ) {
@@ -344,6 +351,7 @@ export class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
       this.contractDataSource,
       this.dateProvider,
       this.telemetryClient,
+      this.avmSimulator,
       bindings,
       this.debugLogStore,
     );
@@ -405,13 +413,23 @@ export class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
       this.contractDataSource,
       this.dateProvider,
       this.telemetryClient,
+      this.avmSimulator,
       bindings,
       this.debugLogStore,
     );
   }
 
-  /** Returns a fork of the world state at the given block number. */
-  getFork(blockNumber: BlockNumber): Promise<MerkleTreeWriteOperations> {
+  /**
+   * Syncs world state to the given block number and returns a fork of it at that block.
+   *
+   * Syncing first is required: the block source (archiver) can already hold a block while world state
+   * still trails it, and forking a not-yet-applied block throws a raw "initialize from future block"
+   * tree error. syncImmediate blocks until world state reaches the block, or throws a typed error if it
+   * genuinely cannot. When `blockHash` is provided it is verified against the synced block, triggering a
+   * resync on mismatch (reorg detection).
+   */
+  async getFork(blockNumber: BlockNumber, blockHash?: BlockHash): Promise<MerkleTreeWriteOperations> {
+    await this.worldState.syncImmediate(blockNumber, blockHash);
     return this.worldState.fork(blockNumber);
   }
 }

package/src/config.ts

@@ -4,15 +4,26 @@ import {
   getConfigFromMappings,
   numberConfigHelper,
   optionalNumberConfigHelper,
+  pickConfigMappings,
   secretValueConfigHelper,
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { type SequencerConfig, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
 import { localSignerConfigMappings, validatorHASignerConfigMappings } from '@aztec/stdlib/ha-signing';
 import type { ValidatorClientConfig } from '@aztec/stdlib/interfaces/server';
 
 export type { ValidatorClientConfig };
 
-export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientConfig> = {
+/**
+ * Default clock-disparity tolerance (ms) for proposal/attestation receive windows, mirroring the p2p config
+ * default. Used by the validator-client validators when the merged node config does not carry the value.
+ */
+export const DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS = 500;
+
+export const validatorClientConfigMappings: ConfigMappingsType<
+  ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'>
+> = {
+  ...pickConfigMappings(sharedSequencerConfigMappings, ['blockDurationMs']),
   validatorPrivateKeys: {
     env: 'VALIDATOR_PRIVATE_KEYS',
     description: 'List of private keys of the validators participating in attestation duties',
@@ -112,6 +123,8 @@ export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientCo
  * Note: If an environment variable is not set, the default value is used.
  * @returns The validator configuration.
  */
-export function getProverEnvVars(): ValidatorClientConfig {
-  return getConfigFromMappings<ValidatorClientConfig>(validatorClientConfigMappings);
+export function getProverEnvVars(): ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'> {
+  return getConfigFromMappings<ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'>>(
+    validatorClientConfigMappings,
+  );
 }

package/src/factory.ts

@@ -7,10 +7,12 @@ import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
 import type { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
 import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import { ConsensusTimetable } from '@aztec/stdlib/timetable';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 import type { SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
 
 import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
+import { DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS } from './config.js';
 import { ValidatorMetrics } from './metrics.js';
 import { ProposalHandler } from './proposal_handler.js';
 import { ValidatorClient } from './validator.js';
@@ -31,7 +33,11 @@ export function createProposalHandler(
   },
 ) {
   const metrics = new ValidatorMetrics(deps.telemetry);
-  const blockProposalValidator = new BlockProposalValidator(deps.epochCache, {
+  const consensusTimetable = new ConsensusTimetable({
+    l1Constants: deps.epochCache.getL1Constants(),
+    blockDuration: config.blockDurationMs / 1000,
+  });
+  const blockProposalValidator = new BlockProposalValidator(deps.epochCache, consensusTimetable, {
     txsPermitted: !config.disableTransactions,
     maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
     maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
@@ -39,6 +45,7 @@ export function createProposalHandler(
       chainId: config.l1ChainId,
       rollupAddress: config.rollupAddress,
     },
+    clockDisparityMs: config.maxGossipClockDisparityMs ?? DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS,
   });
   return new ProposalHandler(
     deps.checkpointsBuilder,
@@ -48,6 +55,7 @@ export function createProposalHandler(
     deps.p2pClient.getTxProvider(),
     blockProposalValidator,
     deps.epochCache,
+    consensusTimetable,
     config,
     deps.blobClient,
     deps.reexecutionTracker,

package/src/key_store/web3signer_key_store.ts

@@ -8,6 +8,9 @@ import type { TypedDataDefinition } from 'viem';
 
 import type { ValidatorKeyStore } from './interface.js';
 
+/** Default hard timeout (ms) applied to each Web3Signer HTTP request. */
+const DEFAULT_WEB3SIGNER_REQUEST_TIMEOUT_MS = 30_000;
+
 /**
  * Web3Signer Key Store
  *
@@ -15,10 +18,15 @@ import type { ValidatorKeyStore } from './interface.js';
  * This implementation uses the Web3Signer JSON-RPC API for secp256k1 signatures.
  */
 export class Web3SignerKeyStore implements ValidatorKeyStore {
+  private readonly requestTimeoutMs: number;
+
   constructor(
     private addresses: EthAddress[],
     private baseUrl: string,
-  ) {}
+    requestTimeoutMs: number = DEFAULT_WEB3SIGNER_REQUEST_TIMEOUT_MS,
+  ) {
+    this.requestTimeoutMs = requestTimeoutMs;
+  }
 
   /**
    * Get the address of a signer by index
@@ -108,75 +116,50 @@ export class Web3SignerKeyStore implements ValidatorKeyStore {
    * @param data - The data to sign
    * @returns The signature
    */
-  private async makeJsonRpcSignRequest(address: EthAddress, data: Buffer32): Promise<Signature> {
-    const url = this.baseUrl;
-
-    // Use JSON-RPC eth_sign method which automatically applies Ethereum message prefixing
-    const body = {
+  private makeJsonRpcSignRequest(address: EthAddress, data: Buffer32): Promise<Signature> {
+    // eth_sign automatically applies Ethereum message prefixing to the raw data.
+    return this.sendSignRequest({
       jsonrpc: '2.0',
       method: 'eth_sign',
-      params: [
-        address.toString(), // Ethereum address as identifier
-        data.toString(), // Raw data to sign (eth_sign will apply Ethereum message prefix)
-      ],
+      params: [address.toString(), data.toString()],
       id: 1,
-    };
-
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(body),
     });
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`Web3Signer request failed: ${response.status} ${response.statusText} - ${errorText}`);
-    }
-
-    const result = await response.json();
-
-    // Handle JSON-RPC response format
-    if (result.error) {
-      throw new Error(`Web3Signer JSON-RPC error: ${result.error.code} - ${result.error.message}`);
-    }
-
-    if (!result.result) {
-      throw new Error('Invalid response from Web3Signer: no result found');
-    }
-
-    let signatureHex = result.result;
-
-    // Ensure the signature has the 0x prefix
-    if (!signatureHex.startsWith('0x')) {
-      signatureHex = '0x' + signatureHex;
-    }
-
-    // Parse the signature from the hex string
-    return normalizeSignature(Signature.fromString(signatureHex as `0x${string}`));
   }
 
-  private async makeJsonRpcSignTypedDataRequest(
-    address: EthAddress,
-    typedData: TypedDataDefinition,
-  ): Promise<Signature> {
-    const url = this.baseUrl;
-
-    const body = {
+  private makeJsonRpcSignTypedDataRequest(address: EthAddress, typedData: TypedDataDefinition): Promise<Signature> {
+    return this.sendSignRequest({
       jsonrpc: '2.0',
       method: 'eth_signTypedData',
       params: [address.toString(), JSON.stringify(typedData)],
       id: 1,
-    };
-
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(body),
     });
+  }
+
+  /**
+   * Send a JSON-RPC request to Web3Signer under a hard request timeout and parse the signature.
+   * A timed-out or aborted request is surfaced as a clear timeout error rather than hanging, so a
+   * slow or unreachable signer cannot stall an HA signing operation past its own timeout budget.
+   */
+  private async sendSignRequest(body: object): Promise<Signature> {
+    let response: Response;
+    try {
+      response = await fetch(this.baseUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(this.requestTimeoutMs),
+      });
+    } catch (err) {
+      if (
+        (err instanceof Error || err instanceof DOMException) &&
+        (err.name === 'TimeoutError' || err.name === 'AbortError')
+      ) {
+        throw new Error(`Web3Signer request timed out after ${this.requestTimeoutMs}ms`);
+      }
+      throw err;
+    }
 
     if (!response.ok) {
       const errorText = await response.text();
@@ -185,6 +168,7 @@ export class Web3SignerKeyStore implements ValidatorKeyStore {
 
     const result = await response.json();
 
+    // Handle JSON-RPC response format
     if (result.error) {
       throw new Error(`Web3Signer JSON-RPC error: ${result.error.code} - ${result.error.message}`);
     }