@aztec/validator-client 2.0.3-rc.16 → 2.0.3-rc.18

package/src/validator.ts

@@ -1,17 +1,13 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { retryUntil } from '@aztec/foundation/retry';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
-import { DateProvider, Timer } from '@aztec/foundation/timer';
+import { DateProvider } from '@aztec/foundation/timer';
 import type { KeystoreManager } from '@aztec/node-keystore';
-import type { P2P, PeerId } from '@aztec/p2p';
-import { AuthRequest, AuthResponse, ReqRespSubProtocol, TxProvider } from '@aztec/p2p';
-import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
-import { computeInHashFromL1ToL2Messages } from '@aztec/prover-client/helpers';
+import type { P2P, PeerId, TxProvider } from '@aztec/p2p';
+import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
 import {
   OffenseType,
   type SlasherConfig,
@@ -21,23 +17,17 @@ import {
 } from '@aztec/slasher';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { L2BlockSource } from '@aztec/stdlib/block';
-import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import type { IFullNodeBlockBuilder, Validator, ValidatorClientFullConfig } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
-import { GlobalVariables, type ProposedBlockHeader, type StateReference, type Tx } from '@aztec/stdlib/tx';
-import {
-  AttestationTimeoutError,
-  ReExFailedTxsError,
-  ReExStateMismatchError,
-  ReExTimeoutError,
-  TransactionsNotAvailableError,
-} from '@aztec/stdlib/validators';
+import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
+import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { type TelemetryClient, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { EventEmitter } from 'events';
 import type { TypedDataDefinition } from 'viem';
 
+import { BlockProposalHandler, type BlockProposalValidationFailureReason } from './block_proposal_handler.js';
 import type { ValidatorClientConfig } from './config.js';
 import { ValidationService } from './duties/validation_service.js';
 import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
@@ -47,6 +37,12 @@ import { ValidatorMetrics } from './metrics.js';
 // Just cap the set to avoid unbounded growth.
 const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
 
+// What errors from the block proposal handler result in slashing
+const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT: BlockProposalValidationFailureReason[] = [
+  'state_mismatch',
+  'failed_txs',
+];
+
 /**
  * Validator Client
  */
@@ -55,24 +51,22 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
   private validationService: ValidationService;
   private metrics: ValidatorMetrics;
 
+  // Whether it has already registered handlers on the p2p client
+  private hasRegisteredHandlers = false;
+
   // Used to check if we are sending the same proposal twice
   private previousProposal?: BlockProposal;
 
   private lastEpochForCommitteeUpdateLoop: bigint | undefined;
   private epochCacheUpdateLoop: RunningPromise;
 
-  private blockProposalValidator: BlockProposalValidator;
-
   private proposersOfInvalidBlocks: Set<string> = new Set();
 
   protected constructor(
-    private blockBuilder: IFullNodeBlockBuilder,
     private keyStore: NodeKeystoreAdapter,
     private epochCache: EpochCache,
     private p2pClient: P2P,
-    private blockSource: L2BlockSource,
-    private l1ToL2MessageSource: L1ToL2MessageSource,
-    private txProvider: TxProvider,
+    private blockProposalHandler: BlockProposalHandler,
     private config: ValidatorClientFullConfig,
     private dateProvider: DateProvider = new DateProvider(),
     telemetry: TelemetryClient = getTelemetryClient(),
@@ -84,8 +78,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
     this.validationService = new ValidationService(keyStore);
 
-    this.blockProposalValidator = new BlockProposalValidator(epochCache);
-
     // Refresh epoch cache every second to trigger alert if participation in committee changes
     this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), log, 1000);
 
@@ -152,21 +144,30 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     dateProvider: DateProvider = new DateProvider(),
     telemetry: TelemetryClient = getTelemetryClient(),
   ) {
-    const validator = new ValidatorClient(
+    const metrics = new ValidatorMetrics(telemetry);
+    const blockProposalValidator = new BlockProposalValidator(epochCache);
+    const blockProposalHandler = new BlockProposalHandler(
       blockBuilder,
-      NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager),
-      epochCache,
-      p2pClient,
       blockSource,
       l1ToL2MessageSource,
       txProvider,
+      blockProposalValidator,
+      config,
+      metrics,
+      dateProvider,
+      telemetry,
+    );
+
+    const validator = new ValidatorClient(
+      NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager),
+      epochCache,
+      p2pClient,
+      blockProposalHandler,
       config,
       dateProvider,
       telemetry,
     );
 
-    // TODO(PhilWindle): This seems like it could/should be done inside start()
-    validator.registerBlockProposalHandler();
     return validator;
   }
 
