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

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

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

package/dest/kernel/public_call_request.js

@@ -2,7 +2,7 @@ var _computedKey, _computedKey1;
 import { COUNTED_PUBLIC_CALL_REQUEST_LENGTH, PUBLIC_CALL_REQUEST_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
@@ -68,8 +68,11 @@ _computedKey = inspect.custom;
         const reader = BufferReader.asReader(buffer);
         return new PublicCallRequest(reader.readObject(AztecAddress), reader.readObject(AztecAddress), reader.readBoolean(), reader.readObject(Fr));
     }
-    toBuffer() {
-        return serializeToBuffer(...PublicCallRequest.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PublicCallRequest.getFields(this));
     }
     static empty() {
         return new PublicCallRequest(AztecAddress.ZERO, AztecAddress.ZERO, false, Fr.ZERO);
@@ -144,8 +147,11 @@ _computedKey1 = inspect.custom;
         const reader = BufferReader.asReader(buffer);
         return new PublicCallRequestArrayLengths(reader.readNumber(), reader.readNumber(), reader.readBoolean());
     }
-    toBuffer() {
-        return serializeToBuffer(...PublicCallRequestArrayLengths.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PublicCallRequestArrayLengths.getFields(this));
     }
     static empty() {
         return new PublicCallRequestArrayLengths(0, 0, false);
@@ -198,8 +204,11 @@ export class CountedPublicCallRequest {
         const reader = BufferReader.asReader(buffer);
         return new CountedPublicCallRequest(reader.readObject(PublicCallRequest), reader.readNumber());
     }
-    toBuffer() {
-        return serializeToBuffer(...CountedPublicCallRequest.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...CountedPublicCallRequest.getFields(this));
     }
     static empty() {
         return new CountedPublicCallRequest(PublicCallRequest.empty(), 0);

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

@@ -1,4 +1,3 @@
 export * from './interfaces.js';
-export * from './optional_number.js';
 export * from './order_and_comparison.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsMkJBQTJCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDJCQUEyQixDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC"}

package/dest/kernel/utils/index.js

@@ -1,3 +1,2 @@
 export * from './interfaces.js';
-export * from './optional_number.js';
 export * from './order_and_comparison.js';

package/dest/keys/derivation.d.ts

@@ -2,28 +2,68 @@ import { Fq, Fr } from '@aztec/foundation/curves/bn254';
 import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 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 deriveMasterMessageSigningSecretKey(secretKey: Fr): GrumpkinScalar;
+export declare function deriveMasterFallbackSecretKey(secretKey: Fr): GrumpkinScalar;
 export declare function deriveSigningKey(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<import("@aztec/foundation/curves/grumpkin").Point>;
+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;
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvZGVyaXZhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRzlDLHdCQUFnQiw0QkFBNEIsQ0FBQyx3QkFBd0IsRUFBRSxjQUFjLEVBQUUsR0FBRyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXJIO0FBRUQsd0JBQWdCLG1CQUFtQixDQUFDLEdBQUcsRUFBRSxjQUFjLEVBQUUsR0FBRyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsU0FBUyxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FHN0c7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLElBQUksRUFBRSxjQUFjLEVBQUUsR0FBRyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBS3pGO0FBRUQsd0JBQWdCLDhCQUE4QixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUU1RTtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFbEY7QUFFRCx3QkFBZ0Isb0NBQW9DLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRWxGO0FBRUQsd0JBQWdCLGdCQUFnQixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUc5RDtBQUVELHdCQUFnQixpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxFQUFFLGVBRXZFO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQVl0RztBQUVELHdCQUFzQixvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLGVBb0JsRTtBQUVELHdCQUFnQiw0QkFBNEIsQ0FBQyxTQUFTLEVBQUUsRUFBRSw4REFFekQ7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLFVBQVUsQ0FBQyxTQUFTLEVBQUUsRUFBRTs7Ozs7O0dBNkI3QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvZGVyaXZhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUMsd0JBQWdCLDRCQUE0QixDQUMxQyw4QkFBOEIsRUFBRSxjQUFjLEVBQzlDLEdBQUcsRUFBRSxZQUFZLEdBQ2hCLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFYjtBQUVELHdCQUFnQixtQkFBbUIsQ0FBQyxHQUFHLEVBQUUsY0FBYyxFQUFFLEdBQUcsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRzdHO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxJQUFJLEVBQUUsY0FBYyxFQUFFLEdBQUcsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUt6RjtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFbEY7QUFFRCx3QkFBZ0Isb0NBQW9DLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRWxGO0FBRUQsd0JBQWdCLG9DQUFvQyxDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUVsRjtBQUVELHdCQUFnQixtQ0FBbUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFakY7QUFFRCx3QkFBZ0IsNkJBQTZCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRTNFO0FBRUQsd0JBQWdCLGdCQUFnQixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUc5RDtBQUVELHdCQUFnQixpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxFQUFFLGVBRXZFO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQVl0RztBQUVELHdCQUFzQixvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLGVBb0JsRTtBQUVELHdCQUFnQiw0QkFBNEIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FPOUU7QUFFRDs7R0FFRztBQUNILE1BQU0sTUFBTSxnQkFBZ0IsR0FBRztJQUM3Qiw4QkFBOEIsRUFBRSxjQUFjLENBQUM7SUFDL0MsOEJBQThCLEVBQUUsY0FBYyxDQUFDO0lBQy9DLDhCQUE4QixFQUFFLGNBQWMsQ0FBQztJQUMvQyxzQkFBc0IsRUFBRSxjQUFjLENBQUM7SUFDdkMsNkJBQTZCLEVBQUUsY0FBYyxDQUFDO0lBQzlDLHVCQUF1QixFQUFFLGNBQWMsQ0FBQztDQUN6QyxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFnQixVQUFVLENBQUMsU0FBUyxFQUFFLEVBQUU7Ozs7Ozs7Ozs7Ozs7R0FXdkM7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLDhCQUE4QixDQUFDLFVBQVUsRUFBRSxnQkFBZ0I7Ozs7Ozs7Ozs7Ozs7R0E0Q2hGIn0=

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,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,8DAEzD;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,SAAS,EAAE,EAAE;;;;;;GA6B7C"}
+{"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,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,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

@@ -5,10 +5,11 @@ 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 { 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);
@@ -24,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
@@ -42,6 +43,18 @@ export function deriveMasterOutgoingViewingSecretKey(secretKey) {
         DomainSeparator.OVSK_M
     ]);
 }
+export function deriveMasterMessageSigningSecretKey(secretKey) {
+    return sha512ToGrumpkinScalar([
+        secretKey,
+        DomainSeparator.MSSK_M
+    ]);
+}
+export function deriveMasterFallbackSecretKey(secretKey) {
+    return sha512ToGrumpkinScalar([
+        secretKey,
+        DomainSeparator.FBSK_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([
@@ -53,15 +66,15 @@ export function computePreaddress(publicKeysHash, partialAddress) {
     return poseidon2HashWithSeparator([
         publicKeysHash,
         partialAddress
-    ], DomainSeparator.CONTRACT_ADDRESS_V1);
+    ], DomainSeparator.CONTRACT_ADDRESS_V2);
 }
 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], DomainSeparator.CONTRACT_ADDRESS_V1);
+    // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V2);
     // 2. addressPoint = (preaddress * G) + ivpk_m
     // 3. address = addressPoint.x
     const preaddress = await computePreaddress(await publicKeys.hash(), partialAddress);
-    const address = await Grumpkin.add(await derivePublicKeyFromSecretKey(new Fq(preaddress.toBigInt())), publicKeys.masterIncomingViewingPublicKey);
+    const address = await Grumpkin.add(await derivePublicKeyFromSecretKey(new Fq(preaddress.toBigInt())), publicKeys.ivpkM);
     return new AztecAddress(address.x);
 }
 export async function computeAddressSecret(preaddress, ivsk) {
@@ -84,34 +97,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);
-    // We hash the public keys to get the public keys hash
-    const publicKeys = new PublicKeys(masterNullifierPublicKey, masterIncomingViewingPublicKey, masterOutgoingViewingPublicKey, masterTaggingPublicKey);
+    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/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.
+    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,
+        masterMessageSigningSecretKey,
+        masterFallbackSecretKey,
+        masterNullifierHidingPublicKey,
+        masterOutgoingViewingPublicKey,
+        masterTaggingPublicKey,
+        masterMessageSigningPublicKey,
+        masterFallbackPublicKey,
         publicKeys
     };
 }

