@aztec/stdlib 0.0.1-commit.d431d1c → 0.0.1-commit.d939eb5aa

package/dest/ha-signing/types.d.ts

@@ -0,0 +1,90 @@
+import { BlockNumber, CheckpointNumber, type IndexWithinCheckpoint, type SlotNumber } from '@aztec/foundation/branded-types';
+/**
+ * Type of validator duty being performed
+ */
+export declare enum DutyType {
+    BLOCK_PROPOSAL = "BLOCK_PROPOSAL",
+    CHECKPOINT_PROPOSAL = "CHECKPOINT_PROPOSAL",
+    ATTESTATION = "ATTESTATION",
+    ATTESTATIONS_AND_SIGNERS = "ATTESTATIONS_AND_SIGNERS",
+    GOVERNANCE_VOTE = "GOVERNANCE_VOTE",
+    SLASHING_VOTE = "SLASHING_VOTE",
+    AUTH_REQUEST = "AUTH_REQUEST",
+    TXS = "TXS"
+}
+/**
+ * Signing context for block proposals.
+ * Includes both the block number and the checkpoint number the block belongs to.
+ */
+export interface BlockProposalSigningContext {
+    slot: SlotNumber;
+    blockNumber: BlockNumber;
+    checkpointNumber: CheckpointNumber;
+    /** Block index within checkpoint (0, 1, 2...). Required for block proposals. */
+    blockIndexWithinCheckpoint: IndexWithinCheckpoint;
+    dutyType: DutyType.BLOCK_PROPOSAL;
+}
+/**
+ * Signing context for checkpoint proposals.
+ * Includes the checkpoint number being proposed, but not a block number.
+ */
+export interface CheckpointProposalSigningContext {
+    slot: SlotNumber;
+    checkpointNumber: CheckpointNumber;
+    dutyType: DutyType.CHECKPOINT_PROPOSAL;
+}
+/**
+ * Signing context for attestation duties (checkpoint attestations).
+ * Includes the checkpoint number when available (from proposal validation).
+ */
+export interface AttestationSigningContext {
+    slot: SlotNumber;
+    checkpointNumber: CheckpointNumber;
+    dutyType: DutyType.ATTESTATION | DutyType.ATTESTATIONS_AND_SIGNERS;
+}
+/**
+ * Signing context for governance/slashing votes which only need slot for HA protection.
+ */
+export interface VoteSigningContext {
+    slot: SlotNumber;
+    dutyType: DutyType.GOVERNANCE_VOTE | DutyType.SLASHING_VOTE;
+}
+/**
+ * Signing context for duties which don't require slot/blockNumber
+ * as they don't need HA protection (AUTH_REQUEST, TXS).
+ */
+export interface NoHAProtectionSigningContext {
+    dutyType: DutyType.AUTH_REQUEST | DutyType.TXS;
+}
+/**
+ * Signing contexts that require HA protection (excludes AUTH_REQUEST and TXS).
+ * Used by the HA signer's signWithProtection method.
+ */
+export type HAProtectedSigningContext = BlockProposalSigningContext | CheckpointProposalSigningContext | AttestationSigningContext | VoteSigningContext;
+/**
+ * Context required for slashing protection during signing operations.
+ * Uses discriminated union to enforce type safety:
+ * - BLOCK_PROPOSAL duties have blockNumber, checkpointNumber, and blockIndexWithinCheckpoint
+ * - CHECKPOINT_PROPOSAL duties have checkpointNumber
+ * - ATTESTATION/ATTESTATIONS_AND_SIGNERS duties have only slot
+ * - Vote duties have only slot
+ * - AUTH_REQUEST and TXS duties don't need HA protection
+ */
+export type SigningContext = HAProtectedSigningContext | NoHAProtectionSigningContext;
+/**
+ * Type guard to check if a SigningContext requires HA protection.
+ * Returns true for contexts that need HA protection, false for AUTH_REQUEST and TXS.
+ */
+export declare function isHAProtectedContext(context: SigningContext): context is HAProtectedSigningContext;
+/**
+ * Gets the block number from a signing context.
+ * Only BLOCK_PROPOSAL duties carry a block number; all others return BlockNumber(0).
+ */
+export declare function getBlockNumberFromSigningContext(context: HAProtectedSigningContext): BlockNumber;
+/**
+ * Gets the checkpoint number from a signing context.
+ * BLOCK_PROPOSAL, CHECKPOINT_PROPOSAL, ATTESTATION, and ATTESTATIONS_AND_SIGNERS duties carry a checkpoint number;
+ * vote duties return CheckpointNumber(0).
+ */
+export declare function getCheckpointNumberFromSigningContext(context: HAProtectedSigningContext): CheckpointNumber;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYS1zaWduaW5nL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxXQUFXLEVBQ1gsZ0JBQWdCLEVBQ2hCLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssVUFBVSxFQUNoQixNQUFNLGlDQUFpQyxDQUFDO0FBRXpDOztHQUVHO0FBQ0gsb0JBQVksUUFBUTtJQUNsQixjQUFjLG1CQUFtQjtJQUNqQyxtQkFBbUIsd0JBQXdCO0lBQzNDLFdBQVcsZ0JBQWdCO0lBQzNCLHdCQUF3Qiw2QkFBNkI7SUFDckQsZUFBZSxvQkFBb0I7SUFDbkMsYUFBYSxrQkFBa0I7SUFDL0IsWUFBWSxpQkFBaUI7SUFDN0IsR0FBRyxRQUFRO0NBQ1o7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFdBQVcsMkJBQTJCO0lBQzFDLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakIsV0FBVyxFQUFFLFdBQVcsQ0FBQztJQUN6QixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQztJQUNuQyxnRkFBZ0Y7SUFDaEYsMEJBQTBCLEVBQUUscUJBQXFCLENBQUM7SUFDbEQsUUFBUSxFQUFFLFFBQVEsQ0FBQyxjQUFjLENBQUM7Q0FDbkM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFdBQVcsZ0NBQWdDO0lBQy9DLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakIsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7SUFDbkMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQztDQUN4QztBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyx5QkFBeUI7SUFDeEMsSUFBSSxFQUFFLFVBQVUsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQztJQUNuQyxRQUFRLEVBQUUsUUFBUSxDQUFDLFdBQVcsR0FBRyxRQUFRLENBQUMsd0JBQXdCLENBQUM7Q0FDcEU7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakMsSUFBSSxFQUFFLFVBQVUsQ0FBQztJQUNqQixRQUFRLEVBQUUsUUFBUSxDQUFDLGVBQWUsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDO0NBQzdEO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxXQUFXLDRCQUE0QjtJQUMzQyxRQUFRLEVBQUUsUUFBUSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO0NBQ2hEO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLHlCQUF5QixHQUNqQywyQkFBMkIsR0FDM0IsZ0NBQWdDLEdBQ2hDLHlCQUF5QixHQUN6QixrQkFBa0IsQ0FBQztBQUV2Qjs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sTUFBTSxjQUFjLEdBQUcseUJBQXlCLEdBQUcsNEJBQTRCLENBQUM7QUFFdEY7OztHQUdHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLE9BQU8sRUFBRSxjQUFjLEdBQUcsT0FBTyxJQUFJLHlCQUF5QixDQUVsRztBQUVEOzs7R0FHRztBQUNILHdCQUFnQixnQ0FBZ0MsQ0FBQyxPQUFPLEVBQUUseUJBQXlCLEdBQUcsV0FBVyxDQUtoRztBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0IscUNBQXFDLENBQUMsT0FBTyxFQUFFLHlCQUF5QixHQUFHLGdCQUFnQixDQVUxRyJ9