@@ -176,6 +177,15 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
       .filter(addr => !this.config.disabledValidators.some(disabled => disabled.equals(addr)));
   }
 
+  public getBlockProposalHandler() {
+    return this.blockProposalHandler;
+  }
+
+  // Proxy method for backwards compatibility with tests
+  public reExecuteTransactions(proposal: BlockProposal, txs: any[], l1ToL2Messages: Fr[]): Promise<any> {
+    return this.blockProposalHandler.reexecuteTransactions(proposal, txs, l1ToL2Messages);
+  }
+
   public signWithAddress(addr: EthAddress, msg: TypedDataDefinition) {
     return this.keyStore.signTypedDataWithAddress(addr, msg);
   }
@@ -197,11 +207,14 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
   }
 
   public async start() {
-    // Sync the committee from the smart contract
-    // https://github.com/AztecProtocol/aztec-packages/issues/7962
+    if (this.epochCacheUpdateLoop.isRunning()) {
+      this.log.warn(`Validator client already started`);
+      return;
+    }
 
-    const myAddresses = this.getValidatorAddresses();
+    await this.registerHandlers();
 
+    const myAddresses = this.getValidatorAddresses();
     const inCommittee = await this.epochCache.filterInCommittee('now', myAddresses);
     if (inCommittee.length > 0) {
       this.log.info(
@@ -214,9 +227,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     }
     this.epochCacheUpdateLoop.start();
 
-    this.p2pClient.registerThisValidatorAddresses(myAddresses);
-    await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
-
     return Promise.resolve();
   }
 
@@ -224,143 +234,71 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     await this.epochCacheUpdateLoop.stop();
   }
 