package/dest/keys/public_key.d.ts

@@ -1,4 +1,23 @@
-import type { Point } from '@aztec/foundation/curves/grumpkin';
-/** Represents a user public key. */
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
+/**
+ * Hashes a public key.
+ *
+ * Mirrors Noir's `hash_public_key` in `noir-protocol-circuits/crates/types/src/public_keys.nr`:
+ * `Poseidon2(DOM_SEP__SINGLE_PUBLIC_KEY_HASH, [pk.x, pk.y])`.
+ *
+ * This is distinct from Noir's generic `Hash` impl for `EmbeddedCurvePoint` (`noir_stdlib/src/embedded_curve_ops.nr`),
+ * which simply absorbs `x` then `y` into a `Hasher` state with no domain separator. That generic impl is unsuitable
+ * for hashing keys at the protocol boundary, where the domain separator is required to prevent collisions with hashes
+ * of other Grumpkin points (e.g. note commitments, nullifiers).
+ */
+export declare function hashPublicKey(pk: PublicKey): Promise<Fr>;
+/**
+ * Represents a user public key.
+ *
+ * Structurally identical to a Grumpkin `Point`; exposed as a distinct name so call sites read as "public key" where
+ * that's the domain meaning.
+ */
 export type PublicKey = Point;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvcHVibGljX2tleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUUvRCxvQ0FBb0M7QUFDcEMsTUFBTSxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMifQ==
