@aztec/validator-client 0.87.7 → 1.0.0-nightly.20250604

package/dest/config.d.ts

@@ -3,14 +3,16 @@ import { type ConfigMappingsType } from '@aztec/foundation/config';
  * The Validator Configuration
  */
 export interface ValidatorClientConfig {
-    /** The private key of the validator participating in attestation duties */
-    validatorPrivateKey?: string;
+    /** The private keys of the validators participating in attestation duties */
+    validatorPrivateKeys?: `0x${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;
+    /** Will re-execute until this many milliseconds are left in the slot */
+    validatorReexecuteDeadlineMs: number;
 }
 export declare const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientConfig>;
 /**

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,2EAA2E;IAC3E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,+BAA+B;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,+DAA+D;IAC/D,4BAA4B,EAAE,MAAM,CAAC;IAErC,+CAA+C;IAC/C,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CAqBnF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,6EAA6E;IAC7E,oBAAoB,CAAC,EAAE,KAAK,MAAM,EAAE,EAAE,CAAC;IAEvC,+BAA+B;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,+DAA+D;IAC/D,4BAA4B,EAAE,MAAM,CAAC;IAErC,+CAA+C;IAC/C,kBAAkB,EAAE,OAAO,CAAC;IAE5B,wEAAwE;IACxE,4BAA4B,EAAE,MAAM,CAAC;CACtC;AAED,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CA0BnF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}

package/dest/config.js

@@ -1,10 +1,9 @@
-import { NULL_KEY } from '@aztec/ethereum';
 import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
 export const validatorClientConfigMappings = {
-    validatorPrivateKey: {
-        env: 'VALIDATOR_PRIVATE_KEY',
-        parseEnv: (val)=>val ? `0x${val.replace('0x', '')}` : NULL_KEY,
-        description: 'The private key of the validator participating in attestation duties'
+    validatorPrivateKeys: {
+        env: 'VALIDATOR_PRIVATE_KEYS',
+        parseEnv: (val)=>val.split(',').map((key)=>`0x${key.replace('0x', '')}`),
+        description: 'List of private keys of the validators participating in attestation duties'
     },
     disableValidator: {
         env: 'VALIDATOR_DISABLED',
@@ -20,6 +19,11 @@ export const validatorClientConfigMappings = {
         env: 'VALIDATOR_REEXECUTE',
         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)
     }
 };
 /**

package/dest/duties/validation_service.d.ts

@@ -1,3 +1,4 @@
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
 import { BlockAttestation, BlockProposal, type BlockProposalOptions } from '@aztec/stdlib/p2p';
 import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
@@ -15,16 +16,17 @@ export declare class ValidationService {
      *
      * @returns A block proposal signing the above information (not the current implementation!!!)
      */
-    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal>;
+    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], proposerAttesterAddress: EthAddress, options: BlockProposalOptions): Promise<BlockProposal>;
     /**
-     * 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
      */
-    attestToProposal(proposal: BlockProposal): Promise<BlockAttestation>;
+    attestToProposal(proposal: BlockProposal, attestors: EthAddress[]): Promise<BlockAttestation[]>;
 }
 //# sourceMappingURL=validation_service.d.ts.map

package/dest/duties/validation_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,KAAK,oBAAoB,EAG1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAE/C;;;;;;;;;OASG;IACG,mBAAmB,CACvB,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAS3E"}
+{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,KAAK,oBAAoB,EAG1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAE/C;;;;;;;;;OASG;IACG,mBAAmB,CACvB,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,uBAAuB,EAAE,UAAU,EACnC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;;;OASG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAUtG"}

package/dest/duties/validation_service.js

@@ -15,24 +15,25 @@ export class ValidationService {
    * @param txs - TxHash[] ordered list of transactions
    *
    * @returns A block proposal signing the above information (not the current implementation!!!)
-   */ async createBlockProposal(blockNumber, header, archive, stateReference, txs, options) {
-        const payloadSigner = (payload)=>this.keyStore.signMessage(payload);
+   */ async createBlockProposal(blockNumber, header, archive, stateReference, txs, proposerAttesterAddress, options) {
+        const payloadSigner = (payload)=>this.keyStore.signMessageWithAddress(proposerAttesterAddress, 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(blockNumber, 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
-   */ async attestToProposal(proposal) {
-        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7961): check that the current validator is correct
+   * @param attestors - The validators to attest with
+   * @returns attestations
+   */ async attestToProposal(proposal, attestors) {
         const buf = Buffer32.fromBuffer(keccak256(proposal.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation)));
-        const sig = await this.keyStore.signMessage(buf);
-        return new BlockAttestation(proposal.blockNumber, proposal.payload, sig);
+        const signatures = await Promise.all(attestors.map((attestor)=>this.keyStore.signMessageWithAddress(attestor, buf)));
+        //await this.keyStore.signMessage(buf);
+        return signatures.map((sig)=>new BlockAttestation(proposal.blockNumber, proposal.payload, sig));
     }
 }

package/dest/factory.d.ts

@@ -2,10 +2,12 @@ import type { EpochCache } from '@aztec/epoch-cache';
 import type { DateProvider } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
 import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { IFullNodeBlockBuilder } from '@aztec/stdlib/interfaces/server';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 import type { ValidatorClientConfig } from './config.js';
 import { ValidatorClient } from './validator.js';
 export declare function createValidatorClient(config: ValidatorClientConfig, deps: {
+    blockBuilder: IFullNodeBlockBuilder;
     p2pClient: P2P;
     blockSource: L2BlockSource;
     telemetry: TelemetryClient;

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;IACJ,SAAS,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,aAAa,CAAC;IAC3B,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;CACxB,+BAiBF"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;IACJ,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,aAAa,CAAC;IAC3B,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;CACxB,+BAkBF"}

package/dest/factory.js

@@ -4,8 +4,10 @@ export function createValidatorClient(config, deps) {
     if (config.disableValidator) {
         return undefined;
     }
-    if (config.validatorPrivateKey === undefined || config.validatorPrivateKey === '') {
-        config.validatorPrivateKey = generatePrivateKey();
+    if (config.validatorPrivateKeys === undefined || !config.validatorPrivateKeys?.length) {
+        config.validatorPrivateKeys = [
+            generatePrivateKey()
+        ];
     }
-    return ValidatorClient.new(config, deps.epochCache, deps.p2pClient, deps.blockSource, deps.dateProvider, deps.telemetry);
+    return ValidatorClient.new(config, deps.blockBuilder, deps.epochCache, deps.p2pClient, deps.blockSource, deps.dateProvider, deps.telemetry);
 }

package/dest/key_store/interface.d.ts

@@ -7,19 +7,28 @@ import type { Signature } from '@aztec/foundation/eth-signature';
  */
 export interface ValidatorKeyStore {
     /**
-     * Get the address of the signer
+     * Get the address of a signer by index
      *
+     * @param index - The index of the signer
      * @returns the address
      */
-    getAddress(): EthAddress;
-    sign(message: Buffer32): Promise<Signature>;
+    getAddress(index: number): EthAddress;
+    /**
+     * Get all addresses
+     *
+     * @returns all addresses
+     */
+    getAddresses(): EthAddress[];
+    sign(message: Buffer32): Promise<Signature[]>;
+    signWithAddress(address: EthAddress, message: Buffer32): Promise<Signature>;
     /**
      * Flavor of sign message that followed EIP-712 eth signed message prefix
      * Note: this is only required when we are using ecdsa signatures over secp256k1
      *
      * @param message - The message to sign.
-     * @returns The signature.
+     * @returns The signatures.
      */
-    signMessage(message: Buffer32): Promise<Signature>;
+    signMessage(message: Buffer32): Promise<Signature[]>;
+    signMessageWithAddress(address: EthAddress, message: Buffer32): Promise<Signature>;
 }
 //# sourceMappingURL=interface.d.ts.map

package/dest/key_store/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/key_store/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,UAAU,IAAI,UAAU,CAAC;IAEzB,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACpD"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/key_store/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC;IAEtC;;;;OAIG;IACH,YAAY,IAAI,UAAU,EAAE,CAAC;IAE7B,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9C,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5E;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACrD,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACpF"}

package/dest/key_store/local_key_store.d.ts

@@ -5,24 +5,53 @@ import type { ValidatorKeyStore } from './interface.js';
 /**
  * Local Key Store
  *
- * An implementation of the Key store using an in memory private key.
+ * An implementation of the Key store using in memory private keys.
  */
 export declare class LocalKeyStore implements ValidatorKeyStore {
-    private signer;
-    constructor(privateKey: Buffer32);
+    private signers;
+    private signersByAddress;
+    constructor(privateKeys: Buffer32[]);
     /**
-     * Get the address of the signer
+     * Get the address of a signer by index
      *
+     * @param index - The index of the signer
      * @returns the address
      */
-    getAddress(): EthAddress;
+    getAddress(index: number): EthAddress;
     /**
-     * Sign a message with the keystore private key
+     * Get the addresses of all signers
      *
-     * @param messageBuffer - The message buffer to sign
+     * @returns the addresses
+     */
+    getAddresses(): EthAddress[];
+    /**
+     * Sign a message with all keystore private keys
+     * @param digest - The message buffer to sign
      * @return signature
      */
-    sign(digest: Buffer32): Promise<Signature>;
-    signMessage(message: Buffer32): Promise<Signature>;
+    sign(digest: Buffer32): Promise<Signature[]>;
+    /**
+     * Sign a message with a specific address's private key
+     * @param address - The address of the signer to use
+     * @param digest - The message buffer to sign
+     * @returns signature for the specified address
+     * @throws Error if the address is not found in the keystore
+     */
+    signWithAddress(address: EthAddress, digest: Buffer32): Promise<Signature>;
+    /**
+     * Sign a message with all keystore private keys
+     *
+     * @param message - The message to sign
+     * @return signatures
+     */
+    signMessage(message: Buffer32): Promise<Signature[]>;
+    /**
+     * Sign a message with a specific address's private key
+     * @param address - The address of the signer to use
+     * @param message - The message to sign
+     * @returns signature for the specified address
+     * @throws Error if the address is not found in the keystore
+     */
+    signMessageWithAddress(address: EthAddress, message: Buffer32): Promise<Signature>;
 }
 //# sourceMappingURL=local_key_store.d.ts.map

package/dest/key_store/local_key_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local_key_store.d.ts","sourceRoot":"","sources":["../../src/key_store/local_key_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;GAIG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IACrD,OAAO,CAAC,MAAM,CAAkB;gBAEpB,UAAU,EAAE,QAAQ;IAIhC;;;;OAIG;IACI,UAAU,IAAI,UAAU;IAI/B;;;;;OAKG;IACI,IAAI,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAM1C,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;CAK1D"}
+{"version":3,"file":"local_key_store.d.ts","sourceRoot":"","sources":["../../src/key_store/local_key_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;GAIG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IACrD,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,gBAAgB,CAAsC;gBAElD,WAAW,EAAE,QAAQ,EAAE;IAKnC;;;;;OAKG;IACI,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU;IAO5C;;;;OAIG;IACI,YAAY,IAAI,UAAU,EAAE;IAInC;;;;OAIG;IACI,IAAI,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAInD;;;;;;OAMG;IACI,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAQjF;;;;;OAKG;IACI,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAI3D;;;;;;OAMG;IACI,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;CAO1F"}

package/dest/key_store/local_key_store.js

@@ -2,31 +2,74 @@ import { Secp256k1Signer } from '@aztec/foundation/crypto';
 /**
  * Local Key Store
  *
- * An implementation of the Key store using an in memory private key.
+ * An implementation of the Key store using in memory private keys.
  */ export class LocalKeyStore {
-    signer;
-    constructor(privateKey){
-        this.signer = new Secp256k1Signer(privateKey);
+    signers;
+    signersByAddress;
+    constructor(privateKeys){
+        this.signers = privateKeys.map((privateKey)=>new Secp256k1Signer(privateKey));
+        this.signersByAddress = new Map(this.signers.map((signer)=>[
+                signer.address.toString(),
+                signer
+            ]));
     }
     /**
-   * Get the address of the signer
+   * Get the address of a signer by index
    *
+   * @param index - The index of the signer
    * @returns the address
-   */ getAddress() {
-        return this.signer.address;
+   */ getAddress(index) {
+        if (index >= this.signers.length) {
+            throw new Error(`Index ${index} is out of bounds.`);
+        }
+        return this.signers[index].address;
     }
     /**
-   * Sign a message with the keystore private key
+   * Get the addresses of all signers
    *
-   * @param messageBuffer - The message buffer to sign
+   * @returns the addresses
+   */ getAddresses() {
+        return this.signers.map((signer)=>signer.address);
+    }
+    /**
+   * Sign a message with all keystore private keys
+   * @param digest - The message buffer to sign
    * @return signature
    */ sign(digest) {
-        const signature = this.signer.sign(digest);
-        return Promise.resolve(signature);
+        return Promise.all(this.signers.map((signer)=>signer.sign(digest)));
+    }
+    /**
+   * Sign a message with a specific address's private key
+   * @param address - The address of the signer to use
+   * @param digest - The message buffer to sign
+   * @returns signature for the specified address
+   * @throws Error if the address is not found in the keystore
+   */ signWithAddress(address, digest) {
+        const signer = this.signersByAddress.get(address.toString());
+        if (!signer) {
+            throw new Error(`No signer found for address ${address.toString()}`);
+        }
+        return Promise.resolve(signer.sign(digest));
     }
-    signMessage(message) {
-        // Sign message adds eth sign prefix and hashes before signing
-        const signature = this.signer.signMessage(message);
-        return Promise.resolve(signature);
+    /**
+   * Sign a message with all keystore private keys
+   *
+   * @param message - The message to sign
+   * @return signatures
+   */ signMessage(message) {
+        return Promise.all(this.signers.map((signer)=>signer.signMessage(message)));
+    }
+    /**
+   * Sign a message with a specific address's private key
+   * @param address - The address of the signer to use
+   * @param message - The message to sign
+   * @returns signature for the specified address
+   * @throws Error if the address is not found in the keystore
+   */ signMessageWithAddress(address, message) {
+        const signer = this.signersByAddress.get(address.toString());
+        if (!signer) {
+            throw new Error(`No signer found for address ${address.toString()}`);
+        }
+        return Promise.resolve(signer.signMessage(message));
     }
 }

package/dest/metrics.d.ts

@@ -9,7 +9,7 @@ export declare class ValidatorMetrics {
     reExecutionTimer(): () => void;
     recordReExecutionTime(time: number): void;
     recordFailedReexecution(proposal: BlockProposal): void;
-    incAttestations(): void;
-    incFailedAttestations(reason: string): void;
+    incAttestations(num: number): void;
+    incFailedAttestations(num: number, reason: string): void;
 }
 //# sourceMappingURL=metrics.d.ts.map

package/dest/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,wBAAwB,CAAgB;IAChD,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,uBAAuB,CAAgB;gBAEnC,eAAe,EAAE,eAAe;IA0BrC,gBAAgB,IAAI,MAAM,IAAI;IAQ9B,qBAAqB,CAAC,IAAI,EAAE,MAAM;IAIlC,uBAAuB,CAAC,QAAQ,EAAE,aAAa;IAO/C,eAAe;IAIf,qBAAqB,CAAC,MAAM,EAAE,MAAM;CAK5C"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,wBAAwB,CAAgB;IAChD,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,uBAAuB,CAAgB;gBAEnC,eAAe,EAAE,eAAe;IA0BrC,gBAAgB,IAAI,MAAM,IAAI;IAQ9B,qBAAqB,CAAC,IAAI,EAAE,MAAM;IAIlC,uBAAuB,CAAC,QAAQ,EAAE,aAAa;IAO/C,eAAe,CAAC,GAAG,EAAE,MAAM;IAI3B,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAKzD"}

package/dest/metrics.js

@@ -41,11 +41,11 @@ export class ValidatorMetrics {
             [Attributes.BLOCK_PROPOSER]: proposal.getSender().toString()
         });
     }
-    incAttestations() {
-        this.attestationsCount.add(1);
+    incAttestations(num) {
+        this.attestationsCount.add(num);
     }
-    incFailedAttestations(reason) {
-        this.failedAttestationsCount.add(1, {
+    incFailedAttestations(num, reason) {
+        this.failedAttestationsCount.add(num, {
             [Attributes.ERROR_TYPE]: reason
         });
     }

package/dest/validator.d.ts

@@ -1,34 +1,20 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { DateProvider, type Timer } from '@aztec/foundation/timer';
-import { type P2P, type PeerId } from '@aztec/p2p';
-import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
+import { DateProvider } from '@aztec/foundation/timer';
+import type { P2P, PeerId } from '@aztec/p2p';
+import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { IFullNodeBlockBuilder } from '@aztec/stdlib/interfaces/server';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
-import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
+import { type ProposedBlockHeader, type StateReference, type Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, WithTracer } from '@aztec/telemetry-client';
 import type { ValidatorClientConfig } from './config.js';
 import type { ValidatorKeyStore } from './key_store/interface.js';
-/**
- * Callback function for building a block
- *
- * We reuse the sequencer's block building functionality for re-execution
- */
-type BlockBuilderCallback = (blockNumber: Fr, header: ProposedBlockHeader, txs: Iterable<Tx> | AsyncIterableIterator<Tx>, opts?: {
-    validateOnly?: boolean;
-}) => Promise<{
-    block: L2Block;
-    publicProcessorDuration: number;
-    numTxs: number;
-    numFailedTxs: number;
-    blockBuildingTimer: Timer;
-}>;
 export interface Validator {
     start(): Promise<void>;
     registerBlockProposalHandler(): void;
-    registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
-    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal | undefined>;
-    attestToProposal(proposal: BlockProposal, sender: PeerId): Promise<BlockAttestation | undefined>;
+    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], proposerAddress: EthAddress, options: BlockProposalOptions): Promise<BlockProposal | undefined>;
+    attestToProposal(proposal: BlockProposal, sender: PeerId): Promise<BlockAttestation[] | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
 }
@@ -36,6 +22,7 @@ export interface Validator {
  * Validator Client
  */
 export declare class ValidatorClient extends WithTracer implements Validator {
+    private blockBuilder;
     private keyStore;
     private epochCache;
     private p2pClient;
@@ -46,35 +33,28 @@ export declare class ValidatorClient extends WithTracer implements Validator {
     private validationService;
     private metrics;
     private previousProposal?;
-    private blockBuilder?;
-    private myAddress;
+    private myAddresses;
     private lastEpoch;
     private epochCacheUpdateLoop;
     private blockProposalValidator;
     private txCollector;
-    constructor(keyStore: ValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, config: ValidatorClientConfig, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    constructor(blockBuilder: IFullNodeBlockBuilder, keyStore: ValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, config: ValidatorClientConfig, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     private handleEpochCommitteeUpdate;
-    static new(config: ValidatorClientConfig, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
-    getValidatorAddress(): EthAddress;
+    static new(config: ValidatorClientConfig, blockBuilder: IFullNodeBlockBuilder, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
+    getValidatorAddresses(): EthAddress[];
     start(): Promise<void>;
     stop(): Promise<void>;
     registerBlockProposalHandler(): void;
-    /**
-     * Register a callback function for building a block
-     *
-     * We reuse the sequencer's block building functionality for re-execution
-     */
-    registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
-    attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation | undefined>;
+    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[]): Promise<void>;
-    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal | undefined>;
+    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], proposerAddress: EthAddress, options: BlockProposalOptions): Promise<BlockProposal | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
     private doAttestToProposal;
 }
-export {};
 //# sourceMappingURL=validator.d.ts.map

package/dest/validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}