-  public registerBlockProposalHandler() {
-    const handler = (block: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> =>
-      this.attestToProposal(block, proposalSender);
-    this.p2pClient.registerBlockProposalHandler(handler);
+  /** Register handlers on the p2p client */
+  public async registerHandlers() {
+    if (!this.hasRegisteredHandlers) {
+      this.hasRegisteredHandlers = true;
+      this.log.debug(`Registering validator handlers for p2p client`);
+
+      const handler = (block: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> =>
+        this.attestToProposal(block, proposalSender);
+      this.p2pClient.registerBlockProposalHandler(handler);
+
+      const myAddresses = this.getValidatorAddresses();
+      this.p2pClient.registerThisValidatorAddresses(myAddresses);
+
+      await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
+    }
   }
 
   async attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> {
     const slotNumber = proposal.slotNumber.toBigInt();
-    const blockNumber = proposal.blockNumber;
     const proposer = proposal.getSender();
 
     // Check that I have any address in current committee before attesting
     const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
     const partOfCommittee = inCommittee.length > 0;
+    const incFailedAttestation = (reason: string) => this.metrics.incFailedAttestations(1, reason, partOfCommittee);
 
-    const proposalInfo = {
-      ...proposal.toBlockInfo(),
-      proposer: proposer.toString(),
-    };
-
+    const proposalInfo = { ...proposal.toBlockInfo(), proposer: proposer.toString() };
     this.log.info(`Received proposal for slot ${slotNumber}`, {
       ...proposalInfo,
-      txHashes: proposal.txHashes.map(txHash => txHash.toString()),
+      txHashes: proposal.txHashes.map(t => t.toString()),
     });
 
-    // Collect txs from the proposal. Note that we do this before checking if we have an address in the
-    // current committee, since we want to collect txs anyway to facilitate propagation.
-    const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, {
-      pinnedPeer: proposalSender,
-      deadline: this.getReexecutionDeadline(proposal, this.blockBuilder.getConfig()),
-    });
-
-    // Check that I have any address in current committee before attesting
-    if (!partOfCommittee) {
-      this.log.verbose(`No validator in the current committee, skipping attestation`, proposalInfo);
-      return undefined;
-    }
-
-    // Check that the proposal is from the current proposer, or the next proposer.
-    // Q: Should this be moved to the block proposal validator, so we disregard proposals from anyone?
-    const invalidProposal = await this.blockProposalValidator.validate(proposal);
-    if (invalidProposal) {
-      this.log.warn(`Proposal is not valid, skipping attestation`, proposalInfo);
-      if (partOfCommittee) {
-        this.metrics.incFailedAttestations(1, 'invalid_proposal');
-      }
-      return undefined;
-    }
-
-    // Check that the parent proposal is a block we know, otherwise reexecution would fail.
-    // Q: Should we move this to the block proposal validator? If there, then p2p would check it
-    // before re-broadcasting it. This means that proposals built on top of an L1-reorg'ed-out block
-    // would not be rebroadcasted. But it also means that nodes that have not fully synced would
-    // not rebroadcast the proposal.
-    if (blockNumber > INITIAL_L2_BLOCK_NUM) {
-      const config = this.blockBuilder.getConfig();
-      const deadline = this.getReexecutionDeadline(proposal, config);
-      const currentTime = this.dateProvider.now();
-      const timeoutDurationMs = deadline.getTime() - currentTime;
-      const parentBlock =
-        timeoutDurationMs <= 0
-          ? undefined
-          : await retryUntil(
-              async () => {
-                const block = await this.blockSource.getBlock(blockNumber - 1);
-                if (block) {
-                  return block;
-                }
-                await this.blockSource.syncImmediate();
-                return await this.blockSource.getBlock(blockNumber - 1);
-              },
-              'Force Archiver Sync',
-              timeoutDurationMs / 1000, // Continue retrying until the deadline
-              0.5, // Retry every 500ms
-            );
-
-      if (parentBlock === undefined) {
-        this.log.warn(`Parent block for ${blockNumber} not found, skipping attestation`, proposalInfo);
-        if (partOfCommittee) {
-          this.metrics.incFailedAttestations(1, 'parent_block_not_found');
-        }
-        return undefined;
-      }
-
-      if (!proposal.payload.header.lastArchiveRoot.equals(parentBlock.archive.root)) {
-        this.log.warn(`Parent block archive root for proposal does not match, skipping attestation`, {
-          proposalLastArchiveRoot: proposal.payload.header.lastArchiveRoot.toString(),
-          parentBlockArchiveRoot: parentBlock.archive.root.toString(),
-          ...proposalInfo,
-        });
-        if (partOfCommittee) {
-          this.metrics.incFailedAttestations(1, 'parent_block_does_not_match');
-        }
-        return undefined;
-      }
-    }
+    // Reexecute txs if we are part of the committee so we can attest, or if slashing is enabled so we can slash
+    // invalid proposals even when not in the committee, or if we are configured to always reexecute for monitoring purposes.
+    const { validatorReexecute, slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals } = this.config;
+    const shouldReexecute =
+      (slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute) ||
+      (partOfCommittee && validatorReexecute) ||
+      alwaysReexecuteBlockProposals;
+
+    const validationResult = await this.blockProposalHandler.handleBlockProposal(
+      proposal,
+      proposalSender,
+      !!shouldReexecute,
+    );
 
-    // Check that I have the same set of l1ToL2Messages as the proposal
-    // Q: Same as above, should this be part of p2p validation?
-    const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
-    const computedInHash = await computeInHashFromL1ToL2Messages(l1ToL2Messages);
-    const proposalInHash = proposal.payload.header.contentCommitment.inHash;
-    if (!computedInHash.equals(proposalInHash)) {
-      this.log.warn(`L1 to L2 messages in hash mismatch, skipping attestation`, {
-        proposalInHash: proposalInHash.toString(),
-        computedInHash: computedInHash.toString(),
-        ...proposalInfo,
-      });
-      if (partOfCommittee) {
-        this.metrics.incFailedAttestations(1, 'in_hash_mismatch');
-      }
-      return undefined;
-    }
+    if (!validationResult.isValid) {
+      this.log.warn(`Proposal validation failed: ${validationResult.reason}`, proposalInfo);
+      incFailedAttestation(validationResult.reason || 'unknown');
 
-    // Check that all of the transactions in the proposal are available in the tx pool before attesting
-    if (missingTxs.length > 0) {
-      this.log.warn(`Missing ${missingTxs.length} txs to attest to proposal`, { ...proposalInfo, missingTxs });
-      if (partOfCommittee) {
-        this.metrics.incFailedAttestations(1, 'TransactionsNotAvailableError');
+      // Slash invalid block proposals
+      if (
+        validationResult.reason &&
+        SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason) &&
+        slashBroadcastedInvalidBlockPenalty > 0n
+      ) {
+        this.log.warn(`Slashing proposer for invalid block proposal`, proposalInfo);
+        this.slashInvalidBlock(proposal);
       }
       return undefined;
     }
 
-    // Try re-executing the transactions in the proposal
-    try {
-      this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
-      if (this.config.validatorReexecute) {
-        this.log.verbose(`Re-executing transactions in the proposal before attesting`);
-        await this.reExecuteTransactions(proposal, txs, l1ToL2Messages);
-      }
-    } catch (error: any) {
-      this.metrics.incFailedAttestations(1, error instanceof Error ? error.name : 'unknown');
-      this.log.error(`Error reexecuting txs while processing block proposal`, error, proposalInfo);
-      if (error instanceof ReExStateMismatchError && this.config.slashBroadcastedInvalidBlockPenalty > 0n) {
-        this.log.warn(`Slashing proposer for invalid block proposal`, proposalInfo);
-        this.slashInvalidBlock(proposal);
-      }
+    // Check that I have any address in current committee before attesting
+    if (!partOfCommittee) {
+      this.log.verbose(`No validator in the current committee, skipping attestation`, proposalInfo);
       return undefined;
     }
 
@@ -369,73 +307,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     this.metrics.incAttestations(inCommittee.length);
 
     // If the above function does not throw an error, then we can attest to the proposal
-    return this.doAttestToProposal(proposal, inCommittee);
-  }
-
-  private getReexecutionDeadline(
-    proposal: BlockProposal,
-    config: { l1GenesisTime: bigint; slotDuration: number },
-  ): Date {
-    const nextSlotTimestampSeconds = Number(getTimestampForSlot(proposal.slotNumber.toBigInt() + 1n, config));
-    const msNeededForPropagationAndPublishing = this.config.validatorReexecuteDeadlineMs;
-    return new Date(nextSlotTimestampSeconds * 1000 - msNeededForPropagationAndPublishing);
-  }
-
-  /**
-   * Re-execute the transactions in the proposal and check that the state updates match the header state
-   * @param proposal - The proposal to re-execute
-   */
-  async reExecuteTransactions(proposal: BlockProposal, txs: Tx[], l1ToL2Messages: Fr[]): Promise<void> {
-    const { header } = proposal.payload;
-    const { txHashes } = proposal;
-
-    // If we do not have all of the transactions, then we should fail
-    if (txs.length !== txHashes.length) {
-      const foundTxHashes = txs.map(tx => tx.getTxHash());
-      const missingTxHashes = txHashes.filter(txHash => !foundTxHashes.includes(txHash));
-      throw new TransactionsNotAvailableError(missingTxHashes);
-    }
-
-    // Use the sequencer's block building logic to re-execute the transactions
-    const timer = new Timer();
-    const config = this.blockBuilder.getConfig();
-    const globalVariables = GlobalVariables.from({
-      ...proposal.payload.header,
-      blockNumber: proposal.blockNumber,
-      timestamp: header.timestamp,
-      chainId: new Fr(config.l1ChainId),
-      version: new Fr(config.rollupVersion),
-    });
-
-    const { block, failedTxs } = await this.blockBuilder.buildBlock(txs, l1ToL2Messages, globalVariables, {
-      deadline: this.getReexecutionDeadline(proposal, config),
-    });
-
-    this.log.verbose(`Transaction re-execution complete`);
-    const numFailedTxs = failedTxs.length;
-
-    if (numFailedTxs > 0) {
-      this.metrics.recordFailedReexecution(proposal);
-      throw new ReExFailedTxsError(numFailedTxs);
-    }
-
-    if (block.body.txEffects.length !== txHashes.length) {
-      this.metrics.recordFailedReexecution(proposal);
-      throw new ReExTimeoutError();
-    }
-
-    // This function will throw an error if state updates do not match
-    if (!block.archive.root.equals(proposal.archive)) {
-      this.metrics.recordFailedReexecution(proposal);
-      throw new ReExStateMismatchError(
-        proposal.archive,
-        block.archive.root,
-        proposal.payload.stateReference,
-        block.header.state,
-      );
-    }
-
-    this.metrics.recordReex(timer.ms(), txs.length, block.header.totalManaUsed.toNumber() / 1e6);
+    return this.createBlockAttestationsFromProposal(proposal, inCommittee);
   }
 
   private slashInvalidBlock(proposal: BlockProposal) {
@@ -494,7 +366,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     const slot = proposal.payload.header.slotNumber.toBigInt();
     const inCommittee = await this.epochCache.filterInCommittee(slot, this.getValidatorAddresses());
     this.log.debug(`Collecting ${inCommittee.length} self-attestations for slot ${slot}`, { inCommittee });
-    return this.doAttestToProposal(proposal, inCommittee);
+    return this.createBlockAttestationsFromProposal(proposal, inCommittee);
   }
 
   async collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]> {
@@ -544,7 +416,10 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     }
   }
 
-  private async doAttestToProposal(proposal: BlockProposal, attestors: EthAddress[] = []): Promise<BlockAttestation[]> {
+  private async createBlockAttestationsFromProposal(
+    proposal: BlockProposal,
+    attestors: EthAddress[] = [],
+  ): Promise<BlockAttestation[]> {
     const attestations = await this.validationService.attestToProposal(proposal, attestors);
     await this.p2pClient.addAttestations(attestations);
     return attestations;
@@ -573,5 +448,3 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     return authResponse.toBuffer();
   }
 }
-
-// Conversion helpers moved into NodeKeystoreAdapter.