@aztec/validator-client 2.0.3 → 2.1.0-rc.10

package/dest/validator.d.ts

@@ -1,19 +1,20 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { KeystoreManager } from '@aztec/node-keystore';
-import type { P2P, PeerId } from '@aztec/p2p';
-import { TxProvider } from '@aztec/p2p';
+import type { P2P, PeerId, TxProvider } from '@aztec/p2p';
 import { type SlasherConfig, type Watcher, type WatcherEmitter } from '@aztec/slasher';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { CommitteeAttestationsAndSigners, L2BlockSource } from '@aztec/stdlib/block';
 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 { type ProposedBlockHeader, type StateReference, type Tx } from '@aztec/stdlib/tx';
+import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
-import type { TypedDataDefinition } from 'viem';
+import type { TypedDataDefinition } from '@spalladino/viem';
+import { BlockProposalHandler } from './block_proposal_handler.js';
 import type { ValidatorClientConfig } from './config.js';
 import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
 declare const ValidatorClient_base: new () => WatcherEmitter;
@@ -21,50 +22,45 @@ declare const ValidatorClient_base: new () => WatcherEmitter;
  * Validator Client
  */
 export declare class ValidatorClient extends ValidatorClient_base implements Validator, Watcher {
-    private blockBuilder;
     private keyStore;
     private epochCache;
     private p2pClient;
-    private blockSource;
-    private l1ToL2MessageSource;
-    private txProvider;
+    private blockProposalHandler;
     private config;
     private dateProvider;
     private log;
     readonly tracer: Tracer;
     private validationService;
     private metrics;
+    private hasRegisteredHandlers;
     private previousProposal?;
     private lastEpochForCommitteeUpdateLoop;
     private epochCacheUpdateLoop;
-    private blockProposalValidator;
     private proposersOfInvalidBlocks;
-    protected constructor(blockBuilder: IFullNodeBlockBuilder, keyStore: NodeKeystoreAdapter, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: TxProvider, config: ValidatorClientFullConfig, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    protected constructor(keyStore: NodeKeystoreAdapter, epochCache: EpochCache, p2pClient: P2P, blockProposalHandler: BlockProposalHandler, config: ValidatorClientFullConfig, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     static validateKeyStoreConfiguration(keyStoreManager: KeystoreManager): void;
     private handleEpochCommitteeUpdate;
     static new(config: ValidatorClientConfig & Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'>, blockBuilder: IFullNodeBlockBuilder, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: TxProvider, keyStoreManager: KeystoreManager, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
     getValidatorAddresses(): EthAddress[];
-    signWithAddress(addr: EthAddress, msg: TypedDataDefinition): Promise<import("@aztec/stdlib/block").Signature>;
+    getBlockProposalHandler(): BlockProposalHandler;
+    reExecuteTransactions(proposal: BlockProposal, txs: any[], l1ToL2Messages: Fr[]): Promise<any>;
+    signWithAddress(addr: EthAddress, msg: TypedDataDefinition): Promise<Signature>;
     getCoinbaseForAttestor(attestor: EthAddress): EthAddress;
     getFeeRecipientForAttestor(attestor: EthAddress): AztecAddress;
     getConfig(): ValidatorClientFullConfig;
     updateConfig(config: Partial<ValidatorClientFullConfig>): void;
     start(): Promise<void>;
     stop(): Promise<void>;
-    registerBlockProposalHandler(): void;
+    /** Register handlers on the p2p client */
+    registerHandlers(): Promise<void>;
     attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined>;
-    private getReexecutionDeadline;
-    /**
-     * Re-execute the transactions in the proposal and check that the state updates match the header state
-     * @param proposal - The proposal to re-execute
-     */
-    reExecuteTransactions(proposal: BlockProposal, txs: Tx[], l1ToL2Messages: Fr[]): Promise<void>;
     private slashInvalidBlock;
     createBlockProposal(blockNumber: number, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], proposerAddress: EthAddress | undefined, options: BlockProposalOptions): Promise<BlockProposal | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
+    signAttestationsAndSigners(attestationsAndSigners: CommitteeAttestationsAndSigners, proposer: EthAddress | undefined): Promise<Signature>;
     collectOwnAttestations(proposal: BlockProposal): Promise<BlockAttestation[]>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
-    private doAttestToProposal;
+    private createBlockAttestationsFromProposal;
     private handleAuthRequest;
 }
 export {};

package/dest/validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,EAAE,YAAY,EAAS,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAiD,UAAU,EAAE,MAAM,YAAY,CAAC;AAGvF,OAAO,EAEL,KAAK,aAAa,EAElB,KAAK,OAAO,EACZ,KAAK,cAAc,EACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACnH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAmB,KAAK,mBAAmB,EAAE,KAAK,cAAc,EAAE,KAAK,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAQ3G,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAsB,MAAM,yBAAyB,CAAC;AAGhG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAEhD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;oCAUrB,UAAU,cAAc;AAH9E;;GAEG;AACH,qBAAa,eAAgB,SAAQ,oBAA2C,YAAW,SAAS,EAAE,OAAO;IAgBzG,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IAzBb,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,OAAO,CAAmB;IAGlC,OAAO,CAAC,gBAAgB,CAAC,CAAgB;IAEzC,OAAO,CAAC,+BAA+B,CAAqB;IAC5D,OAAO,CAAC,oBAAoB,CAAiB;IAE7C,OAAO,CAAC,sBAAsB,CAAyB;IAEvD,OAAO,CAAC,wBAAwB,CAA0B;IAE1D,SAAS,aACC,YAAY,EAAE,qBAAqB,EACnC,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,EACd,WAAW,EAAE,aAAa,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,yBAAyB,EACjC,YAAY,GAAE,YAAiC,EACvD,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAA4B;WAiB3B,6BAA6B,CAAC,eAAe,EAAE,eAAe;YAoB9D,0BAA0B;IA2BxC,MAAM,CAAC,GAAG,CACR,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAC,aAAa,EAAE,qCAAqC,CAAC,EAC1F,YAAY,EAAE,qBAAqB,EACnC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,EACd,WAAW,EAAE,aAAa,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,eAAe,EAChC,YAAY,GAAE,YAAiC,EAC/C,SAAS,GAAE,eAAsC;IAoB5C,qBAAqB;IAMrB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,mBAAmB;IAI1D,sBAAsB,CAAC,QAAQ,EAAE,UAAU,GAAG,UAAU;IAIxD,0BAA0B,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY;IAI9D,SAAS,IAAI,yBAAyB;IAItC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,yBAAyB,CAAC;IAIjD,KAAK;IAwBL,IAAI;IAIV,4BAA4B;IAM7B,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,GAAG,SAAS,CAAC;IA8IhH,OAAO,CAAC,sBAAsB;IAS9B;;;OAGG;IACG,qBAAqB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDpG,OAAO,CAAC,iBAAiB;IAqBnB,mBAAmB,CACvB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,EAAE,UAAU,GAAG,SAAS,EACvC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAmB/B,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAO5E,mBAAmB,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YA+CnG,kBAAkB;YAMlB,iBAAiB;CAsBhC"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}

package/dest/validator.js

@@ -1,53 +1,49 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-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 { AuthRequest, AuthResponse, ReqRespSubProtocol } from '@aztec/p2p';
-import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
-import { computeInHashFromL1ToL2Messages } from '@aztec/prover-client/helpers';
+import { DateProvider } from '@aztec/foundation/timer';
+import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
 import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
-import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
-import { GlobalVariables } from '@aztec/stdlib/tx';
-import { AttestationTimeoutError, ReExFailedTxsError, ReExStateMismatchError, ReExTimeoutError, TransactionsNotAvailableError } from '@aztec/stdlib/validators';
+import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
+import { BlockProposalHandler } from './block_proposal_handler.js';
 import { ValidationService } from './duties/validation_service.js';
 import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
 import { ValidatorMetrics } from './metrics.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;
+// What errors from the block proposal handler result in slashing
+const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
+    'state_mismatch',
+    'failed_txs'
+];
 /**
  * Validator Client
  */ export class ValidatorClient extends EventEmitter {
-    blockBuilder;
     keyStore;
     epochCache;
     p2pClient;
-    blockSource;
-    l1ToL2MessageSource;
-    txProvider;
+    blockProposalHandler;
     config;
     dateProvider;
     log;
     tracer;
     validationService;
     metrics;
+    // Whether it has already registered handlers on the p2p client
+    hasRegisteredHandlers;
     // Used to check if we are sending the same proposal twice
     previousProposal;
     lastEpochForCommitteeUpdateLoop;
     epochCacheUpdateLoop;
-    blockProposalValidator;
     proposersOfInvalidBlocks;
-    constructor(blockBuilder, keyStore, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, config, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
-        super(), this.blockBuilder = blockBuilder, this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockSource = blockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.txProvider = txProvider, this.config = config, this.dateProvider = dateProvider, this.log = log, this.proposersOfInvalidBlocks = new Set();
+    constructor(keyStore, epochCache, p2pClient, blockProposalHandler, config, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
+        super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockProposalHandler = blockProposalHandler, this.config = config, this.dateProvider = dateProvider, this.log = log, this.hasRegisteredHandlers = false, this.proposersOfInvalidBlocks = new Set();
         this.tracer = telemetry.getTracer('Validator');
         this.metrics = new ValidatorMetrics(telemetry);
         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);
         const myAddresses = this.getValidatorAddresses();
@@ -94,14 +90,22 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         }
     }
     static new(config, blockBuilder, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
-        const validator = new ValidatorClient(blockBuilder, NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager), epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, config, dateProvider, telemetry);
-        // TODO(PhilWindle): This seems like it could/should be done inside start()
-        validator.registerBlockProposalHandler();
+        const metrics = new ValidatorMetrics(telemetry);
+        const blockProposalValidator = new BlockProposalValidator(epochCache);
+        const blockProposalHandler = new BlockProposalHandler(blockBuilder, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, config, metrics, dateProvider, telemetry);
+        const validator = new ValidatorClient(NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager), epochCache, p2pClient, blockProposalHandler, config, dateProvider, telemetry);
         return validator;
     }
     getValidatorAddresses() {
         return this.keyStore.getAddresses().filter((addr)=>!this.config.disabledValidators.some((disabled)=>disabled.equals(addr)));
     }