+export declare const PublicKey: typeof Point;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvcHVibGljX2tleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRTFEOzs7Ozs7Ozs7O0dBVUc7QUFDSCx3QkFBZ0IsYUFBYSxDQUFDLEVBQUUsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV4RDtBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUM7QUFDOUIsZUFBTyxNQUFNLFNBQVMsY0FBUSxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"public_key.d.ts","sourceRoot":"","sources":["../../src/keys/public_key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE/D,oCAAoC;AACpC,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC"}
+{"version":3,"file":"public_key.d.ts","sourceRoot":"","sources":["../../src/keys/public_key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAExD;AAED;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC;AAC9B,eAAO,MAAM,SAAS,cAAQ,CAAC"}

package/dest/keys/public_key.js

@@ -1 +1,20 @@
-/** Represents a user public key. */ export { };
+import { DomainSeparator } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Point } from '@aztec/foundation/curves/grumpkin';
+/**
+ * Hashes a public key.
+ *
+ * Mirrors Noir's `hash_public_key` in `noir-protocol-circuits/crates/types/src/public_keys.nr`:
+ * `Poseidon2(DOM_SEP__SINGLE_PUBLIC_KEY_HASH, [pk.x, pk.y])`.
+ *
+ * This is distinct from Noir's generic `Hash` impl for `EmbeddedCurvePoint` (`noir_stdlib/src/embedded_curve_ops.nr`),
+ * which simply absorbs `x` then `y` into a `Hasher` state with no domain separator. That generic impl is unsuitable
+ * for hashing keys at the protocol boundary, where the domain separator is required to prevent collisions with hashes
+ * of other Grumpkin points (e.g. note commitments, nullifiers).
+ */ export function hashPublicKey(pk) {
+    return poseidon2HashWithSeparator([
+        pk.x,
+        pk.y
+    ], DomainSeparator.SINGLE_PUBLIC_KEY_HASH);
+}
+export const PublicKey = Point;

