@aztec/stdlib 0.0.1-commit.2f68f620 → 0.0.1-commit.3100065

package/dest/kernel/utils/optional_number.d.ts

@@ -0,0 +1,31 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+export declare class OptionalNumber {
+    /**
+     * Whether a value was set.
+     */
+    isSome: boolean;
+    /**
+     * The actual number, if isSome is true.
+     */
+    value: number;
+    constructor(
+    /**
+     * Whether a value was set.
+     */
+    isSome: boolean, 
+    /**
+     * The actual number, if isSome is true.
+     */
+    value: number);
+    getSize(): number;
+    static getFields(fields: FieldsOf<OptionalNumber>): readonly [boolean, number];
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): OptionalNumber;
+    toFields(): Fr[];
+    static fromFields(fields: Fr[] | FieldReader): OptionalNumber;
+    isEmpty(): boolean;
+    static empty(): OptionalNumber;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uYWxfbnVtYmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsL3V0aWxzL29wdGlvbmFsX251bWJlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxxQkFBYSxjQUFjO0lBRXZCOztPQUVHO0lBQ0ksTUFBTSxFQUFFLE9BQU87SUFDdEI7O09BRUc7SUFDSSxLQUFLLEVBQUUsTUFBTTtJQVJ0QjtJQUNFOztPQUVHO0lBQ0ksTUFBTSxFQUFFLE9BQU87SUFDdEI7O09BRUc7SUFDSSxLQUFLLEVBQUUsTUFBTSxFQUNsQjtJQUVKLE9BQU8sV0FFTjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxjQUFjLENBQUMsOEJBRWhEO0lBRUQsUUFBUSw0QkFFUDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsY0FBYyxDQUcvRDtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxjQUFjLENBRzVEO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxNQUFNLENBQUMsS0FBSyxtQkFFWDtDQUNGIn0=

package/dest/kernel/utils/optional_number.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"optional_number.d.ts","sourceRoot":"","sources":["../../../src/kernel/utils/optional_number.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,qBAAa,cAAc;IAEvB;;OAEG;IACI,MAAM,EAAE,OAAO;IACtB;;OAEG;IACI,KAAK,EAAE,MAAM;IARtB;IACE;;OAEG;IACI,MAAM,EAAE,OAAO;IACtB;;OAEG;IACI,KAAK,EAAE,MAAM,EAClB;IAEJ,OAAO,WAEN;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,8BAEhD;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc,CAG/D;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc,CAG5D;IAED,OAAO,IAAI,OAAO,CAEjB;IAED,MAAM,CAAC,KAAK,mBAEX;CACF"}

package/dest/kernel/utils/optional_number.js

@@ -0,0 +1,42 @@
+import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+export class OptionalNumber {
+    isSome;
+    value;
+    constructor(/**
+     * Whether a value was set.
+     */ isSome, /**
+     * The actual number, if isSome is true.
+     */ value){
+        this.isSome = isSome;
+        this.value = value;
+    }
+    getSize() {
+        return this.toBuffer().length;
+    }
+    static getFields(fields) {
+        return [
+            fields.isSome,
+            fields.value
+        ];
+    }
+    toBuffer() {
+        return serializeToBuffer(...OptionalNumber.getFields(this));
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new OptionalNumber(reader.readBoolean(), reader.readNumber());
+    }
+    toFields() {
+        return serializeToFields(...OptionalNumber.getFields(this));
+    }
+    static fromFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        return new OptionalNumber(reader.readBoolean(), reader.readU32());
+    }
+    isEmpty() {
+        return !this.isSome && !this.value;
+    }
+    static empty() {
+        return new OptionalNumber(false, 0);
+    }
+}

package/dest/keys/derivation.d.ts

@@ -4,30 +4,65 @@ import { AztecAddress } from '../aztec-address/index.js';
 import type { KeyPrefix } from './key_types.js';
 import { PublicKey } from './public_key.js';
 import { PublicKeys } from './public_keys.js';
-export declare function computeAppNullifierHidingKey(masterNullifierHidingKey: GrumpkinScalar, app: AztecAddress): Promise<Fr>;
+export declare function computeAppNullifierHidingKey(masterNullifierHidingSecretKey: GrumpkinScalar, app: AztecAddress): Promise<Fr>;
 export declare function computeAppSecretKey(skM: GrumpkinScalar, app: AztecAddress, keyPrefix: KeyPrefix): Promise<Fr>;
 export declare function computeOvskApp(ovsk: GrumpkinScalar, app: AztecAddress): Promise<Fq>;
-export declare function deriveMasterNullifierHidingKey(secretKey: Fr): GrumpkinScalar;
+export declare function deriveMasterNullifierHidingSecretKey(secretKey: Fr): GrumpkinScalar;
 export declare function deriveMasterIncomingViewingSecretKey(secretKey: Fr): GrumpkinScalar;
 export declare function deriveMasterOutgoingViewingSecretKey(secretKey: Fr): GrumpkinScalar;
-export declare function deriveSigningKey(secretKey: Fr): GrumpkinScalar;
+export declare function deriveMasterMessageSigningSecretKey(secretKey: Fr): GrumpkinScalar;
+export declare function deriveMasterFallbackSecretKey(secretKey: Fr): GrumpkinScalar;
 export declare function computePreaddress(publicKeysHash: Fr, partialAddress: Fr): Promise<Fr>;
 export declare function computeAddress(publicKeys: PublicKeys, partialAddress: Fr): Promise<AztecAddress>;
 export declare function computeAddressSecret(preaddress: Fr, ivsk: Fq): Promise<Fq>;
 export declare function derivePublicKeyFromSecretKey(secretKey: Fq): Promise<PublicKey>;