+    getBlockProposalHandler() {
+        return this.blockProposalHandler;
+    }
+    // Proxy method for backwards compatibility with tests
+    reExecuteTransactions(proposal, txs, l1ToL2Messages) {
+        return this.blockProposalHandler.reexecuteTransactions(proposal, txs, l1ToL2Messages);
+    }
     signWithAddress(addr, msg) {
         return this.keyStore.signTypedDataWithAddress(addr, msg);
     }
@@ -121,8 +125,11 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         };
     }
     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;
+        }
+        await this.registerHandlers();
         const myAddresses = this.getValidatorAddresses();
         const inCommittee = await this.epochCache.filterInCommittee('now', myAddresses);
         if (inCommittee.length > 0) {
@@ -131,185 +138,62 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
             this.log.info(`Started validator with addresses: ${myAddresses.map((a)=>a.toString()).join(', ')}`);
         }
         this.epochCacheUpdateLoop.start();
-        this.p2pClient.registerThisValidatorAddresses(myAddresses);
-        await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
         return Promise.resolve();
     }
     async stop() {
         await this.epochCacheUpdateLoop.stop();
     }
-    registerBlockProposalHandler() {
-        const handler = (block, proposalSender)=>this.attestToProposal(block, proposalSender);
-        this.p2pClient.registerBlockProposalHandler(handler);
+    /** Register handlers on the p2p client */ async registerHandlers() {
+        if (!this.hasRegisteredHandlers) {
+            this.hasRegisteredHandlers = true;
+            this.log.debug(`Registering validator handlers for p2p client`);
+            const handler = (block, proposalSender)=>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, proposalSender) {
         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)=>this.metrics.incFailedAttestations(1, reason, partOfCommittee);
         const proposalInfo = {
             ...proposal.toBlockInfo(),
             proposer: proposer.toString()
         };
-        this.log.info(`Received proposal for slot ${slotNumber}`, {
+        this.log.info(`Received proposal for block ${proposal.blockNumber} at slot ${slotNumber}`, {
             ...proposalInfo,
-            txHashes: proposal.txHashes.map((txHash)=>txHash.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())
+            txHashes: proposal.txHashes.map((t)=>t.toString())
         });
-        // 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, 0.5);
-            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;
-            }
-        }
-        // 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;
-        }
-        // 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');
-            }
-            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) {
-            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) {
+        // 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);
+        if (!validationResult.isValid) {
+            this.log.warn(`Proposal validation failed: ${validationResult.reason}`, proposalInfo);
+            incFailedAttestation(validationResult.reason || 'unknown');
+            // 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;
         }
+        // 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;
+        }
         // Provided all of the above checks pass, we can attest to the proposal