package/dest/keys/public_keys.d.ts

@@ -1,68 +1,65 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { Point } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
-import type { PublicKey } from './public_key.js';
+import { PublicKey } 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 declare class PublicKeys {
-    /** Master nullifier public key */
-    masterNullifierPublicKey: PublicKey;
+    /** Hash of the master nullifier public key */
+    npkMHash: Fr;
     /** Master incoming viewing public key */
-    masterIncomingViewingPublicKey: PublicKey;
-    /** Master outgoing viewing public key */
-    masterOutgoingViewingPublicKey: PublicKey;
-    /** Master tagging viewing public key */
-    masterTaggingPublicKey: PublicKey;
+    ivpkM: PublicKey;
+    /** Hash of the master outgoing viewing public key */
+    ovpkMHash: Fr;
+    /** Hash of the master tagging public key */
+    tpkMHash: Fr;
+    /** Hash of the master message-signing public key */
+    mspkMHash: Fr;
+    /** Hash of the master fallback public key */
+    fbpkMHash: Fr;
     constructor(
-    /** Master nullifier public key */
-    masterNullifierPublicKey: PublicKey, 
+    /** Hash of the master nullifier public key */
+    npkMHash: Fr, 
     /** Master incoming viewing public key */
-    masterIncomingViewingPublicKey: PublicKey, 
-    /** Master outgoing viewing public key */
-    masterOutgoingViewingPublicKey: PublicKey, 
-    /** Master tagging viewing public key */
-    masterTaggingPublicKey: PublicKey);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        masterNullifierPublicKey: z.ZodType<Point, any, string>;
-        masterIncomingViewingPublicKey: z.ZodType<Point, any, string>;
-        masterOutgoingViewingPublicKey: z.ZodType<Point, any, string>;
-        masterTaggingPublicKey: z.ZodType<Point, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        masterNullifierPublicKey: Point;
-        masterIncomingViewingPublicKey: Point;
-        masterOutgoingViewingPublicKey: Point;
-        masterTaggingPublicKey: Point;
-    }, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>, PublicKeys, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>;
+    ivpkM: PublicKey, 
+    /** Hash of the master outgoing viewing public key */
+    ovpkMHash: Fr, 
+    /** Hash of the master tagging public key */
+    tpkMHash: Fr, 
+    /** Hash of the master message-signing public key */
+    mspkMHash: Fr, 
+    /** Hash of the master fallback public key */
+    fbpkMHash: Fr);
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
+        ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<PublicKeys, {
+        npkMHash: Fr;
+        ivpkM: import("@aztec/foundation/schemas").Point;
+        ovpkMHash: Fr;
+        tpkMHash: Fr;
+        mspkMHash: Fr;
+        fbpkMHash: Fr;
+    }>>;
     static from(fields: FieldsOf<PublicKeys>): PublicKeys;
     /**
      * 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: any): PublicKeys;
-    hash(): Fr | Promise<Fr>;
+    hash(): Promise<Fr>;
     isEmpty(): boolean;
     static default(): PublicKeys;
     static random(): Promise<PublicKeys>;
-    /**
-     * 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: PublicKeys): boolean;
     /**
      * Converts the PublicKeys instance into a Buffer.
@@ -71,48 +68,24 @@ export declare class PublicKeys {
      * @returns A Buffer representation of the PublicKeys instance.
      */
     toBuffer(): Buffer;