+/**
+ * The six master secret keys that fully define an account's privacy keys.
+ */
+export type MasterSecretKeys = {
+    masterNullifierHidingSecretKey: GrumpkinScalar;
+    masterIncomingViewingSecretKey: GrumpkinScalar;
+    masterOutgoingViewingSecretKey: GrumpkinScalar;
+    masterTaggingSecretKey: GrumpkinScalar;
+    masterMessageSigningSecretKey: GrumpkinScalar;
+    masterFallbackSecretKey: GrumpkinScalar;
+};
 /**
  * Computes secret and public keys and public keys hash from a secret key.
  * @param secretKey - The secret key to derive keys from.
  * @returns The derived keys.
  */
 export declare function deriveKeys(secretKey: Fr): Promise<{
-    masterNullifierHidingKey: Fq;
+    masterNullifierHidingSecretKey: Fq;
+    masterIncomingViewingSecretKey: Fq;
+    masterOutgoingViewingSecretKey: Fq;
+    masterTaggingSecretKey: Fq;
+    masterMessageSigningSecretKey: Fq;
+    masterFallbackSecretKey: Fq;
+    masterNullifierHidingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterOutgoingViewingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterTaggingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterMessageSigningPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterFallbackPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    publicKeys: PublicKeys;
+}>;
+/**
+ * Derives the master public keys and the {@link PublicKeys} struct from a set of master secret keys.
+ * @param secretKeys - The master secret keys to derive public keys from.
+ * @returns The provided secret keys alongside the derived public keys.
+ */
+export declare function deriveKeysFromMasterSecretKeys(secretKeys: MasterSecretKeys): Promise<{
+    masterNullifierHidingSecretKey: Fq;
     masterIncomingViewingSecretKey: Fq;
     masterOutgoingViewingSecretKey: Fq;
     masterTaggingSecretKey: Fq;
-    masterNullifierPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterMessageSigningSecretKey: Fq;
+    masterFallbackSecretKey: Fq;
+    masterNullifierHidingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
     masterOutgoingViewingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
     masterTaggingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterMessageSigningPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterFallbackPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
     publicKeys: PublicKeys;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvZGVyaXZhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUMsd0JBQWdCLDRCQUE0QixDQUFDLHdCQUF3QixFQUFFLGNBQWMsRUFBRSxHQUFHLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFckg7QUFFRCx3QkFBZ0IsbUJBQW1CLENBQUMsR0FBRyxFQUFFLGNBQWMsRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUc3RztBQUVELHdCQUFzQixjQUFjLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRSxHQUFHLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FLekY7QUFFRCx3QkFBZ0IsOEJBQThCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRTVFO0FBRUQsd0JBQWdCLG9DQUFvQyxDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUVsRjtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFbEY7QUFFRCx3QkFBZ0IsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRzlEO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLGNBQWMsRUFBRSxFQUFFLEVBQUUsY0FBYyxFQUFFLEVBQUUsZUFFdkU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBWXRHO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsZUFvQmxFO0FBRUQsd0JBQWdCLDRCQUE0QixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUU5RTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsVUFBVSxDQUFDLFNBQVMsRUFBRSxFQUFFOzs7Ozs7Ozs7R0F3QzdDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvZGVyaXZhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUMsd0JBQWdCLDRCQUE0QixDQUMxQyw4QkFBOEIsRUFBRSxjQUFjLEVBQzlDLEdBQUcsRUFBRSxZQUFZLEdBQ2hCLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFYjtBQUVELHdCQUFnQixtQkFBbUIsQ0FBQyxHQUFHLEVBQUUsY0FBYyxFQUFFLEdBQUcsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRzdHO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxJQUFJLEVBQUUsY0FBYyxFQUFFLEdBQUcsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUt6RjtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFbEY7QUFFRCx3QkFBZ0Isb0NBQW9DLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRWxGO0FBRUQsd0JBQWdCLG9DQUFvQyxDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUVsRjtBQUVELHdCQUFnQixtQ0FBbUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFakY7QUFFRCx3QkFBZ0IsNkJBQTZCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRTNFO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLGNBQWMsRUFBRSxFQUFFLEVBQUUsY0FBYyxFQUFFLEVBQUUsZUFFdkU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBWXRHO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsZUFvQmxFO0FBRUQsd0JBQWdCLDRCQUE0QixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQU85RTtBQUVEOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLDhCQUE4QixFQUFFLGNBQWMsQ0FBQztJQUMvQyw4QkFBOEIsRUFBRSxjQUFjLENBQUM7SUFDL0MsOEJBQThCLEVBQUUsY0FBYyxDQUFDO0lBQy9DLHNCQUFzQixFQUFFLGNBQWMsQ0FBQztJQUN2Qyw2QkFBNkIsRUFBRSxjQUFjLENBQUM7SUFDOUMsdUJBQXVCLEVBQUUsY0FBYyxDQUFDO0NBQ3pDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQWdCLFVBQVUsQ0FBQyxTQUFTLEVBQUUsRUFBRTs7Ozs7Ozs7Ozs7OztHQVd2QztBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsOEJBQThCLENBQUMsVUFBVSxFQUFFLGdCQUFnQjs7Ozs7Ozs7Ozs7OztHQTRDaEYifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"derivation.d.ts","sourceRoot":"","sources":["../../src/keys/derivation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAgB,4BAA4B,CAAC,wBAAwB,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAErH;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAG7G;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAKzF;AAED,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAE5E;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAG9D;AAED,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,eAEvE;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAYtG;AAED,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,eAoBlE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAE9E;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,SAAS,EAAE,EAAE;;;;;;;;;GAwC7C"}
+{"version":3,"file":"derivation.d.ts","sourceRoot":"","sources":["../../src/keys/derivation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAgB,4BAA4B,CAC1C,8BAA8B,EAAE,cAAc,EAC9C,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,EAAE,CAAC,CAEb;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAG7G;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAKzF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,mCAAmC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAEjF;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAE3E;AAED,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,eAEvE;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAYtG;AAED,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,eAoBlE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAO9E;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,8BAA8B,EAAE,cAAc,CAAC;IAC/C,8BAA8B,EAAE,cAAc,CAAC;IAC/C,8BAA8B,EAAE,cAAc,CAAC;IAC/C,sBAAsB,EAAE,cAAc,CAAC;IACvC,6BAA6B,EAAE,cAAc,CAAC;IAC9C,uBAAuB,EAAE,cAAc,CAAC;CACzC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,EAAE;;;;;;;;;;;;;GAWvC;AAED;;;;GAIG;AACH,wBAAsB,8BAA8B,CAAC,UAAU,EAAE,gBAAgB;;;;;;;;;;;;;GA4ChF"}

package/dest/keys/derivation.js

@@ -1,15 +1,15 @@
-import { DEFAULT_FBPK_M_HASH, DEFAULT_MSPK_M_HASH, DomainSeparator } 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';
 import { Fq, Fr } from '@aztec/foundation/curves/bn254';
 import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { AztecAddress } from '../aztec-address/index.js';
-import { hashPublicKey } from './public_key.js';
+import { PublicKey, hashPublicKey } from './public_key.js';
 import { PublicKeys } from './public_keys.js';
 import { getKeyGenerator } from './utils.js';
-export function computeAppNullifierHidingKey(masterNullifierHidingKey, app) {
-    return computeAppSecretKey(masterNullifierHidingKey, app, 'n'); // 'n' is the key prefix for nullifier hiding key
+export function computeAppNullifierHidingKey(masterNullifierHidingSecretKey, app) {
+    return computeAppSecretKey(masterNullifierHidingSecretKey, app, 'n'); // 'n' is the key prefix for nullifier hiding key
 }
 export function computeAppSecretKey(skM, app, keyPrefix) {
     const generator = getKeyGenerator(keyPrefix);
@@ -25,7 +25,7 @@ export async function computeOvskApp(ovsk, app) {
     // P = s * G will not be uniform because 2 * (q - r) / q is small.
     return GrumpkinScalar.fromBuffer(ovskAppFr.toBuffer());
 }
-export function deriveMasterNullifierHidingKey(secretKey) {
+export function deriveMasterNullifierHidingSecretKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
         DomainSeparator.NHK_M
@@ -43,11 +43,16 @@ export function deriveMasterOutgoingViewingSecretKey(secretKey) {
         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
+export function deriveMasterMessageSigningSecretKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
-        DomainSeparator.IVSK_M
+        DomainSeparator.MSSK_M
+    ]);
+}
+export function deriveMasterFallbackSecretKey(secretKey) {
+    return sha512ToGrumpkinScalar([
+        secretKey,
+        DomainSeparator.FBSK_M
     ]);
 }
 export function computePreaddress(publicKeysHash, partialAddress) {
@@ -85,43 +90,61 @@ export async function computeAddressSecret(preaddress, ivsk) {
     return addressSecretCandidate;
 }
 export function derivePublicKeyFromSecretKey(secretKey) {
+    // 0 * G is the point at infinity. The WASM encodes infinity with an out-of-field x coordinate that Point cannot
+    // deserialize, so return the point directly instead of calling into it.
+    if (secretKey.isZero()) {
+        return Promise.resolve(PublicKey.INFINITY);
+    }
     return Grumpkin.mul(Grumpkin.generator, secretKey);
 }
 /**
  * Computes secret and public keys and public keys hash from a secret key.
  * @param secretKey - The secret key to derive keys from.
  * @returns The derived keys.
- */ export async function deriveKeys(secretKey) {
+ */ export function deriveKeys(secretKey) {
     // First we derive master secret/hiding keys -  we use sha512 here because this derivation will never take place
     // in a circuit
-    const masterNullifierHidingKey = deriveMasterNullifierHidingKey(secretKey);
-    const masterIncomingViewingSecretKey = deriveMasterIncomingViewingSecretKey(secretKey);
-    const masterOutgoingViewingSecretKey = deriveMasterOutgoingViewingSecretKey(secretKey);
-    const masterTaggingSecretKey = sha512ToGrumpkinScalar([
-        secretKey,
-        DomainSeparator.TSK_M
-    ]);
-    // Then we derive master public keys
-    const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(masterNullifierHidingKey);
+    return deriveKeysFromMasterSecretKeys({
+        masterNullifierHidingSecretKey: deriveMasterNullifierHidingSecretKey(secretKey),
+        masterIncomingViewingSecretKey: deriveMasterIncomingViewingSecretKey(secretKey),
+        masterOutgoingViewingSecretKey: deriveMasterOutgoingViewingSecretKey(secretKey),
+        masterTaggingSecretKey: sha512ToGrumpkinScalar([
+            secretKey,
+            DomainSeparator.TSK_M
+        ]),
+        masterMessageSigningSecretKey: deriveMasterMessageSigningSecretKey(secretKey),
+        masterFallbackSecretKey: deriveMasterFallbackSecretKey(secretKey)
+    });
+}
+/**
+ * Derives the master public keys and the {@link PublicKeys} struct from a set of master secret keys.
+ * @param secretKeys - The master secret keys to derive public keys from.
+ * @returns The provided secret keys alongside the derived public keys.
+ */ export async function deriveKeysFromMasterSecretKeys(secretKeys) {
+    const { masterNullifierHidingSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, masterMessageSigningSecretKey, masterFallbackSecretKey } = secretKeys;
+    const masterNullifierHidingPublicKey = await derivePublicKeyFromSecretKey(masterNullifierHidingSecretKey);
     const masterIncomingViewingPublicKey = await derivePublicKeyFromSecretKey(masterIncomingViewingSecretKey);
     const masterOutgoingViewingPublicKey = await derivePublicKeyFromSecretKey(masterOutgoingViewingSecretKey);
     const masterTaggingPublicKey = await derivePublicKeyFromSecretKey(masterTaggingSecretKey);
+    const masterMessageSigningPublicKey = await derivePublicKeyFromSecretKey(masterMessageSigningSecretKey);
+    const masterFallbackPublicKey = await derivePublicKeyFromSecretKey(masterFallbackSecretKey);
     // The non-owner-visible PublicKeys carries hashes for npk/ovpk/tpk/mspk/fbpk and the raw
-    // point only for ivpk_m. The npk/ovpk/tpk raw points are also returned alongside so the key
-    // store can persist them under `${account}-{n|ov|t}pk_m` (only their hashes live in publicKeys).
+    // point only for ivpk_m. The npk/ovpk/tpk/mspk/fbpk raw points are also returned alongside so the key
+    // store can persist them under `${account}-{n|ov|t|ms|fb}pk_m` (only their hashes live in publicKeys).
     // The ivpk_m point isn't returned separately because it already lives in publicKeys.ivpkM.
-    //
-    // TODO: There isn't a derivation path for the message signing(msk) and fallback(fbk) keys yet. So we just use the the
-    // default values for now.
-    const publicKeys = new PublicKeys(await hashPublicKey(masterNullifierPublicKey), masterIncomingViewingPublicKey, await hashPublicKey(masterOutgoingViewingPublicKey), await hashPublicKey(masterTaggingPublicKey), new Fr(DEFAULT_MSPK_M_HASH), new Fr(DEFAULT_FBPK_M_HASH));
+    const publicKeys = new PublicKeys(await hashPublicKey(masterNullifierHidingPublicKey), masterIncomingViewingPublicKey, await hashPublicKey(masterOutgoingViewingPublicKey), await hashPublicKey(masterTaggingPublicKey), await hashPublicKey(masterMessageSigningPublicKey), await hashPublicKey(masterFallbackPublicKey));
     return {
-        masterNullifierHidingKey,
+        masterNullifierHidingSecretKey,
         masterIncomingViewingSecretKey,
         masterOutgoingViewingSecretKey,
         masterTaggingSecretKey,
-        masterNullifierPublicKey,
+        masterMessageSigningSecretKey,
+        masterFallbackSecretKey,
+        masterNullifierHidingPublicKey,
         masterOutgoingViewingPublicKey,
         masterTaggingPublicKey,
+        masterMessageSigningPublicKey,
+        masterFallbackPublicKey,
         publicKeys
     };
 }

package/dest/logs/app_tagging_secret.d.ts

@@ -1,4 +1,5 @@
 import { type Fq, Fr } from '@aztec/foundation/curves/bn254';
+import type { Point } from '@aztec/foundation/curves/grumpkin';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import type { CompleteAddress } from '../contract/complete_address.js';
@@ -16,17 +17,32 @@ export declare class AppTaggingSecret {
     readonly kind: AppTaggingSecretKind;
     constructor(secret: Fr, app: AztecAddress, kind?: AppTaggingSecretKind);
     /**
-     * Derives shared tagging secret and from that, the app address and recipient derives the directional app tagging
-     * secret. Returns undefined if `externalAddress` is an invalid address.
+     * Derives an app-siloed, recipient-directional tagging secret from a shared tagging secret point.
      *
-     * @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
+     * App-silos the point via {@link appSiloEcdhSharedSecretPoint}, then directs the result to `recipient`:
+     * `h([s_app, recipient])`. The directional step stops a symmetric shared secret (ECDH against an address, or an
+     * arbitrary registered point) from colliding bidirectionally, so two parties never share a tag sequence.
+     *
+     * The point is obtained either via {@link computeSharedTaggingSecret} (an ECDH key exchange against a sender) or
+     * registered directly as a pre-shared secret.
+     *
+     * @param taggingSecretPoint - The shared tagging secret point (ECDH output, or a directly registered pre-shared secret)
      * @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 computeUnconstrained(localAddress: CompleteAddress, localIvsk: Fq, externalAddress: AztecAddress, app: AztecAddress, recipient: AztecAddress): Promise<AppTaggingSecret | undefined>;
+    static computeDirectional(taggingSecretPoint: Point, app: AztecAddress, recipient: AztecAddress): Promise<AppTaggingSecret>;
+    /**
+     * Derives the bare app-siloed tagging secret from a shared secret point via {@link appSiloEcdhSharedSecretPoint},
+     * under the given delivery-mode kind.
+     */
+    static computeAppSiloed(taggingSecretPoint: Point, app: AztecAddress, kind: AppTaggingSecretKind): Promise<AppTaggingSecret>;
+    /**
+     * Derives the tagging secret for `(externalAddress, recipient, app)` by performing an ECDH key exchange against
+     * `externalAddress` to obtain the shared point, then siloing and directing it via {@link computeDirectional}.
+     * Returns undefined if `externalAddress` is not a valid address.
+     */
+    static computeViaEcdh(localAddress: CompleteAddress, localIvsk: Fq, externalAddress: AztecAddress, app: AztecAddress, recipient: AztecAddress): Promise<AppTaggingSecret | undefined>;
     toString(): string;
     static fromString(str: string): AppTaggingSecret;
 }
@@ -43,4 +59,11 @@ export declare const AppTaggingSecretSchema: z.ZodPipe<z.ZodObject<{
     secret: Fr;
     app: AztecAddress;
 }>>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwX3RhZ2dpbmdfc2VjcmV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9hcHBfdGFnZ2luZ19zZWNyZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRzdELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBT3BFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjthQUVULE1BQU0sRUFBRSxFQUFFO2FBQ1YsR0FBRyxFQUFFLFlBQVk7YUFDakIsSUFBSSxFQUFFLG9CQUFvQjtJQUg1QyxZQUNrQixNQUFNLEVBQUUsRUFBRSxFQUNWLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLElBQUksR0FBRSxvQkFBeUQsRUFDN0U7SUFFSjs7Ozs7Ozs7OztPQVVHO0lBQ0gsT0FBYSxvQkFBb0IsQ0FDL0IsWUFBWSxFQUFFLGVBQWUsRUFDN0IsU0FBUyxFQUFFLEVBQUUsRUFDYixlQUFlLEVBQUUsWUFBWSxFQUM3QixHQUFHLEVBQUUsWUFBWSxFQUNqQixTQUFTLEVBQUUsWUFBWSxHQUN0QixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBVXZDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FNakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBZ0IvQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0IsMEJBQTBCLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsQ0FFeEU7QUFFRCxlQUFPLE1BQU0sc0JBQXNCOzs7Ozs7OztHQU02QyxDQUFDIn0=
+/**
+ * Computes the shared tagging secret point between a local address (i.e. one for which the privacy keys are known) and
+ * an external one via a Diffie-Hellman key exchange.
+ *
+ * Returns undefined if `externalAddress` is an invalid address.
+ */
+export declare function computeSharedTaggingSecret(localAddress: CompleteAddress, localIvsk: Fq, externalAddress: AztecAddress): Promise<Point | undefined>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwX3RhZ2dpbmdfc2VjcmV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9hcHBfdGFnZ2luZ19zZWNyZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRS9ELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBUXBFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjthQUVULE1BQU0sRUFBRSxFQUFFO2FBQ1YsR0FBRyxFQUFFLFlBQVk7YUFDakIsSUFBSSxFQUFFLG9CQUFvQjtJQUg1QyxZQUNrQixNQUFNLEVBQUUsRUFBRSxFQUNWLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLElBQUksR0FBRSxvQkFBeUQsRUFDN0U7SUFFSjs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNILE9BQWEsa0JBQWtCLENBQzdCLGtCQUFrQixFQUFFLEtBQUssRUFDekIsR0FBRyxFQUFFLFlBQVksRUFDakIsU0FBUyxFQUFFLFlBQVksR0FDdEIsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBSzNCO0lBRUQ7OztPQUdHO0lBQ0gsT0FBYSxnQkFBZ0IsQ0FDM0Isa0JBQWtCLEVBQUUsS0FBSyxFQUN6QixHQUFHLEVBQUUsWUFBWSxFQUNqQixJQUFJLEVBQUUsb0JBQW9CLEdBQ3pCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUUzQjtJQUVEOzs7O09BSUc7SUFDSCxPQUFhLGNBQWMsQ0FDekIsWUFBWSxFQUFFLGVBQWUsRUFDN0IsU0FBUyxFQUFFLEVBQUUsRUFDYixlQUFlLEVBQUUsWUFBWSxFQUM3QixHQUFHLEVBQUUsWUFBWSxFQUNqQixTQUFTLEVBQUUsWUFBWSxHQUN0QixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBT3ZDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBVy9DO0NBQ0Y7QUFFRDs7R0FFRztBQUNILHdCQUFnQiwwQkFBMEIsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLGdCQUFnQixDQUV4RTtBQUVELGVBQU8sTUFBTSxzQkFBc0I7Ozs7Ozs7O0dBTTZDLENBQUM7QUFhakY7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLFlBQVksRUFBRSxlQUFlLEVBQzdCLFNBQVMsRUFBRSxFQUFFLEVBQ2IsZUFBZSxFQUFFLFlBQVksR0FDNUIsT0FBTyxDQUFDLEtBQUssR0FBRyxTQUFTLENBQUMsQ0FlNUIifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"app_tagging_secret.d.ts","sourceRoot":"","sources":["../../src/logs/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;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAOpE;;;;;;GAMG;AACH,qBAAa,gBAAgB;aAET,MAAM,EAAE,EAAE;aACV,GAAG,EAAE,YAAY;aACjB,IAAI,EAAE,oBAAoB;IAH5C,YACkB,MAAM,EAAE,EAAE,EACV,GAAG,EAAE,YAAY,EACjB,IAAI,GAAE,oBAAyD,EAC7E;IAEJ;;;;;;;;;;OAUG;IACH,OAAa,oBAAoB,CAC/B,YAAY,EAAE,eAAe,EAC7B,SAAS,EAAE,EAAE,EACb,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAUvC;IAED,QAAQ,IAAI,MAAM,CAMjB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAgB/C;CACF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAExE;AAED,eAAO,MAAM,sBAAsB;;;;;;;;GAM6C,CAAC"}
+{"version":3,"file":"app_tagging_secret.d.ts","sourceRoot":"","sources":["../../src/logs/app_tagging_secret.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAQpE;;;;;;GAMG;AACH,qBAAa,gBAAgB;aAET,MAAM,EAAE,EAAE;aACV,GAAG,EAAE,YAAY;aACjB,IAAI,EAAE,oBAAoB;IAH5C,YACkB,MAAM,EAAE,EAAE,EACV,GAAG,EAAE,YAAY,EACjB,IAAI,GAAE,oBAAyD,EAC7E;IAEJ;;;;;;;;;;;;;;OAcG;IACH,OAAa,kBAAkB,CAC7B,kBAAkB,EAAE,KAAK,EACzB,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,gBAAgB,CAAC,CAK3B;IAED;;;OAGG;IACH,OAAa,gBAAgB,CAC3B,kBAAkB,EAAE,KAAK,EACzB,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,gBAAgB,CAAC,CAE3B;IAED;;;;OAIG;IACH,OAAa,cAAc,CACzB,YAAY,EAAE,eAAe,EAC7B,SAAS,EAAE,EAAE,EACb,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAOvC;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAW/C;CACF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAExE;AAED,eAAO,MAAM,sBAAsB;;;;;;;;GAM6C,CAAC;AAajF;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,eAAe,EAC7B,SAAS,EAAE,EAAE,EACb,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAe5B"}

package/dest/logs/app_tagging_secret.js

@@ -5,6 +5,7 @@ import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { computeAddressSecret, computePreaddress } from '../keys/derivation.js';
 import { AppTaggingSecretKind } from './app_tagging_secret_kind.js';
+import { appSiloEcdhSharedSecretPoint } from './shared_secret_derivation.js';
 const AppTaggingSecretKindSchema = z.union([
     z.literal(AppTaggingSecretKind.UNCONSTRAINED),
     z.literal(AppTaggingSecretKind.CONSTRAINED)
@@ -25,50 +26,54 @@ const AppTaggingSecretKindSchema = z.union([
         this.kind = kind;
     }
     /**
-   * Derives shared tagging secret and from that, the app address and recipient derives the directional app tagging
-   * secret. Returns undefined if `externalAddress` is an invalid address.
+   * Derives an app-siloed, recipient-directional tagging secret from a shared tagging secret point.
    *
-   * @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
+   * App-silos the point via {@link appSiloEcdhSharedSecretPoint}, then directs the result to `recipient`:
+   * `h([s_app, recipient])`. The directional step stops a symmetric shared secret (ECDH against an address, or an
+   * arbitrary registered point) from colliding bidirectionally, so two parties never share a tag sequence.
+   *
+   * The point is obtained either via {@link computeSharedTaggingSecret} (an ECDH key exchange against a sender) or
+   * registered directly as a pre-shared secret.
+   *
+   * @param taggingSecretPoint - The shared tagging secret point (ECDH output, or a directly registered pre-shared secret)
    * @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 async computeUnconstrained(localAddress, localIvsk, externalAddress, app, recipient) {
-        const taggingSecretPoint = await computeSharedTaggingSecret(localAddress, localIvsk, externalAddress);
-        if (!taggingSecretPoint) {
-            return undefined;
-        }
-        const appTaggingSecret = await poseidon2Hash([
-            taggingSecretPoint.x,
-            taggingSecretPoint.y,
-            app
-        ]);
+   */ static async computeDirectional(taggingSecretPoint, app, recipient) {
+        const appSiloedSecret = await appSiloEcdhSharedSecretPoint(taggingSecretPoint, app);
         const directionalAppTaggingSecret = await poseidon2Hash([
-            appTaggingSecret,
+            appSiloedSecret,
             recipient
         ]);
         return new AppTaggingSecret(directionalAppTaggingSecret, app);
     }
-    toString() {
-        // TODO(F-680): Migrate stored tagging keys and remove the legacy unconstrained format.
-        if (this.kind === AppTaggingSecretKind.UNCONSTRAINED) {
-            return `${this.secret.toString()}:${this.app.toString()}`;
+    /**
+   * Derives the bare app-siloed tagging secret from a shared secret point via {@link appSiloEcdhSharedSecretPoint},
+   * under the given delivery-mode kind.
+   */ static async computeAppSiloed(taggingSecretPoint, app, kind) {
+        return new AppTaggingSecret(await appSiloEcdhSharedSecretPoint(taggingSecretPoint, app), app, kind);
+    }
+    /**
+   * Derives the tagging secret for `(externalAddress, recipient, app)` by performing an ECDH key exchange against
+   * `externalAddress` to obtain the shared point, then siloing and directing it via {@link computeDirectional}.
+   * Returns undefined if `externalAddress` is not a valid address.
+   */ static async computeViaEcdh(localAddress, localIvsk, externalAddress, app, recipient) {
+        const taggingSecretPoint = await computeSharedTaggingSecret(localAddress, localIvsk, externalAddress);
+        if (!taggingSecretPoint) {
+            return undefined;
         }
+        return AppTaggingSecret.computeDirectional(taggingSecretPoint, app, recipient);
+    }
+    toString() {
         return `${this.kind}:${this.secret.toString()}:${this.app.toString()}`;
     }
     static fromString(str) {
         const parts = str.split(':');
-        if (parts.length === 2) {
-            // TODO(F-680): Remove legacy two-part parsing after stored tagging keys are migrated.
-            const [secretStr, appStr] = parts;
-            return new AppTaggingSecret(Fr.fromString(secretStr), AztecAddress.fromString(appStr));
-        }
-        if (parts.length === 3) {
-            const [kindStr, secretStr, appStr] = parts;
-            return new AppTaggingSecret(Fr.fromString(secretStr), AztecAddress.fromString(appStr), appTaggingSecretKindFromString(kindStr));
+        if (parts.length !== 3) {
+            throw new Error(`Invalid AppTaggingSecret string: ${str}`);
         }
-        throw new Error(`Invalid AppTaggingSecret string: ${str}`);
+        const [kindStr, secretStr, appStr] = parts;
+        return new AppTaggingSecret(Fr.fromString(secretStr), AztecAddress.fromStringUnsafe(appStr), appTaggingSecretKindFromString(kindStr));
     }
 }
 /**
@@ -91,19 +96,21 @@ function appTaggingSecretKindFromString(kind) {
             throw new Error(`Invalid AppTaggingSecret kind: ${kind}`);
     }
 }
-// Returns shared tagging secret computed with Diffie-Hellman key exchange, or undefined if `externalAddress` is an
-// invalid address.
-async function computeSharedTaggingSecret(localAddress, localIvsk, externalAddress) {
-    // Given A (local complete address) -> B (external address) and h == preaddress
-    // Compute shared secret as S = (h_A + local_ivsk_A) * Addr_Point_B
-    const knownPreaddress = await computePreaddress(await localAddress.publicKeys.hash(), localAddress.partialAddress);
+/**
+ * Computes the shared tagging secret point between a local address (i.e. one for which the privacy keys are known) and
+ * an external one via a Diffie-Hellman key exchange.
+ *
+ * Returns undefined if `externalAddress` is an invalid address.
+ */ export async function computeSharedTaggingSecret(localAddress, localIvsk, externalAddress) {
     // An invalid address has no corresponding address point
     if (!await externalAddress.isValid()) {
         return undefined;
     }
     const externalAddressPoint = await externalAddress.toAddressPoint();
-    // Beware! h_a + local_ivsk_a (also known as the address secret) can lead to an address point with a negative
-    // y-coordinate, since there's two possible candidates computeAddressSecret takes care of selecting the one that
-    // leads to a positive y-coordinate, which is the only valid address point
-    return Grumpkin.mul(externalAddressPoint, await computeAddressSecret(knownPreaddress, localIvsk));
+    const localPreaddress = await computePreaddress(await localAddress.publicKeys.hash(), localAddress.partialAddress);
+    const localAddressSecret = await computeAddressSecret(localPreaddress, localIvsk);
+    // For a given local address A and external address B, the shared tagging secret S is (h_A + ivsk_A) * Addr_Point_B
+    // (conceptually, in reality we don't use h_A + ivsk_A directly but rather the actual address secret, which is the
+    // same but with an optional sign adjustment to prevent A's address point from having a negative y-coordinate).
+    return Grumpkin.mul(externalAddressPoint, localAddressSecret);
 }

package/dest/logs/app_tagging_secret_kind.js

@@ -2,7 +2,7 @@ export const AppTaggingSecretKind = {
     UNCONSTRAINED: 'unconstrained',
     CONSTRAINED: 'constrained'
 };
-// Keep in sync with aztec::messages::message_delivery::{ONCHAIN_UNCONSTRAINED, ONCHAIN_CONSTRAINED}.
+// Keep in sync with aztec::messages::delivery::OnchainDeliveryMode.
 const ONCHAIN_UNCONSTRAINED_DELIVERY_MODE = 2;
 const ONCHAIN_CONSTRAINED_DELIVERY_MODE = 3;
 export function appTaggingSecretKindFromDeliveryMode(deliveryMode) {

package/dest/logs/contract_class_log.d.ts

@@ -43,7 +43,6 @@ export declare class ContractClassLog {
     static from(fields: FieldsOf<ContractClassLog>): ContractClassLog;
     toFields(): Fr[];
     equals(other: ContractClassLog): boolean;
-    static fromFields(fields: Fr[] | FieldReader): ContractClassLog;
     getEmittedFields(): Fr[];
     toBlobFields(): Fr[];
     static fromBlobFields(emittedLength: number, fields: Fr[] | FieldReader): ContractClassLog;
@@ -77,4 +76,4 @@ export declare class ContractClassLog {
     static fromPlainObject(obj: any): ContractClassLog;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3NfbG9nLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9jb250cmFjdF9jbGFzc19sb2cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBc0MsTUFBTSw2QkFBNkIsQ0FBQztBQUN4SCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELHFCQUFhLHNCQUFzQjtJQUdkLE1BQU0sRUFBRSxFQUFFLEVBQUU7SUFBL0IsWUFBbUIsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQU05QjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7O1FBTWhCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLHNCQUFzQixDQUt2RDtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsMEJBTzNDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFRakMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksMEJBTzlDO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxzQkFBc0IsV0FFbkM7SUFFRCxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsTUFBTSxRQUVyQztJQUVELE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxhQUFhLEVBQUUsRUFBRSxFQUFFLDBCQUkzQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLDJCQUVYO0lBRUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxhQUFhLFNBQW9DLDBCQU05RDtJQUVLLElBQUksZ0JBRVQ7SUFFRCxLQUFLLDJCQUVKO0NBQ0Y7QUFFRCxxQkFBYSxnQkFBZ0I7SUFJbEIsZUFBZSxFQUFFLFlBQVk7SUFDN0IsTUFBTSxFQUFFLHNCQUFzQjtJQUM5QixhQUFhLEVBQUUsTUFBTTtJQUw5QixNQUFNLENBQUMsYUFBYSxTQUFnRDtJQUVwRSxZQUNTLGVBQWUsRUFBRSxZQUFZLEVBQzdCLE1BQU0sRUFBRSxzQkFBc0IsRUFDOUIsYUFBYSxFQUFFLE1BQU0sRUFDMUI7SUFFSixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsb0JBRTdDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsV0FNN0I7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLG9CQU8zQztJQUVELGdCQUFnQixTQUVmO0lBRUQsWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUVuQjtJQUVELE1BQU0sQ0FBQyxjQUFjLENBQUMsYUFBYSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxvQkFTdEU7SUFFRCxPQUFPLFlBRU47SUFFRCxNQUFNLENBQUMsS0FBSyxxQkFFWDtJQUVELFFBQVEsSUFBSSxNQUFNLENBQUM7SUFDbkIsUUFBUSxDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsSUFBSSxDQUFDO0lBUWpDLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLG9CQU05QztJQUVELE9BQWEsTUFBTSw4QkFRbEI7SUFFSyxJQUFJLGdCQUVUO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7OztRQVFoQjtJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxnQkFBZ0IsQ0FTakQ7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxNQUFNLENBTXpCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3NfbG9nLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9jb250cmFjdF9jbGFzc19sb2cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBc0MsTUFBTSw2QkFBNkIsQ0FBQztBQUN4SCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELHFCQUFhLHNCQUFzQjtJQUdkLE1BQU0sRUFBRSxFQUFFLEVBQUU7SUFBL0IsWUFBbUIsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQU05QjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7O1FBTWhCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLHNCQUFzQixDQUt2RDtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsMEJBTzNDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFRakMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksMEJBTzlDO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxzQkFBc0IsV0FFbkM7SUFFRCxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsTUFBTSxRQUVyQztJQUVELE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxhQUFhLEVBQUUsRUFBRSxFQUFFLDBCQUkzQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLDJCQUVYO0lBRUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxhQUFhLFNBQW9DLDBCQU05RDtJQUVLLElBQUksZ0JBRVQ7SUFFRCxLQUFLLDJCQUVKO0NBQ0Y7QUFFRCxxQkFBYSxnQkFBZ0I7SUFJbEIsZUFBZSxFQUFFLFlBQVk7SUFDN0IsTUFBTSxFQUFFLHNCQUFzQjtJQUM5QixhQUFhLEVBQUUsTUFBTTtJQUw5QixNQUFNLENBQUMsYUFBYSxTQUFnRDtJQUVwRSxZQUNTLGVBQWUsRUFBRSxZQUFZLEVBQzdCLE1BQU0sRUFBRSxzQkFBc0IsRUFDOUIsYUFBYSxFQUFFLE1BQU0sRUFDMUI7SUFFSixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsb0JBRTdDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsV0FNN0I7SUFFRCxnQkFBZ0IsU0FFZjtJQUVELFlBQVksSUFBSSxFQUFFLEVBQUUsQ0FFbkI7SUFFRCxNQUFNLENBQUMsY0FBYyxDQUFDLGFBQWEsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsb0JBU3RFO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUsscUJBRVg7SUFFRCxRQUFRLElBQUksTUFBTSxDQUFDO0lBQ25CLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FBQztJQVFqQyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxvQkFNOUM7SUFFRCxPQUFhLE1BQU0sOEJBUWxCO0lBRUssSUFBSSxnQkFFVDtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7UUFRaEI7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsZ0JBQWdCLENBU2pEO0lBRUQsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksTUFBTSxDQU16QjtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/contract_class_log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAsC,MAAM,6BAA6B,CAAC;AACxH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,sBAAsB;IAGd,MAAM,EAAE,EAAE,EAAE;IAA/B,YAAmB,MAAM,EAAE,EAAE,EAAE,EAM9B;IAED,MAAM,KAAK,MAAM;;;;QAMhB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,sBAAsB,CAKvD;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,0BAO3C;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,0BAO9C;IAED,MAAM,CAAC,KAAK,EAAE,sBAAsB,WAEnC;IAED,gBAAgB,CAAC,aAAa,EAAE,MAAM,QAErC;IAED,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,EAAE,EAAE,0BAI3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,2BAEX;IAED,MAAM,CAAC,MAAM,CAAC,aAAa,SAAoC,0BAM9D;IAEK,IAAI,gBAET;IAED,KAAK,2BAEJ;CACF;AAED,qBAAa,gBAAgB;IAIlB,eAAe,EAAE,YAAY;IAC7B,MAAM,EAAE,sBAAsB;IAC9B,aAAa,EAAE,MAAM;IAL9B,MAAM,CAAC,aAAa,SAAgD;IAEpE,YACS,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,sBAAsB,EAC9B,aAAa,EAAE,MAAM,EAC1B;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,oBAE7C;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,KAAK,EAAE,gBAAgB,WAM7B;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,oBAO3C;IAED,gBAAgB,SAEf;IAED,YAAY,IAAI,EAAE,EAAE,CAEnB;IAED,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,oBAStE;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,qBAEX;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,oBAM9C;IAED,OAAa,MAAM,8BAQlB;IAEK,IAAI,gBAET;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;QAQhB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,gBAAgB,CASjD;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAMzB;CACF"}
+{"version":3,"file":"contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/contract_class_log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAsC,MAAM,6BAA6B,CAAC;AACxH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,sBAAsB;IAGd,MAAM,EAAE,EAAE,EAAE;IAA/B,YAAmB,MAAM,EAAE,EAAE,EAAE,EAM9B;IAED,MAAM,KAAK,MAAM;;;;QAMhB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,sBAAsB,CAKvD;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,0BAO3C;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,0BAO9C;IAED,MAAM,CAAC,KAAK,EAAE,sBAAsB,WAEnC;IAED,gBAAgB,CAAC,aAAa,EAAE,MAAM,QAErC;IAED,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,EAAE,EAAE,0BAI3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,2BAEX;IAED,MAAM,CAAC,MAAM,CAAC,aAAa,SAAoC,0BAM9D;IAEK,IAAI,gBAET;IAED,KAAK,2BAEJ;CACF;AAED,qBAAa,gBAAgB;IAIlB,eAAe,EAAE,YAAY;IAC7B,MAAM,EAAE,sBAAsB;IAC9B,aAAa,EAAE,MAAM;IAL9B,MAAM,CAAC,aAAa,SAAgD;IAEpE,YACS,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,sBAAsB,EAC9B,aAAa,EAAE,MAAM,EAC1B;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,oBAE7C;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,KAAK,EAAE,gBAAgB,WAM7B;IAED,gBAAgB,SAEf;IAED,YAAY,IAAI,EAAE,EAAE,CAEnB;IAED,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,oBAStE;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,qBAEX;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,oBAM9C;IAED,OAAa,MAAM,8BAQlB;IAEK,IAAI,gBAET;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;QAQhB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,gBAAgB,CASjD;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAMzB;CACF"}

package/dest/logs/contract_class_log.js

@@ -110,10 +110,6 @@ export class ContractClassLog {
     equals(other) {
         return this.contractAddress.equals(other.contractAddress) && this.fields.equals(other.fields) && this.emittedLength === other.emittedLength;
     }
-    static fromFields(fields) {
-        const reader = FieldReader.asReader(fields);
-        return new ContractClassLog(reader.readObject(AztecAddress), reader.readObject(ContractClassLogFields), reader.readU32());
-    }
     getEmittedFields() {
         return this.fields.getEmittedFields(this.emittedLength);
     }

package/dest/logs/index.d.ts

@@ -5,15 +5,13 @@ export * from './tagging_index_range.js';
 export * from './contract_class_log.js';
 export * from './public_log.js';
 export * from './private_log.js';
-export * from './pending_tagged_log.js';
 export * from './log_result.js';
 export * from './log_cursor.js';
 export * from './logs_query.js';
 export * from './query_all_logs_by_tags.js';
 export * from './shared_secret_derivation.js';
-export * from './message_context.js';
 export * from './debug_log.js';
 export * from './debug_log_store.js';
 export * from './tag.js';
 export * from './siloed_tag.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsaUJBQWlCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxpQkFBaUIsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logs/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logs/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC"}

package/dest/logs/index.js

@@ -5,13 +5,11 @@ export * from './tagging_index_range.js';
 export * from './contract_class_log.js';
 export * from './public_log.js';
 export * from './private_log.js';
-export * from './pending_tagged_log.js';
 export * from './log_result.js';
 export * from './log_cursor.js';
 export * from './logs_query.js';
 export * from './query_all_logs_by_tags.js';
 export * from './shared_secret_derivation.js';
-export * from './message_context.js';
 export * from './debug_log.js';
 export * from './debug_log_store.js';
 export * from './tag.js';