-        this.log.info(`Attesting to proposal for slot ${slotNumber}`, proposalInfo);
+        this.log.info(`Attesting to proposal for block ${proposal.blockNumber} at slot ${slotNumber}`, proposalInfo);
         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);
-    }
-    getReexecutionDeadline(proposal, config) {
-        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, txs, l1ToL2Messages) {
-        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);
     }
     slashInvalidBlock(proposal) {
         const proposer = proposal.getSender();
@@ -340,13 +224,16 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
     async broadcastBlockProposal(proposal) {
         await this.p2pClient.broadcastProposal(proposal);
     }
+    async signAttestationsAndSigners(attestationsAndSigners, proposer) {
+        return await this.validationService.signAttestationsAndSigners(attestationsAndSigners, proposer);
+    }
     async collectOwnAttestations(proposal) {
         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, required, deadline) {
         // Wait and poll the p2pClient's attestation pool for this block until we have enough attestations
@@ -382,7 +269,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
             await sleep(this.config.attestationPollingIntervalMs);
         }
     }
-    async doAttestToProposal(proposal, attestors = []) {
+    async createBlockAttestationsFromProposal(proposal, attestors = []) {
         const attestations = await this.validationService.attestToProposal(proposal, attestors);
         await this.p2pClient.addAttestations(attestations);
         return attestations;
@@ -405,4 +292,4 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         const authResponse = new AuthResponse(statusMessage, signature);
         return authResponse.toBuffer();
     }
-} // Conversion helpers moved into NodeKeystoreAdapter.
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/validator-client",
-  "version": "2.0.3",
+  "version": "2.1.0-rc.10",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -64,20 +64,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "2.0.3",
-    "@aztec/epoch-cache": "2.0.3",
-    "@aztec/ethereum": "2.0.3",
-    "@aztec/foundation": "2.0.3",
-    "@aztec/node-keystore": "2.0.3",
-    "@aztec/p2p": "2.0.3",
-    "@aztec/prover-client": "2.0.3",
-    "@aztec/slasher": "2.0.3",
-    "@aztec/stdlib": "2.0.3",
-    "@aztec/telemetry-client": "2.0.3",
+    "@aztec/constants": "2.1.0-rc.10",
+    "@aztec/epoch-cache": "2.1.0-rc.10",
+    "@aztec/ethereum": "2.1.0-rc.10",
+    "@aztec/foundation": "2.1.0-rc.10",
+    "@aztec/node-keystore": "2.1.0-rc.10",
+    "@aztec/p2p": "2.1.0-rc.10",
+    "@aztec/prover-client": "2.1.0-rc.10",
+    "@aztec/slasher": "2.1.0-rc.10",
+    "@aztec/stdlib": "2.1.0-rc.10",
+    "@aztec/telemetry-client": "2.1.0-rc.10",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "koa": "^2.16.1",
-    "koa-router": "^12.0.0",
-    "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "koa-router": "^13.1.1",
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",