package/dest/ha-signing/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/ha-signing/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,oBAAY,QAAQ;IAClB,cAAc,mBAAmB;IACjC,mBAAmB,wBAAwB;IAC3C,WAAW,gBAAgB;IAC3B,wBAAwB,6BAA6B;IACrD,eAAe,oBAAoB;IACnC,aAAa,kBAAkB;IAC/B,YAAY,iBAAiB;IAC7B,GAAG,QAAQ;CACZ;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gFAAgF;IAChF,0BAA0B,EAAE,qBAAqB,CAAC;IAClD,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC;CACnC;AAED;;;GAGG;AACH,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,QAAQ,CAAC,mBAAmB,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC,wBAAwB,CAAC;CACpE;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC;CAC7D;AAED;;;GAGG;AACH,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,QAAQ,CAAC,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GACjC,2BAA2B,GAC3B,gCAAgC,GAChC,yBAAyB,GACzB,kBAAkB,CAAC;AAEvB;;;;;;;;GAQG;AACH,MAAM,MAAM,cAAc,GAAG,yBAAyB,GAAG,4BAA4B,CAAC;AAEtF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,IAAI,yBAAyB,CAElG;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,yBAAyB,GAAG,WAAW,CAKhG;AAED;;;;GAIG;AACH,wBAAgB,qCAAqC,CAAC,OAAO,EAAE,yBAAyB,GAAG,gBAAgB,CAU1G"}

package/dest/ha-signing/types.js

@@ -0,0 +1,39 @@
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+/**
+ * Type of validator duty being performed
+ */ export var DutyType = /*#__PURE__*/ function(DutyType) {
+    DutyType["BLOCK_PROPOSAL"] = "BLOCK_PROPOSAL";
+    DutyType["CHECKPOINT_PROPOSAL"] = "CHECKPOINT_PROPOSAL";
+    DutyType["ATTESTATION"] = "ATTESTATION";
+    DutyType["ATTESTATIONS_AND_SIGNERS"] = "ATTESTATIONS_AND_SIGNERS";
+    DutyType["GOVERNANCE_VOTE"] = "GOVERNANCE_VOTE";
+    DutyType["SLASHING_VOTE"] = "SLASHING_VOTE";
+    DutyType["AUTH_REQUEST"] = "AUTH_REQUEST";
+    DutyType["TXS"] = "TXS";
+    return DutyType;
+}({});
+/**
+ * Type guard to check if a SigningContext requires HA protection.
+ * Returns true for contexts that need HA protection, false for AUTH_REQUEST and TXS.
+ */ export function isHAProtectedContext(context) {
+    return context.dutyType !== "AUTH_REQUEST" && context.dutyType !== "TXS";
+}
+/**
+ * Gets the block number from a signing context.
+ * Only BLOCK_PROPOSAL duties carry a block number; all others return BlockNumber(0).
+ */ export function getBlockNumberFromSigningContext(context) {
+    if (context.dutyType === "BLOCK_PROPOSAL") {
+        return context.blockNumber;
+    }
+    return BlockNumber(0);
+}
+/**
+ * Gets the checkpoint number from a signing context.
+ * BLOCK_PROPOSAL, CHECKPOINT_PROPOSAL, ATTESTATION, and ATTESTATIONS_AND_SIGNERS duties carry a checkpoint number;
+ * vote duties return CheckpointNumber(0).
+ */ export function getCheckpointNumberFromSigningContext(context) {
+    if (context.dutyType === "BLOCK_PROPOSAL" || context.dutyType === "CHECKPOINT_PROPOSAL" || context.dutyType === "ATTESTATION" || context.dutyType === "ATTESTATIONS_AND_SIGNERS") {
+        return context.checkpointNumber;
+    }
+    return CheckpointNumber(0);
+}

package/dest/hash/hash.d.ts

