@aztec/stdlib 0.0.1-commit.1bb068fb5 → 0.0.1-commit.1de2a32

package/dest/kernel/private_kernel_tail_circuit_private_inputs.js

@@ -6,17 +6,17 @@ import { PrivateKernelData } from './private_kernel_data.js';
  */ export class PrivateKernelTailCircuitPrivateInputs {
     previousKernel;
     paddedSideEffectAmounts;
-    includeByTimestampUpperBound;
+    expirationTimestampUpperBound;
     constructor(/**
      * The previous kernel data
      */ previousKernel, /**
      * The number of the padded side effects.
      */ paddedSideEffectAmounts, /**
      * The timestamp by which the transaction must be included in a block.
-     */ includeByTimestampUpperBound){
+     */ expirationTimestampUpperBound){
         this.previousKernel = previousKernel;
         this.paddedSideEffectAmounts = paddedSideEffectAmounts;
-        this.includeByTimestampUpperBound = includeByTimestampUpperBound;
+        this.expirationTimestampUpperBound = expirationTimestampUpperBound;
     }
     isForPublic() {
         return this.previousKernel.publicInputs.end.publicCallRequests.claimedLength > 0 || !this.previousKernel.publicInputs.publicTeardownCallRequest.isEmpty();
@@ -25,7 +25,7 @@ import { PrivateKernelData } from './private_kernel_data.js';
    * Serialize this as a buffer.
    * @returns The buffer.
    */ toBuffer() {
-        return serializeToBuffer(this.previousKernel, this.paddedSideEffectAmounts, bigintToUInt64BE(this.includeByTimestampUpperBound));
+        return serializeToBuffer(this.previousKernel, this.paddedSideEffectAmounts, bigintToUInt64BE(this.expirationTimestampUpperBound));
     }
     /**
    * Deserializes from a buffer or reader.

package/dest/kernel/private_kernel_tail_circuit_public_inputs.d.ts

@@ -70,7 +70,7 @@ export declare class PrivateKernelTailCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    includeByTimestamp: UInt64;
+    expirationTimestamp: UInt64;
     forPublic?: PartialPrivateTailPublicInputsForPublic | undefined;
     forRollup?: PartialPrivateTailPublicInputsForRollup | undefined;
     constructor(
@@ -90,7 +90,7 @@ export declare class PrivateKernelTailCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    includeByTimestamp: UInt64, forPublic?: PartialPrivateTailPublicInputsForPublic | undefined, forRollup?: PartialPrivateTailPublicInputsForRollup | undefined);
+    expirationTimestamp: UInt64, forPublic?: PartialPrivateTailPublicInputsForPublic | undefined, forRollup?: PartialPrivateTailPublicInputsForRollup | undefined);
     static get schema(): import("zod").ZodType<PrivateKernelTailCircuitPublicInputs, any, string>;
     toJSON(): Buffer<ArrayBufferLike>;
     getSize(): number;
@@ -105,6 +105,7 @@ export declare class PrivateKernelTailCircuitPublicInputs {
     getRevertiblePublicCallRequests(): PublicCallRequest[];
     getTeardownPublicCallRequest(): PublicCallRequest | undefined;
     getNonEmptyNoteHashes(): Fr[];
+    getNonEmptyL2ToL1Msgs(): import("../messaging/l2_to_l1_message.js").ScopedL2ToL1Message[];
     getNonEmptyNullifiers(): Fr[];
     getNonEmptyPrivateLogs(): PrivateLog[];
     getNonEmptyContractClassLogsHashes(): ScopedLogHash[];
@@ -120,4 +121,4 @@ export declare class PrivateKernelTailCircuitPublicInputs {
      */
     static emptyWithNullifier(): PrivateKernelTailCircuitPublicInputs;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfdGFpbF9jaXJjdWl0X3B1YmxpY19pbnB1dHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWwvcHJpdmF0ZV9rZXJuZWxfdGFpbF9jaXJjdWl0X3B1YmxpY19pbnB1dHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQXVDLE1BQU0sNkJBQTZCLENBQUM7QUFFaEcsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUN6RixPQUFPLEVBQUUsd0NBQXdDLEVBQUUsTUFBTSxxREFBcUQsQ0FBQztBQUMvRyxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUN6RixPQUFPLEVBQUUsd0NBQXdDLEVBQUUsTUFBTSxxREFBcUQsQ0FBQztBQUMvRyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUc3RCxxQkFBYSx1Q0FBdUM7SUFFaEQ7O09BRUc7SUFDSSw0QkFBNEIsRUFBRSw4QkFBOEI7SUFDbkU7O09BRUc7SUFDSSx5QkFBeUIsRUFBRSw4QkFBOEI7SUFDaEU7O09BRUc7SUFDSSx5QkFBeUIsRUFBRSxpQkFBaUI7SUFackQ7SUFDRTs7T0FFRztJQUNJLDRCQUE0QixFQUFFLDhCQUE4QjtJQUNuRTs7T0FFRztJQUNJLHlCQUF5QixFQUFFLDhCQUE4QjtJQUNoRTs7T0FFRztJQUNJLHlCQUF5QixFQUFFLGlCQUFpQixFQUNqRDtJQUVKLE9BQU8sV0FNTjtJQUVELElBQUksVUFBVSxZQUViO0lBRUQsSUFBSSxhQUFhLFlBRWhCO0lBRUQsSUFBSSxhQUFhLFlBRWhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyx1Q0FBdUMsQ0FPeEY7SUFFRCxRQUFRLDRCQU1QO0lBRUQsTUFBTSxDQUFDLEtBQUssNENBTVg7Q0FDRjtBQUVELHFCQUFhLHVDQUF1QztJQUMvQixHQUFHLEVBQUUsOEJBQThCO0lBQXRELFlBQW1CLEdBQUcsRUFBRSw4QkFBOEIsRUFBSTtJQUUxRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLHVDQUF1QyxDQUd4RjtJQUVELE9BQU8sV0FFTjtJQUVELFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsS0FBSyw0Q0FFWDtDQUNGO0FBRUQscUJBQWEsb0NBQW9DO0lBRTdDOztPQUVHO0lBQ0ksU0FBUyxFQUFFLGNBQWM7SUFDaEM7OztPQUdHO0lBQ0ksT0FBTyxFQUFFLEdBQUc7SUFDbkI7O09BRUc7SUFDSSxRQUFRLEVBQUUsWUFBWTtJQUM3Qjs7T0FFRztJQUNJLGtCQUFrQixFQUFFLE1BQU07SUFFMUIsU0FBUyxDQUFDO0lBQ1YsU0FBUyxDQUFDO0lBcEJuQjtJQUNFOztPQUVHO0lBQ0ksU0FBUyxFQUFFLGNBQWM7SUFDaEM7OztPQUdHO0lBQ0ksT0FBTyxFQUFFLEdBQUc7SUFDbkI7O09BRUc7SUFDSSxRQUFRLEVBQUUsWUFBWTtJQUM3Qjs7T0FFRztJQUNJLGtCQUFrQixFQUFFLE1BQU0sRUFFMUIsU0FBUyxDQUFDLHFEQUF5QyxFQUNuRCxTQUFTLENBQUMscURBQXlDLEVBVTNEO0lBRUQsTUFBTSxLQUFLLE1BQU0sNkVBRWhCO0lBRUQsTUFBTSw0QkFFTDtJQUVELE9BQU8sV0FTTjtJQUVELDBDQUEwQyw2Q0FhekM7SUFFRCwwQ0FBMEMsNkNBaUJ6QztJQUVELFlBQVksSUFBSSx3Q0FBd0MsR0FBRyx3Q0FBd0MsQ0FJbEc7SUFFRCwwQkFBMEIsV0FNekI7SUFFRCx1Q0FBdUMsV0FFdEM7SUFFRCxvQ0FBb0MsV0FFbkM7SUFFRCw0QkFBNEIsWUFFM0I7SUFFRCxrQ0FBa0Msd0JBSWpDO0lBRUQsK0JBQStCLHdCQUU5QjtJQUVELDRCQUE0QixrQ0FHM0I7SUFFRCxxQkFBcUIsU0FPcEI7SUFFRCxxQkFBcUIsU0FPcEI7SUFFRCxzQkFBc0IsaUJBT3JCO0lBRUQsa0NBQWtDLG9CQU9qQztJQUVELGlDQUFpQyxXQU9oQztJQUVELDJCQUEyQixXQU0xQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsb0NBQW9DLENBV3JGO0lBRUQsUUFBUSw0QkFVUDtJQUVELE1BQU0sQ0FBQyxLQUFLLHlDQVNYO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxrQkFBa0IseUNBV3hCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfdGFpbF9jaXJjdWl0X3B1YmxpY19pbnB1dHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWwvcHJpdmF0ZV9rZXJuZWxfdGFpbF9jaXJjdWl0X3B1YmxpY19pbnB1dHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQXVDLE1BQU0sNkJBQTZCLENBQUM7QUFFaEcsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUN6RixPQUFPLEVBQUUsd0NBQXdDLEVBQUUsTUFBTSxxREFBcUQsQ0FBQztBQUMvRyxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUN6RixPQUFPLEVBQUUsd0NBQXdDLEVBQUUsTUFBTSxxREFBcUQsQ0FBQztBQUMvRyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUc3RCxxQkFBYSx1Q0FBdUM7SUFFaEQ7O09BRUc7SUFDSSw0QkFBNEIsRUFBRSw4QkFBOEI7SUFDbkU7O09BRUc7SUFDSSx5QkFBeUIsRUFBRSw4QkFBOEI7SUFDaEU7O09BRUc7SUFDSSx5QkFBeUIsRUFBRSxpQkFBaUI7SUFackQ7SUFDRTs7T0FFRztJQUNJLDRCQUE0QixFQUFFLDhCQUE4QjtJQUNuRTs7T0FFRztJQUNJLHlCQUF5QixFQUFFLDhCQUE4QjtJQUNoRTs7T0FFRztJQUNJLHlCQUF5QixFQUFFLGlCQUFpQixFQUNqRDtJQUVKLE9BQU8sV0FNTjtJQUVELElBQUksVUFBVSxZQUViO0lBRUQsSUFBSSxhQUFhLFlBRWhCO0lBRUQsSUFBSSxhQUFhLFlBRWhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyx1Q0FBdUMsQ0FPeEY7SUFFRCxRQUFRLDRCQU1QO0lBRUQsTUFBTSxDQUFDLEtBQUssNENBTVg7Q0FDRjtBQUVELHFCQUFhLHVDQUF1QztJQUMvQixHQUFHLEVBQUUsOEJBQThCO0lBQXRELFlBQW1CLEdBQUcsRUFBRSw4QkFBOEIsRUFBSTtJQUUxRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLHVDQUF1QyxDQUd4RjtJQUVELE9BQU8sV0FFTjtJQUVELFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsS0FBSyw0Q0FFWDtDQUNGO0FBRUQscUJBQWEsb0NBQW9DO0lBRTdDOztPQUVHO0lBQ0ksU0FBUyxFQUFFLGNBQWM7SUFDaEM7OztPQUdHO0lBQ0ksT0FBTyxFQUFFLEdBQUc7SUFDbkI7O09BRUc7SUFDSSxRQUFRLEVBQUUsWUFBWTtJQUM3Qjs7T0FFRztJQUNJLG1CQUFtQixFQUFFLE1BQU07SUFFM0IsU0FBUyxDQUFDO0lBQ1YsU0FBUyxDQUFDO0lBcEJuQjtJQUNFOztPQUVHO0lBQ0ksU0FBUyxFQUFFLGNBQWM7SUFDaEM7OztPQUdHO0lBQ0ksT0FBTyxFQUFFLEdBQUc7SUFDbkI7O09BRUc7SUFDSSxRQUFRLEVBQUUsWUFBWTtJQUM3Qjs7T0FFRztJQUNJLG1CQUFtQixFQUFFLE1BQU0sRUFFM0IsU0FBUyxDQUFDLHFEQUF5QyxFQUNuRCxTQUFTLENBQUMscURBQXlDLEVBVTNEO0lBRUQsTUFBTSxLQUFLLE1BQU0sNkVBRWhCO0lBRUQsTUFBTSw0QkFFTDtJQUVELE9BQU8sV0FTTjtJQUVELDBDQUEwQyw2Q0FhekM7SUFFRCwwQ0FBMEMsNkNBaUJ6QztJQUVELFlBQVksSUFBSSx3Q0FBd0MsR0FBRyx3Q0FBd0MsQ0FJbEc7SUFFRCwwQkFBMEIsV0FNekI7SUFFRCx1Q0FBdUMsV0FFdEM7SUFFRCxvQ0FBb0MsV0FFbkM7SUFFRCw0QkFBNEIsWUFFM0I7SUFFRCxrQ0FBa0Msd0JBSWpDO0lBRUQsK0JBQStCLHdCQUU5QjtJQUVELDRCQUE0QixrQ0FHM0I7SUFFRCxxQkFBcUIsU0FPcEI7SUFFRCxxQkFBcUIscUVBT3BCO0lBRUQscUJBQXFCLFNBT3BCO0lBRUQsc0JBQXNCLGlCQU9yQjtJQUVELGtDQUFrQyxvQkFPakM7SUFFRCxpQ0FBaUMsV0FPaEM7SUFFRCwyQkFBMkIsV0FNMUI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLG9DQUFvQyxDQVdyRjtJQUVELFFBQVEsNEJBVVA7SUFFRCxNQUFNLENBQUMsS0FBSyx5Q0FTWDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsa0JBQWtCLHlDQVd4QjtDQUNGIn0=

package/dest/kernel/private_kernel_tail_circuit_public_inputs.d.ts.map

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

package/dest/kernel/private_kernel_tail_circuit_public_inputs.js

@@ -71,7 +71,7 @@ export class PrivateKernelTailCircuitPublicInputs {
     constants;
     gasUsed;
     feePayer;
-    includeByTimestamp;
+    expirationTimestamp;
     forPublic;
     forRollup;
     constructor(/**
@@ -83,11 +83,11 @@ export class PrivateKernelTailCircuitPublicInputs {
      * The address of the fee payer for the transaction.
      */ feePayer, /**
      * The timestamp by which the transaction must be included in a block.
-     */ includeByTimestamp, forPublic, forRollup){
+     */ expirationTimestamp, forPublic, forRollup){
         this.constants = constants;
         this.gasUsed = gasUsed;
         this.feePayer = feePayer;
-        this.includeByTimestamp = includeByTimestamp;
+        this.expirationTimestamp = expirationTimestamp;
         this.forPublic = forPublic;
         this.forRollup = forRollup;
         if (!forPublic && !forRollup) {
@@ -104,21 +104,21 @@ export class PrivateKernelTailCircuitPublicInputs {
         return this.toBuffer();
     }
     getSize() {
-        return (this.forPublic?.getSize() ?? 0) + (this.forRollup?.getSize() ?? 0) + this.constants.getSize() + this.gasUsed.getSize() + this.feePayer.size + 8 // includeByTimestamp
+        return (this.forPublic?.getSize() ?? 0) + (this.forRollup?.getSize() ?? 0) + this.constants.getSize() + this.gasUsed.getSize() + this.feePayer.size + 8 // expirationTimestamp
         ;
     }
     toPrivateToPublicKernelCircuitPublicInputs() {
         if (!this.forPublic) {
             throw new Error('Private tail public inputs is not for public circuit.');
         }
-        return new PrivateToPublicKernelCircuitPublicInputs(this.constants, this.forPublic.nonRevertibleAccumulatedData, this.forPublic.revertibleAccumulatedData, this.forPublic.publicTeardownCallRequest, this.gasUsed, this.feePayer, this.includeByTimestamp);
+        return new PrivateToPublicKernelCircuitPublicInputs(this.constants, this.forPublic.nonRevertibleAccumulatedData, this.forPublic.revertibleAccumulatedData, this.forPublic.publicTeardownCallRequest, this.gasUsed, this.feePayer, this.expirationTimestamp);
     }
     toPrivateToRollupKernelCircuitPublicInputs() {
         if (!this.forRollup) {
             throw new Error('Private tail public inputs is not for rollup circuit.');
         }
         const constants = new TxConstantData(this.constants.anchorBlockHeader, this.constants.txContext, this.constants.vkTreeRoot, this.constants.protocolContractsHash);
-        return new PrivateToRollupKernelCircuitPublicInputs(constants, this.forRollup.end, this.gasUsed, this.feePayer, this.includeByTimestamp);
+        return new PrivateToRollupKernelCircuitPublicInputs(constants, this.forRollup.end, this.gasUsed, this.feePayer, this.expirationTimestamp);
     }
     publicInputs() {
         return this.forPublic ? this.toPrivateToPublicKernelCircuitPublicInputs() : this.toPrivateToRollupKernelCircuitPublicInputs();
@@ -149,6 +149,10 @@ export class PrivateKernelTailCircuitPublicInputs {
         const noteHashes = this.forPublic ? this.forPublic.nonRevertibleAccumulatedData.noteHashes.concat(this.forPublic.revertibleAccumulatedData.noteHashes) : this.forRollup.end.noteHashes;
         return noteHashes.filter((n)=>!n.isZero());
     }
+    getNonEmptyL2ToL1Msgs() {
+        const l2ToL1Msgs = this.forPublic ? this.forPublic.nonRevertibleAccumulatedData.l2ToL1Msgs.concat(this.forPublic.revertibleAccumulatedData.l2ToL1Msgs) : this.forRollup.end.l2ToL1Msgs;
+        return l2ToL1Msgs.filter((m)=>!m.isEmpty());
+    }
     getNonEmptyNullifiers() {
         const nullifiers = this.forPublic ? this.forPublic.nonRevertibleAccumulatedData.nullifiers.concat(this.forPublic.revertibleAccumulatedData.nullifiers) : this.forRollup.end.nullifiers;
         return nullifiers.filter((n)=>!n.isZero());
@@ -176,7 +180,7 @@ export class PrivateKernelTailCircuitPublicInputs {
     }
     toBuffer() {
         const isForPublic = !!this.forPublic;
-        return serializeToBuffer(isForPublic, this.constants, this.gasUsed, this.feePayer, bigintToUInt64BE(this.includeByTimestamp), isForPublic ? this.forPublic.toBuffer() : this.forRollup.toBuffer());
+        return serializeToBuffer(isForPublic, this.constants, this.gasUsed, this.feePayer, bigintToUInt64BE(this.expirationTimestamp), isForPublic ? this.forPublic.toBuffer() : this.forRollup.toBuffer());
     }
     static empty() {
         return new PrivateKernelTailCircuitPublicInputs(TxConstantData.empty(), Gas.empty(), AztecAddress.ZERO, 0n, undefined, PartialPrivateTailPublicInputsForRollup.empty());

package/dest/kernel/private_to_public_kernel_circuit_public_inputs.d.ts

@@ -14,8 +14,8 @@ export declare class PrivateToPublicKernelCircuitPublicInputs {
     publicTeardownCallRequest: PublicCallRequest;
     gasUsed: Gas;
     feePayer: AztecAddress;
-    includeByTimestamp: UInt64;
-    constructor(constants: TxConstantData, nonRevertibleAccumulatedData: PrivateToPublicAccumulatedData, revertibleAccumulatedData: PrivateToPublicAccumulatedData, publicTeardownCallRequest: PublicCallRequest, gasUsed: Gas, feePayer: AztecAddress, includeByTimestamp: UInt64);
+    expirationTimestamp: UInt64;
+    constructor(constants: TxConstantData, nonRevertibleAccumulatedData: PrivateToPublicAccumulatedData, revertibleAccumulatedData: PrivateToPublicAccumulatedData, publicTeardownCallRequest: PublicCallRequest, gasUsed: Gas, feePayer: AztecAddress, expirationTimestamp: UInt64);
     toBuffer(): Buffer<ArrayBufferLike>;
     static getFields(fields: FieldsOf<PrivateToPublicKernelCircuitPublicInputs>): readonly [TxConstantData, PrivateToPublicAccumulatedData, PrivateToPublicAccumulatedData, PublicCallRequest, Gas, AztecAddress, bigint];
     static fromBuffer(buffer: Buffer | BufferReader): PrivateToPublicKernelCircuitPublicInputs;
@@ -27,4 +27,4 @@ export declare class PrivateToPublicKernelCircuitPublicInputs {
     toJSON(): Buffer<ArrayBufferLike>;
     static get schema(): import("zod").ZodType<PrivateToPublicKernelCircuitPublicInputs, any, string>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19wdWJsaWNfa2VybmVsX2NpcmN1aXRfcHVibGljX2lucHV0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3B1YmxpY19rZXJuZWxfY2lyY3VpdF9wdWJsaWNfaW5wdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sRUFBRSxZQUFZLEVBQTBELE1BQU0sNkJBQTZCLENBQUM7QUFFbkgsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ3pGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTdELHFCQUFhLHdDQUF3QztJQUUxQyxTQUFTLEVBQUUsY0FBYztJQUN6Qiw0QkFBNEIsRUFBRSw4QkFBOEI7SUFDNUQseUJBQXlCLEVBQUUsOEJBQThCO0lBQ3pELHlCQUF5QixFQUFFLGlCQUFpQjtJQUM1QyxPQUFPLEVBQUUsR0FBRztJQUNaLFFBQVEsRUFBRSxZQUFZO0lBQ3RCLGtCQUFrQixFQUFFLE1BQU07SUFQbkMsWUFDUyxTQUFTLEVBQUUsY0FBYyxFQUN6Qiw0QkFBNEIsRUFBRSw4QkFBOEIsRUFDNUQseUJBQXlCLEVBQUUsOEJBQThCLEVBQ3pELHlCQUF5QixFQUFFLGlCQUFpQixFQUM1QyxPQUFPLEVBQUUsR0FBRyxFQUNaLFFBQVEsRUFBRSxZQUFZLEVBQ3RCLGtCQUFrQixFQUFFLE1BQU0sRUFDL0I7SUFFSixRQUFRLDRCQVVQO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHdDQUF3QyxDQUFDLDJJQVUxRTtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLDRDQVc5QztJQUVELE1BQU0sQ0FBQyxLQUFLLDZDQVVYO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSw0Q0FFNUI7SUFFRCxRQUFRLGtCQUVQO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsSUFBSSxnQkFFSDtJQUVELE1BQU0sNEJBRUw7SUFFRCxNQUFNLEtBQUssTUFBTSxpRkFFaEI7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19wdWJsaWNfa2VybmVsX2NpcmN1aXRfcHVibGljX2lucHV0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3B1YmxpY19rZXJuZWxfY2lyY3VpdF9wdWJsaWNfaW5wdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sRUFBRSxZQUFZLEVBQTBELE1BQU0sNkJBQTZCLENBQUM7QUFFbkgsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ3pGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTdELHFCQUFhLHdDQUF3QztJQUUxQyxTQUFTLEVBQUUsY0FBYztJQUN6Qiw0QkFBNEIsRUFBRSw4QkFBOEI7SUFDNUQseUJBQXlCLEVBQUUsOEJBQThCO0lBQ3pELHlCQUF5QixFQUFFLGlCQUFpQjtJQUM1QyxPQUFPLEVBQUUsR0FBRztJQUNaLFFBQVEsRUFBRSxZQUFZO0lBQ3RCLG1CQUFtQixFQUFFLE1BQU07SUFQcEMsWUFDUyxTQUFTLEVBQUUsY0FBYyxFQUN6Qiw0QkFBNEIsRUFBRSw4QkFBOEIsRUFDNUQseUJBQXlCLEVBQUUsOEJBQThCLEVBQ3pELHlCQUF5QixFQUFFLGlCQUFpQixFQUM1QyxPQUFPLEVBQUUsR0FBRyxFQUNaLFFBQVEsRUFBRSxZQUFZLEVBQ3RCLG1CQUFtQixFQUFFLE1BQU0sRUFDaEM7SUFFSixRQUFRLDRCQVVQO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHdDQUF3QyxDQUFDLDJJQVUxRTtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLDRDQVc5QztJQUVELE1BQU0sQ0FBQyxLQUFLLDZDQVVYO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSw0Q0FFNUI7SUFFRCxRQUFRLGtCQUVQO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsSUFBSSxnQkFFSDtJQUVELE1BQU0sNEJBRUw7SUFFRCxNQUFNLEtBQUssTUFBTSxpRkFFaEI7Q0FDRiJ9

package/dest/kernel/private_to_public_kernel_circuit_public_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_to_public_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_kernel_circuit_public_inputs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAA0D,MAAM,6BAA6B,CAAC;AAEnH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,wCAAwC;IAE1C,SAAS,EAAE,cAAc;IACzB,4BAA4B,EAAE,8BAA8B;IAC5D,yBAAyB,EAAE,8BAA8B;IACzD,yBAAyB,EAAE,iBAAiB;IAC5C,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,YAAY;IACtB,kBAAkB,EAAE,MAAM;IAPnC,YACS,SAAS,EAAE,cAAc,EACzB,4BAA4B,EAAE,8BAA8B,EAC5D,yBAAyB,EAAE,8BAA8B,EACzD,yBAAyB,EAAE,iBAAiB,EAC5C,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,YAAY,EACtB,kBAAkB,EAAE,MAAM,EAC/B;IAEJ,QAAQ,4BAUP;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC,2IAU1E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,4CAW9C;IAED,MAAM,CAAC,KAAK,6CAUX;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,4CAE5B;IAED,QAAQ,kBAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,IAAI,gBAEH;IAED,MAAM,4BAEL;IAED,MAAM,KAAK,MAAM,iFAEhB;CACF"}
+{"version":3,"file":"private_to_public_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_kernel_circuit_public_inputs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAA0D,MAAM,6BAA6B,CAAC;AAEnH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,wCAAwC;IAE1C,SAAS,EAAE,cAAc;IACzB,4BAA4B,EAAE,8BAA8B;IAC5D,yBAAyB,EAAE,8BAA8B;IACzD,yBAAyB,EAAE,iBAAiB;IAC5C,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,YAAY;IACtB,mBAAmB,EAAE,MAAM;IAPpC,YACS,SAAS,EAAE,cAAc,EACzB,4BAA4B,EAAE,8BAA8B,EAC5D,yBAAyB,EAAE,8BAA8B,EACzD,yBAAyB,EAAE,iBAAiB,EAC5C,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,YAAY,EACtB,mBAAmB,EAAE,MAAM,EAChC;IAEJ,QAAQ,4BAUP;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC,2IAU1E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,4CAW9C;IAED,MAAM,CAAC,KAAK,6CAUX;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,4CAE5B;IAED,QAAQ,kBAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,IAAI,gBAEH;IAED,MAAM,4BAEL;IAED,MAAM,KAAK,MAAM,iFAEhB;CACF"}

package/dest/kernel/private_to_public_kernel_circuit_public_inputs.js

@@ -1,4 +1,4 @@
-import { GeneratorIndex, PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
+import { DomainSeparator, PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
@@ -15,18 +15,18 @@ export class PrivateToPublicKernelCircuitPublicInputs {
     publicTeardownCallRequest;
     gasUsed;
     feePayer;
-    includeByTimestamp;
-    constructor(constants, nonRevertibleAccumulatedData, revertibleAccumulatedData, publicTeardownCallRequest, gasUsed, feePayer, includeByTimestamp){
+    expirationTimestamp;
+    constructor(constants, nonRevertibleAccumulatedData, revertibleAccumulatedData, publicTeardownCallRequest, gasUsed, feePayer, expirationTimestamp){
         this.constants = constants;
         this.nonRevertibleAccumulatedData = nonRevertibleAccumulatedData;
         this.revertibleAccumulatedData = revertibleAccumulatedData;
         this.publicTeardownCallRequest = publicTeardownCallRequest;
         this.gasUsed = gasUsed;
         this.feePayer = feePayer;
-        this.includeByTimestamp = includeByTimestamp;
+        this.expirationTimestamp = expirationTimestamp;
     }
     toBuffer() {
-        return serializeToBuffer(this.constants, this.nonRevertibleAccumulatedData, this.revertibleAccumulatedData, this.publicTeardownCallRequest, this.gasUsed, this.feePayer, bigintToUInt64BE(this.includeByTimestamp));
+        return serializeToBuffer(this.constants, this.nonRevertibleAccumulatedData, this.revertibleAccumulatedData, this.publicTeardownCallRequest, this.gasUsed, this.feePayer, bigintToUInt64BE(this.expirationTimestamp));
     }
     static getFields(fields) {
         return [
@@ -36,7 +36,7 @@ export class PrivateToPublicKernelCircuitPublicInputs {
             fields.publicTeardownCallRequest,
             fields.gasUsed,
             fields.feePayer,
-            fields.includeByTimestamp
+            fields.expirationTimestamp
         ];
     }
     static fromBuffer(buffer) {
@@ -60,7 +60,7 @@ export class PrivateToPublicKernelCircuitPublicInputs {
         return fields;
     }
     hash() {
-        return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.PUBLIC_TX_HASH);
+        return poseidon2HashWithSeparator(this.toFields(), DomainSeparator.PUBLIC_TX_HASH);
     }
     toJSON() {
         return this.toBuffer();

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts

@@ -30,7 +30,7 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    includeByTimestamp: UInt64;
+    expirationTimestamp: UInt64;
     constructor(
     /**
      * Data which is not modified by the circuits.
@@ -51,7 +51,7 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    includeByTimestamp: UInt64);
+    expirationTimestamp: UInt64);
     getNonEmptyNullifiers(): Fr[];
     toBuffer(): Buffer<ArrayBufferLike>;
     /**
@@ -71,4 +71,4 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     toFields(): Fr[];
     hash(): Promise<Fr>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19yb2xsdXBfa2VybmVsX2NpcmN1aXRfcHVibGljX2lucHV0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3JvbGx1cF9rZXJuZWxfY2lyY3VpdF9wdWJsaWNfaW5wdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sRUFBRSxZQUFZLEVBQTBELE1BQU0sNkJBQTZCLENBQUM7QUFFbkgsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBRXpGOzs7R0FHRztBQUNILHFCQUFhLHdDQUF3QztJQUVqRDs7T0FFRztJQUNJLFNBQVMsRUFBRSxjQUFjO0lBQ2hDOztPQUVHO0lBQ0ksR0FBRyxFQUFFLDhCQUE4QjtJQUMxQzs7T0FFRztJQUNJLE9BQU8sRUFBRSxHQUFHO0lBQ25COztPQUVHO0lBQ0ksUUFBUSxFQUFFLFlBQVk7SUFDN0I7O09BRUc7SUFDSSxrQkFBa0IsRUFBRSxNQUFNO0lBcEJuQztJQUNFOztPQUVHO0lBQ0ksU0FBUyxFQUFFLGNBQWM7SUFDaEM7O09BRUc7SUFDSSxHQUFHLEVBQUUsOEJBQThCO0lBQzFDOztPQUVHO0lBQ0ksT0FBTyxFQUFFLEdBQUc7SUFDbkI7O09BRUc7SUFDSSxRQUFRLEVBQUUsWUFBWTtJQUM3Qjs7T0FFRztJQUNJLGtCQUFrQixFQUFFLE1BQU0sRUFDL0I7SUFFSixxQkFBcUIsU0FFcEI7SUFFRCxRQUFRLDRCQVFQO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsd0NBQXdDLENBU3pGO0lBRUQsTUFBTSxDQUFDLEtBQUssNkNBUVg7SUFFRCxRQUFRLGtCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSw0Q0FFNUI7SUFFRCwyREFBMkQ7SUFDM0QsTUFBTSw0QkFFTDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyx3Q0FBd0MsQ0FBQyx3RkFFMUU7SUFFRCw2Q0FBNkM7SUFDN0MsTUFBTSxLQUFLLE1BQU0saUZBRWhCO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsSUFBSSxnQkFFSDtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19yb2xsdXBfa2VybmVsX2NpcmN1aXRfcHVibGljX2lucHV0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3JvbGx1cF9rZXJuZWxfY2lyY3VpdF9wdWJsaWNfaW5wdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sRUFBRSxZQUFZLEVBQTBELE1BQU0sNkJBQTZCLENBQUM7QUFFbkgsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBRXpGOzs7R0FHRztBQUNILHFCQUFhLHdDQUF3QztJQUVqRDs7T0FFRztJQUNJLFNBQVMsRUFBRSxjQUFjO0lBQ2hDOztPQUVHO0lBQ0ksR0FBRyxFQUFFLDhCQUE4QjtJQUMxQzs7T0FFRztJQUNJLE9BQU8sRUFBRSxHQUFHO0lBQ25COztPQUVHO0lBQ0ksUUFBUSxFQUFFLFlBQVk7SUFDN0I7O09BRUc7SUFDSSxtQkFBbUIsRUFBRSxNQUFNO0lBcEJwQztJQUNFOztPQUVHO0lBQ0ksU0FBUyxFQUFFLGNBQWM7SUFDaEM7O09BRUc7SUFDSSxHQUFHLEVBQUUsOEJBQThCO0lBQzFDOztPQUVHO0lBQ0ksT0FBTyxFQUFFLEdBQUc7SUFDbkI7O09BRUc7SUFDSSxRQUFRLEVBQUUsWUFBWTtJQUM3Qjs7T0FFRztJQUNJLG1CQUFtQixFQUFFLE1BQU0sRUFDaEM7SUFFSixxQkFBcUIsU0FFcEI7SUFFRCxRQUFRLDRCQVFQO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsd0NBQXdDLENBU3pGO0lBRUQsTUFBTSxDQUFDLEtBQUssNkNBUVg7SUFFRCxRQUFRLGtCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSw0Q0FFNUI7SUFFRCwyREFBMkQ7SUFDM0QsTUFBTSw0QkFFTDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyx3Q0FBd0MsQ0FBQyx3RkFFMUU7SUFFRCw2Q0FBNkM7SUFDN0MsTUFBTSxLQUFLLE1BQU0saUZBRWhCO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsSUFBSSxnQkFFSDtDQUNGIn0=

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_to_rollup_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAA0D,MAAM,6BAA6B,CAAC;AAEnH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAEzF;;;GAGG;AACH,qBAAa,wCAAwC;IAEjD;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,kBAAkB,EAAE,MAAM;IApBnC;IACE;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,kBAAkB,EAAE,MAAM,EAC/B;IAEJ,qBAAqB,SAEpB;IAED,QAAQ,4BAQP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,wCAAwC,CASzF;IAED,MAAM,CAAC,KAAK,6CAQX;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,4CAE5B;IAED,2DAA2D;IAC3D,MAAM,4BAEL;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC,wFAE1E;IAED,6CAA6C;IAC7C,MAAM,KAAK,MAAM,iFAEhB;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,IAAI,gBAEH;CACF"}
+{"version":3,"file":"private_to_rollup_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAA0D,MAAM,6BAA6B,CAAC;AAEnH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAEzF;;;GAGG;AACH,qBAAa,wCAAwC;IAEjD;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,mBAAmB,EAAE,MAAM;IApBpC;IACE;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,mBAAmB,EAAE,MAAM,EAChC;IAEJ,qBAAqB,SAEpB;IAED,QAAQ,4BAQP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,wCAAwC,CASzF;IAED,MAAM,CAAC,KAAK,6CAQX;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,4CAE5B;IAED,2DAA2D;IAC3D,MAAM,4BAEL;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC,wFAE1E;IAED,6CAA6C;IAC7C,MAAM,KAAK,MAAM,iFAEhB;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,IAAI,gBAEH;CACF"}

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.js

@@ -1,4 +1,4 @@
-import { GeneratorIndex, PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
+import { DomainSeparator, PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
@@ -15,7 +15,7 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
     end;
     gasUsed;
     feePayer;
-    includeByTimestamp;
+    expirationTimestamp;
     constructor(/**
      * Data which is not modified by the circuits.
      */ constants, /**
@@ -26,18 +26,18 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
      * The address of the fee payer for the transaction.
      */ feePayer, /**
      * The timestamp by which the transaction must be included in a block.
-     */ includeByTimestamp){
+     */ expirationTimestamp){
         this.constants = constants;
         this.end = end;
         this.gasUsed = gasUsed;
         this.feePayer = feePayer;
-        this.includeByTimestamp = includeByTimestamp;
+        this.expirationTimestamp = expirationTimestamp;
     }
     getNonEmptyNullifiers() {
         return this.end.nullifiers.filter((n)=>!n.isZero());
     }
     toBuffer() {
-        return serializeToBuffer(this.constants, this.end, this.gasUsed, this.feePayer, bigintToUInt64BE(this.includeByTimestamp));
+        return serializeToBuffer(this.constants, this.end, this.gasUsed, this.feePayer, bigintToUInt64BE(this.expirationTimestamp));
     }
     /**
    * Deserializes from a buffer or reader, corresponding to a write in cpp.
@@ -65,7 +65,7 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
             fields.end,
             fields.gasUsed,
             fields.feePayer,
-            fields.includeByTimestamp
+            fields.expirationTimestamp
         ];
     }
     /** Creates an instance from a hex string. */ static get schema() {
@@ -79,6 +79,6 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
         return fields;
     }
     hash() {
-        return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.PRIVATE_TX_HASH);
+        return poseidon2HashWithSeparator(this.toFields(), DomainSeparator.PRIVATE_TX_HASH);
     }
 }

package/dest/kernel/private_validation_requests.d.ts

@@ -1,7 +1,7 @@
 import { MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
-import { ScopedKeyValidationRequestAndGenerator } from '../kernel/hints/scoped_key_validation_request_and_generator.js';
+import { ScopedKeyValidationRequestAndSeparator } from '../kernel/hints/scoped_key_validation_request_and_separator.js';
 import { ClaimedLengthArray } from './claimed_length_array.js';
 import { ScopedReadRequest } from './hints/read_request.js';
 /**
@@ -19,7 +19,7 @@ export declare class PrivateValidationRequests {
     /**
      * All the key validation requests made in this transaction.
      */
-    scopedKeyValidationRequestsAndGenerators: ClaimedLengthArray<ScopedKeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>;
+    scopedKeyValidationRequestsAndSeparators: ClaimedLengthArray<ScopedKeyValidationRequestAndSeparator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>;
     constructor(
     /**
      * All the read requests made in this transaction.
@@ -32,7 +32,7 @@ export declare class PrivateValidationRequests {
     /**
      * All the key validation requests made in this transaction.
      */
-    scopedKeyValidationRequestsAndGenerators: ClaimedLengthArray<ScopedKeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>);
+    scopedKeyValidationRequestsAndSeparators: ClaimedLengthArray<ScopedKeyValidationRequestAndSeparator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>);
     getSize(): number;
     toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;

package/dest/kernel/private_validation_requests.js

@@ -3,7 +3,7 @@ import { MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
-import { ScopedKeyValidationRequestAndGenerator } from '../kernel/hints/scoped_key_validation_request_and_generator.js';
+import { ScopedKeyValidationRequestAndSeparator } from '../kernel/hints/scoped_key_validation_request_and_separator.js';
 import { ClaimedLengthArray, ClaimedLengthArrayFromBuffer } from './claimed_length_array.js';
 import { ScopedReadRequest } from './hints/read_request.js';
 _computedKey = inspect.custom;
@@ -12,23 +12,23 @@ _computedKey = inspect.custom;
  */ export class PrivateValidationRequests {
     noteHashReadRequests;
     nullifierReadRequests;
-    scopedKeyValidationRequestsAndGenerators;
+    scopedKeyValidationRequestsAndSeparators;
     constructor(/**
      * All the read requests made in this transaction.
      */ noteHashReadRequests, /**
      * All the nullifier read requests made in this transaction.
      */ nullifierReadRequests, /**
      * All the key validation requests made in this transaction.
-     */ scopedKeyValidationRequestsAndGenerators){
+     */ scopedKeyValidationRequestsAndSeparators){
         this.noteHashReadRequests = noteHashReadRequests;
         this.nullifierReadRequests = nullifierReadRequests;
-        this.scopedKeyValidationRequestsAndGenerators = scopedKeyValidationRequestsAndGenerators;
+        this.scopedKeyValidationRequestsAndSeparators = scopedKeyValidationRequestsAndSeparators;
     }
     getSize() {
-        return this.noteHashReadRequests.getSize() + this.nullifierReadRequests.getSize() + this.scopedKeyValidationRequestsAndGenerators.getSize();
+        return this.noteHashReadRequests.getSize() + this.nullifierReadRequests.getSize() + this.scopedKeyValidationRequestsAndSeparators.getSize();
     }
     toBuffer() {
-        return serializeToBuffer(this.noteHashReadRequests, this.nullifierReadRequests, this.scopedKeyValidationRequestsAndGenerators);
+        return serializeToBuffer(this.noteHashReadRequests, this.nullifierReadRequests, this.scopedKeyValidationRequestsAndSeparators);
     }
     toString() {
         return bufferToHex(this.toBuffer());
@@ -39,7 +39,7 @@ _computedKey = inspect.custom;
    * @returns Deserialized object.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateValidationRequests(reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX)));
+        return new PrivateValidationRequests(reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedKeyValidationRequestAndSeparator, MAX_KEY_VALIDATION_REQUESTS_PER_TX)));
     }
     /**
    * Deserializes from a string, corresponding to a write in cpp.
@@ -49,13 +49,13 @@ _computedKey = inspect.custom;
         return PrivateValidationRequests.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PrivateValidationRequests(ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX));
+        return new PrivateValidationRequests(ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedKeyValidationRequestAndSeparator, MAX_KEY_VALIDATION_REQUESTS_PER_TX));
     }
     [_computedKey]() {
         return `PrivateValidationRequests {
   noteHashReadRequests: ${inspect(this.noteHashReadRequests)},
   nullifierReadRequests: ${inspect(this.nullifierReadRequests)},
-  scopedKeyValidationRequestsAndGenerators: ${inspect(this.scopedKeyValidationRequestsAndGenerators)},
+  scopedKeyValidationRequestsAndSeparators: ${inspect(this.scopedKeyValidationRequestsAndSeparators)},
   `;
     }
 }

package/dest/keys/derivation.js

@@ -1,4 +1,4 @@
-import { GeneratorIndex } from '@aztec/constants';
+import { DomainSeparator } from '@aztec/constants';
 import { Grumpkin } from '@aztec/foundation/crypto/grumpkin';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { sha512ToGrumpkinScalar } from '@aztec/foundation/crypto/sha512';
@@ -27,37 +27,37 @@ export async function computeOvskApp(ovsk, app) {
 export function deriveMasterNullifierHidingKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.NHK_M
+        DomainSeparator.NHK_M
     ]);
 }
 export function deriveMasterIncomingViewingSecretKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.IVSK_M
+        DomainSeparator.IVSK_M
     ]);
 }
 export function deriveMasterOutgoingViewingSecretKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.OVSK_M
+        DomainSeparator.OVSK_M
     ]);
 }
 export function deriveSigningKey(secretKey) {
     // TODO(#5837): come up with a standard signing key derivation scheme instead of using ivsk_m as signing keys here
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.IVSK_M
+        DomainSeparator.IVSK_M
     ]);
 }
 export function computePreaddress(publicKeysHash, partialAddress) {
     return poseidon2HashWithSeparator([
         publicKeysHash,
         partialAddress
-    ], GeneratorIndex.CONTRACT_ADDRESS_V1);
+    ], DomainSeparator.CONTRACT_ADDRESS_V1);
 }
 export async function computeAddress(publicKeys, partialAddress) {
     // Given public keys and a partial address, we can compute our address in the following steps.
-    // 1. preaddress = poseidon2([publicKeysHash, partialAddress], GeneratorIndex.CONTRACT_ADDRESS_V1);
+    // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V1);
     // 2. addressPoint = (preaddress * G) + ivpk_m
     // 3. address = addressPoint.x
     const preaddress = await computePreaddress(await publicKeys.hash(), partialAddress);
@@ -98,7 +98,7 @@ export function derivePublicKeyFromSecretKey(secretKey) {
     const masterOutgoingViewingSecretKey = deriveMasterOutgoingViewingSecretKey(secretKey);
     const masterTaggingSecretKey = sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.TSK_M
+        DomainSeparator.TSK_M
     ]);
     // Then we derive master public keys
     const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(masterNullifierHidingKey);

package/dest/keys/key_types.d.ts

@@ -1,5 +1,5 @@
-import type { GeneratorIndex } from '@aztec/constants';
-export type KeyGenerator = GeneratorIndex.NHK_M | GeneratorIndex.IVSK_M | GeneratorIndex.OVSK_M | GeneratorIndex.TSK_M;
+import type { DomainSeparator } from '@aztec/constants';
+export type KeyGenerator = DomainSeparator.NHK_M | DomainSeparator.IVSK_M | DomainSeparator.OVSK_M | DomainSeparator.TSK_M;
 export type KeyPrefix = 'n' | 'iv' | 'ov' | 't';
 export declare const KEY_PREFIXES: KeyPrefix[];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3R5cGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2V5cy9rZXlfdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdkQsTUFBTSxNQUFNLFlBQVksR0FBRyxjQUFjLENBQUMsS0FBSyxHQUFHLGNBQWMsQ0FBQyxNQUFNLEdBQUcsY0FBYyxDQUFDLE1BQU0sR0FBRyxjQUFjLENBQUMsS0FBSyxDQUFDO0FBQ3ZILE1BQU0sTUFBTSxTQUFTLEdBQUcsR0FBRyxHQUFHLElBQUksR0FBRyxJQUFJLEdBQUcsR0FBRyxDQUFDO0FBQ2hELGVBQU8sTUFBTSxZQUFZLEVBQUUsU0FBUyxFQUEyQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3R5cGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2V5cy9rZXlfdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFeEQsTUFBTSxNQUFNLFlBQVksR0FDcEIsZUFBZSxDQUFDLEtBQUssR0FDckIsZUFBZSxDQUFDLE1BQU0sR0FDdEIsZUFBZSxDQUFDLE1BQU0sR0FDdEIsZUFBZSxDQUFDLEtBQUssQ0FBQztBQUMxQixNQUFNLE1BQU0sU0FBUyxHQUFHLEdBQUcsR0FBRyxJQUFJLEdBQUcsSUFBSSxHQUFHLEdBQUcsQ0FBQztBQUNoRCxlQUFPLE1BQU0sWUFBWSxFQUFFLFNBQVMsRUFBMkIsQ0FBQyJ9

package/dest/keys/key_types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"key_types.d.ts","sourceRoot":"","sources":["../../src/keys/key_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC;AACvH,MAAM,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;AAChD,eAAO,MAAM,YAAY,EAAE,SAAS,EAA2B,CAAC"}
+{"version":3,"file":"key_types.d.ts","sourceRoot":"","sources":["../../src/keys/key_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,MAAM,YAAY,GACpB,eAAe,CAAC,KAAK,GACrB,eAAe,CAAC,MAAM,GACtB,eAAe,CAAC,MAAM,GACtB,eAAe,CAAC,KAAK,CAAC;AAC1B,MAAM,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;AAChD,eAAO,MAAM,YAAY,EAAE,SAAS,EAA2B,CAAC"}

package/dest/keys/public_keys.js

@@ -1,4 +1,4 @@
-import { DEFAULT_IVPK_M_X, DEFAULT_IVPK_M_Y, DEFAULT_NPK_M_X, DEFAULT_NPK_M_Y, DEFAULT_OVPK_M_X, DEFAULT_OVPK_M_Y, DEFAULT_TPK_M_X, DEFAULT_TPK_M_Y, GeneratorIndex } from '@aztec/constants';
+import { DEFAULT_IVPK_M_X, DEFAULT_IVPK_M_Y, DEFAULT_NPK_M_X, DEFAULT_NPK_M_Y, DEFAULT_OVPK_M_X, DEFAULT_OVPK_M_Y, DEFAULT_TPK_M_X, DEFAULT_TPK_M_Y, DomainSeparator } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { Point } from '@aztec/foundation/curves/grumpkin';
@@ -46,7 +46,7 @@ export class PublicKeys {
             this.masterIncomingViewingPublicKey,
             this.masterOutgoingViewingPublicKey,
             this.masterTaggingPublicKey
-        ], GeneratorIndex.PUBLIC_KEYS_HASH);
+        ], DomainSeparator.PUBLIC_KEYS_HASH);
     }
     isEmpty() {
         return this.masterNullifierPublicKey.isZero() && this.masterIncomingViewingPublicKey.isZero() && this.masterOutgoingViewingPublicKey.isZero() && this.masterTaggingPublicKey.isZero();

package/dest/keys/utils.js

@@ -1,10 +1,10 @@
-import { GeneratorIndex } from '@aztec/constants';
+import { DomainSeparator } from '@aztec/constants';
 export function getKeyGenerator(prefix) {
     const map = {
-        n: GeneratorIndex.NHK_M,
-        iv: GeneratorIndex.IVSK_M,
-        ov: GeneratorIndex.OVSK_M,
-        t: GeneratorIndex.TSK_M
+        n: DomainSeparator.NHK_M,
+        iv: DomainSeparator.IVSK_M,
+        ov: DomainSeparator.OVSK_M,
+        t: DomainSeparator.TSK_M
     };
     return map[prefix];
 }

package/dest/kv-store/config.d.ts

@@ -0,0 +1,17 @@
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+export type DataStoreConfig = {
+    dataDirectory?: string;
+    dataStoreMapSizeKb: number;
+    l1Contracts?: {
+        rollupAddress: EthAddress;
+    };
+};
+export declare const dataConfigMappings: ConfigMappingsType<DataStoreConfig>;
+/**
+ * Returns the archiver configuration from the environment variables.
+ * Note: If an environment variable is not set, the default value is used.
+ * @returns The archiver configuration.
+ */
+export declare function getDataConfigFromEnv(): DataStoreConfig;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva3Ytc3RvcmUvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUE2QyxNQUFNLDBCQUEwQixDQUFDO0FBQzlHLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE1BQU0sTUFBTSxlQUFlLEdBQUc7SUFDNUIsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixXQUFXLENBQUMsRUFBRTtRQUFFLGFBQWEsRUFBRSxVQUFVLENBQUE7S0FBRSxDQUFDO0NBQzdDLENBQUM7QUFFRixlQUFPLE1BQU0sa0JBQWtCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQWdCbEUsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBZ0Isb0JBQW9CLElBQUksZUFBZSxDQUV0RCJ9

package/dest/kv-store/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/kv-store/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,eAAe,GAAG;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE;QAAE,aAAa,EAAE,UAAU,CAAA;KAAE,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,kBAAkB,CAAC,eAAe,CAgBlE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,eAAe,CAEtD"}

package/dest/kv-store/config.js

@@ -0,0 +1,26 @@
+import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
+import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+export const dataConfigMappings = {
+    dataDirectory: {
+        env: 'DATA_DIRECTORY',
+        description: 'Optional dir to store data. If omitted will store in memory.'
+    },
+    dataStoreMapSizeKb: {
+        env: 'DATA_STORE_MAP_SIZE_KB',
+        description: 'The maximum possible size of a data store DB in KB. Can be overridden by component-specific options.',
+        ...numberConfigHelper(128 * 1_024 * 1_024)
+    },
+    l1Contracts: {
+        description: 'The deployed L1 contract addresses',
+        nested: {
+            rollupAddress: l1ContractAddressesMapping.rollupAddress
+        }
+    }
+};
+/**
+ * Returns the archiver configuration from the environment variables.
+ * Note: If an environment variable is not set, the default value is used.
+ * @returns The archiver configuration.
+ */ export function getDataConfigFromEnv() {
+    return getConfigFromMappings(dataConfigMappings);
+}

package/dest/kv-store/index.d.ts

@@ -0,0 +1,2 @@
+export * from './config.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rdi1zdG9yZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGFBQWEsQ0FBQyJ9

package/dest/kv-store/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/kv-store/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}

package/dest/kv-store/index.js

@@ -0,0 +1 @@
+export * from './config.js';