@aztec/stdlib 5.0.0-private.20260319 → 5.0.0-rc.1

package/dest/interfaces/validator.d.ts

@@ -1,20 +1,23 @@
-import type { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import type { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { SecretValue } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
 import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
-import type { BlockProposal, BlockProposalOptions, CheckpointAttestation, CheckpointLastBlockData, CheckpointProposal, CheckpointProposalOptions } from '@aztec/stdlib/p2p';
+import type { BlockProposal, BlockProposalOptions, CheckpointAttestation, CheckpointProposal, CheckpointProposalOptions } from '@aztec/stdlib/p2p';
 import type { CheckpointHeader } from '@aztec/stdlib/rollup';
 import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
 import type { PeerId } from '@libp2p/interface';
 import { z } from 'zod';
 import type { CommitteeAttestationsAndSigners } from '../block/index.js';
+import type { ChainConfig } from '../config/chain-config.js';
 import { type LocalSignerConfig, type ValidatorHASignerConfig } from '../ha-signing/index.js';
 /**
  * Validator client configuration
  */
 export type ValidatorClientConfig = ValidatorHASignerConfig & LocalSignerConfig & {
+    /** The L1 chain id used for EIP-712 proposal-path signing. */
+    l1ChainId: ChainConfig['l1ChainId'];
     /** The private keys of the validators participating in attestation duties */
     validatorPrivateKeys?: SecretValue<`0x${string}`[]>;
     /** The addresses of the validators to use with remote signers */
@@ -25,9 +28,7 @@ export type ValidatorClientConfig = ValidatorHASignerConfig & LocalSignerConfig
     disabledValidators: EthAddress[];
     /** Interval between polling for new attestations from peers */
     attestationPollingIntervalMs: number;
-    /** Whether to re-execute transactions in a block proposal before attesting */
-    validatorReexecute: boolean;
-    /** Whether to always reexecute block proposals, even for non-validator nodes or when out of the currnet committee */
+    /** Whether to always reexecute block proposals, even for non-validator nodes or when out of the current committee */
     alwaysReexecuteBlockProposals?: boolean;
     /** Whether to run in fisherman mode: validates all proposals and attestations but does not broadcast attestations or participate in consensus */
     fishermanMode?: boolean;
@@ -37,6 +38,8 @@ export type ValidatorClientConfig = ValidatorHASignerConfig & LocalSignerConfig
     skipPushProposedBlocksToArchiver?: boolean;
     /** Agree to attest to equivocated checkpoint proposals (for testing purposes only) */
     attestToEquivocatedProposals?: boolean;
+    /** Accept proposal validation regardless of slot timing (for testing only) */
+    skipProposalSlotValidation?: boolean;
     /** Maximum L2 gas per block for validation. Proposals exceeding this limit are rejected. */
     validateMaxL2BlockGas?: number;
     /** Maximum DA gas per block for validation. Proposals exceeding this limit are rejected. */
@@ -46,307 +49,111 @@ export type ValidatorClientConfig = ValidatorHASignerConfig & LocalSignerConfig
     /** Maximum transactions per checkpoint for validation. Proposals exceeding this limit are rejected. */
     validateMaxTxsPerCheckpoint?: number;
 };
-export type ValidatorClientFullConfig = ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowListExtend' | 'broadcastInvalidBlockProposal'> & Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty' | 'slashDuplicateProposalPenalty' | 'slashDuplicateAttestationPenalty'> & {
+export type ValidatorClientFullConfig = ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowListExtend' | 'broadcastInvalidBlockProposal' | 'maxBlocksPerCheckpoint'> & Required<Pick<SequencerConfig, 'blockDurationMs'>> & Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty' | 'slashBroadcastedInvalidCheckpointProposalPenalty' | 'slashDuplicateProposalPenalty' | 'slashDuplicateAttestationPenalty' | 'slashAttestInvalidCheckpointProposalPenalty'> & {
     /**
      * Whether transactions are disabled for this node
      * @remarks This should match the property in P2PConfig. It's not picked from there to avoid circular dependencies.
      */
     disableTransactions?: boolean;
+    /**
+     * Maximum clock-disparity tolerance (ms) applied to proposal/attestation receive windows.
+     * @remarks Mirrors the property in P2PConfig. It's not picked from there to avoid circular dependencies.
+     */
+    maxGossipClockDisparityMs?: number;
 };
 export declare const ValidatorClientConfigSchema: z.ZodObject<{
-    haSigningEnabled: z.ZodBoolean;
-    databaseUrl: z.ZodOptional<z.ZodString>;
-    poolMaxCount: z.ZodOptional<z.ZodNumber>;
-    poolMinCount: z.ZodOptional<z.ZodNumber>;
-    poolIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
-    poolConnectionTimeoutMs: z.ZodOptional<z.ZodNumber>;
-} & {
-    l1Contracts: z.ZodObject<{
-        rollupAddress: z.ZodType<EthAddress, z.ZodTypeDef, EthAddress>;
-    }, "strip", z.ZodTypeAny, {
-        rollupAddress: EthAddress;
-    }, {
-        rollupAddress: EthAddress;
-    }>;
+    rollupAddress: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
     nodeId: z.ZodString;
     pollingIntervalMs: z.ZodNumber;
     signingTimeoutMs: z.ZodNumber;
     maxStuckDutiesAgeMs: z.ZodOptional<z.ZodNumber>;
     cleanupOldDutiesAfterHours: z.ZodOptional<z.ZodNumber>;
+    haSigningEnabled: z.ZodBoolean;
+    databaseUrl: z.ZodOptional<z.ZodType<SecretValue<string>, any, z.core.$ZodTypeInternals<SecretValue<string>, any>>>;
+    poolMaxCount: z.ZodOptional<z.ZodNumber>;
+    poolMinCount: z.ZodOptional<z.ZodNumber>;
+    poolIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
+    poolConnectionTimeoutMs: z.ZodOptional<z.ZodNumber>;
     dataDirectory: z.ZodOptional<z.ZodString>;
     dataStoreMapSizeKb: z.ZodNumber;
     signingProtectionMapSizeKb: z.ZodOptional<z.ZodNumber>;
-} & {
-    validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, any, string>, "many">>;
+    l1ChainId: z.ZodNumber;
+    validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>>>;
     disableValidator: z.ZodBoolean;
-    disabledValidators: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    disabledValidators: z.ZodArray<z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>>;
     attestationPollingIntervalMs: z.ZodNumber;
-    validatorReexecute: z.ZodBoolean;
     alwaysReexecuteBlockProposals: z.ZodOptional<z.ZodBoolean>;
     fishermanMode: z.ZodOptional<z.ZodBoolean>;
     skipCheckpointProposalValidation: z.ZodOptional<z.ZodBoolean>;
     skipPushProposedBlocksToArchiver: z.ZodOptional<z.ZodBoolean>;
     attestToEquivocatedProposals: z.ZodOptional<z.ZodBoolean>;
+    skipProposalSlotValidation: z.ZodOptional<z.ZodBoolean>;
     validateMaxL2BlockGas: z.ZodOptional<z.ZodNumber>;
     validateMaxDABlockGas: z.ZodOptional<z.ZodNumber>;
     validateMaxTxsPerBlock: z.ZodOptional<z.ZodNumber>;
     validateMaxTxsPerCheckpoint: z.ZodOptional<z.ZodNumber>;
-}, "strip", z.ZodTypeAny, {
-    l1Contracts: {
-        rollupAddress: EthAddress;
-    };
-    nodeId: string;
-    pollingIntervalMs: number;
-    signingTimeoutMs: number;
-    maxStuckDutiesAgeMs?: number | undefined;
-    cleanupOldDutiesAfterHours?: number | undefined;
-    haSigningEnabled: boolean;
-    databaseUrl?: string | undefined;
-    poolMaxCount?: number | undefined;
-    poolMinCount?: number | undefined;
-    poolIdleTimeoutMs?: number | undefined;
-    poolConnectionTimeoutMs?: number | undefined;
-    dataDirectory?: string | undefined;
-    dataStoreMapSizeKb: number;
-    signingProtectionMapSizeKb?: number | undefined;
-    validatorAddresses?: EthAddress[] | undefined;
-    disableValidator: boolean;
-    disabledValidators: EthAddress[];
-    attestationPollingIntervalMs: number;
-    validatorReexecute: boolean;
-    alwaysReexecuteBlockProposals?: boolean | undefined;
-    fishermanMode?: boolean | undefined;
-    skipCheckpointProposalValidation?: boolean | undefined;
-    skipPushProposedBlocksToArchiver?: boolean | undefined;
-    attestToEquivocatedProposals?: boolean | undefined;
-    validateMaxL2BlockGas?: number | undefined;
-    validateMaxDABlockGas?: number | undefined;
-    validateMaxTxsPerBlock?: number | undefined;
-    validateMaxTxsPerCheckpoint?: number | undefined;
-}, {
-    l1Contracts: {
-        rollupAddress: EthAddress;
-    };
-    nodeId: string;
-    pollingIntervalMs: number;
-    signingTimeoutMs: number;
-    maxStuckDutiesAgeMs?: number | undefined;
-    cleanupOldDutiesAfterHours?: number | undefined;
-    haSigningEnabled: boolean;
-    databaseUrl?: string | undefined;
-    poolMaxCount?: number | undefined;
-    poolMinCount?: number | undefined;
-    poolIdleTimeoutMs?: number | undefined;
-    poolConnectionTimeoutMs?: number | undefined;
-    dataDirectory?: string | undefined;
-    dataStoreMapSizeKb: number;
-    signingProtectionMapSizeKb?: number | undefined;
-    validatorAddresses?: string[] | undefined;
-    disableValidator: boolean;
-    disabledValidators: string[];
-    attestationPollingIntervalMs: number;
-    validatorReexecute: boolean;
-    alwaysReexecuteBlockProposals?: boolean | undefined;
-    fishermanMode?: boolean | undefined;
-    skipCheckpointProposalValidation?: boolean | undefined;
-    skipPushProposedBlocksToArchiver?: boolean | undefined;
-    attestToEquivocatedProposals?: boolean | undefined;
-    validateMaxL2BlockGas?: number | undefined;
-    validateMaxDABlockGas?: number | undefined;
-    validateMaxTxsPerBlock?: number | undefined;
-    validateMaxTxsPerCheckpoint?: number | undefined;
-}>;
+}, z.core.$strip>;
 export declare const ValidatorClientFullConfigSchema: z.ZodObject<{
-    haSigningEnabled: z.ZodBoolean;
-    databaseUrl: z.ZodOptional<z.ZodString>;
-    poolMaxCount: z.ZodOptional<z.ZodNumber>;
-    poolMinCount: z.ZodOptional<z.ZodNumber>;
-    poolIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
-    poolConnectionTimeoutMs: z.ZodOptional<z.ZodNumber>;
-} & {
-    l1Contracts: z.ZodObject<{
-        rollupAddress: z.ZodType<EthAddress, z.ZodTypeDef, EthAddress>;
-    }, "strip", z.ZodTypeAny, {
-        rollupAddress: EthAddress;
-    }, {
-        rollupAddress: EthAddress;
-    }>;
+    rollupAddress: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
     nodeId: z.ZodString;
     pollingIntervalMs: z.ZodNumber;
     signingTimeoutMs: z.ZodNumber;
     maxStuckDutiesAgeMs: z.ZodOptional<z.ZodNumber>;
     cleanupOldDutiesAfterHours: z.ZodOptional<z.ZodNumber>;
+    haSigningEnabled: z.ZodBoolean;
+    databaseUrl: z.ZodOptional<z.ZodType<SecretValue<string>, any, z.core.$ZodTypeInternals<SecretValue<string>, any>>>;
+    poolMaxCount: z.ZodOptional<z.ZodNumber>;
+    poolMinCount: z.ZodOptional<z.ZodNumber>;
+    poolIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
+    poolConnectionTimeoutMs: z.ZodOptional<z.ZodNumber>;
     dataDirectory: z.ZodOptional<z.ZodString>;
     dataStoreMapSizeKb: z.ZodNumber;
     signingProtectionMapSizeKb: z.ZodOptional<z.ZodNumber>;
-} & {
-    validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, any, string>, "many">>;
+    l1ChainId: z.ZodNumber;
+    validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>>>;
     disableValidator: z.ZodBoolean;
-    disabledValidators: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    disabledValidators: z.ZodArray<z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>>;
     attestationPollingIntervalMs: z.ZodNumber;
-    validatorReexecute: z.ZodBoolean;
     alwaysReexecuteBlockProposals: z.ZodOptional<z.ZodBoolean>;
     fishermanMode: z.ZodOptional<z.ZodBoolean>;
     skipCheckpointProposalValidation: z.ZodOptional<z.ZodBoolean>;
     skipPushProposedBlocksToArchiver: z.ZodOptional<z.ZodBoolean>;
     attestToEquivocatedProposals: z.ZodOptional<z.ZodBoolean>;
+    skipProposalSlotValidation: z.ZodOptional<z.ZodBoolean>;
     validateMaxL2BlockGas: z.ZodOptional<z.ZodNumber>;
     validateMaxDABlockGas: z.ZodOptional<z.ZodNumber>;
     validateMaxTxsPerBlock: z.ZodOptional<z.ZodNumber>;
     validateMaxTxsPerCheckpoint: z.ZodOptional<z.ZodNumber>;
-} & {
-    txPublicSetupAllowListExtend: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<{
+    txPublicSetupAllowListExtend: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         address: import("@aztec/foundation/schemas").ZodFor<import("../aztec-address/index.js").AztecAddress>;
         selector: import("@aztec/foundation/schemas").ZodFor<import("../abi/function_selector.js").FunctionSelector>;
         onlySelf: z.ZodOptional<z.ZodBoolean>;
         rejectNullMsgSender: z.ZodOptional<z.ZodBoolean>;
         calldataLength: z.ZodOptional<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
-        address: import("../aztec-address/index.js").AztecAddress;
-        selector: import("../abi/function_selector.js").FunctionSelector;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    }, {
-        address?: any;
-        selector?: any;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    }>, z.ZodObject<{
+    }, z.core.$strip>, z.ZodObject<{
         classId: import("@aztec/foundation/schemas").ZodFor<Fr>;
         selector: import("@aztec/foundation/schemas").ZodFor<import("../abi/function_selector.js").FunctionSelector>;
         onlySelf: z.ZodOptional<z.ZodBoolean>;
         rejectNullMsgSender: z.ZodOptional<z.ZodBoolean>;
         calldataLength: z.ZodOptional<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
-        classId: Fr;
-        selector: import("../abi/function_selector.js").FunctionSelector;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    }, {
-        classId?: any;
-        selector?: any;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    }>]>, "many">>;
+    }, z.core.$strip>]>>>;
     broadcastInvalidBlockProposal: z.ZodOptional<z.ZodBoolean>;