@@ -1,3 +1,4 @@
+import { DomainSeparator } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { AztecAddress } from '../aztec-address/index.js';
@@ -37,6 +38,21 @@ export declare function computeUniqueNoteHash(noteNonce: Fr, siloedNoteHash: Fr)
  * @returns A siloed nullifier.
  */
 export declare function siloNullifier(contract: AztecAddress, innerNullifier: Fr): Promise<Fr>;
+/**
+ * Computes the siloed private initialization nullifier for a contract, given its address and initialization hash.
+ * @param contract - The contract address.
+ * @param initializationHash - The contract's initialization hash.
+ * @returns The siloed private initialization nullifier.
+ */
+export declare function computeSiloedPrivateInitializationNullifier(contract: AztecAddress, initializationHash: Fr): Promise<Fr>;
+/**
+ * Computes the siloed public initialization nullifier for a contract. Not all contracts emit this nullifier: it is only
+ * emitted when the contract has public functions that perform initialization checks (i.e. external public functions that
+ * are not `#[noinitcheck]` or `#[only_self]`).
+ * @param contract - The contract address.
+ * @returns The siloed public initialization nullifier.
+ */
+export declare function computeSiloedPublicInitializationNullifier(contract: AztecAddress): Promise<Fr>;
 /**
  * Computes the protocol nullifier, which is the hash of the initial tx request siloed with the null msg sender address.
  * @param txRequestHash - The hash of the initial tx request.
@@ -45,6 +61,9 @@ export declare function siloNullifier(contract: AztecAddress, innerNullifier: Fr
  * @dev Must match the implementation in noir-protocol-circuits/crates/types/src/hash.nr > compute_protocol_nullifier
  */
 export declare function computeProtocolNullifier(txRequestHash: Fr): Promise<Fr>;
