@aztec/validator-client 0.0.1-commit.3e3d0c9cd → 0.0.1-commit.3f5453c7b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/src/validator.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import type { BlobClientInterface } from '@aztec/blob-client/client';
2
2
  import { type Blob, getBlobsPerL1Block } from '@aztec/blob-lib';
3
3
  import type { EpochCache } from '@aztec/epoch-cache';
4
- import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
5
4
  import {
6
5
  BlockNumber,
7
6
  CheckpointNumber,
@@ -10,11 +9,9 @@ import {
10
9
  SlotNumber,
11
10
  } from '@aztec/foundation/branded-types';
12
11
  import { Fr } from '@aztec/foundation/curves/bn254';
13
- import { TimeoutError } from '@aztec/foundation/error';
14
12
  import type { EthAddress } from '@aztec/foundation/eth-address';
15
13
  import type { Signature } from '@aztec/foundation/eth-signature';
16
14
  import { type LogData, type Logger, createLogger } from '@aztec/foundation/log';
17
- import { retryUntil } from '@aztec/foundation/retry';
18
15
  import { RunningPromise } from '@aztec/foundation/running-promise';
19
16
  import { sleep } from '@aztec/foundation/sleep';
20
17
  import { DateProvider } from '@aztec/foundation/timer';
@@ -23,17 +20,15 @@ import type { DuplicateAttestationInfo, DuplicateProposalInfo, P2P, PeerId } fro
23
20
  import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
24
21
  import { OffenseType, WANT_TO_SLASH_EVENT, type Watcher, type WatcherEmitter } from '@aztec/slasher';
25
22
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
26
- import type { CommitteeAttestationsAndSigners, L2Block, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
27
- import { validateCheckpoint } from '@aztec/stdlib/checkpoint';
28
- import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
23
+ import type { CommitteeAttestationsAndSigners, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
24
+ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
29
25
  import type {
30
- CreateCheckpointProposalLastBlockData,
31
26
  ITxProvider,
32
27
  Validator,
33
28
  ValidatorClientFullConfig,
34
29
  WorldStateSynchronizer,
35
30
  } from '@aztec/stdlib/interfaces/server';
36
- import { type L1ToL2MessageSource, accumulateCheckpointOutHashes } from '@aztec/stdlib/messaging';
31
+ import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
37
32
  import {
38
33
  type BlockProposal,
39
34
  type BlockProposalOptions,
@@ -43,23 +38,27 @@ import {
43
38
  type CheckpointProposalOptions,
44
39
  } from '@aztec/stdlib/p2p';
45
40
  import type { CheckpointHeader } from '@aztec/stdlib/rollup';
46
- import type { BlockHeader, CheckpointGlobalVariables, Tx } from '@aztec/stdlib/tx';
41
+ import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
47
42
  import { AttestationTimeoutError } from '@aztec/stdlib/validators';
48
43
  import { type TelemetryClient, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
49
- import { createHASigner, createLocalSignerWithProtection } from '@aztec/validator-ha-signer/factory';
50
- import { DutyType, type SigningContext } from '@aztec/validator-ha-signer/types';
44
+ import {
45
+ createHASigner,
46
+ createLocalSignerWithProtection,
47
+ createSignerFromSharedDb,
48
+ } from '@aztec/validator-ha-signer/factory';
49
+ import { DutyType, type SigningContext, type SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
51
50
  import type { ValidatorHASigner } from '@aztec/validator-ha-signer/validator-ha-signer';
52
51
 
53
52
  import { EventEmitter } from 'events';
54
53
  import type { TypedDataDefinition } from 'viem';
55
54
 
56
- import { BlockProposalHandler, type BlockProposalValidationFailureReason } from './block_proposal_handler.js';
57
55
  import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
58
56
  import { ValidationService } from './duties/validation_service.js';
59
57
  import { HAKeyStore } from './key_store/ha_key_store.js';
60
58
  import type { ExtendedValidatorKeyStore } from './key_store/interface.js';
61
59
  import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
62
60
  import { ValidatorMetrics } from './metrics.js';
61
+ import { type BlockProposalValidationFailureReason, ProposalHandler } from './proposal_handler.js';
63
62
 
64
63
  // We maintain a set of proposers who have proposed invalid blocks.
65
64
  // Just cap the set to avoid unbounded growth.
@@ -102,7 +101,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
102
101
  private keyStore: ExtendedValidatorKeyStore,
103
102
  private epochCache: EpochCache,
104
103
  private p2pClient: P2P,
105
- private blockProposalHandler: BlockProposalHandler,
104
+ private proposalHandler: ProposalHandler,
106
105
  private blockSource: L2BlockSource,
107
106
  private checkpointsBuilder: FullNodeCheckpointsBuilder,
108
107
  private worldState: WorldStateSynchronizer,
@@ -197,13 +196,14 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
197
196
  blobClient: BlobClientInterface,
198
197
  dateProvider: DateProvider = new DateProvider(),
199
198
  telemetry: TelemetryClient = getTelemetryClient(),
199
+ slashingProtectionDb?: SlashingProtectionDatabase,
200
200
  ) {
201
201
  const metrics = new ValidatorMetrics(telemetry);
202
202
  const blockProposalValidator = new BlockProposalValidator(epochCache, {
203
203
  txsPermitted: !config.disableTransactions,
204
204
  maxTxsPerBlock: config.validateMaxTxsPerBlock,
205
205
  });
206
- const blockProposalHandler = new BlockProposalHandler(
206
+ const proposalHandler = new ProposalHandler(
207
207
  checkpointsBuilder,
208
208
  worldState,
209
209
  blockSource,
@@ -212,14 +212,22 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
212
212
  blockProposalValidator,
213
213
  epochCache,
214
214
  config,
215
+ blobClient,
215
216
  metrics,
216
217
  dateProvider,
217
218
  telemetry,
219
+ undefined,
218
220
  );
219
221
 
220
222
  const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
221
223
  let slashingProtectionSigner: ValidatorHASigner;
222
- if (config.haSigningEnabled) {
224
+ if (slashingProtectionDb) {
225
+ // Shared database mode: use a pre-existing database (e.g. for testing HA setups).
226
+ ({ signer: slashingProtectionSigner } = createSignerFromSharedDb(slashingProtectionDb, config, {
227
+ telemetryClient: telemetry,
228
+ dateProvider,
229
+ }));
230
+ } else if (config.haSigningEnabled) {
223
231
  // Multi-node HA mode: use PostgreSQL-backed distributed locking.
224
232
  // If maxStuckDutiesAgeMs is not explicitly set, compute it from Aztec slot duration
225
233
  const haConfig = {
@@ -244,7 +252,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
244
252
  validatorKeyStore,
245
253
  epochCache,
246
254
  p2pClient,
247
- blockProposalHandler,
255
+ proposalHandler,
248
256
  blockSource,
249
257
  checkpointsBuilder,
250
258
  worldState,
@@ -265,8 +273,8 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
265
273
  .filter(addr => !this.config.disabledValidators.some(disabled => disabled.equals(addr)));
266
274
  }
267
275
 
268
- public getBlockProposalHandler() {
269
- return this.blockProposalHandler;
276
+ public getProposalHandler() {
277
+ return this.proposalHandler;
270
278
  }
271
279
 
272
280
  public signWithAddress(addr: EthAddress, msg: TypedDataDefinition, context: SigningContext) {
@@ -339,7 +347,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
339
347
  checkpoint: CheckpointProposalCore,
340
348
  proposalSender: PeerId,
341
349
  ): Promise<CheckpointAttestation[] | undefined> => this.attestToCheckpointProposal(checkpoint, proposalSender);
342
- this.p2pClient.registerCheckpointProposalHandler(checkpointHandler);
350
+ this.p2pClient.registerValidatorCheckpointProposalHandler(checkpointHandler);
343
351
 
344
352
  // Duplicate proposal handler - triggers slashing for equivocation
345
353
  this.p2pClient.registerDuplicateProposalCallback((info: DuplicateProposalInfo) => {
@@ -378,13 +386,12 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
378
386
  return false;
379
387
  }
380
388
 
381
- // Ignore proposals from ourselves (may happen in HA setups)
389
+ // Log self-proposals from HA peers (same validator key on different nodes)
382
390
  if (this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
383
- this.log.debug(`Ignoring block proposal from self for slot ${slotNumber}`, {
391
+ this.log.verbose(`Processing block proposal from HA peer for slot ${slotNumber}`, {
384
392
  proposer: proposer.toString(),
385
393
  slotNumber,
386
394
  });
387
- return false;
388
395
  }
389
396
 
390
397
  // Check if we're in the committee (for metrics purposes)
@@ -400,16 +407,15 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
400
407
 
401
408
  // Reexecute txs if we are part of the committee, or if slashing is enabled, or if we are configured to always reexecute.
402
409
  // In fisherman mode, we always reexecute to validate proposals.
403
- const { validatorReexecute, slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals, fishermanMode } =
404
- this.config;
410
+ const { slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals, fishermanMode } = this.config;
405
411
  const shouldReexecute =
406
412
  fishermanMode ||
407
- (slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute) ||
408
- (partOfCommittee && validatorReexecute) ||
413
+ slashBroadcastedInvalidBlockPenalty > 0n ||
414
+ partOfCommittee ||
409
415
  alwaysReexecuteBlockProposals ||
410
416
  this.blobClient.canUpload();
411
417
 
412
- const validationResult = await this.blockProposalHandler.handleBlockProposal(
418
+ const validationResult = await this.proposalHandler.handleBlockProposal(
413
419
  proposal,
414
420
  proposalSender,
415
421
  !!shouldReexecute && !escapeHatchOpen,
@@ -474,68 +480,50 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
474
480
  proposal: CheckpointProposalCore,
475
481
  _proposalSender: PeerId,
476
482
  ): Promise<CheckpointAttestation[] | undefined> {
477
- const slotNumber = proposal.slotNumber;
483
+ const proposalSlotNumber = proposal.slotNumber;
478
484
  const proposer = proposal.getSender();
479
485
 
480
486
  // If escape hatch is open for this slot's epoch, do not attest.
481
- if (await this.epochCache.isEscapeHatchOpenAtSlot(slotNumber)) {
482
- this.log.warn(`Escape hatch open for slot ${slotNumber}, skipping checkpoint attestation handling`);
483
- return undefined;
484
- }
485
-
486
- // Reject proposals with invalid signatures
487
- if (!proposer) {
488
- this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
487
+ if (await this.epochCache.isEscapeHatchOpenAtSlot(proposalSlotNumber)) {
488
+ this.log.warn(`Escape hatch open for slot ${proposalSlotNumber}, skipping checkpoint attestation handling`);
489
489
  return undefined;
490
490
  }
491
491
 
492
492
  // Ignore proposals from ourselves (may happen in HA setups)
493
- if (this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
494
- this.log.debug(`Ignoring block proposal from self for slot ${slotNumber}`, {
493
+ if (proposer && this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
494
+ this.log.debug(`Ignoring block proposal from self for slot ${proposalSlotNumber}`, {
495
495
  proposer: proposer.toString(),
496
- slotNumber,
496
+ proposalSlotNumber,
497
497
  });
498
498
  return undefined;
499
499
  }
500
500
 
501
- // Validate fee asset price modifier is within allowed range
502
- if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
503
- this.log.warn(
504
- `Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`,
505
- );
506
- return undefined;
507
- }
508
-
509
- // Check that I have any address in current committee before attesting
510
- const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
501
+ // Check that I have any address in the committee where this checkpoint will land before attesting
502
+ const inCommittee = await this.epochCache.filterInCommittee(proposalSlotNumber, this.getValidatorAddresses());
511
503
  const partOfCommittee = inCommittee.length > 0;
512
504
 
513
505
  const proposalInfo = {
514
- slotNumber,
506
+ proposalSlotNumber,
515
507
  archive: proposal.archive.toString(),
516
- proposer: proposer.toString(),
508
+ proposer: proposer?.toString(),
517
509
  };
518
- this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
510
+ this.log.info(`Received checkpoint proposal for slot ${proposalSlotNumber}`, {
519
511
  ...proposalInfo,
520
512
  fishermanMode: this.config.fishermanMode || false,
521
513
  });
522
514
 
523
- // Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set)
515
+ // Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set).
516
+ // Uses the cached result from the all-nodes callback if available (avoids double validation).
524
517
  if (this.config.skipCheckpointProposalValidation) {
525
- this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
518
+ this.log.warn(`Skipping checkpoint proposal validation for slot ${proposalSlotNumber}`, proposalInfo);
526
519
  } else {
527
- const validationResult = await this.validateCheckpointProposal(proposal, proposalInfo);
520
+ const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
528
521
  if (!validationResult.isValid) {
529
522
  this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
530
523
  return undefined;
531
524
  }
532
525
  }
533
526
 
534
- // Upload blobs to filestore if we can (fire and forget)
535
- if (this.blobClient.canUpload()) {
536
- void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
537
- }
538
-
539
527
  // Check that I have any address in current committee before attesting
540
528
  // In fisherman mode, we still create attestations for validation even if not in committee
541
529
  if (!partOfCommittee && !this.config.fishermanMode) {
@@ -544,16 +532,19 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
544
532
  }
545
533
 
546
534
  // Provided all of the above checks pass, we can attest to the proposal
547
- this.log.info(`${partOfCommittee ? 'Attesting to' : 'Validated'} checkpoint proposal for slot ${slotNumber}`, {
548
- ...proposalInfo,
549
- inCommittee: partOfCommittee,
550
- fishermanMode: this.config.fishermanMode || false,
551
- });
535
+ this.log.info(
536
+ `${partOfCommittee ? 'Attesting to' : 'Validated'} checkpoint proposal for slot ${proposalSlotNumber}`,
537
+ {
538
+ ...proposalInfo,
539
+ inCommittee: partOfCommittee,
540
+ fishermanMode: this.config.fishermanMode || false,
541
+ },
542
+ );
552
543
 
553
544
  this.metrics.incSuccessfulAttestations(inCommittee.length);
554
545
 
555
546
  // Track epoch participation per attester: count each (attester, epoch) pair at most once
556
- const proposalEpoch = getEpochAtSlot(slotNumber, this.epochCache.getL1Constants());
547
+ const proposalEpoch = getEpochAtSlot(proposalSlotNumber, this.epochCache.getL1Constants());
557
548
  for (const attester of inCommittee) {
558
549
  const key = attester.toString();
559
550
  const lastEpoch = this.lastAttestedEpochByAttester.get(key);
@@ -581,7 +572,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
581
572
 
582
573
  if (this.config.fishermanMode) {
583
574
  // bail out early and don't save attestations to the pool in fisherman mode
584
- this.log.info(`Creating checkpoint attestations for slot ${slotNumber}`, {
575
+ this.log.info(`Creating checkpoint attestations for slot ${proposalSlotNumber}`, {
585
576
  ...proposalInfo,
586
577
  attestors: attestors.map(a => a.toString()),
587
578
  });
@@ -630,172 +621,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
630
621
  return attestations;
631
622
  }
632
623
 
633
- /**
634
- * Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
635
- * @returns Validation result with isValid flag and reason if invalid.
636
- */
637
- private async validateCheckpointProposal(
638
- proposal: CheckpointProposalCore,
639
- proposalInfo: LogData,
640
- ): Promise<{ isValid: true } | { isValid: false; reason: string }> {
641
- const slot = proposal.slotNumber;
642
-
643
- // Timeout block syncing at the start of the next slot
644
- const config = this.checkpointsBuilder.getConfig();
645
- const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
646
- const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
647
-
648
- // Wait for last block to sync by archive
649
- let lastBlockHeader: BlockHeader | undefined;
650
- try {
651
- lastBlockHeader = await retryUntil(
652
- async () => {
653
- await this.blockSource.syncImmediate();
654
- return this.blockSource.getBlockHeaderByArchive(proposal.archive);
655
- },
656
- `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`,
657
- timeoutSeconds,
658
- 0.5,
659
- );
660
- } catch (err) {
661
- if (err instanceof TimeoutError) {
662
- this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
663
- return { isValid: false, reason: 'last_block_not_found' };
664
- }
665
- this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
666
- return { isValid: false, reason: 'block_fetch_error' };
667
- }
668
-
669
- if (!lastBlockHeader) {
670
- this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
671
- return { isValid: false, reason: 'last_block_not_found' };
672
- }
673
-
674
- // Get all full blocks for the slot and checkpoint
675
- const blocks = await this.blockSource.getBlocksForSlot(slot);
676
- if (blocks.length === 0) {
677
- this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
678
- return { isValid: false, reason: 'no_blocks_for_slot' };
679
- }
680
-
681
- // Ensure the last block for this slot matches the archive in the checkpoint proposal
682
- if (!blocks.at(-1)?.archive.root.equals(proposal.archive)) {
683
- this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
684
- return { isValid: false, reason: 'last_block_archive_mismatch' };
685
- }
686
-
687
- this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
688
- ...proposalInfo,
689
- blockNumbers: blocks.map(b => b.number),
690
- });
691
-
692
- // Get checkpoint constants from first block
693
- const firstBlock = blocks[0];
694
- const constants = this.extractCheckpointConstants(firstBlock);
695
- const checkpointNumber = firstBlock.checkpointNumber;
696
-
697
- // Get L1-to-L2 messages for this checkpoint
698
- const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
699
-
700
- // Collect the out hashes of all the checkpoints before this one in the same epoch
701
- const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
702
- const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch))
703
- .filter(c => c.checkpointNumber < checkpointNumber)
704
- .map(c => c.checkpointOutHash);
705
-
706
- // Fork world state at the block before the first block
707
- const parentBlockNumber = BlockNumber(firstBlock.number - 1);
708
- const fork = await this.worldState.fork(parentBlockNumber);
709
-
710
- try {
711
- // Create checkpoint builder with all existing blocks
712
- const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(
713
- checkpointNumber,
714
- constants,
715
- proposal.feeAssetPriceModifier,
716
- l1ToL2Messages,
717
- previousCheckpointOutHashes,
718
- fork,
719
- blocks,
720
- this.log.getBindings(),
721
- );
722
-
723
- // Complete the checkpoint to get computed values
724
- const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
725
-
726
- // Compare checkpoint header with proposal
727
- if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
728
- this.log.warn(`Checkpoint header mismatch`, {
729
- ...proposalInfo,
730
- computed: computedCheckpoint.header.toInspect(),
731
- proposal: proposal.checkpointHeader.toInspect(),
732
- });
733
- return { isValid: false, reason: 'checkpoint_header_mismatch' };
734
- }
735
-
736
- // Compare archive root with proposal
737
- if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
738
- this.log.warn(`Archive root mismatch`, {
739
- ...proposalInfo,
740
- computed: computedCheckpoint.archive.root.toString(),
741
- proposal: proposal.archive.toString(),
742
- });
743
- return { isValid: false, reason: 'archive_mismatch' };
744
- }
745
-
746
- // Check that the accumulated epoch out hash matches the value in the proposal.
747
- // The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
748
- const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
749
- const computedEpochOutHash = accumulateCheckpointOutHashes([...previousCheckpointOutHashes, checkpointOutHash]);
750
- const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
751
- if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
752
- this.log.warn(`Epoch out hash mismatch`, {
753
- proposalEpochOutHash: proposalEpochOutHash.toString(),
754
- computedEpochOutHash: computedEpochOutHash.toString(),
755
- checkpointOutHash: checkpointOutHash.toString(),
756
- previousCheckpointOutHashes: previousCheckpointOutHashes.map(h => h.toString()),
757
- ...proposalInfo,
758
- });
759
- return { isValid: false, reason: 'out_hash_mismatch' };
760
- }
761
-
762
- // Final round of validations on the checkpoint, just in case.
763
- try {
764
- validateCheckpoint(computedCheckpoint, {
765
- rollupManaLimit: this.checkpointsBuilder.getConfig().rollupManaLimit,
766
- maxDABlockGas: this.config.validateMaxDABlockGas,
767
- maxL2BlockGas: this.config.validateMaxL2BlockGas,
768
- maxTxsPerBlock: this.config.validateMaxTxsPerBlock,
769
- maxTxsPerCheckpoint: this.config.validateMaxTxsPerCheckpoint,
770
- });
771
- } catch (err) {
772
- this.log.warn(`Checkpoint validation failed: ${err}`, proposalInfo);
773
- return { isValid: false, reason: 'checkpoint_validation_failed' };
774
- }
775
-
776
- this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
777
- return { isValid: true };
778
- } finally {
779
- await fork.close();
780
- }
781
- }
782
-
783
- /**
784
- * Extract checkpoint global variables from a block.
785
- */
786
- private extractCheckpointConstants(block: L2Block): CheckpointGlobalVariables {
787
- const gv = block.header.globalVariables;
788
- return {
789
- chainId: gv.chainId,
790
- version: gv.version,
791
- slotNumber: gv.slotNumber,
792
- timestamp: gv.timestamp,
793
- coinbase: gv.coinbase,
794
- feeRecipient: gv.feeRecipient,
795
- gasFees: gv.gasFees,
796
- };
797
- }
798
-
799
624
  /**
800
625
  * Uploads blobs for a checkpoint to the filestore (fire and forget).
801
626
  */
@@ -944,7 +769,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
944
769
  checkpointHeader: CheckpointHeader,
945
770
  archive: Fr,
946
771
  feeAssetPriceModifier: bigint,
947
- lastBlockInfo: CreateCheckpointProposalLastBlockData | undefined,
772
+ lastBlockProposal: BlockProposal | undefined,
948
773
  proposerAddress: EthAddress | undefined,
949
774
  options: CheckpointProposalOptions = {},
950
775
  ): Promise<CheckpointProposal> {
@@ -966,7 +791,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
966
791
  checkpointHeader,
967
792
  archive,
968
793
  feeAssetPriceModifier,
969
- lastBlockInfo,
794
+ lastBlockProposal,
970
795
  proposerAddress,
971
796
  options,
972
797
  );
@@ -1,64 +0,0 @@
1
- import type { EpochCache } from '@aztec/epoch-cache';
2
- import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
3
- import { Fr } from '@aztec/foundation/curves/bn254';
4
- import { DateProvider } from '@aztec/foundation/timer';
5
- import type { P2P, PeerId } from '@aztec/p2p';
6
- import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
7
- import type { L2Block, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
8
- import type { ITxProvider, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
9
- import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging';
10
- import type { BlockProposal } from '@aztec/stdlib/p2p';
11
- import type { FailedTx, Tx } from '@aztec/stdlib/tx';
12
- import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
13
- import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
14
- import type { ValidatorMetrics } from './metrics.js';
15
- export type BlockProposalValidationFailureReason = 'invalid_proposal' | 'parent_block_not_found' | 'block_source_not_synced' | 'parent_block_wrong_slot' | 'in_hash_mismatch' | 'global_variables_mismatch' | 'block_number_already_exists' | 'txs_not_available' | 'state_mismatch' | 'failed_txs' | 'initial_state_mismatch' | 'timeout' | 'unknown_error';
16
- type ReexecuteTransactionsResult = {
17
- block: L2Block;
18
- failedTxs: FailedTx[];
19
- reexecutionTimeMs: number;
20
- totalManaUsed: number;
21
- };
22
- export type BlockProposalValidationSuccessResult = {
23
- isValid: true;
24
- blockNumber: BlockNumber;
25
- reexecutionResult?: ReexecuteTransactionsResult;
26
- };
27
- export type BlockProposalValidationFailureResult = {
28
- isValid: false;
29
- reason: BlockProposalValidationFailureReason;
30
- blockNumber?: BlockNumber;
31
- reexecutionResult?: ReexecuteTransactionsResult;
32
- };
33
- export type BlockProposalValidationResult = BlockProposalValidationSuccessResult | BlockProposalValidationFailureResult;
34
- export declare class BlockProposalHandler {
35
- private checkpointsBuilder;
36
- private worldState;
37
- private blockSource;
38
- private l1ToL2MessageSource;
39
- private txProvider;
40
- private blockProposalValidator;
41
- private epochCache;
42
- private config;
43
- private metrics?;
44
- private dateProvider;
45
- private log;
46
- readonly tracer: Tracer;
47
- constructor(checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: ITxProvider, blockProposalValidator: BlockProposalValidator, epochCache: EpochCache, config: ValidatorClientFullConfig, metrics?: ValidatorMetrics | undefined, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
48
- register(p2pClient: P2P, shouldReexecute: boolean): BlockProposalHandler;
49
- handleBlockProposal(proposal: BlockProposal, proposalSender: PeerId, shouldReexecute: boolean): Promise<BlockProposalValidationResult>;
50
- private getParentBlock;
51
- private computeCheckpointNumber;
52
- /**
53
- * Validates that a non-first block in a checkpoint has consistent global variables with its parent.
54
- * For blocks with indexWithinCheckpoint > 0, all global variables except blockNumber must match the parent.
55
- * @returns A failure result if validation fails, undefined if validation passes
56
- */
57
- private validateNonFirstBlockInCheckpoint;
58
- private getReexecutionDeadline;
59
- private waitForBlockSourceSync;
60
- private getReexecuteFailureReason;
61
- reexecuteTransactions(proposal: BlockProposal, blockNumber: BlockNumber, checkpointNumber: CheckpointNumber, txs: Tx[], l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[]): Promise<ReexecuteTransactionsResult>;
62
- }
63
- export {};
64
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfaGFuZGxlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Jsb2NrX3Byb3Bvc2FsX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBRTVGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUlwRCxPQUFPLEVBQUUsWUFBWSxFQUFTLE1BQU0seUJBQXlCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM5QyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBYSxPQUFPLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRzFGLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSx5QkFBeUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RILE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFtQyxNQUFNLHlCQUF5QixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXZELE9BQU8sS0FBSyxFQUE2QixRQUFRLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFRaEYsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLEtBQUssTUFBTSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRWhHLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFckQsTUFBTSxNQUFN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
@@ -1 +0,0 @@
1
- {"version":3,"file":"block_proposal_handler.d.ts","sourceRoot":"","sources":["../src/block_proposal_handler.ts"],"names":[],"mappings":"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"}