-    /**
-     * 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: Buffer | BufferReader): PublicKeys;
     toNoirStruct(): {
-        npk_m: {
-            inner: {
-                x: Fr;
-                y: Fr;
-                is_infinite: boolean;
-            };
-        };
+        npk_m_hash: Fr;
         ivpk_m: {
             inner: {
                 x: Fr;
                 y: Fr;
-                is_infinite: boolean;
-            };
-        };
-        ovpk_m: {
-            inner: {
-                x: Fr;
-                y: Fr;
-                is_infinite: boolean;
-            };
-        };
-        tpk_m: {
-            inner: {
-                x: Fr;
-                y: Fr;
-                is_infinite: boolean;
             };
         };
+        ovpk_m_hash: Fr;
+        tpk_m_hash: Fr;
+        mspk_m_hash: Fr;
+        fbpk_m_hash: Fr;
     };
     /**
-     * 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(): Fr[];
     encodeToNoir(): Fr[];
@@ -120,4 +93,4 @@ export declare class PublicKeys {
     toString(): `0x${string}`;
     static fromString(keys: string): PublicKeys;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlzL3B1YmxpY19rZXlzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVlBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFMUQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVqRCxxQkFBYSxVQUFVO0lBRW5CLGtDQUFrQztJQUMzQix3QkFBd0IsRUFBRSxTQUFTO0lBQzFDLHlDQUF5QztJQUNsQyw4QkFBOEIsRUFBRSxTQUFTO0lBQ2hELHlDQUF5QztJQUNsQyw4QkFBOEIsRUFBRSxTQUFTO0lBQ2hELHdDQUF3QztJQUNqQyxzQkFBc0IsRUFBRSxTQUFTO0lBUjFDO0lBQ0Usa0NBQWtDO0lBQzNCLHdCQUF3QixFQUFFLFNBQVM7SUFDMUMseUNBQXlDO0lBQ2xDLDhCQUE4QixFQUFFLFNBQVM7SUFDaEQseUNBQXlDO0lBQ2xDLDhCQUE4QixFQUFFLFNBQVM7SUFDaEQsd0NBQXdDO0lBQ2pDLHNCQUFzQixFQUFFLFNBQVMsRUFDdEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FTaEI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsVUFBVSxDQUFDLGNBT3ZDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLFVBQVUsQ0FVM0M7SUFFRCxJQUFJLHFCQVlIO0lBRUQsT0FBTyxZQU9OO0lBRUQsTUFBTSxDQUFDLE9BQU8sSUFBSSxVQUFVLENBTzNCO0lBRUQsT0FBYSxNQUFNLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUV6QztJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxLQUFLLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FPakM7SUFFRDs7Ozs7T0FLRztJQUNILFFBQVEsSUFBSSxNQUFNLENBT2pCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsVUFBVSxDQVkzRDtJQUVELFlBQVk7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BWVg7SUFFRDs7O09BR0c7SUFDSCxRQUFRLElBQUksRUFBRSxFQUFFLENBT2Y7SUFJRCxZQUFZLElBQUksRUFBRSxFQUFFLENBRW5CO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLFVBQVUsQ0FReEQ7SUFFRCxRQUFRLGtCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxjQUU3QjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlzL3B1YmxpY19rZXlzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVdBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxTQUFTLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFM0Q7Ozs7O0dBS0c7QUFDSCxxQkFBYSxVQUFVO0lBRW5CLDhDQUE4QztJQUN2QyxRQUFRLEVBQUUsRUFBRTtJQUNuQix5Q0FBeUM7SUFDbEMsS0FBSyxFQUFFLFNBQVM7SUFDdkIscURBQXFEO0lBQzlDLFNBQVMsRUFBRSxFQUFFO0lBQ3BCLDRDQUE0QztJQUNyQyxRQUFRLEVBQUUsRUFBRTtJQUNuQixvREFBb0Q7SUFDN0MsU0FBUyxFQUFFLEVBQUU7SUFDcEIsNkNBQTZDO0lBQ3RDLFNBQVMsRUFBRSxFQUFFO0lBWnRCO0lBQ0UsOENBQThDO0lBQ3ZDLFFBQVEsRUFBRSxFQUFFO0lBQ25CLHlDQUF5QztJQUNsQyxLQUFLLEVBQUUsU0FBUztJQUN2QixxREFBcUQ7SUFDOUMsU0FBUyxFQUFFLEVBQUU7SUFDcEIsNENBQTRDO0lBQ3JDLFFBQVEsRUFBRSxFQUFFO0lBQ25CLG9EQUFvRDtJQUM3QyxTQUFTLEVBQUUsRUFBRTtJQUNwQiw2Q0FBNkM7SUFDdEMsU0FBUyxFQUFFLEVBQUUsRUFDbEI7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7UUFXaEI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsVUFBVSxDQUFDLGNBU3ZDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLFVBQVUsQ0FZM0M7SUFFSyxJQUFJLGdCQVlUO0lBRUQsT0FBTyxZQVNOO0lBRUQsTUFBTSxDQUFDLE9BQU8sSUFBSSxVQUFVLENBYzNCO0lBRUQsT0FBYSxNQUFNLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQWN6QztJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FTakM7SUFFRDs7Ozs7T0FLRztJQUNILFFBQVEsSUFBSSxNQUFNLENBU2pCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxVQUFVLENBUzNEO0lBRUQsWUFBWTs7Ozs7Ozs7Ozs7O01BWVg7SUFFRDs7OztPQUlHO0lBQ0gsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBR0QsWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUVuQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxVQUFVLENBU3hEO0lBRUQsUUFBUSxrQkFFUDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLE1BQU0sY0FFN0I7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"public_keys.d.ts","sourceRoot":"","sources":["../../src/keys/public_keys.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,qBAAa,UAAU;IAEnB,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS;IAR1C;IACE,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS,EACtC;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,cAOvC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAU3C;IAED,IAAI,qBAYH;IAED,OAAO,YAON;IAED,MAAM,CAAC,OAAO,IAAI,UAAU,CAO3B;IAED,OAAa,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,CAEzC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAOjC;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CAOjB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU,CAY3D;IAED,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAYX;IAED;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE,CAOf;IAID,YAAY,IAAI,EAAE,EAAE,CAEnB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU,CAQxD;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,cAE7B;CACF"}
+{"version":3,"file":"public_keys.d.ts","sourceRoot":"","sources":["../../src/keys/public_keys.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAE3D;;;;;GAKG;AACH,qBAAa,UAAU;IAEnB,8CAA8C;IACvC,QAAQ,EAAE,EAAE;IACnB,yCAAyC;IAClC,KAAK,EAAE,SAAS;IACvB,qDAAqD;IAC9C,SAAS,EAAE,EAAE;IACpB,4CAA4C;IACrC,QAAQ,EAAE,EAAE;IACnB,oDAAoD;IAC7C,SAAS,EAAE,EAAE;IACpB,6CAA6C;IACtC,SAAS,EAAE,EAAE;IAZtB;IACE,8CAA8C;IACvC,QAAQ,EAAE,EAAE;IACnB,yCAAyC;IAClC,KAAK,EAAE,SAAS;IACvB,qDAAqD;IAC9C,SAAS,EAAE,EAAE;IACpB,4CAA4C;IACrC,QAAQ,EAAE,EAAE;IACnB,oDAAoD;IAC7C,SAAS,EAAE,EAAE;IACpB,6CAA6C;IACtC,SAAS,EAAE,EAAE,EAClB;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;QAWhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,cASvC;IAED;;;OAGG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAY3C;IAEK,IAAI,gBAYT;IAED,OAAO,YASN;IAED,MAAM,CAAC,OAAO,IAAI,UAAU,CAc3B;IAED,OAAa,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,CAczC;IAED,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CASjC;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CASjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU,CAS3D;IAED,YAAY;;;;;;;;;;;;MAYX;IAED;;;;OAIG;IACH,QAAQ,IAAI,EAAE,EAAE,CAEf;IAGD,YAAY,IAAI,EAAE,EAAE,CAEnB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU,CASxD;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,cAE7B;CACF"}