+/** Domain-separates a raw log tag with the given domain separator. */
+export declare function computeLogTag(rawTag: number | bigint | boolean | Fr | Buffer, domSep: DomainSeparator): Promise<Fr>;
+export declare function computeSiloedPrivateLogFirstField(contract: AztecAddress, field: Fr): Promise<Fr>;
 /**
  * Computes a public data tree value ready for insertion.
  * @param value - Raw public data tree value to hash into a tree-insertion-ready value.
@@ -92,4 +111,4 @@ export declare function computeL2ToL1MessageHash({ l2Sender, l1Recipient, conten
     rollupVersion: Fr;
     chainId: Fr;
 }): Fr;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hhc2gvaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpEOzs7O0dBSUc7QUFDSCx3QkFBc0IsTUFBTSxDQUFDLFdBQVcsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRzNEO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0Isb0JBQW9CLENBQUMsYUFBYSxFQUFFLEVBQUUsRUFBRSxhQUFhLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFMUY7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBZ0IsWUFBWSxDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRTlFO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IscUJBQXFCLENBQUMsU0FBUyxFQUFFLEVBQUUsRUFBRSxjQUFjLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFcEY7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBZ0IsYUFBYSxDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXJGO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQWdCLHdCQUF3QixDQUFDLGFBQWEsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV2RTtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLDBCQUEwQixDQUFDLEtBQUssRUFBRSxFQUFFLEdBQUcsRUFBRSxDQUV4RDtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFnQiw2QkFBNkIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV6RztBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGtCQUFrQixDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBTTFEO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQixtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUUvRDtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV6RDtBQUVELHdCQUFzQiw2QkFBNkIsQ0FBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsZUFNdEc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0Isd0JBQXdCLENBQUMsRUFDdkMsUUFBUSxFQUNSLFdBQVcsRUFDWCxPQUFPLEVBQ1AsYUFBYSxFQUNiLE9BQU8sRUFDUixFQUFFO0lBQ0QsUUFBUSxFQUFFLFlBQVksQ0FBQztJQUN2QixXQUFXLEVBQUUsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sRUFBRSxFQUFFLENBQUM7SUFDWixhQUFhLEVBQUUsRUFBRSxDQUFDO0lBQ2xCLE9BQU8sRUFBRSxFQUFFLENBQUM7Q0FDYixNQUVBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hhc2gvaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFvQyxNQUFNLGtCQUFrQixDQUFDO0FBR3JGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFekQ7Ozs7R0FJRztBQUNILHdCQUFzQixNQUFNLENBQUMsV0FBVyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FHM0Q7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFnQixvQkFBb0IsQ0FBQyxhQUFhLEVBQUUsRUFBRSxFQUFFLGFBQWEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUUxRjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFnQixZQUFZLENBQUMsUUFBUSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFOUU7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFnQixxQkFBcUIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVwRjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFnQixhQUFhLENBQUMsUUFBUSxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFckY7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQiwyQ0FBMkMsQ0FDL0QsUUFBUSxFQUFFLFlBQVksRUFDdEIsa0JBQWtCLEVBQUUsRUFBRSxHQUNyQixPQUFPLENBQUMsRUFBRSxDQUFDLENBTWI7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBc0IsMENBQTBDLENBQUMsUUFBUSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBR3BHO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQWdCLHdCQUF3QixDQUFDLGFBQWEsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV2RTtBQUVELHNFQUFzRTtBQUN0RSx3QkFBZ0IsYUFBYSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsTUFBTSxHQUFHLE9BQU8sR0FBRyxFQUFFLEdBQUcsTUFBTSxFQUFFLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVuSDtBQUVELHdCQUFnQixpQ0FBaUMsQ0FBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVoRztBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLDBCQUEwQixDQUFDLEtBQUssRUFBRSxFQUFFLEdBQUcsRUFBRSxDQUV4RDtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFnQiw2QkFBNkIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV6RztBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGtCQUFrQixDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBTTFEO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQixtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUUvRDtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV6RDtBQUVELHdCQUFzQiw2QkFBNkIsQ0FBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsZUFNdEc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0Isd0JBQXdCLENBQUMsRUFDdkMsUUFBUSxFQUNSLFdBQVcsRUFDWCxPQUFPLEVBQ1AsYUFBYSxFQUNiLE9BQU8sRUFDUixFQUFFO0lBQ0QsUUFBUSxFQUFFLFlBQVksQ0FBQztJQUN2QixXQUFXLEVBQUUsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sRUFBRSxFQUFFLENBQUM7SUFDWixhQUFhLEVBQUUsRUFBRSxDQUFDO0lBQ2xCLE9BQU8sRUFBRSxFQUFFLENBQUM7Q0FDYixNQUVBIn0=

package/dest/hash/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/hash/hash.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAG3D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAE1F;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEpF;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAErF;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEvE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzG;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAM1D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE/D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzD;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,eAMtG;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,WAAW,EACX,OAAO,EACP,aAAa,EACb,OAAO,EACR,EAAE;IACD,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,EAAE,CAAC;IACZ,aAAa,EAAE,EAAE,CAAC;IAClB,OAAO,EAAE,EAAE,CAAC;CACb,MAEA"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/hash/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAoC,MAAM,kBAAkB,CAAC;AAGrF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAG3D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAE1F;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEpF;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAErF;AAED;;;;;GAKG;AACH,wBAAsB,2CAA2C,CAC/D,QAAQ,EAAE,YAAY,EACtB,kBAAkB,EAAE,EAAE,GACrB,OAAO,CAAC,EAAE,CAAC,CAMb;AAED;;;;;;GAMG;AACH,wBAAsB,0CAA0C,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEvE;AAED,sEAAsE;AACtE,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,EAAE,CAAC,CAEnH;AAED,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhG;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzG;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAM1D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE/D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzD;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,eAMtG;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,WAAW,EACX,OAAO,EACP,aAAa,EACb,OAAO,EACR,EAAE;IACD,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,EAAE,CAAC;IACZ,aAAa,EAAE,EAAE,CAAC;IAClB,OAAO,EAAE,EAAE,CAAC;CACb,MAEA"}

package/dest/hash/hash.js

@@ -1,4 +1,4 @@
-import { GeneratorIndex, NULL_MSG_SENDER_CONTRACT_ADDRESS } from '@aztec/constants';
+import { DomainSeparator, NULL_MSG_SENDER_CONTRACT_ADDRESS } from '@aztec/constants';
 import { poseidon2Hash, poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { sha256ToField } from '@aztec/foundation/crypto/sha256';
 import { Fr } from '@aztec/foundation/curves/bn254';
@@ -20,7 +20,7 @@ import { AztecAddress } from '../aztec-address/index.js';
     return poseidon2HashWithSeparator([
         nullifierZero,
         noteHashIndex
-    ], GeneratorIndex.NOTE_HASH_NONCE);
+    ], DomainSeparator.NOTE_HASH_NONCE);
 }
 /**
  * Computes a siloed note hash, given the contract address and the note hash itself.
@@ -32,7 +32,7 @@ import { AztecAddress } from '../aztec-address/index.js';
     return poseidon2HashWithSeparator([
         contract,
         noteHash
-    ], GeneratorIndex.SILOED_NOTE_HASH);
+    ], DomainSeparator.SILOED_NOTE_HASH);
 }
 /**
  * Computes a unique note hash.
@@ -43,7 +43,7 @@ import { AztecAddress } from '../aztec-address/index.js';
     return poseidon2HashWithSeparator([
         noteNonce,
         siloedNoteHash
-    ], GeneratorIndex.UNIQUE_NOTE_HASH);
+    ], DomainSeparator.UNIQUE_NOTE_HASH);
 }
 /**
  * Computes a siloed nullifier, given the contract address and the inner nullifier.
@@ -55,7 +55,31 @@ import { AztecAddress } from '../aztec-address/index.js';
     return poseidon2HashWithSeparator([
         contract,
         innerNullifier
-    ], GeneratorIndex.OUTER_NULLIFIER);
+    ], DomainSeparator.SILOED_NULLIFIER);
+}
+/**
+ * Computes the siloed private initialization nullifier for a contract, given its address and initialization hash.
+ * @param contract - The contract address.
+ * @param initializationHash - The contract's initialization hash.
+ * @returns The siloed private initialization nullifier.
+ */ export async function computeSiloedPrivateInitializationNullifier(contract, initializationHash) {
+    const innerNullifier = await poseidon2HashWithSeparator([
+        contract,
+        initializationHash
+    ], DomainSeparator.PRIVATE_INITIALIZATION_NULLIFIER);
+    return siloNullifier(contract, innerNullifier);
+}
+/**
+ * Computes the siloed public initialization nullifier for a contract. Not all contracts emit this nullifier: it is only
+ * emitted when the contract has public functions that perform initialization checks (i.e. external public functions that
+ * are not `#[noinitcheck]` or `#[only_self]`).
+ * @param contract - The contract address.
+ * @returns The siloed public initialization nullifier.
+ */ export async function computeSiloedPublicInitializationNullifier(contract) {
+    const innerNullifier = await poseidon2HashWithSeparator([
+        contract
+    ], DomainSeparator.PUBLIC_INITIALIZATION_NULLIFIER);
+    return siloNullifier(contract, innerNullifier);
 }
 /**
  * Computes the protocol nullifier, which is the hash of the initial tx request siloed with the null msg sender address.
@@ -66,6 +90,17 @@ import { AztecAddress } from '../aztec-address/index.js';
  */ export function computeProtocolNullifier(txRequestHash) {
     return siloNullifier(AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS), txRequestHash);
 }