-    slashBroadcastedInvalidBlockPenalty: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-    slashDuplicateProposalPenalty: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-    slashDuplicateAttestationPenalty: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    blockDurationMs: z.ZodNumber;
+    maxBlocksPerCheckpoint: z.ZodOptional<z.ZodNumber>;
+    slashBroadcastedInvalidBlockPenalty: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+    slashBroadcastedInvalidCheckpointProposalPenalty: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+    slashDuplicateProposalPenalty: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+    slashDuplicateAttestationPenalty: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+    slashAttestInvalidCheckpointProposalPenalty: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
     disableTransactions: z.ZodOptional<z.ZodBoolean>;
-}, "strip", z.ZodTypeAny, {
-    l1Contracts: {
-        rollupAddress: EthAddress;
-    };
-    nodeId: string;
-    pollingIntervalMs: number;
-    signingTimeoutMs: number;
-    maxStuckDutiesAgeMs?: number | undefined;
-    cleanupOldDutiesAfterHours?: number | undefined;
-    haSigningEnabled: boolean;
-    databaseUrl?: string | undefined;
-    poolMaxCount?: number | undefined;
-    poolMinCount?: number | undefined;
-    poolIdleTimeoutMs?: number | undefined;
-    poolConnectionTimeoutMs?: number | undefined;
-    dataDirectory?: string | undefined;
-    dataStoreMapSizeKb: number;
-    signingProtectionMapSizeKb?: number | undefined;
-    validatorAddresses?: EthAddress[] | undefined;
-    disableValidator: boolean;
-    disabledValidators: EthAddress[];
-    attestationPollingIntervalMs: number;
-    validatorReexecute: boolean;
-    alwaysReexecuteBlockProposals?: boolean | undefined;
-    fishermanMode?: boolean | undefined;
-    skipCheckpointProposalValidation?: boolean | undefined;
-    skipPushProposedBlocksToArchiver?: boolean | undefined;
-    attestToEquivocatedProposals?: boolean | undefined;
-    validateMaxL2BlockGas?: number | undefined;
-    validateMaxDABlockGas?: number | undefined;
-    validateMaxTxsPerBlock?: number | undefined;
-    validateMaxTxsPerCheckpoint?: number | undefined;
-    txPublicSetupAllowListExtend?: ({
-        address: import("../aztec-address/index.js").AztecAddress;
-        selector: import("../abi/function_selector.js").FunctionSelector;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    } | {
-        classId: Fr;
-        selector: import("../abi/function_selector.js").FunctionSelector;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    })[] | undefined;
-    broadcastInvalidBlockProposal?: boolean | undefined;
-    slashBroadcastedInvalidBlockPenalty: bigint;
-    slashDuplicateProposalPenalty: bigint;
-    slashDuplicateAttestationPenalty: bigint;
-    disableTransactions?: boolean | undefined;
-}, {
-    l1Contracts: {
-        rollupAddress: EthAddress;
-    };
-    nodeId: string;
-    pollingIntervalMs: number;
-    signingTimeoutMs: number;
-    maxStuckDutiesAgeMs?: number | undefined;
-    cleanupOldDutiesAfterHours?: number | undefined;
-    haSigningEnabled: boolean;
-    databaseUrl?: string | undefined;
-    poolMaxCount?: number | undefined;
-    poolMinCount?: number | undefined;
-    poolIdleTimeoutMs?: number | undefined;
-    poolConnectionTimeoutMs?: number | undefined;
-    dataDirectory?: string | undefined;
-    dataStoreMapSizeKb: number;
-    signingProtectionMapSizeKb?: number | undefined;
-    validatorAddresses?: string[] | undefined;
-    disableValidator: boolean;
-    disabledValidators: string[];
-    attestationPollingIntervalMs: number;
-    validatorReexecute: boolean;
-    alwaysReexecuteBlockProposals?: boolean | undefined;
-    fishermanMode?: boolean | undefined;
-    skipCheckpointProposalValidation?: boolean | undefined;
-    skipPushProposedBlocksToArchiver?: boolean | undefined;
-    attestToEquivocatedProposals?: boolean | undefined;
-    validateMaxL2BlockGas?: number | undefined;
-    validateMaxDABlockGas?: number | undefined;
-    validateMaxTxsPerBlock?: number | undefined;
-    validateMaxTxsPerCheckpoint?: number | undefined;
-    txPublicSetupAllowListExtend?: ({
-        address?: any;
-        selector?: any;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    } | {
-        classId?: any;
-        selector?: any;
-        onlySelf?: boolean | undefined;
-        rejectNullMsgSender?: boolean | undefined;
-        calldataLength?: number | undefined;
-    })[] | undefined;
-    broadcastInvalidBlockProposal?: boolean | undefined;
-    slashBroadcastedInvalidBlockPenalty: string | number | bigint;
-    slashDuplicateProposalPenalty: string | number | bigint;
-    slashDuplicateAttestationPenalty: string | number | bigint;
-    disableTransactions?: boolean | undefined;
-}>;
-export type CreateCheckpointProposalLastBlockData = Omit<CheckpointLastBlockData, 'txHashes'> & {
-    txs: Tx[];
-};
+    maxGossipClockDisparityMs: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strip>;
 export interface Validator {
     start(): Promise<void>;
     updateConfig(config: Partial<ValidatorClientFullConfig>): void;
-    createBlockProposal(blockHeader: BlockHeader, indexWithinCheckpoint: number, inHash: Fr, archive: Fr, txs: Tx[], proposerAddress: EthAddress | undefined, options: BlockProposalOptions): Promise<BlockProposal | undefined>;
+    createBlockProposal(blockHeader: BlockHeader, checkpointNumber: CheckpointNumber, indexWithinCheckpoint: number, inHash: Fr, archive: Fr, txs: Tx[], proposerAddress: EthAddress | undefined, options: BlockProposalOptions): Promise<BlockProposal | undefined>;
     /** Creates a checkpoint proposal for the last block in a checkpoint */
-    createCheckpointProposal(checkpointHeader: CheckpointHeader, archive: Fr, feeAssetPriceModifier: bigint, lastBlockInfo: CreateCheckpointProposalLastBlockData | undefined, proposerAddress: EthAddress | undefined, options: CheckpointProposalOptions): Promise<CheckpointProposal>;
+    createCheckpointProposal(checkpointHeader: CheckpointHeader, archive: Fr, checkpointNumber: CheckpointNumber, feeAssetPriceModifier: bigint, lastBlockProposal: BlockProposal | undefined, proposerAddress: EthAddress | undefined, options: CheckpointProposalOptions): Promise<CheckpointProposal>;
     /**
      * Validate a block proposal from a peer.
      * Note: Validators do NOT attest to individual blocks - attestations are only for checkpoint proposals.
@@ -360,9 +167,9 @@ export interface Validator {
     attestToCheckpointProposal(proposal: CheckpointProposal, sender: PeerId): Promise<CheckpointAttestation[] | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     /** Collect own attestations for a checkpoint proposal (used when skipping p2p attestation collection) */
-    collectOwnAttestations(proposal: CheckpointProposal): Promise<CheckpointAttestation[]>;
+    collectOwnAttestations(proposal: CheckpointProposal, checkpointNumber: CheckpointNumber): Promise<CheckpointAttestation[]>;
     /** Collect attestations from the p2p network for a checkpoint proposal */
-    collectAttestations(proposal: CheckpointProposal, required: number, deadline: Date): Promise<CheckpointAttestation[]>;
-    signAttestationsAndSigners(attestationsAndSigners: CommitteeAttestationsAndSigners, proposer: EthAddress, slot: SlotNumber, blockNumber: BlockNumber | CheckpointNumber): Promise<Signature>;
+    collectAttestations(proposal: CheckpointProposal, required: number, deadline: Date, checkpointNumber: CheckpointNumber): Promise<CheckpointAttestation[]>;
+    signAttestationsAndSigners(attestationsAndSigners: CommitteeAttestationsAndSigners, proposer: EthAddress, slot: SlotNumber, checkpointNumber: CheckpointNumber): Promise<Signature>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50ZXJmYWNlcy92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pHLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzVELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsYUFBYSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEYsT0FBTyxLQUFLLEVBQ1YsYUFBYSxFQUNiLG9CQUFvQixFQUNwQixxQkFBcUIsRUFDckIsdUJBQXVCLEVBQ3ZCLGtCQUFrQixFQUNsQix5QkFBeUIsRUFDMUIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sS0FBSyxFQUFFLCtCQUErQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekUsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBRXRCLEtBQUssdUJBQXVCLEVBRTdCLE1BQU0sd0JBQXdCLENBQUM7QUFHaEM7O0dBRUc7QUFDSCxNQUFNLE1BQU0scUJBQXFC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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50ZXJmYWNlcy92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWpFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RixPQUFPLEtBQUssRUFDVixhQUFhLEVBQ2Isb0JBQW9CLEVBQ3BCLHFCQUFxQixFQUNyQixrQkFBa0IsRUFDbEIseUJBQXlCLEVBQzFCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFeEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDaEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSwrQkFBK0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdELE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUV0QixLQUFLLHVCQUF1QixFQUU3QixNQUFNLHdCQUF3QixDQUFDO0FBR2hDOztH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

package/dest/interfaces/validator.d.ts.map

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

package/dest/interfaces/validator.js

@@ -3,16 +3,17 @@ import { z } from 'zod';
 import { LocalSignerConfigSchema, ValidatorHASignerConfigSchema } from '../ha-signing/index.js';
 import { AllowedElementSchema } from './allowed_element.js';
 export const ValidatorClientConfigSchema = zodFor()(ValidatorHASignerConfigSchema.merge(LocalSignerConfigSchema).extend({
+    l1ChainId: z.number().int().nonnegative(),
     validatorAddresses: z.array(schemas.EthAddress).optional(),
     disableValidator: z.boolean(),
     disabledValidators: z.array(schemas.EthAddress),
     attestationPollingIntervalMs: z.number().min(0),
-    validatorReexecute: z.boolean(),
     alwaysReexecuteBlockProposals: z.boolean().optional(),
     fishermanMode: z.boolean().optional(),
     skipCheckpointProposalValidation: z.boolean().optional(),
     skipPushProposedBlocksToArchiver: z.boolean().optional(),
     attestToEquivocatedProposals: z.boolean().optional(),
+    skipProposalSlotValidation: z.boolean().optional(),
     validateMaxL2BlockGas: z.number().optional(),
     validateMaxDABlockGas: z.number().optional(),
     validateMaxTxsPerBlock: z.number().optional(),
@@ -21,8 +22,13 @@ export const ValidatorClientConfigSchema = zodFor()(ValidatorHASignerConfigSchem
 export const ValidatorClientFullConfigSchema = zodFor()(ValidatorClientConfigSchema.extend({
     txPublicSetupAllowListExtend: z.array(AllowedElementSchema).optional(),
     broadcastInvalidBlockProposal: z.boolean().optional(),
+    blockDurationMs: z.number().positive(),
+    maxBlocksPerCheckpoint: z.number().positive().optional(),
     slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
+    slashBroadcastedInvalidCheckpointProposalPenalty: schemas.BigInt,
     slashDuplicateProposalPenalty: schemas.BigInt,
     slashDuplicateAttestationPenalty: schemas.BigInt,
-    disableTransactions: z.boolean().optional()
+    slashAttestInvalidCheckpointProposalPenalty: schemas.BigInt,
+    disableTransactions: z.boolean().optional(),
+    maxGossipClockDisparityMs: z.number().optional()
 }));

package/dest/interfaces/world_state.d.ts

@@ -76,5 +76,5 @@ export interface WorldStateSynchronizer extends ReadonlyWorldStateAccess, ForkMe
     /** Deletes the db */
     clear(): Promise<void>;
 }
-export declare const WorldStateSyncStatusSchema: z.ZodType<WorldStateSyncStatus, z.ZodTypeDef, any>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ybGRfc3RhdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL3dvcmxkX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQXFCLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV0RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUseUJBQXlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV2RyxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQztBQUVqQzs7R0FFRztBQUNILG9CQUFZLHNCQUFzQjtJQUNoQyxJQUFJLElBQUE7SUFDSixRQUFRLElBQUE7SUFDUixPQUFPLElBQUE7SUFDUCxPQUFPLElBQUE7Q0FDUjtBQUVELE1BQU0sV0FBVyxvQkFBb0I7SUFDbkMsaUJBQWlCLEVBQUUsV0FBVyxDQUFDO0lBQy9CLGVBQWUsRUFBRSxNQUFNLENBQUM7SUFDeEIsb0JBQW9CLEVBQUUsV0FBVyxDQUFDO0lBQ2xDLHlCQUF5QixFQUFFLFdBQVcsQ0FBQztJQUN2QyxlQUFlLEVBQUUsT0FBTyxDQUFDO0NBQzFCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsNEJBQTRCO0lBQzNDOztPQUVHO0lBQ0gsS0FBSyxFQUFFLHNCQUFzQixDQUFDO0lBQzlCOztPQUVHO0lBQ0gsV0FBVyxFQUFFLG9CQUFvQixDQUFDO0NBQ25DO0FBRUQsMkVBQTJFO0FBQzNFLE1BQU0sV0FBVyx3QkFBd0I7SUFDdkM7Ozs7O09BS0c7SUFDSCxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsV0FBVyxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQUUsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FBQztJQUVoRyx5Q0FBeUM7SUFDekMsUUFBUSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7Q0FDOUc7QUFFRCxNQUFNLFdBQVcsd0JBQXdCO0lBQ3ZDLCtGQUErRjtJQUMvRixZQUFZLElBQUksd0JBQXdCLENBQUM7SUFFekMsdUZBQXVGO0lBQ3ZGLFdBQVcsQ0FBQyxXQUFXLEVBQUUsTUFBTSxHQUFHLHdCQUF3QixDQUFDO0NBQzVEO0FBRUQsNERBQTREO0FBQzVELE1BQU0sV0FBVyxzQkFBdUIsU0FBUSx3QkFBd0IsRUFBRSx3QkFBd0I7SUFDaEcsK0JBQStCO0lBQy9CLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxHQUFHLG9CQUFvQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFFcEQsc0RBQXNEO0lBQ3RELE1BQU0sSUFBSSxPQUFPLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUVoRCwrQ0FBK0M7SUFDL0MsSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV0QiwwRUFBMEU7SUFDMUUsUUFBUSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUxQiw4Q0FBOEM7SUFDOUMsVUFBVSxJQUFJLElBQUksQ0FBQztJQUVuQjs7Ozs7T0FLRztJQUNILGFBQWEsQ0FBQyxjQUFjLENBQUMsRUFBRSxXQUFXLEVBQUUsU0FBUyxDQUFDLEVBQUUsU0FBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV6RixxQkFBcUI7SUFDckIsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUN4QjtBQUVELGVBQU8sTUFBTSwwQkFBMEIsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLG9CQUFvQixFQUFFLENBQUMsQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQU14RixDQUFDIn0=
+export declare const WorldStateSyncStatusSchema: z.ZodType<WorldStateSyncStatus, any>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ybGRfc3RhdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL3dvcmxkX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQXFCLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV0RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUseUJBQXlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV2RyxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQztBQUVqQzs7R0FFRztBQUNILG9CQUFZLHNCQUFzQjtJQUNoQyxJQUFJLElBQUE7SUFDSixRQUFRLElBQUE7SUFDUixPQUFPLElBQUE7SUFDUCxPQUFPLElBQUE7Q0FDUjtBQUVELE1BQU0sV0FBVyxvQkFBb0I7SUFDbkMsaUJBQWlCLEVBQUUsV0FBVyxDQUFDO0lBQy9CLGVBQWUsRUFBRSxNQUFNLENBQUM7SUFDeEIsb0JBQW9CLEVBQUUsV0FBVyxDQUFDO0lBQ2xDLHlCQUF5QixFQUFFLFdBQVcsQ0FBQztJQUN2QyxlQUFlLEVBQUUsT0FBTyxDQUFDO0NBQzFCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsNEJBQTRCO0lBQzNDOztPQUVHO0lBQ0gsS0FBSyxFQUFFLHNCQUFzQixDQUFDO0lBQzlCOztPQUVHO0lBQ0gsV0FBVyxFQUFFLG9CQUFvQixDQUFDO0NBQ25DO0FBRUQsMkVBQTJFO0FBQzNFLE1BQU0sV0FBVyx3QkFBd0I7SUFDdkM7Ozs7O09BS0c7SUFDSCxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsV0FBVyxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQUUsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FBQztJQUVoRyx5Q0FBeUM7SUFDekMsUUFBUSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7Q0FDOUc7QUFFRCxNQUFNLFdBQVcsd0JBQXdCO0lBQ3ZDLCtGQUErRjtJQUMvRixZQUFZLElBQUksd0JBQXdCLENBQUM7SUFFekMsdUZBQXVGO0lBQ3ZGLFdBQVcsQ0FBQyxXQUFXLEVBQUUsTUFBTSxHQUFHLHdCQUF3QixDQUFDO0NBQzVEO0FBRUQsNERBQTREO0FBQzVELE1BQU0sV0FBVyxzQkFBdUIsU0FBUSx3QkFBd0IsRUFBRSx3QkFBd0I7SUFDaEcsK0JBQStCO0lBQy9CLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxHQUFHLG9CQUFvQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFFcEQsc0RBQXNEO0lBQ3RELE1BQU0sSUFBSSxPQUFPLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUVoRCwrQ0FBK0M7SUFDL0MsSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV0QiwwRUFBMEU7SUFDMUUsUUFBUSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUxQiw4Q0FBOEM7SUFDOUMsVUFBVSxJQUFJLElBQUksQ0FBQztJQUVuQjs7Ozs7T0FLRztJQUNILGFBQWEsQ0FBQyxjQUFjLENBQUMsRUFBRSxXQUFXLEVBQUUsU0FBUyxDQUFDLEVBQUUsU0FBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV6RixxQkFBcUI7SUFDckIsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUN4QjtBQUVELGVBQU8sTUFBTSwwQkFBMEIsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLG9CQUFvQixFQUFFLEdBQUcsQ0FNMUUsQ0FBQyJ9

package/dest/interfaces/world_state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"world_state.d.ts","sourceRoot":"","sources":["../../src/interfaces/world_state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAEvG,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAEjC;;GAEG;AACH,oBAAY,sBAAsB;IAChC,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,WAAW,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,WAAW,CAAC;IAClC,yBAAyB,EAAE,WAAW,CAAC;IACvC,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,KAAK,EAAE,sBAAsB,CAAC;IAC9B;;OAEG;IACH,WAAW,EAAE,oBAAoB,CAAC;CACnC;AAED,2EAA2E;AAC3E,MAAM,WAAW,wBAAwB;IACvC;;;;;OAKG;IACH,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAEhG,yCAAyC;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;CAC9G;AAED,MAAM,WAAW,wBAAwB;IACvC,+FAA+F;IAC/F,YAAY,IAAI,wBAAwB,CAAC;IAEzC,uFAAuF;IACvF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB,CAAC;CAC5D;AAED,4DAA4D;AAC5D,MAAM,WAAW,sBAAuB,SAAQ,wBAAwB,EAAE,wBAAwB;IAChG,+BAA+B;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;IAEpD,sDAAsD;IACtD,MAAM,IAAI,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAEhD,+CAA+C;IAC/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,0EAA0E;IAC1E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,8CAA8C;IAC9C,UAAU,IAAI,IAAI,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEzF,qBAAqB;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAMxF,CAAC"}
+{"version":3,"file":"world_state.d.ts","sourceRoot":"","sources":["../../src/interfaces/world_state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAEvG,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAEjC;;GAEG;AACH,oBAAY,sBAAsB;IAChC,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,WAAW,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,WAAW,CAAC;IAClC,yBAAyB,EAAE,WAAW,CAAC;IACvC,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,KAAK,EAAE,sBAAsB,CAAC;IAC9B;;OAEG;IACH,WAAW,EAAE,oBAAoB,CAAC;CACnC;AAED,2EAA2E;AAC3E,MAAM,WAAW,wBAAwB;IACvC;;;;;OAKG;IACH,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAEhG,yCAAyC;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;CAC9G;AAED,MAAM,WAAW,wBAAwB;IACvC,+FAA+F;IAC/F,YAAY,IAAI,wBAAwB,CAAC;IAEzC,uFAAuF;IACvF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB,CAAC;CAC5D;AAED,4DAA4D;AAC5D,MAAM,WAAW,sBAAuB,SAAQ,wBAAwB,EAAE,wBAAwB;IAChG,+BAA+B;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;IAEpD,sDAAsD;IACtD,MAAM,IAAI,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAEhD,+CAA+C;IAC/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,0EAA0E;IAC1E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,8CAA8C;IAC9C,UAAU,IAAI,IAAI,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEzF,qBAAqB;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAM1E,CAAC"}

package/dest/kernel/hints/key_validation_request.d.ts

@@ -1,17 +1,21 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { GrumpkinScalar, Point } from '@aztec/foundation/curves/grumpkin';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 /**
  * Request for validating keys used in the app.
+ *
+ * The master public key is exposed only as `pkMHash` (its `hashPublicKey` digest).
+ * The kernel reset circuit derives the corresponding point from the master secret key hint and
+ * asserts that its hash matches `pkMHash`.
  */
 export declare class KeyValidationRequest {
-    /** Master public key corresponding to the same underlying secret as app secret key below. */
-    readonly pkM: Point;
-    /** App-siloed secret key corresponding to the same underlying secret as master public key above. */
+    /** Hash of the master public key corresponding to the same underlying secret as `skApp`. */
+    readonly pkMHash: Fr;
+    /** App-siloed secret key corresponding to the same underlying secret as `pkMHash`. */
     readonly skApp: Fr;
     constructor(
-    /** Master public key corresponding to the same underlying secret as app secret key below. */
-    pkM: Point, skApp: Fr | GrumpkinScalar);
+    /** Hash of the master public key corresponding to the same underlying secret as `skApp`. */
+    pkMHash: Fr, skApp: Fr | GrumpkinScalar);
     toBuffer(): Buffer<ArrayBufferLike>;
     get skAppAsGrumpkinScalar(): import("@aztec/foundation/curves/bn254").Fq;
     static fromBuffer(buffer: Buffer | BufferReader): KeyValidationRequest;
@@ -19,6 +23,6 @@ export declare class KeyValidationRequest {
     static fromFields(fields: Fr[] | FieldReader): KeyValidationRequest;
     isEmpty(): boolean;
     static empty(): KeyValidationRequest;
-    static random(): Promise<KeyValidationRequest>;
+    static random(): KeyValidationRequest;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTNGOztHQUVHO0FBQ0gscUJBQWEsb0JBQW9CO0lBSzdCLDZGQUE2RjthQUM3RSxHQUFHLEVBQUUsS0FBSztJQUw1QixvR0FBb0c7SUFDcEcsU0FBZ0IsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUUxQjtJQUNFLDZGQUE2RjtJQUM3RSxHQUFHLEVBQUUsS0FBSyxFQUMxQixLQUFLLEVBQUUsRUFBRSxHQUFHLGNBQWMsRUFPM0I7SUFFRCxRQUFRLDRCQUVQO0lBRUQsSUFBSSxxQkFBcUIsZ0RBRXhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLG9CQUFvQixDQUdsRTtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLHlCQUVYO0lBRUQsT0FBYSxNQUFNLGtDQUVsQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0Y7Ozs7OztHQU1HO0FBQ0gscUJBQWEsb0JBQW9CO0lBSzdCLDRGQUE0RjthQUM1RSxPQUFPLEVBQUUsRUFBRTtJQUw3QixzRkFBc0Y7SUFDdEYsU0FBZ0IsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUUxQjtJQUNFLDRGQUE0RjtJQUM1RSxPQUFPLEVBQUUsRUFBRSxFQUMzQixLQUFLLEVBQUUsRUFBRSxHQUFHLGNBQWMsRUFLM0I7SUFFRCxRQUFRLDRCQUVQO0lBRUQsSUFBSSxxQkFBcUIsZ0RBRXhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLG9CQUFvQixDQUdsRTtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLHlCQUVYO0lBRUQsTUFBTSxDQUFDLE1BQU0seUJBRVo7Q0FDRiJ9

package/dest/kernel/hints/key_validation_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"key_validation_request.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F;;GAEG;AACH,qBAAa,oBAAoB;IAK7B,6FAA6F;aAC7E,GAAG,EAAE,KAAK;IAL5B,oGAAoG;IACpG,SAAgB,KAAK,EAAE,EAAE,CAAC;IAE1B;IACE,6FAA6F;IAC7E,GAAG,EAAE,KAAK,EAC1B,KAAK,EAAE,EAAE,GAAG,cAAc,EAO3B;IAED,QAAQ,4BAEP;IAED,IAAI,qBAAqB,gDAExB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAGlE;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;IAED,OAAa,MAAM,kCAElB;CACF"}
+{"version":3,"file":"key_validation_request.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAK7B,4FAA4F;aAC5E,OAAO,EAAE,EAAE;IAL7B,sFAAsF;IACtF,SAAgB,KAAK,EAAE,EAAE,CAAC;IAE1B;IACE,4FAA4F;IAC5E,OAAO,EAAE,EAAE,EAC3B,KAAK,EAAE,EAAE,GAAG,cAAc,EAK3B;IAED,QAAQ,4BAEP;IAED,IAAI,qBAAqB,gDAExB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAGlE;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;IAED,MAAM,CAAC,MAAM,yBAEZ;CACF"}