@aztec/validator-client 0.0.0-test.1 → 0.0.1-commit.b655e406

package/src/block_proposal_handler.ts

@@ -0,0 +1,343 @@
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { TimeoutError } from '@aztec/foundation/error';
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+import { DateProvider, Timer } from '@aztec/foundation/timer';
+import type { P2P, PeerId } from '@aztec/p2p';
+import { TxProvider } from '@aztec/p2p';
+import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
+import { computeInHashFromL1ToL2Messages } from '@aztec/prover-client/helpers';
+import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
+import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import type { IFullNodeBlockBuilder, ValidatorClientFullConfig } from '@aztec/stdlib/interfaces/server';
+import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import { type BlockProposal, ConsensusPayload } from '@aztec/stdlib/p2p';
+import { BlockHeader, type FailedTx, GlobalVariables, type Tx } from '@aztec/stdlib/tx';
+import {
+  ReExFailedTxsError,
+  ReExStateMismatchError,
+  ReExTimeoutError,
+  TransactionsNotAvailableError,
+} from '@aztec/stdlib/validators';
+import { type TelemetryClient, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
+
+import type { ValidatorMetrics } from './metrics.js';
+
+export type BlockProposalValidationFailureReason =
+  | 'invalid_proposal'
+  | 'parent_block_not_found'
+  | 'parent_block_wrong_slot'
+  | 'in_hash_mismatch'
+  | 'block_number_already_exists'
+  | 'txs_not_available'
+  | 'state_mismatch'
+  | 'failed_txs'
+  | 'timeout'
+  | 'unknown_error';
+
+type ReexecuteTransactionsResult = {
+  block: L2Block;
+  failedTxs: FailedTx[];
+  reexecutionTimeMs: number;
+  totalManaUsed: number;
+};
+
+export type BlockProposalValidationSuccessResult = {
+  isValid: true;
+  blockNumber: number;
+  reexecutionResult?: ReexecuteTransactionsResult;
+};
+
+export type BlockProposalValidationFailureResult = {
+  isValid: false;
+  reason: BlockProposalValidationFailureReason;
+  blockNumber?: number;
+  reexecutionResult?: ReexecuteTransactionsResult;
+};
+
+export type BlockProposalValidationResult = BlockProposalValidationSuccessResult | BlockProposalValidationFailureResult;
+
+export class BlockProposalHandler {
+  public readonly tracer: Tracer;
+
+  constructor(
+    private blockBuilder: IFullNodeBlockBuilder,
+    private blockSource: L2BlockSource,
+    private l1ToL2MessageSource: L1ToL2MessageSource,
+    private txProvider: TxProvider,
+    private blockProposalValidator: BlockProposalValidator,
+    private config: ValidatorClientFullConfig,
+    private metrics?: ValidatorMetrics,
+    private dateProvider: DateProvider = new DateProvider(),
+    telemetry: TelemetryClient = getTelemetryClient(),
+    private log = createLogger('validator:block-proposal-handler'),
+  ) {
+    this.tracer = telemetry.getTracer('BlockProposalHandler');
+  }
+
+  registerForReexecution(p2pClient: P2P): BlockProposalHandler {
+    const handler = async (proposal: BlockProposal, proposalSender: PeerId) => {
+      try {
+        const result = await this.handleBlockProposal(proposal, proposalSender, true);
+        if (result.isValid) {
+          this.log.info(`Non-validator reexecution completed for slot ${proposal.slotNumber.toBigInt()}`, {
+            blockNumber: result.blockNumber,
+            reexecutionTimeMs: result.reexecutionResult?.reexecutionTimeMs,
+            totalManaUsed: result.reexecutionResult?.totalManaUsed,
+            numTxs: result.reexecutionResult?.block?.body?.txEffects?.length ?? 0,
+          });
+        } else {
+          this.log.warn(`Non-validator reexecution failed for slot ${proposal.slotNumber.toBigInt()}`, {
+            blockNumber: result.blockNumber,
+            reason: result.reason,
+          });
+        }
+      } catch (error) {
+        this.log.error('Error processing block proposal in non-validator handler', error);
+      }
+      return undefined; // Non-validator nodes don't return attestations
+    };
+
+    p2pClient.registerBlockProposalHandler(handler);
+    return this;
+  }
+
+  async handleBlockProposal(
+    proposal: BlockProposal,
+    proposalSender: PeerId,
+    shouldReexecute: boolean,
+  ): Promise<BlockProposalValidationResult> {
+    const slotNumber = proposal.slotNumber.toBigInt();
+    const proposer = proposal.getSender();
+    const config = this.blockBuilder.getConfig();
+
+    // Reject proposals with invalid signatures
+    if (!proposer) {
+      this.log.warn(`Received proposal with invalid signature for slot ${slotNumber}`);
+      return { isValid: false, reason: 'invalid_proposal' };
+    }
+
+    const proposalInfo = { ...proposal.toBlockInfo(), proposer: proposer.toString() };
+    this.log.info(`Processing proposal for slot ${slotNumber}`, {
+      ...proposalInfo,
+      txHashes: proposal.txHashes.map(t => t.toString()),
+    });
+
+    // Check that the proposal is from the current proposer, or the next proposer
+    // This should have been handled by the p2p layer, but we double check here out of caution
+    const invalidProposal = await this.blockProposalValidator.validate(proposal);
+    if (invalidProposal) {
+      this.log.warn(`Proposal is not valid, skipping processing`, proposalInfo);
+      return { isValid: false, reason: 'invalid_proposal' };
+    }
+
+    // Check that the parent proposal is a block we know, otherwise reexecution would fail
+    const parentBlockHeader = await this.getParentBlock(proposal);
+    if (parentBlockHeader === undefined) {
+      this.log.warn(`Parent block for proposal not found, skipping processing`, proposalInfo);
+      return { isValid: false, reason: 'parent_block_not_found' };
+    }
+
+    // Check that the parent block's slot is less than the proposal's slot (should not happen, but we check anyway)
+    if (parentBlockHeader !== 'genesis' && parentBlockHeader.getSlot() >= slotNumber) {
+      this.log.warn(`Parent block slot is greater than or equal to proposal slot, skipping processing`, {
+        parentBlockSlot: parentBlockHeader.getSlot().toString(),
+        proposalSlot: slotNumber.toString(),
+        ...proposalInfo,
+      });
+      return { isValid: false, reason: 'parent_block_wrong_slot' };
+    }
+
+    // Compute the block number based on the parent block
+    const blockNumber = parentBlockHeader === 'genesis' ? INITIAL_L2_BLOCK_NUM : parentBlockHeader.getBlockNumber() + 1;
+
+    // Check that this block number does not exist already
+    const existingBlock = await this.blockSource.getBlockHeader(blockNumber);
+    if (existingBlock) {
+      this.log.warn(`Block number ${blockNumber} already exists, skipping processing`, proposalInfo);
+      return { isValid: false, blockNumber, reason: 'block_number_already_exists' };
+    }
+
+    // Collect txs from the proposal. We start doing this as early as possible,
+    // and we do it even if we don't plan to re-execute the txs, so that we have them if another node needs them.
+    const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, blockNumber, {
+      pinnedPeer: proposalSender,
+      deadline: this.getReexecutionDeadline(slotNumber, config),
+    });
+
+    // Check that I have the same set of l1ToL2Messages as the proposal
+    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 processing`, {
+        proposalInHash: proposalInHash.toString(),
+        computedInHash: computedInHash.toString(),
+        ...proposalInfo,
+      });
+      return { isValid: false, blockNumber, reason: 'in_hash_mismatch' };
+    }
+
+    // Check that all of the transactions in the proposal are available
+    if (missingTxs.length > 0) {
+      this.log.warn(`Missing ${missingTxs.length} txs to process proposal`, { ...proposalInfo, missingTxs });
+      return { isValid: false, blockNumber, reason: 'txs_not_available' };
+    }
+
+    // Try re-executing the transactions in the proposal if needed
+    let reexecutionResult;
+    if (shouldReexecute) {
+      try {
+        this.log.verbose(`Re-executing transactions in the proposal`, proposalInfo);
+        reexecutionResult = await this.reexecuteTransactions(proposal, blockNumber, txs, l1ToL2Messages);
+      } catch (error) {
+        this.log.error(`Error reexecuting txs while processing block proposal`, error, proposalInfo);
+        const reason = this.getReexecuteFailureReason(error);
+        return { isValid: false, blockNumber, reason, reexecutionResult };
+      }
+    }
+
+    this.log.info(`Successfully processed proposal for slot ${slotNumber}`, proposalInfo);
+    return { isValid: true, blockNumber, reexecutionResult };
+  }
+
+  private async getParentBlock(proposal: BlockProposal): Promise<'genesis' | BlockHeader | undefined> {
+    const parentArchive = proposal.payload.header.lastArchiveRoot;
+    const slot = proposal.slotNumber.toBigInt();
+    const config = this.blockBuilder.getConfig();
+    const { genesisArchiveRoot } = await this.blockSource.getGenesisValues();
+
+    if (parentArchive.equals(genesisArchiveRoot)) {
+      return 'genesis';
+    }
+
+    const deadline = this.getReexecutionDeadline(slot, config);
+    const currentTime = this.dateProvider.now();
+    const timeoutDurationMs = deadline.getTime() - currentTime;
+
+    try {
+      return (
+        (await this.blockSource.getBlockHeaderByArchive(parentArchive)) ??
+        (timeoutDurationMs <= 0
+          ? undefined
+          : await retryUntil(
+              () =>
+                this.blockSource.syncImmediate().then(() => this.blockSource.getBlockHeaderByArchive(parentArchive)),
+              'force archiver sync',
+              timeoutDurationMs / 1000,
+              0.5,
+            ))
+      );
+    } catch (err) {
+      if (err instanceof TimeoutError) {
+        this.log.debug(`Timed out getting parent block by archive root`, { parentArchive });
+      } else {
+        this.log.error('Error getting parent block by archive root', err, { parentArchive });
+      }
+      return undefined;
+    }
+  }
+
+  private getReexecutionDeadline(slot: bigint, config: { l1GenesisTime: bigint; slotDuration: number }): Date {
+    const nextSlotTimestampSeconds = Number(getTimestampForSlot(slot + 1n, config));
+    const msNeededForPropagationAndPublishing = this.config.validatorReexecuteDeadlineMs;
+    return new Date(nextSlotTimestampSeconds * 1000 - msNeededForPropagationAndPublishing);
+  }
+
+  private getReexecuteFailureReason(err: any) {
+    if (err instanceof ReExStateMismatchError) {
+      return 'state_mismatch';
+    } else if (err instanceof ReExFailedTxsError) {
+      return 'failed_txs';
+    } else if (err instanceof ReExTimeoutError) {
+      return 'timeout';
+    } else {
+      return 'unknown_error';
+    }
+  }
+
+  async reexecuteTransactions(
+    proposal: BlockProposal,
+    blockNumber: number,
+    txs: Tx[],
+    l1ToL2Messages: Fr[],
+  ): Promise<ReexecuteTransactionsResult> {
+    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();
+
+    // We source most global variables from the proposal
+    const globalVariables = GlobalVariables.from({
+      slotNumber: proposal.payload.header.slotNumber, // checked in the block proposal validator
+      coinbase: proposal.payload.header.coinbase, // set arbitrarily by the proposer
+      feeRecipient: proposal.payload.header.feeRecipient, // set arbitrarily by the proposer
+      gasFees: proposal.payload.header.gasFees, // validated by the rollup contract
+      blockNumber, // computed from the parent block and checked it does not exist in archiver
+      timestamp: header.timestamp, // checked in the rollup contract against the slot number
+      chainId: new Fr(config.l1ChainId),
+      version: new Fr(config.rollupVersion),
+    });
+
+    const { block, failedTxs } = await this.blockBuilder.buildBlock(txs, l1ToL2Messages, globalVariables, {
+      deadline: this.getReexecutionDeadline(proposal.payload.header.slotNumber.toBigInt(), config),
+    });
+
+    const numFailedTxs = failedTxs.length;
+    const slot = proposal.slotNumber.toBigInt();
+    this.log.verbose(`Transaction re-execution complete for slot ${slot}`, {
+      numFailedTxs,
+      numProposalTxs: txHashes.length,
+      numProcessedTxs: block.body.txEffects.length,
+      slot,
+    });
+
+    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();
+    }
+
+    // Throw a ReExStateMismatchError error if state updates do not match
+    const blockPayload = ConsensusPayload.fromBlock(block);
+    if (!blockPayload.equals(proposal.payload)) {
+      this.log.warn(`Re-execution state mismatch for slot ${slot}`, {
+        expected: blockPayload.toInspect(),
+        actual: proposal.payload.toInspect(),
+      });
+      this.metrics?.recordFailedReexecution(proposal);
+      throw new ReExStateMismatchError(
+        proposal.archive,
+        block.archive.root,
+        proposal.payload.stateReference,
+        block.header.state,
+      );
+    }
+
+    const reexecutionTimeMs = timer.ms();
+    const totalManaUsed = block.header.totalManaUsed.toNumber() / 1e6;
+
+    this.metrics?.recordReex(reexecutionTimeMs, txs.length, totalManaUsed);
+
+    return {
+      block,
+      failedTxs,
+      reexecutionTimeMs,
+      totalManaUsed,
+    };
+  }
+}

package/src/config.ts

@@ -1,38 +1,47 @@
-import { NULL_KEY } from '@aztec/ethereum';
 import {
   type ConfigMappingsType,
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
+  secretValueConfigHelper,
 } from '@aztec/foundation/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { ValidatorClientConfig } from '@aztec/stdlib/interfaces/server';
 
-/**
- * The Validator Configuration
- */
-export interface ValidatorClientConfig {
-  /** The private key of the validator participating in attestation duties */
-  validatorPrivateKey?: string;
-
-  /** Do not run the validator */
-  disableValidator: boolean;
-
-  /** Interval between polling for new attestations from peers */
-  attestationPollingIntervalMs: number;
-
-  /** Re-execute transactions before attesting */
-  validatorReexecute: boolean;
-}
+export type { ValidatorClientConfig };
 
 export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientConfig> = {
-  validatorPrivateKey: {
-    env: 'VALIDATOR_PRIVATE_KEY',
-    parseEnv: (val: string) => (val ? `0x${val.replace('0x', '')}` : NULL_KEY),
-    description: 'The private key of the validator participating in attestation duties',
+  validatorPrivateKeys: {
+    env: 'VALIDATOR_PRIVATE_KEYS',
+    description: 'List of private keys of the validators participating in attestation duties',
+    ...secretValueConfigHelper<`0x${string}`[]>(val =>
+      val ? val.split(',').map<`0x${string}`>(key => `0x${key.replace('0x', '')}`) : [],
+    ),
+    fallback: ['VALIDATOR_PRIVATE_KEY'],
+  },
+  validatorAddresses: {
+    env: 'VALIDATOR_ADDRESSES',
+    description: 'List of addresses of the validators to use with remote signers',
+    parseEnv: (val: string) =>
+      val
+        .split(',')
+        .filter(address => address && address.trim().length > 0)
+        .map(address => EthAddress.fromString(address.trim())),
+    defaultValue: [],
   },
   disableValidator: {
     env: 'VALIDATOR_DISABLED',
     description: 'Do not run the validator',
-    ...booleanConfigHelper(),
+    ...booleanConfigHelper(false),
+  },
+  disabledValidators: {
+    description: 'Temporarily disable these specific validator addresses',
+    parseEnv: (val: string) =>
+      val
+        .split(',')
+        .filter(address => address && address.trim().length > 0)
+        .map(address => EthAddress.fromString(address.trim())),
+    defaultValue: [],
   },
   attestationPollingIntervalMs: {
     env: 'VALIDATOR_ATTESTATIONS_POLLING_INTERVAL_MS',
@@ -44,6 +53,17 @@ export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientCo
     description: 'Re-execute transactions before attesting',
     ...booleanConfigHelper(true),
   },
+  validatorReexecuteDeadlineMs: {
+    env: 'VALIDATOR_REEXECUTE_DEADLINE_MS',
+    description: 'Will re-execute until this many milliseconds are left in the slot',
+    ...numberConfigHelper(6000),
+  },
+  alwaysReexecuteBlockProposals: {
+    env: 'ALWAYS_REEXECUTE_BLOCK_PROPOSALS',
+    description:
+      'Whether to always reexecute block proposals, even for non-validator nodes (useful for monitoring network status).',
+    ...booleanConfigHelper(false),
+  },
 };
 
 /**

package/src/duties/validation_service.ts

@@ -1,13 +1,29 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256 } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
-import { BlockAttestation, BlockProposal, ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { Signature } from '@aztec/foundation/eth-signature';
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { unfreeze } from '@aztec/foundation/types';
+import type { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
+import {
+  BlockAttestation,
+  BlockProposal,
+  type BlockProposalOptions,
+  ConsensusPayload,
+  SignatureDomainSeparator,
+} from '@aztec/stdlib/p2p';
+import type { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import { StateReference, type Tx } from '@aztec/stdlib/tx';
 
 import type { ValidatorKeyStore } from '../key_store/interface.js';
 
 export class ValidationService {
-  constructor(private keyStore: ValidatorKeyStore) {}
+  constructor(
+    private keyStore: ValidatorKeyStore,
+    private log = createLogger('validator:validation-service'),
+  ) {}
 
   /**
    * Create a block proposal with the given header, archive, and transactions
@@ -15,31 +31,70 @@ export class ValidationService {
    * @param header - The block header
    * @param archive - The archive of the current block
    * @param txs - TxHash[] ordered list of transactions
+   * @param options - Block proposal options (including broadcastInvalidBlockProposal for testing)
    *
    * @returns A block proposal signing the above information (not the current implementation!!!)
    */
-  createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal> {
-    const payloadSigner = (payload: Buffer32) => this.keyStore.signMessage(payload);
+  async createBlockProposal(
+    header: CheckpointHeader,
+    archive: Fr,
+    stateReference: StateReference,
+    txs: Tx[],
+    proposerAttesterAddress: EthAddress | undefined,
+    options: BlockProposalOptions,
+  ): Promise<BlockProposal> {
+    let payloadSigner: (payload: Buffer32) => Promise<Signature>;
+    if (proposerAttesterAddress !== undefined) {
+      payloadSigner = (payload: Buffer32) => this.keyStore.signMessageWithAddress(proposerAttesterAddress, payload);
+    } else {
+      // if there is no proposer attester address, just use the first signer
+      const signer = this.keyStore.getAddress(0);
+      payloadSigner = (payload: Buffer32) => this.keyStore.signMessageWithAddress(signer, payload);
+    }
+    // TODO: check if this is calculated earlier / can not be recomputed
+    const txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
 
-    return BlockProposal.createProposalFromSigner(new ConsensusPayload(header, archive, txs), payloadSigner);
+    // For testing: corrupt the state reference to trigger state_mismatch validation failure
+    if (options.broadcastInvalidBlockProposal) {
+      unfreeze(stateReference.partial).noteHashTree = AppendOnlyTreeSnapshot.random();
+      this.log.warn(`Creating INVALID block proposal for slot ${header.slotNumber.toBigInt()}`);
+    }
+
+    return BlockProposal.createProposalFromSigner(
+      new ConsensusPayload(header, archive, stateReference),
+      txHashes,
+      options.publishFullTxs ? txs : undefined,
+      payloadSigner,
+    );
   }
 
   /**
-   * Attest to the given block proposal constructed by the current sequencer
+   * Attest with selection of validators to the given block proposal, constructed by the current sequencer
    *
    * NOTE: This is just a blind signing.
    *       We assume that the proposal is valid and DA guarantees have been checked previously.
    *
    * @param proposal - The proposal to attest to
-   * @returns attestation
+   * @param attestors - The validators to attest with
+   * @returns attestations
    */
-  async attestToProposal(proposal: BlockProposal): Promise<BlockAttestation> {
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7961): check that the current validator is correct
+  async attestToProposal(proposal: BlockProposal, attestors: EthAddress[]): Promise<BlockAttestation[]> {
+    const buf = Buffer32.fromBuffer(
+      keccak256(proposal.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation)),
+    );
+    const signatures = await Promise.all(
+      attestors.map(attestor => this.keyStore.signMessageWithAddress(attestor, buf)),
+    );
+    return signatures.map(sig => new BlockAttestation(proposal.payload, sig, proposal.signature));
+  }
 
+  async signAttestationsAndSigners(
+    attestationsAndSigners: CommitteeAttestationsAndSigners,
+    proposer: EthAddress,
+  ): Promise<Signature> {
     const buf = Buffer32.fromBuffer(
-      keccak256(await proposal.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation)),
+      keccak256(attestationsAndSigners.getPayloadToSign(SignatureDomainSeparator.attestationsAndSigners)),
     );
-    const sig = await this.keyStore.signMessage(buf);
-    return new BlockAttestation(proposal.payload, sig);
+    return await this.keyStore.signMessageWithAddress(proposer, buf);
   }
 }

package/src/factory.ts

@@ -1,28 +1,73 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { P2P } from '@aztec/p2p';
+import type { KeystoreManager } from '@aztec/node-keystore';
+import { BlockProposalValidator, type P2PClient } from '@aztec/p2p';
+import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { IFullNodeBlockBuilder, ValidatorClientFullConfig } from '@aztec/stdlib/interfaces/server';
+import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 
-import { generatePrivateKey } from 'viem/accounts';
-
-import type { ValidatorClientConfig } from './config.js';
+import { BlockProposalHandler } from './block_proposal_handler.js';
+import { ValidatorMetrics } from './metrics.js';
 import { ValidatorClient } from './validator.js';
 
+export function createBlockProposalHandler(
+  config: ValidatorClientFullConfig,
+  deps: {
+    blockBuilder: IFullNodeBlockBuilder;
+    blockSource: L2BlockSource;
+    l1ToL2MessageSource: L1ToL2MessageSource;
+    p2pClient: P2PClient;
+    epochCache: EpochCache;
+    dateProvider: DateProvider;
+    telemetry: TelemetryClient;
+  },
+) {
+  const metrics = new ValidatorMetrics(deps.telemetry);
+  const blockProposalValidator = new BlockProposalValidator(deps.epochCache, {
+    txsPermitted: !config.disableTransactions,
+  });
+  return new BlockProposalHandler(
+    deps.blockBuilder,
+    deps.blockSource,
+    deps.l1ToL2MessageSource,
+    deps.p2pClient.getTxProvider(),
+    blockProposalValidator,
+    config,
+    metrics,
+    deps.dateProvider,
+    deps.telemetry,
+  );
+}
+
 export function createValidatorClient(
-  config: ValidatorClientConfig,
+  config: ValidatorClientFullConfig,
   deps: {
-    p2pClient: P2P;
+    blockBuilder: IFullNodeBlockBuilder;
+    p2pClient: P2PClient;
+    blockSource: L2BlockSource;
+    l1ToL2MessageSource: L1ToL2MessageSource;
     telemetry: TelemetryClient;
     dateProvider: DateProvider;
     epochCache: EpochCache;
+    keyStoreManager: KeystoreManager | undefined;
   },
 ) {
-  if (config.disableValidator) {
+  if (config.disableValidator || !deps.keyStoreManager) {
     return undefined;
   }
-  if (config.validatorPrivateKey === undefined || config.validatorPrivateKey === '') {
-    config.validatorPrivateKey = generatePrivateKey();
-  }
 
-  return ValidatorClient.new(config, deps.epochCache, deps.p2pClient, deps.dateProvider, deps.telemetry);
+  const txProvider = deps.p2pClient.getTxProvider();
+  return ValidatorClient.new(
+    config,
+    deps.blockBuilder,
+    deps.epochCache,
+    deps.p2pClient,
+    deps.blockSource,
+    deps.l1ToL2MessageSource,
+    txProvider,
+    deps.keyStoreManager,
+    deps.dateProvider,
+    deps.telemetry,
+  );
 }

package/src/index.ts

@@ -1,3 +1,5 @@
+export * from './block_proposal_handler.js';
 export * from './config.js';
-export * from './validator.js';
 export * from './factory.js';
+export * from './validator.js';
+export * from './key_store/index.js';

package/src/key_store/index.ts

@@ -1,2 +1,4 @@
 export * from './interface.js';
 export * from './local_key_store.js';
+export * from './node_keystore_adapter.js';
+export * from './web3signer_key_store.js';