@aztec/stdlib 0.0.1-commit.6b90f3f5 → 0.0.1-commit.6c354eb4c

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();
@@ -176,7 +176,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/logs/debug_log_store.d.ts

@@ -0,0 +1,30 @@
+import type { TxReceipt } from '../tx/tx_receipt.js';
+import type { DebugLog } from './debug_log.js';
+/**
+ * Store for debug logs emitted by public functions during transaction execution.
+ *
+ * Uses the Null Object pattern: production code uses NullDebugLogStore (no-op), while test mode uses
+ * InMemoryDebugLogStore (stores and serves logs).
+ */
+export interface DebugLogStore {
+    /** Store debug logs for a processed transaction. */
+    storeLogs(txHash: string, logs: DebugLog[]): void;
+    /** Decorate a TxReceipt with any stored debug logs for the given tx. */
+    decorateReceiptWithLogs(txHash: string, receipt: TxReceipt): void;
+    /** Whether debug log collection is enabled. */
+    readonly isEnabled: boolean;
+}
+/** No-op implementation for production mode. */
+export declare class NullDebugLogStore implements DebugLogStore {
+    storeLogs(_txHash: string, _logs: DebugLog[]): void;
+    decorateReceiptWithLogs(_txHash: string, _receipt: TxReceipt): void;
+    get isEnabled(): boolean;
+}
+/** In-memory implementation for test mode that stores and serves debug logs. */
+export declare class InMemoryDebugLogStore implements DebugLogStore {
+    private map;
+    storeLogs(txHash: string, logs: DebugLog[]): void;
+    decorateReceiptWithLogs(txHash: string, receipt: TxReceipt): void;
+    get isEnabled(): boolean;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWdfbG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9kZWJ1Z19sb2dfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFL0M7Ozs7O0dBS0c7QUFDSCxNQUFNLFdBQVcsYUFBYTtJQUM1QixvREFBb0Q7SUFDcEQsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxHQUFHLElBQUksQ0FBQztJQUNsRCx3RUFBd0U7SUFDeEUsdUJBQXVCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsU0FBUyxHQUFHLElBQUksQ0FBQztJQUNsRSwrQ0FBK0M7SUFDL0MsUUFBUSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUM7Q0FDN0I7QUFFRCxnREFBZ0Q7QUFDaEQscUJBQWEsaUJBQWtCLFlBQVcsYUFBYTtJQUNyRCxTQUFTLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLEdBQUcsSUFBSSxDQUVsRDtJQUNELHVCQUF1QixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLFNBQVMsR0FBRyxJQUFJLENBRWxFO0lBQ0QsSUFBSSxTQUFTLElBQUksT0FBTyxDQUV2QjtDQUNGO0FBRUQsZ0ZBQWdGO0FBQ2hGLHFCQUFhLHFCQUFzQixZQUFXLGFBQWE7SUFDekQsT0FBTyxDQUFDLEdBQUcsQ0FBaUM7SUFFNUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxHQUFHLElBQUksQ0FJaEQ7SUFFRCx1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxTQUFTLEdBQUcsSUFBSSxDQU9oRTtJQUVELElBQUksU0FBUyxJQUFJLE9BQU8sQ0FFdkI7Q0FDRiJ9

package/dest/logs/debug_log_store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug_log_store.d.ts","sourceRoot":"","sources":["../../src/logs/debug_log_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAClD,wEAAwE;IACxE,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CAAC;IAClE,+CAA+C;IAC/C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED,gDAAgD;AAChD,qBAAa,iBAAkB,YAAW,aAAa;IACrD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAElD;IACD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,IAAI,CAElE;IACD,IAAI,SAAS,IAAI,OAAO,CAEvB;CACF;AAED,gFAAgF;AAChF,qBAAa,qBAAsB,YAAW,aAAa;IACzD,OAAO,CAAC,GAAG,CAAiC;IAE5C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAIhD;IAED,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CAOhE;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;CACF"}

package/dest/logs/debug_log_store.js

@@ -0,0 +1,30 @@
+/** No-op implementation for production mode. */ export class NullDebugLogStore {
+    storeLogs(_txHash, _logs) {
+        return;
+    }
+    decorateReceiptWithLogs(_txHash, _receipt) {
+        return;
+    }
+    get isEnabled() {
+        return false;
+    }
+}
+/** In-memory implementation for test mode that stores and serves debug logs. */ export class InMemoryDebugLogStore {
+    map = new Map();
+    storeLogs(txHash, logs) {
+        if (logs.length > 0) {
+            this.map.set(txHash, logs);
+        }
+    }
+    decorateReceiptWithLogs(txHash, receipt) {
+        if (receipt.isMined()) {
+            const debugLogs = this.map.get(txHash);
+            if (debugLogs) {
+                receipt.debugLogs = debugLogs;
+            }
+        }
+    }
+    get isEnabled() {
+        return true;
+    }
+}

package/dest/logs/extended_directional_app_tagging_secret.d.ts

@@ -0,0 +1,47 @@
+import { type Fq, Fr } from '@aztec/foundation/curves/bn254';
+import { z } from 'zod';
+import { AztecAddress } from '../aztec-address/index.js';
+import type { CompleteAddress } from '../contract/complete_address.js';
+/**
+ * Extended directional application tagging secret used for log tagging.
+ *
+ * "Extended" because it bundles the directional app tagging secret with the app (contract) address. This bundling was
+ * done because where this type is used we commonly need access to both the secret and the address.
+ *
+ * "Directional" because the derived secret is bound to the recipient address: A→B differs from B→A even with the same
+ * participants and app.
+ *
+ * Note: It's a bit unfortunate that this type resides in `stdlib` as the rest of the tagging functionality resides in
+ * `pxe/src/tagging`. We need to use this type in `PreTag` that in turn is used by other types in stdlib hence there
+ * doesn't seem to be a good way around this.
+ */
+export declare class ExtendedDirectionalAppTaggingSecret {
+    readonly secret: Fr;
+    readonly app: AztecAddress;
+    private constructor();
+    /**
+     * Derives shared tagging secret and from that, the app address and recipient derives the directional app tagging
+     * secret.
+     *
+     * @param localAddress - The complete address of entity A in the shared tagging secret derivation scheme
+     * @param localIvsk - The incoming viewing secret key of entity A
+     * @param externalAddress - The address of entity B in the shared tagging secret derivation scheme
+     * @param app - Contract address to silo the secret to
+     * @param recipient - Recipient of the log. Defines the "direction of the secret".
+     * @returns The secret that can be used along with an index to compute a tag to be included in a log.
+     */
+    static compute(localAddress: CompleteAddress, localIvsk: Fq, externalAddress: AztecAddress, app: AztecAddress, recipient: AztecAddress): Promise<ExtendedDirectionalAppTaggingSecret>;
+    toString(): string;
+    static fromString(str: string): ExtendedDirectionalAppTaggingSecret;
+}
+export declare const ExtendedDirectionalAppTaggingSecretSchema: z.ZodObject<{
+    secret: z.ZodType<Fr, any, string>;
+    app: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
+}, "strip", z.ZodTypeAny, {
+    secret: Fr;
+    app: AztecAddress;
+}, {
+    secret: string;
+    app?: any;
+}>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRfZGlyZWN0aW9uYWxfYXBwX3RhZ2dpbmdfc2VjcmV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9leHRlbmRlZF9kaXJlY3Rpb25hbF9hcHBfdGFnZ2luZ19zZWNyZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRzdELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR3ZFOzs7Ozs7Ozs7Ozs7R0FZRztBQUNILHFCQUFhLG1DQUFtQzthQUU1QixNQUFNLEVBQUUsRUFBRTthQUNWLEdBQUcsRUFBRSxZQUFZO0lBRm5DLE9BQU8sZUFHSDtJQUVKOzs7Ozs7Ozs7O09BVUc7SUFDSCxPQUFhLE9BQU8sQ0FDbEIsWUFBWSxFQUFFLGVBQWUsRUFDN0IsU0FBUyxFQUFFLEVBQUUsRUFDYixlQUFlLEVBQUUsWUFBWSxFQUM3QixHQUFHLEVBQUUsWUFBWSxFQUNqQixTQUFTLEVBQUUsWUFBWSxHQUN0QixPQUFPLENBQUMsbUNBQW1DLENBQUMsQ0FNOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxtQ0FBbUMsQ0FHbEU7Q0FDRjtBQW9CRCxlQUFPLE1BQU0seUNBQXlDOzs7Ozs7Ozs7RUFHcEQsQ0FBQyJ9

package/dest/logs/extended_directional_app_tagging_secret.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extended_directional_app_tagging_secret.d.ts","sourceRoot":"","sources":["../../src/logs/extended_directional_app_tagging_secret.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAG7D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGvE;;;;;;;;;;;;GAYG;AACH,qBAAa,mCAAmC;aAE5B,MAAM,EAAE,EAAE;aACV,GAAG,EAAE,YAAY;IAFnC,OAAO,eAGH;IAEJ;;;;;;;;;;OAUG;IACH,OAAa,OAAO,CAClB,YAAY,EAAE,eAAe,EAC7B,SAAS,EAAE,EAAE,EACb,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,mCAAmC,CAAC,CAM9C;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,mCAAmC,CAGlE;CACF;AAoBD,eAAO,MAAM,yCAAyC;;;;;;;;;EAGpD,CAAC"}

package/dest/logs/{directional_app_tagging_secret.js → extended_directional_app_tagging_secret.js}

@@ -2,20 +2,26 @@ import { Grumpkin } from '@aztec/foundation/crypto/grumpkin';
 import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { z } from 'zod';
+import { AztecAddress } from '../aztec-address/index.js';
 import { computeAddressSecret, computePreaddress } from '../keys/derivation.js';
 /**
- * Directional application tagging secret used for log tagging.
+ * Extended directional application tagging secret used for log tagging.
  *
- * "Directional" because the derived secret is bound to the recipient
- * address: A→B differs from B→A even with the same participants and app.
+ * "Extended" because it bundles the directional app tagging secret with the app (contract) address. This bundling was
+ * done because where this type is used we commonly need access to both the secret and the address.
  *
- * Note: It's a bit unfortunate that this type resides in `stdlib` as the rest of the tagging functionality resides
- * in `pxe/src/tagging`. We need to use this type in `PreTag` that in turn is used by other types
- * in stdlib hence there doesn't seem to be a good way around this.
- */ export class DirectionalAppTaggingSecret {
-    value;
-    constructor(value){
-        this.value = value;
+ * "Directional" because the derived secret is bound to the recipient address: A→B differs from B→A even with the same
+ * participants and app.
+ *
+ * Note: It's a bit unfortunate that this type resides in `stdlib` as the rest of the tagging functionality resides in
+ * `pxe/src/tagging`. We need to use this type in `PreTag` that in turn is used by other types in stdlib hence there
+ * doesn't seem to be a good way around this.
+ */ export class ExtendedDirectionalAppTaggingSecret {
+    secret;
+    app;
+    constructor(secret, app){
+        this.secret = secret;
+        this.app = app;
     }
     /**
    * Derives shared tagging secret and from that, the app address and recipient derives the directional app tagging
@@ -38,13 +44,14 @@ import { computeAddressSecret, computePreaddress } from '../keys/derivation.js';
             appTaggingSecret,
             recipient
         ]);
-        return new DirectionalAppTaggingSecret(directionalAppTaggingSecret);
+        return new ExtendedDirectionalAppTaggingSecret(directionalAppTaggingSecret, app);
     }
     toString() {
-        return this.value.toString();
+        return `${this.secret.toString()}:${this.app.toString()}`;
     }
     static fromString(str) {
-        return new DirectionalAppTaggingSecret(Fr.fromString(str));
+        const [secretStr, appStr] = str.split(':');
+        return new ExtendedDirectionalAppTaggingSecret(Fr.fromString(secretStr), AztecAddress.fromString(appStr));
     }
 }
 // Returns shared tagging secret computed with Diffie-Hellman key exchange.
@@ -59,6 +66,7 @@ async function computeSharedTaggingSecret(localAddress, localIvsk, externalAddre
     // leads to a positive y-coordinate, which is the only valid address point
     return Grumpkin.mul(externalAddressPoint, await computeAddressSecret(knownPreaddress, localIvsk));
 }
-export const DirectionalAppTaggingSecretSchema = z.object({
-    value: Fr.schema
+export const ExtendedDirectionalAppTaggingSecretSchema = z.object({
+    secret: Fr.schema,
+    app: AztecAddress.schema
 });