+/** Domain-separates a raw log tag with the given domain separator. */ export function computeLogTag(rawTag, domSep) {
+    return poseidon2HashWithSeparator([
+        new Fr(rawTag)
+    ], domSep);
+}
+export function computeSiloedPrivateLogFirstField(contract, field) {
+    return poseidon2HashWithSeparator([
+        contract,
+        field
+    ], DomainSeparator.PRIVATE_LOG_FIRST_FIELD);
+}
 /**
  * Computes a public data tree value ready for insertion.
  * @param value - Raw public data tree value to hash into a tree-insertion-ready value.
@@ -84,7 +119,7 @@ import { AztecAddress } from '../aztec-address/index.js';
     return poseidon2HashWithSeparator([
         contractAddress,
         storageSlot
-    ], GeneratorIndex.PUBLIC_LEAF_INDEX);
+    ], DomainSeparator.PUBLIC_LEAF_SLOT);
 }
 /**
  * Computes the hash of a list of arguments.
@@ -95,14 +130,14 @@ import { AztecAddress } from '../aztec-address/index.js';
     if (args.length === 0) {
         return Promise.resolve(Fr.ZERO);
     }
-    return poseidon2HashWithSeparator(args, GeneratorIndex.FUNCTION_ARGS);
+    return poseidon2HashWithSeparator(args, DomainSeparator.FUNCTION_ARGS);
 }
 /**
  * Computes the hash of a public function's calldata.
  * @param calldata - Calldata to hash.
  * @returns Hash of the calldata.
  */ export function computeCalldataHash(calldata) {
-    return poseidon2HashWithSeparator(calldata, GeneratorIndex.PUBLIC_CALLDATA);
+    return poseidon2HashWithSeparator(calldata, DomainSeparator.PUBLIC_CALLDATA);
 }
 /**
  * Computes a hash of a secret.
@@ -112,13 +147,13 @@ import { AztecAddress } from '../aztec-address/index.js';
  */ export function computeSecretHash(secret) {
     return poseidon2HashWithSeparator([
         secret
-    ], GeneratorIndex.SECRET_HASH);
+    ], DomainSeparator.SECRET_HASH);
 }
 export async function computeL1ToL2MessageNullifier(contract, messageHash, secret) {
     const innerMessageNullifier = await poseidon2HashWithSeparator([
         messageHash,
         secret
-    ], GeneratorIndex.MESSAGE_NULLIFIER);
+    ], DomainSeparator.MESSAGE_NULLIFIER);
     return siloNullifier(contract, innerMessageNullifier);
 }
 /**

package/dest/hash/map_slot.d.ts

@@ -9,4 +9,4 @@ export declare function deriveStorageSlotInMap(mapSlot: Fr | bigint, key: {
     /** Convert key to a field. */
     toField: () => Fr;
 }): Promise<Fr>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFwX3Nsb3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYXNoL21hcF9zbG90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxPQUFPLEVBQUUsRUFBRSxHQUFHLE1BQU0sRUFDcEIsR0FBRyxFQUFFO0lBQ0gsOEJBQThCO0lBQzlCLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUNuQixHQUNBLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFYiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFwX3Nsb3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYXNoL21hcF9zbG90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxPQUFPLEVBQUUsRUFBRSxHQUFHLE1BQU0sRUFDcEIsR0FBRyxFQUFFO0lBQ0gsOEJBQThCO0lBQzlCLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUNuQixHQUNBLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFYiJ9

