@aztec/stdlib 0.0.1-commit.9ef841308 → 0.0.1-commit.a4600f49

package/dest/keys/public_keys.js

@@ -1,70 +1,91 @@
-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 { DEFAULT_FBPK_M_HASH, DEFAULT_IVPK_M_X, DEFAULT_IVPK_M_Y, DEFAULT_MSPK_M_HASH, DEFAULT_NPK_M_HASH, DEFAULT_OVPK_M_HASH, DEFAULT_TPK_M_HASH, 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';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, withoutHexPrefix } from '@aztec/foundation/string';
 import { z } from 'zod';
-export class PublicKeys {
-    masterNullifierPublicKey;
-    masterIncomingViewingPublicKey;
-    masterOutgoingViewingPublicKey;
-    masterTaggingPublicKey;
-    constructor(/** Master nullifier public key */ masterNullifierPublicKey, /** Master incoming viewing public key */ masterIncomingViewingPublicKey, /** Master outgoing viewing public key */ masterOutgoingViewingPublicKey, /** Master tagging viewing public key */ masterTaggingPublicKey){
-        this.masterNullifierPublicKey = masterNullifierPublicKey;
-        this.masterIncomingViewingPublicKey = masterIncomingViewingPublicKey;
-        this.masterOutgoingViewingPublicKey = masterOutgoingViewingPublicKey;
-        this.masterTaggingPublicKey = masterTaggingPublicKey;
+import { PublicKey, hashPublicKey } from './public_key.js';
+/**
+ * A non-owner's view of an account's master public keys.
+ *
+ * Only `ivpkM` is exposed as a point (since address derivation needs the curve
+ * point in-circuit); the other five keys are exposed as their `hashPublicKey` digests.
+ */ export class PublicKeys {
+    npkMHash;
+    ivpkM;
+    ovpkMHash;
+    tpkMHash;
+    mspkMHash;
+    fbpkMHash;
+    constructor(/** Hash of the master nullifier public key */ npkMHash, /** Master incoming viewing public key */ ivpkM, /** Hash of the master outgoing viewing public key */ ovpkMHash, /** Hash of the master tagging public key */ tpkMHash, /** Hash of the master message-signing public key */ mspkMHash, /** Hash of the master fallback public key */ fbpkMHash){
+        this.npkMHash = npkMHash;
+        this.ivpkM = ivpkM;
+        this.ovpkMHash = ovpkMHash;
+        this.tpkMHash = tpkMHash;
+        this.mspkMHash = mspkMHash;
+        this.fbpkMHash = fbpkMHash;
     }
     static get schema() {
         return z.object({
-            masterNullifierPublicKey: schemas.Point,
-            masterIncomingViewingPublicKey: schemas.Point,
-            masterOutgoingViewingPublicKey: schemas.Point,
-            masterTaggingPublicKey: schemas.Point
+            npkMHash: schemas.Fr,
+            ivpkM: schemas.Point,
+            ovpkMHash: schemas.Fr,
+            tpkMHash: schemas.Fr,
+            mspkMHash: schemas.Fr,
+            fbpkMHash: schemas.Fr
         }).transform(PublicKeys.from);
     }
     static from(fields) {
-        return new PublicKeys(fields.masterNullifierPublicKey, fields.masterIncomingViewingPublicKey, fields.masterOutgoingViewingPublicKey, fields.masterTaggingPublicKey);
+        return new PublicKeys(fields.npkMHash, fields.ivpkM, fields.ovpkMHash, fields.tpkMHash, fields.mspkMHash, fields.fbpkMHash);
     }
     /**
    * Creates a PublicKeys from a plain object without Zod validation.
-   * This method is optimized for performance and skips validation, making it suitable
-   * for deserializing trusted data (e.g., from C++ via MessagePack).
-   * @param obj - Plain object containing PublicKeys fields
-   * @returns A PublicKeys instance
+   * Suitable for deserializing trusted data (e.g., from C++ via MessagePack).
    */ static fromPlainObject(obj) {
         if (obj instanceof PublicKeys) {
             return obj;
         }
-        return new PublicKeys(Point.fromPlainObject(obj.masterNullifierPublicKey), Point.fromPlainObject(obj.masterIncomingViewingPublicKey), Point.fromPlainObject(obj.masterOutgoingViewingPublicKey), Point.fromPlainObject(obj.masterTaggingPublicKey));
-    }
-    hash() {
-        return this.isEmpty() ? Fr.ZERO : poseidon2HashWithSeparator([
-            this.masterNullifierPublicKey,
-            this.masterIncomingViewingPublicKey,
-            this.masterOutgoingViewingPublicKey,
-            this.masterTaggingPublicKey
+        return new PublicKeys(Fr.fromPlainObject(obj.npkMHash), PublicKey.fromPlainObject(obj.ivpkM), Fr.fromPlainObject(obj.ovpkMHash), Fr.fromPlainObject(obj.tpkMHash), Fr.fromPlainObject(obj.mspkMHash), Fr.fromPlainObject(obj.fbpkMHash));
+    }
+    async hash() {
+        if (this.isEmpty()) {
+            return Fr.ZERO;
+        }
+        // Mirror Noir's `PublicKeys::hash`: hash the six single-key digests under
+        // DOM_SEP__PUBLIC_KEYS_HASH. `ivpk_m` must be reduced to its single-key digest first
+        // (Poseidon2 over [x, y]); passing the Point directly would omit the DOM_SEP__SINGLE_PUBLIC_KEY_HASH
+        const ivpkMHash = await hashPublicKey(this.ivpkM);
+        return poseidon2HashWithSeparator([
+            this.npkMHash,
+            ivpkMHash,
+            this.ovpkMHash,
+            this.tpkMHash,
+            this.mspkMHash,
+            this.fbpkMHash
         ], DomainSeparator.PUBLIC_KEYS_HASH);
     }
     isEmpty() {
-        return this.masterNullifierPublicKey.isZero() && this.masterIncomingViewingPublicKey.isZero() && this.masterOutgoingViewingPublicKey.isZero() && this.masterTaggingPublicKey.isZero();
+        return this.npkMHash.isZero() && this.ivpkM.isZero() && this.ovpkMHash.isZero() && this.tpkMHash.isZero() && this.mspkMHash.isZero() && this.fbpkMHash.isZero();
     }
     static default() {
-        return new PublicKeys(new Point(new Fr(DEFAULT_NPK_M_X), new Fr(DEFAULT_NPK_M_Y), false), new Point(new Fr(DEFAULT_IVPK_M_X), new Fr(DEFAULT_IVPK_M_Y), false), new Point(new Fr(DEFAULT_OVPK_M_X), new Fr(DEFAULT_OVPK_M_Y), false), new Point(new Fr(DEFAULT_TPK_M_X), new Fr(DEFAULT_TPK_M_Y), false));
+        // Precomputed `hash_public_key(PublicKey { DEFAULT_*_X, DEFAULT_*_Y })` for the hash-only keys.
+        // Sourced from constants.gen.ts (originally defined in
+        // noir-protocol-circuits/crates/types/src/constants.nr); a self-test in public_keys.nr
+        // (`default_hashes_match_default_points`) catches drift between the *_HASH constants and
+        // the underlying X/Y points.
+        return new PublicKeys(new Fr(DEFAULT_NPK_M_HASH), new PublicKey(new Fr(DEFAULT_IVPK_M_X), new Fr(DEFAULT_IVPK_M_Y)), new Fr(DEFAULT_OVPK_M_HASH), new Fr(DEFAULT_TPK_M_HASH), new Fr(DEFAULT_MSPK_M_HASH), new Fr(DEFAULT_FBPK_M_HASH));
     }
     static async random() {
-        return new PublicKeys(await Point.random(), await Point.random(), await Point.random(), await Point.random());
+        const npkM = await PublicKey.random();
+        const ovpkM = await PublicKey.random();
+        const tpkM = await PublicKey.random();
+        const mspkM = await PublicKey.random();
+        const fbpkM = await PublicKey.random();
+        return new PublicKeys(await hashPublicKey(npkM), await PublicKey.random(), await hashPublicKey(ovpkM), await hashPublicKey(tpkM), await hashPublicKey(mspkM), await hashPublicKey(fbpkM));
     }
-    /**
-   * Determines if this PublicKeys instance is equal to the given PublicKeys instance.
-   * Equality is based on the content of their respective buffers.
-   *
-   * @param other - The PublicKeys instance to compare against.
-   * @returns True if the buffers of both instances are equal, false otherwise.
-   */ equals(other) {
-        return this.masterNullifierPublicKey.equals(other.masterNullifierPublicKey) && this.masterIncomingViewingPublicKey.equals(other.masterIncomingViewingPublicKey) && this.masterOutgoingViewingPublicKey.equals(other.masterOutgoingViewingPublicKey) && this.masterTaggingPublicKey.equals(other.masterTaggingPublicKey);
+    equals(other) {
+        return this.npkMHash.equals(other.npkMHash) && this.ivpkM.equals(other.ivpkM) && this.ovpkMHash.equals(other.ovpkMHash) && this.tpkMHash.equals(other.tpkMHash) && this.mspkMHash.equals(other.mspkMHash) && this.fbpkMHash.equals(other.fbpkMHash);
     }
     /**
    * Converts the PublicKeys instance into a Buffer.
@@ -73,56 +94,63 @@ export class PublicKeys {
    * @returns A Buffer representation of the PublicKeys instance.
    */ toBuffer() {
         return serializeToBuffer([
-            this.masterNullifierPublicKey,
-            this.masterIncomingViewingPublicKey,
-            this.masterOutgoingViewingPublicKey,
-            this.masterTaggingPublicKey
+            this.npkMHash,
+            this.ivpkM,
+            this.ovpkMHash,
+            this.tpkMHash,
+            this.mspkMHash,
+            this.fbpkMHash
         ]);
     }
-    /**
-   * Creates an PublicKeys instance from a given buffer or BufferReader.
-   * If the input is a Buffer, it wraps it in a BufferReader before processing.
-   * Throws an error if the input length is not equal to the expected size.
-   *
-   * @param buffer - The input buffer or BufferReader containing the address data.
-   * @returns - A new PublicKeys instance with the extracted address data.
-   */ static fromBuffer(buffer) {
+    static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        const masterNullifierPublicKey = reader.readObject(Point);
-        const masterIncomingViewingPublicKey = reader.readObject(Point);
-        const masterOutgoingViewingPublicKey = reader.readObject(Point);
-        const masterTaggingPublicKey = reader.readObject(Point);
-        return new PublicKeys(masterNullifierPublicKey, masterIncomingViewingPublicKey, masterOutgoingViewingPublicKey, masterTaggingPublicKey);
+        const npkMHash = Fr.fromBuffer(reader);
+        const ivpkM = reader.readObject(PublicKey);
+        const ovpkMHash = Fr.fromBuffer(reader);
+        const tpkMHash = Fr.fromBuffer(reader);
+        const mspkMHash = Fr.fromBuffer(reader);
+        const fbpkMHash = Fr.fromBuffer(reader);
+        return new PublicKeys(npkMHash, ivpkM, ovpkMHash, tpkMHash, mspkMHash, fbpkMHash);
     }
     toNoirStruct() {
-        // We need to use lowercase identifiers as those are what the noir interface expects
-        return {
-            // TODO(#6337): Directly dump account.publicKeys here
-            /* eslint-disable camelcase */ npk_m: this.masterNullifierPublicKey.toWrappedNoirStruct(),
-            ivpk_m: this.masterIncomingViewingPublicKey.toWrappedNoirStruct(),
-            ovpk_m: this.masterOutgoingViewingPublicKey.toWrappedNoirStruct(),
-            tpk_m: this.masterTaggingPublicKey.toWrappedNoirStruct()
+        // We need to use lowercase identifiers as those are what the noir interface expects.
+        /* eslint-disable camelcase */ return {
+            npk_m_hash: this.npkMHash,
+            ivpk_m: this.ivpkM.toWrappedNoirStruct(),
+            ovpk_m_hash: this.ovpkMHash,
+            tpk_m_hash: this.tpkMHash,
+            mspk_m_hash: this.mspkMHash,
+            fbpk_m_hash: this.fbpkMHash
         };
-    }
+    /* eslint-enable camelcase */ }
     /**
-   * Serializes the payload to an array of fields
-   * @returns The fields of the payload
+   * Wire-format fields matching Noir's struct flattening of `PublicKeys`:
+   * `[npk_m_hash, ivpk_m.x, ivpk_m.y, ovpk_m_hash, tpk_m_hash, mspk_m_hash, fbpk_m_hash]`
+   * (7 fields).
    */ toFields() {
         return [
-            ...this.masterNullifierPublicKey.toFields(),
-            ...this.masterIncomingViewingPublicKey.toFields(),
-            ...this.masterOutgoingViewingPublicKey.toFields(),
-            ...this.masterTaggingPublicKey.toFields()
+            this.npkMHash,
+            this.ivpkM.x,
+            this.ivpkM.y,
+            this.ovpkMHash,
+            this.tpkMHash,
+            this.mspkMHash,
+            this.fbpkMHash
         ];
     }
-    // TOOD: This is used in foundation/src/abi/encoder. This is probably non-optimal but I did not want
-    // to spend too much time on the encoder now. It probably needs a refactor.
+    // Used in foundation/src/abi/encoder. Probably non-optimal but the encoder needs a refactor.
     encodeToNoir() {
         return this.toFields();
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PublicKeys(reader.readObject(Point), reader.readObject(Point), reader.readObject(Point), reader.readObject(Point));
+        const npkMHash = reader.readField();
+        const ivpkM = reader.readObject(PublicKey);
+        const ovpkMHash = reader.readField();
+        const tpkMHash = reader.readField();
+        const mspkMHash = reader.readField();
+        const fbpkMHash = reader.readField();
+        return new PublicKeys(npkMHash, ivpkM, ovpkMHash, tpkMHash, mspkMHash, fbpkMHash);
     }
     toString() {
         return bufferToHex(this.toBuffer());

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

@@ -1,12 +1,9 @@
+import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
-import type { EthAddress } from '@aztec/foundation/eth-address';
 export type DataStoreConfig = {
     dataDirectory?: string;
     dataStoreMapSizeKb: number;
-    l1Contracts?: {
-        rollupAddress: EthAddress;
-    };
-};
+} & Partial<Pick<L1ContractAddresses, 'rollupAddress'>>;
 export declare const dataConfigMappings: ConfigMappingsType<DataStoreConfig>;
 /**
  * Returns the archiver configuration from the environment variables.
@@ -14,4 +11,4 @@ export declare const dataConfigMappings: ConfigMappingsType<DataStoreConfig>;
  * @returns The archiver configuration.
  */
 export declare function getDataConfigFromEnv(): DataStoreConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva3Ytc3RvcmUvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUE2QyxNQUFNLDBCQUEwQixDQUFDO0FBQzlHLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE1BQU0sTUFBTSxlQUFlLEdBQUc7SUFDNUIsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixXQUFXLENBQUMsRUFBRTtRQUFFLGFBQWEsRUFBRSxVQUFVLENBQUE7S0FBRSxDQUFDO0NBQzdDLENBQUM7QUFFRixlQUFPLE1BQU0sa0JBQWtCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQWdCbEUsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBZ0Isb0JBQW9CLElBQUksZUFBZSxDQUV0RCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva3Ytc3RvcmUvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFpQyxNQUFNLHVDQUF1QyxDQUFDO0FBQ2hILE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUE2QyxNQUFNLDBCQUEwQixDQUFDO0FBRTlHLE1BQU0sTUFBTSxlQUFlLEdBQUc7SUFDNUIsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztDQUM1QixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQztBQUV4RCxlQUFPLE1BQU0sa0JBQWtCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQVdsRSxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFnQixvQkFBb0IsSUFBSSxlQUFlLENBRXREIn0=

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

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

package/dest/kv-store/config.js

@@ -1,4 +1,4 @@
-import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
+import { pickL1ContractAddressMappings } from '@aztec/ethereum/l1-contract-addresses';
 import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
 export const dataConfigMappings = {
     dataDirectory: {
@@ -10,12 +10,7 @@ export const dataConfigMappings = {
         description: 'The maximum possible size of a data store DB in KB. Can be overridden by component-specific options.',
         ...numberConfigHelper(128 * 1_024 * 1_024)
     },
-    l1Contracts: {
-        description: 'The deployed L1 contract addresses',
-        nested: {
-            rollupAddress: l1ContractAddressesMapping.rollupAddress
-        }
-    }
+    ...pickL1ContractAddressMappings('rollupAddress')
 };
 /**
  * Returns the archiver configuration from the environment variables.

package/dest/l1-contracts/index.d.ts

@@ -1,2 +1,2 @@
-export * from './slash_factory.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sMS1jb250cmFjdHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxvQkFBb0IsQ0FBQyJ9
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sMS1jb250cmFjdHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dest/l1-contracts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/l1-contracts/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/l1-contracts/index.ts"],"names":[],"mappings":""}

package/dest/l1-contracts/index.js

@@ -1 +1 @@
-export * from './slash_factory.js';
+// No exports.

package/dest/logs/app_tagging_secret.d.ts

@@ -0,0 +1,69 @@
+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';
+import { AppTaggingSecretKind } from './app_tagging_secret_kind.js';
+/**
+ * Application tagging secret used for log tagging.
+ *
+ * It bundles a tagging secret with the app contract address. Unconstrained secrets are derived by the simulator from
+ * `(sender, recipient, app)` via ECDH. Constrained secrets are supplied to the simulator by the caller as an
+ * app-siloed shared secret retrieved from a handshake registry.
+ */
+export declare class AppTaggingSecret {
+    readonly secret: Fr;
+    readonly app: AztecAddress;
+    readonly kind: AppTaggingSecretKind;
+    constructor(secret: Fr, app: AztecAddress, kind?: AppTaggingSecretKind);
+    /**
+     * Derives an app-siloed, recipient-directional tagging secret from a shared tagging secret point.
+     *
+     * 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 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;
+}
+/**
+ * Parses a stored `AppTaggingSecret` string key.
+ */
+export declare function appTaggingSecretFromString(str: string): AppTaggingSecret;
+export declare const AppTaggingSecretSchema: z.ZodPipe<z.ZodObject<{
+    kind: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"unconstrained">, z.ZodLiteral<"constrained">]>>;
+    secret: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    app: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
+}, z.core.$strip>, z.ZodTransform<AppTaggingSecret, {
+    kind: "constrained" | "unconstrained";
+    secret: Fr;
+    app: AztecAddress;
+}>>;
+/**
+ * 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwX3RhZ2dpbmdfc2VjcmV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9hcHBfdGFnZ2luZ19zZWNyZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRS9ELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBUXBFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjthQUVULE1BQU0sRUFBRSxFQUFFO2FBQ1YsR0FBRyxFQUFFLFlBQVk7YUFDakIsSUFBSSxFQUFFLG9CQUFvQjtJQUg1QyxZQUNrQixNQUFNLEVBQUUsRUFBRSxFQUNWLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLElBQUksR0FBRSxvQkFBeUQsRUFDN0U7SUFFSjs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNILE9BQWEsa0JBQWtCLENBQzdCLGtCQUFrQixFQUFFLEtBQUssRUFDekIsR0FBRyxFQUFFLFlBQVksRUFDakIsU0FBUyxFQUFFLFlBQVksR0FDdEIsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBSzNCO0lBRUQ7OztPQUdHO0lBQ0gsT0FBYSxnQkFBZ0IsQ0FDM0Isa0JBQWtCLEVBQUUsS0FBSyxFQUN6QixHQUFHLEVBQUUsWUFBWSxFQUNqQixJQUFJLEVBQUUsb0JBQW9CLEdBQ3pCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUUzQjtJQUVEOzs7O09BSUc7SUFDSCxPQUFhLGNBQWMsQ0FDekIsWUFBWSxFQUFFLGVBQWUsRUFDN0IsU0FBUyxFQUFFLEVBQUUsRUFDYixlQUFlLEVBQUUsWUFBWSxFQUM3QixHQUFHLEVBQUUsWUFBWSxFQUNqQixTQUFTLEVBQUUsWUFBWSxHQUN0QixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBT3ZDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FNakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBZ0IvQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0IsMEJBQTBCLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsQ0FFeEU7QUFFRCxlQUFPLE1BQU0sc0JBQXNCOzs7Ozs7OztHQU02QyxDQUFDO0FBYWpGOzs7OztHQUtHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUM5QyxZQUFZLEVBQUUsZUFBZSxFQUM3QixTQUFTLEVBQUUsRUFBRSxFQUNiLGVBQWUsRUFBRSxZQUFZLEdBQzVCLE9BQU8sQ0FBQyxLQUFLLEdBQUcsU0FBUyxDQUFDLENBZTVCIn0=

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

@@ -0,0 +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;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,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;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

@@ -0,0 +1,125 @@
+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';
+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)
+]);
+/**
+ * Application tagging secret used for log tagging.
+ *
+ * It bundles a tagging secret with the app contract address. Unconstrained secrets are derived by the simulator from
+ * `(sender, recipient, app)` via ECDH. Constrained secrets are supplied to the simulator by the caller as an
+ * app-siloed shared secret retrieved from a handshake registry.
+ */ export class AppTaggingSecret {
+    secret;
+    app;
+    kind;
+    constructor(secret, app, kind = AppTaggingSecretKind.UNCONSTRAINED){
+        this.secret = secret;
+        this.app = app;
+        this.kind = kind;
+    }
+    /**
+   * Derives an app-siloed, recipient-directional tagging secret from a shared tagging secret point.
+   *
+   * 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 computeDirectional(taggingSecretPoint, app, recipient) {
+        const appSiloedSecret = await appSiloEcdhSharedSecretPoint(taggingSecretPoint, app);
+        const directionalAppTaggingSecret = await poseidon2Hash([
+            appSiloedSecret,
+            recipient
+        ]);
+        return new AppTaggingSecret(directionalAppTaggingSecret, app);
+    }
+    /**
+   * 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() {
+        // 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()}`;
+        }
+        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.fromStringUnsafe(appStr));
+        }
+        if (parts.length === 3) {
+            const [kindStr, secretStr, appStr] = parts;
+            return new AppTaggingSecret(Fr.fromString(secretStr), AztecAddress.fromStringUnsafe(appStr), appTaggingSecretKindFromString(kindStr));
+        }
+        throw new Error(`Invalid AppTaggingSecret string: ${str}`);
+    }
+}
+/**
+ * Parses a stored `AppTaggingSecret` string key.
+ */ export function appTaggingSecretFromString(str) {
+    return AppTaggingSecret.fromString(str);
+}
+export const AppTaggingSecretSchema = z.object({
+    kind: AppTaggingSecretKindSchema.default(AppTaggingSecretKind.UNCONSTRAINED),
+    secret: Fr.schema,
+    app: AztecAddress.schema
+}).transform(({ kind, secret, app })=>new AppTaggingSecret(secret, app, kind));
+function appTaggingSecretKindFromString(kind) {
+    switch(kind){
+        case AppTaggingSecretKind.CONSTRAINED:
+            return AppTaggingSecretKind.CONSTRAINED;
+        case AppTaggingSecretKind.UNCONSTRAINED:
+            return AppTaggingSecretKind.UNCONSTRAINED;
+        default:
+            throw new Error(`Invalid AppTaggingSecret kind: ${kind}`);
+    }
+}
+/**
+ * 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();
+    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.d.ts

@@ -0,0 +1,7 @@
+export declare const AppTaggingSecretKind: {
+    readonly UNCONSTRAINED: "unconstrained";
+    readonly CONSTRAINED: "constrained";
+};
+export type AppTaggingSecretKind = (typeof AppTaggingSecretKind)[keyof typeof AppTaggingSecretKind];
+export declare function appTaggingSecretKindFromDeliveryMode(deliveryMode: number): AppTaggingSecretKind;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwX3RhZ2dpbmdfc2VjcmV0X2tpbmQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dzL2FwcF90YWdnaW5nX3NlY3JldF9raW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQU8sTUFBTSxvQkFBb0I7OztDQUd2QixDQUFDO0FBRVgsTUFBTSxNQUFNLG9CQUFvQixHQUFHLENBQUMsT0FBTyxvQkFBb0IsQ0FBQyxDQUFDLE1BQU0sT0FBTyxvQkFBb0IsQ0FBQyxDQUFDO0FBTXBHLHdCQUFnQixvQ0FBb0MsQ0FBQyxZQUFZLEVBQUUsTUFBTSxHQUFHLG9CQUFvQixDQVMvRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"app_tagging_secret_kind.d.ts","sourceRoot":"","sources":["../../src/logs/app_tagging_secret_kind.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB;;;CAGvB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,OAAO,oBAAoB,CAAC,CAAC;AAMpG,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,MAAM,GAAG,oBAAoB,CAS/F"}

package/dest/logs/app_tagging_secret_kind.js

@@ -0,0 +1,17 @@
+export const AppTaggingSecretKind = {
+    UNCONSTRAINED: 'unconstrained',
+    CONSTRAINED: '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) {
+    switch(deliveryMode){
+        case ONCHAIN_UNCONSTRAINED_DELIVERY_MODE:
+            return AppTaggingSecretKind.UNCONSTRAINED;
+        case ONCHAIN_CONSTRAINED_DELIVERY_MODE:
+            return AppTaggingSecretKind.CONSTRAINED;
+        default:
+            throw new Error(`Unrecognized delivery mode for tagging: ${deliveryMode}`);
+    }
+}