package/dest/hash/map_slot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map_slot.d.ts","sourceRoot":"","sources":["../../src/hash/map_slot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,EAAE,GAAG,MAAM,EACpB,GAAG,EAAE;IACH,8BAA8B;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,GACA,OAAO,CAAC,EAAE,CAAC,CAEb"}
+{"version":3,"file":"map_slot.d.ts","sourceRoot":"","sources":["../../src/hash/map_slot.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,EAAE,GAAG,MAAM,EACpB,GAAG,EAAE;IACH,8BAA8B;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,GACA,OAAO,CAAC,EAAE,CAAC,CAEb"}

package/dest/hash/map_slot.js

@@ -1,12 +1,13 @@
-import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { DomainSeparator } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 /**
  * Computes the resulting storage slot for an entry in a map.
  * @param mapSlot - The slot of the map within state.
  * @param key - The key of the map.
  * @returns The slot in the contract storage where the value is stored.
  */ export function deriveStorageSlotInMap(mapSlot, key) {
-    return poseidon2Hash([
+    return poseidon2HashWithSeparator([
         mapSlot,
         key.toField()
-    ]);
+    ], DomainSeparator.PUBLIC_STORAGE_MAP_SLOT);
 }

package/dest/interfaces/allowed_element.d.ts

@@ -2,51 +2,57 @@ import type { Fr } from '@aztec/foundation/curves/bn254';
 import { z } from 'zod';
 import type { FunctionSelector } from '../abi/function_selector.js';
 import type { AztecAddress } from '../aztec-address/index.js';
-type AllowedInstance = {
-    address: AztecAddress;
-};
 type AllowedInstanceFunction = {
     address: AztecAddress;
     selector: FunctionSelector;
-};
-type AllowedClass = {
-    classId: Fr;
+    onlySelf?: boolean;
+    rejectNullMsgSender?: boolean;
+    calldataLength?: number;
 };
 type AllowedClassFunction = {
     classId: Fr;
     selector: FunctionSelector;
+    onlySelf?: boolean;
+    rejectNullMsgSender?: boolean;
+    calldataLength?: number;
 };
-export type AllowedElement = AllowedInstance | AllowedInstanceFunction | AllowedClass | AllowedClassFunction;
+export type AllowedElement = AllowedInstanceFunction | AllowedClassFunction;
 export declare const AllowedElementSchema: z.ZodUnion<[z.ZodObject<{
     address: import("../schemas/index.js").ZodFor<AztecAddress>;
     selector: import("../schemas/index.js").ZodFor<FunctionSelector>;
+    onlySelf: z.ZodOptional<z.ZodBoolean>;
+    rejectNullMsgSender: z.ZodOptional<z.ZodBoolean>;
+    calldataLength: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     address: AztecAddress;
     selector: FunctionSelector;
+    onlySelf?: boolean | undefined;
+    rejectNullMsgSender?: boolean | undefined;
+    calldataLength?: number | undefined;
 }, {
     address?: any;
     selector?: any;
-}>, z.ZodObject<{
-    address: import("../schemas/index.js").ZodFor<AztecAddress>;
-}, "strip", z.ZodTypeAny, {
-    address: AztecAddress;
-}, {
-    address?: any;
+    onlySelf?: boolean | undefined;
+    rejectNullMsgSender?: boolean | undefined;
+    calldataLength?: number | undefined;
 }>, z.ZodObject<{
     classId: import("../schemas/index.js").ZodFor<Fr>;
     selector: import("../schemas/index.js").ZodFor<FunctionSelector>;
+    onlySelf: z.ZodOptional<z.ZodBoolean>;
+    rejectNullMsgSender: z.ZodOptional<z.ZodBoolean>;
+    calldataLength: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     classId: Fr;
     selector: FunctionSelector;
+    onlySelf?: boolean | undefined;
+    rejectNullMsgSender?: boolean | undefined;
+    calldataLength?: number | undefined;
 }, {
     classId?: any;
     selector?: any;
-}>, z.ZodObject<{
-    classId: import("../schemas/index.js").ZodFor<Fr>;
-}, "strip", z.ZodTypeAny, {
-    classId: Fr;
-}, {
-    classId?: any;
+    onlySelf?: boolean | undefined;
+    rejectNullMsgSender?: boolean | undefined;
+    calldataLength?: number | undefined;
 }>]>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsb3dlZF9lbGVtZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50ZXJmYWNlcy9hbGxvd2VkX2VsZW1lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzlELEtBQUssZUFBZSxHQUFHO0lBQUUsT0FBTyxFQUFFLFlBQVksQ0FBQTtDQUFFLENBQUM7QUFDakQsS0FBSyx1QkFBdUIsR0FBRztJQUFFLE9BQU8sRUFBRSxZQUFZLENBQUM7SUFBQyxRQUFRLEVBQUUsZ0JBQWdCLENBQUE7Q0FBRSxDQUFDO0FBQ3JGLEtBQUssWUFBWSxHQUFHO0lBQUUsT0FBTyxFQUFFLEVBQUUsQ0FBQTtDQUFFLENBQUM7QUFDcEMsS0FBSyxvQkFBb0IsR0FBRztJQUFFLE9BQU8sRUFBRSxFQUFFLENBQUM7SUFBQyxRQUFRLEVBQUUsZ0JBQWdCLENBQUE7Q0FBRSxDQUFDO0FBRXhFLE1BQU0sTUFBTSxjQUFjLEdBQUcsZUFBZSxHQUFHLHVCQUF1QixHQUFHLFlBQVksR0FBRyxvQkFBb0IsQ0FBQztBQUU3RyxlQUFPLE1BQU0sb0JBQW9COzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFPaEMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsb3dlZF9lbGVtZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50ZXJmYWNlcy9hbGxvd2VkX2VsZW1lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzlELEtBQUssdUJBQXVCLEdBQUc7SUFDN0IsT0FBTyxFQUFFLFlBQVksQ0FBQztJQUN0QixRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0IsUUFBUSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ25CLG1CQUFtQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzlCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN6QixDQUFDO0FBQ0YsS0FBSyxvQkFBb0IsR0FBRztJQUMxQixPQUFPLEVBQUUsRUFBRSxDQUFDO0lBQ1osUUFBUSxFQUFFLGdCQUFnQixDQUFDO0lBQzNCLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNuQixtQkFBbUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUM5QixjQUFjLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDekIsQ0FBQztBQUVGLE1BQU0sTUFBTSxjQUFjLEdBQUcsdUJBQXVCLEdBQUcsb0JBQW9CLENBQUM7QUFFNUUsZUFBTyxNQUFNLG9CQUFvQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0lBaUJoQyxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"allowed_element.d.ts","sourceRoot":"","sources":["../../src/interfaces/allowed_element.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,KAAK,eAAe,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AACjD,KAAK,uBAAuB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CAAC;AACrF,KAAK,YAAY,GAAG;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,CAAC;AACpC,KAAK,oBAAoB,GAAG;IAAE,OAAO,EAAE,EAAE,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG,uBAAuB,GAAG,YAAY,GAAG,oBAAoB,CAAC;AAE7G,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAOhC,CAAC"}
+{"version":3,"file":"allowed_element.d.ts","sourceRoot":"","sources":["../../src/interfaces/allowed_element.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AACF,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,uBAAuB,GAAG,oBAAoB,CAAC;AAE5E,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiBhC,CAAC"}

package/dest/interfaces/allowed_element.js

@@ -3,16 +3,16 @@ import { schemas, zodFor } from '../schemas/index.js';
 export const AllowedElementSchema = zodFor()(z.union([
     z.object({
         address: schemas.AztecAddress,
-        selector: schemas.FunctionSelector
-    }),
-    z.object({
-        address: schemas.AztecAddress
+        selector: schemas.FunctionSelector,
+        onlySelf: z.boolean().optional(),
+        rejectNullMsgSender: z.boolean().optional(),
+        calldataLength: z.number().optional()
     }),
     z.object({
         classId: schemas.Fr,
-        selector: schemas.FunctionSelector
-    }),
-    z.object({
-        classId: schemas.Fr
+        selector: schemas.FunctionSelector,
+        onlySelf: z.boolean().optional(),
+        rejectNullMsgSender: z.boolean().optional(),
+        calldataLength: z.number().optional()
     })
 ]));

package/dest/interfaces/archiver.d.ts

@@ -58,4 +58,4 @@ export declare const ArchiverSpecificConfigSchema: z.ZodObject<{
 }>;
 export type ArchiverApi = Omit<L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource, 'start' | 'stop'>;
 export declare const ArchiverApiSchema: ApiSchemaFor<ArchiverApi>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL2FyY2hpdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFakYsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUl4QixPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQWdCLE1BQU0sNkJBQTZCLENBQUM7QUFJL0UsT0FBTyxFQUVMLEtBQUssa0JBQWtCLEVBRXhCLE1BQU0sc0JBQXNCLENBQUM7QUFNOUIsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQU9uRixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV4RDs7R0FFRztBQUNILE1BQU0sTUFBTSxzQkFBc0IsR0FBRztJQUNuQyxrRkFBa0Y7SUFDbEYseUJBQXlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFbkMsK0VBQStFO0lBQy9FLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRTNCLDJDQUEyQztJQUMzQyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUUvQix5Q0FBeUM7SUFDekMsV0FBVyxFQUFFLG1CQUFtQixDQUFDO0lBRWpDLDZFQUE2RTtJQUM3RSxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFakIscUdBQXFHO0lBQ3JHLHNCQUFzQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRWhDLHFGQUFxRjtJQUNyRiwrQkFBK0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUV6QyxrR0FBa0c7SUFDbEcseUJBQXlCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFFcEMsMEVBQTBFO0lBQzFFLGtDQUFrQyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQzlDLENBQUM7QUFFRixlQUFPLE1BQU0sNEJBQTRCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFTdkMsQ0FBQztBQUVILE1BQU0sTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUM1QixhQUFhLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixHQUFHLG1CQUFtQixFQUN2RSxPQUFPLEdBQUcsTUFBTSxDQUNqQixDQUFDO0FBRUYsZUFBTyxNQUFNLGlCQUFpQixFQUFFLFlBQVksQ0FBQyxXQUFXLENBOEV2RCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL2FyY2hpdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFakYsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQU14QixPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQWdCLE1BQU0sNkJBQTZCLENBQUM7QUFLL0UsT0FBTyxFQUVMLEtBQUssa0JBQWtCLEVBRXhCLE1BQU0sc0JBQXNCLENBQUM7QUFNOUIsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQU9uRixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV4RDs7R0FFRztBQUNILE1BQU0sTUFBTSxzQkFBc0IsR0FBRztJQUNuQyxrRkFBa0Y7SUFDbEYseUJBQXlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFbkMsK0VBQStFO0lBQy9FLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRTNCLDJDQUEyQztJQUMzQyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUUvQix5Q0FBeUM7SUFDekMsV0FBVyxFQUFFLG1CQUFtQixDQUFDO0lBRWpDLDZFQUE2RTtJQUM3RSxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFakIscUdBQXFHO0lBQ3JHLHNCQUFzQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRWhDLHFGQUFxRjtJQUNyRiwrQkFBK0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUV6QyxrR0FBa0c7SUFDbEcseUJBQXlCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFFcEMsMEVBQTBFO0lBQzFFLGtDQUFrQyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQzlDLENBQUM7QUFFRixlQUFPLE1BQU0sNEJBQTRCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFTdkMsQ0FBQztBQUVILE1BQU0sTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUM1QixhQUFhLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixHQUFHLG1CQUFtQixFQUN2RSxPQUFPLEdBQUcsTUFBTSxDQUNqQixDQUFDO0FBRUYsZUFBTyxNQUFNLGlCQUFpQixFQUFFLFlBQVksQ0FBQyxXQUFXLENBMkV2RCxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/interfaces/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,KAAK,aAAa,EAAgB,MAAM,6BAA6B,CAAC;AAI/E,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAOnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qGAAqG;IACrG,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qFAAqF;IACrF,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,kGAAkG;IAClG,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC,0EAA0E;IAC1E,kCAAkC,CAAC,EAAE,OAAO,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;EASvC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,EACvE,OAAO,GAAG,MAAM,CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CA8EvD,CAAC"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/interfaces/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,EAAE,KAAK,aAAa,EAAgB,MAAM,6BAA6B,CAAC;AAK/E,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAOnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qGAAqG;IACrG,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qFAAqF;IACrF,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,kGAAkG;IAClG,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC,0EAA0E;IAC1E,kCAAkC,CAAC,EAAE,OAAO,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;EASvC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,EACvE,OAAO,GAAG,MAAM,CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CA2EvD,CAAC"}

package/dest/interfaces/archiver.js

@@ -1,10 +1,13 @@
 import { BlockNumberSchema, CheckpointNumberSchema, EpochNumberSchema } from '@aztec/foundation/branded-types';
 import { z } from 'zod';
+import { BlockDataSchema } from '../block/block_data.js';
+import { BlockHash } from '../block/block_hash.js';
 import { CheckpointedL2Block } from '../block/checkpointed_l2_block.js';
-import { L2BlockNew } from '../block/l2_block_new.js';
+import { L2Block } from '../block/l2_block.js';
 import { L2TipsSchema } from '../block/l2_block_source.js';
 import { ValidateCheckpointResultSchema } from '../block/validate_block_result.js';
 import { Checkpoint } from '../checkpoint/checkpoint.js';
+import { CheckpointDataSchema, ProposedCheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
 import { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
 import { ContractClassPublicSchema, ContractInstanceWithAddressSchema } from '../contract/index.js';
 import { L1RollupConstantsSchema } from '../epoch-helpers/index.js';
@@ -33,32 +36,36 @@ export const ArchiverApiSchema = {
     getRegistryAddress: z.function().args().returns(schemas.EthAddress),
     getBlockNumber: z.function().args().returns(BlockNumberSchema),
     getProvenBlockNumber: z.function().args().returns(BlockNumberSchema),
-    getBlock: z.function().args(BlockNumberSchema).returns(L2BlockNew.schema.optional()),
+    getCheckpointedL2BlockNumber: z.function().args().returns(BlockNumberSchema),
+    getCheckpointNumber: z.function().args().returns(CheckpointNumberSchema),
+    getFinalizedL2BlockNumber: z.function().args().returns(BlockNumberSchema),
+    getBlock: z.function().args(BlockNumberSchema).returns(L2Block.schema.optional()),
     getBlockHeader: z.function().args(z.union([
         BlockNumberSchema,
         z.literal('latest')
     ])).returns(BlockHeader.schema.optional()),
     getCheckpointedBlock: z.function().args(BlockNumberSchema).returns(CheckpointedL2Block.schema.optional()),
-    getCheckpointedBlocks: z.function().args(BlockNumberSchema, schemas.Integer, optional(z.boolean())).returns(z.array(CheckpointedL2Block.schema)),
-    getBlocks: z.function().args(BlockNumberSchema, schemas.Integer, optional(z.boolean())).returns(z.array(L2BlockNew.schema)),
-    getPublishedCheckpoints: z.function().args(CheckpointNumberSchema, schemas.Integer).returns(z.array(PublishedCheckpoint.schema)),
-    getPublishedBlocks: z.function().args(BlockNumberSchema, schemas.Integer, optional(z.boolean())).returns(z.array(CheckpointedL2Block.schema)),
-    getL2BlocksNew: z.function().args(BlockNumberSchema, schemas.Integer, optional(z.boolean())).returns(z.array(L2BlockNew.schema)),
-    getPublishedBlockByHash: z.function().args(schemas.Fr).returns(CheckpointedL2Block.schema.optional()),
-    getPublishedBlockByArchive: z.function().args(schemas.Fr).returns(CheckpointedL2Block.schema.optional()),
-    getBlockHeaderByHash: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
+    getCheckpointedBlocks: z.function().args(BlockNumberSchema, schemas.Integer).returns(z.array(CheckpointedL2Block.schema)),
+    getBlocks: z.function().args(BlockNumberSchema, schemas.Integer).returns(z.array(L2Block.schema)),
+    getCheckpoints: z.function().args(CheckpointNumberSchema, schemas.Integer).returns(z.array(PublishedCheckpoint.schema)),
+    getCheckpointedBlockByHash: z.function().args(BlockHash.schema).returns(CheckpointedL2Block.schema.optional()),
+    getCheckpointedBlockByArchive: z.function().args(schemas.Fr).returns(CheckpointedL2Block.schema.optional()),
+    getBlockHeaderByHash: z.function().args(BlockHash.schema).returns(BlockHeader.schema.optional()),
     getBlockHeaderByArchive: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
-    getL2BlockNew: z.function().args(BlockNumberSchema).returns(L2BlockNew.schema.optional()),
-    getL2BlockNewByHash: z.function().args(schemas.Fr).returns(L2BlockNew.schema.optional()),
-    getL2BlockNewByArchive: z.function().args(schemas.Fr).returns(L2BlockNew.schema.optional()),
+    getBlockData: z.function().args(BlockNumberSchema).returns(BlockDataSchema.optional()),
+    getBlockDataByArchive: z.function().args(schemas.Fr).returns(BlockDataSchema.optional()),
+    getL2Block: z.function().args(BlockNumberSchema).returns(L2Block.schema.optional()),
+    getL2BlockByHash: z.function().args(BlockHash.schema).returns(L2Block.schema.optional()),
+    getL2BlockByArchive: z.function().args(schemas.Fr).returns(L2Block.schema.optional()),
     getTxEffect: z.function().args(TxHash.schema).returns(indexedTxSchema().optional()),
     getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
-    getL2SlotNumber: z.function().args().returns(schemas.SlotNumber.optional()),
-    getL2EpochNumber: z.function().args().returns(EpochNumberSchema.optional()),
+    getSyncedL2SlotNumber: z.function().args().returns(schemas.SlotNumber.optional()),
+    getSyncedL2EpochNumber: z.function().args().returns(EpochNumberSchema.optional()),
     getCheckpointsForEpoch: z.function().args(EpochNumberSchema).returns(z.array(Checkpoint.schema)),
-    getBlocksForEpoch: z.function().args(EpochNumberSchema).returns(z.array(L2BlockNew.schema)),
-    getBlocksForSlot: z.function().args(schemas.SlotNumber).returns(z.array(L2BlockNew.schema)),
-    getBlockHeadersForEpoch: z.function().args(EpochNumberSchema).returns(z.array(BlockHeader.schema)),
+    getCheckpointsDataForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointDataSchema)),
+    getCheckpointedBlocksForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointedL2Block.schema)),
+    getBlocksForSlot: z.function().args(schemas.SlotNumber).returns(z.array(L2Block.schema)),
+    getCheckpointedBlockHeadersForEpoch: z.function().args(EpochNumberSchema).returns(z.array(BlockHeader.schema)),
     isEpochComplete: z.function().args(EpochNumberSchema).returns(z.boolean()),
     getL2Tips: z.function().args().returns(L2TipsSchema),
     getPrivateLogsByTags: z.function().args(z.array(SiloedTag.schema), optional(z.number().gte(0))).returns(z.array(z.array(TxScopedL2Log.schema))),
@@ -78,6 +85,8 @@ export const ArchiverApiSchema = {
         genesisArchiveRoot: schemas.Fr
     })),
     getL1Timestamp: z.function().args().returns(schemas.BigInt.optional()),
+    getProposedCheckpoint: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
+    getProposedCheckpointOnly: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
     syncImmediate: z.function().args().returns(z.void()),
     isPendingChainInvalid: z.function().args().returns(z.boolean()),
     getPendingChainValidationStatus: z.function().args().returns(ValidateCheckpointResultSchema)