@aztec/accounts 5.0.0-rc.2 → 5.0.0

package/dest/schnorr/initializerless/index.d.ts

@@ -17,9 +17,9 @@ export declare class SchnorrInitializerlessAccountContract extends SchnorrBaseAc
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
  */
-export declare function getSchnorrInitializerlessAccountContractAddress(secret: Fr, salt: Fr, signingPrivateKey?: GrumpkinScalar): Promise<AztecAddress>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zY2hub3JyL2luaXRpYWxpemVybGVzcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFNMUQsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFcEUsZUFBTyxNQUFNLDZDQUE2QyxrQkFFekQsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxxQkFBYSxxQ0FBc0MsU0FBUSwwQkFBMEI7SUFDbkYsWUFBWSxpQkFBaUIsRUFBRSxjQUFjLEVBRTVDO0lBRVEsZ0NBQWdDLHVCQUV4QztJQUVjLGlCQUFpQixJQUFJLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FHOUM7SUFFUSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FFeEQ7Q0FDRjtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLCtDQUErQyxDQUNuRSxNQUFNLEVBQUUsRUFBRSxFQUNWLElBQUksRUFBRSxFQUFFLEVBQ1IsaUJBQWlCLENBQUMsRUFBRSxjQUFjLEdBQ2pDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FJdkIifQ==
+export declare function getSchnorrInitializerlessAccountContractAddress(signingPrivateKey: GrumpkinScalar, salt: Fr, secretKey?: Fr): Promise<AztecAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zY2hub3JyL2luaXRpYWxpemVybGVzcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFNMUQsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFcEUsZUFBTyxNQUFNLDZDQUE2QyxrQkFFekQsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxxQkFBYSxxQ0FBc0MsU0FBUSwwQkFBMEI7SUFDbkYsWUFBWSxpQkFBaUIsRUFBRSxjQUFjLEVBRTVDO0lBRVEsZ0NBQWdDLHVCQUV4QztJQUVjLGlCQUFpQixJQUFJLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FHOUM7SUFFUSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FFeEQ7Q0FDRjtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLCtDQUErQyxDQUNuRSxpQkFBaUIsRUFBRSxjQUFjLEVBQ2pDLElBQUksRUFBRSxFQUFFLEVBQ1IsU0FBUyxDQUFDLEVBQUUsRUFBRSxHQUNiLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FJdkIifQ==

package/dest/schnorr/initializerless/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schnorr/initializerless/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,eAAO,MAAM,6CAA6C,kBAEzD,CAAC;AAEF;;;;GAIG;AACH,qBAAa,qCAAsC,SAAQ,0BAA0B;IACnF,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,gCAAgC,uBAExC;IAEc,iBAAiB,IAAI,OAAO,CAAC,EAAE,CAAC,CAG9C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,+CAA+C,CACnE,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,EAAE,EACR,iBAAiB,CAAC,EAAE,cAAc,GACjC,OAAO,CAAC,YAAY,CAAC,CAIvB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schnorr/initializerless/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,eAAO,MAAM,6CAA6C,kBAEzD,CAAC;AAEF;;;;GAIG;AACH,qBAAa,qCAAsC,SAAQ,0BAA0B;IACnF,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,gCAAgC,uBAExC;IAEc,iBAAiB,IAAI,OAAO,CAAC,EAAE,CAAC,CAG9C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,+CAA+C,CACnE,iBAAiB,EAAE,cAAc,EACjC,IAAI,EAAE,EAAE,EACR,SAAS,CAAC,EAAE,EAAE,GACb,OAAO,CAAC,YAAY,CAAC,CAIvB"}

package/dest/schnorr/initializerless/index.js

@@ -6,10 +6,10 @@
  */ import { getAccountContractAddress } from '@aztec/aztec.js/account';
 import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 import SchnorrInitializerlessAccountContractJson from '../../../artifacts/SchnorrInitializerlessAccount.json' with {
     type: 'json'
 };
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
 import { SchnorrBaseAccountContract } from '../account_contract.js';
 export const SchnorrInitializerlessAccountContractArtifact = loadContractArtifact(SchnorrInitializerlessAccountContractJson);
 /**
@@ -36,11 +36,11 @@ export const SchnorrInitializerlessAccountContractArtifact = loadContractArtifac
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
- */ export async function getSchnorrInitializerlessAccountContractAddress(secret, salt, signingPrivateKey) {
-    const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-    const accountContract = new SchnorrInitializerlessAccountContract(signingKey);
-    return await getAccountContractAddress(accountContract, secret, salt);
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
+ */ export async function getSchnorrInitializerlessAccountContractAddress(signingPrivateKey, salt, secretKey) {
+    const resolvedSecretKey = secretKey ?? await deriveSecretKeyFromSigningKey(signingPrivateKey);
+    const accountContract = new SchnorrInitializerlessAccountContract(signingPrivateKey);
+    return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
 }

package/dest/schnorr/initializerless/lazy.d.ts

@@ -21,9 +21,9 @@ export declare class SchnorrInitializerlessAccountContract extends SchnorrBaseAc
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
  */
-export declare function getSchnorrInitializerlessAccountContractAddress(secret: Fr, salt: Fr, signingPrivateKey?: GrumpkinScalar): Promise<AztecAddress>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NjaG5vcnIvaW5pdGlhbGl6ZXJsZXNzL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTFELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR2hFLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXBFOzs7R0FHRztBQUNILHdCQUFzQixnREFBZ0QsOEJBUXJFO0FBRUQ7Ozs7R0FJRztBQUNILHFCQUFhLHFDQUFzQyxTQUFRLDBCQUEwQjtJQUNuRixZQUFZLGlCQUFpQixFQUFFLGNBQWMsRUFFNUM7SUFFUSxnQ0FBZ0MsdUJBRXhDO0lBRWMsaUJBQWlCLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUc5QztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsK0NBQStDLENBQ25FLE1BQU0sRUFBRSxFQUFFLEVBQ1YsSUFBSSxFQUFFLEVBQUUsRUFDUixpQkFBaUIsQ0FBQyxFQUFFLGNBQWMsR0FDakMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUl2QiJ9
+export declare function getSchnorrInitializerlessAccountContractAddress(signingPrivateKey: GrumpkinScalar, salt: Fr, secretKey?: Fr): Promise<AztecAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NjaG5vcnIvaW5pdGlhbGl6ZXJsZXNzL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTFELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR2hFLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXBFOzs7R0FHRztBQUNILHdCQUFzQixnREFBZ0QsOEJBUXJFO0FBRUQ7Ozs7R0FJRztBQUNILHFCQUFhLHFDQUFzQyxTQUFRLDBCQUEwQjtJQUNuRixZQUFZLGlCQUFpQixFQUFFLGNBQWMsRUFFNUM7SUFFUSxnQ0FBZ0MsdUJBRXhDO0lBRWMsaUJBQWlCLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUc5QztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsK0NBQStDLENBQ25FLGlCQUFpQixFQUFFLGNBQWMsRUFDakMsSUFBSSxFQUFFLEVBQUUsRUFDUixTQUFTLENBQUMsRUFBRSxFQUFFLEdBQ2IsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUl2QiJ9

package/dest/schnorr/initializerless/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/schnorr/initializerless/lazy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,gDAAgD,8BAQrE;AAED;;;;GAIG;AACH,qBAAa,qCAAsC,SAAQ,0BAA0B;IACnF,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,gCAAgC,uBAExC;IAEc,iBAAiB,IAAI,OAAO,CAAC,EAAE,CAAC,CAG9C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,+CAA+C,CACnE,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,EAAE,EACR,iBAAiB,CAAC,EAAE,cAAc,GACjC,OAAO,CAAC,YAAY,CAAC,CAIvB"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/schnorr/initializerless/lazy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,gDAAgD,8BAQrE;AAED;;;;GAIG;AACH,qBAAa,qCAAsC,SAAQ,0BAA0B;IACnF,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,gCAAgC,uBAExC;IAEc,iBAAiB,IAAI,OAAO,CAAC,EAAE,CAAC,CAG9C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,+CAA+C,CACnE,iBAAiB,EAAE,cAAc,EACjC,IAAI,EAAE,EAAE,EACR,SAAS,CAAC,EAAE,EAAE,GACb,OAAO,CAAC,YAAY,CAAC,CAIvB"}

package/dest/schnorr/initializerless/lazy.js

@@ -6,7 +6,7 @@
  */ import { getAccountContractAddress } from '@aztec/aztec.js/account';
 import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
 import { SchnorrBaseAccountContract } from '../account_contract.js';
 /**
  * Lazily loads the contract artifact
@@ -44,11 +44,11 @@ import { SchnorrBaseAccountContract } from '../account_contract.js';
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
- */ export async function getSchnorrInitializerlessAccountContractAddress(secret, salt, signingPrivateKey) {
-    const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-    const accountContract = new SchnorrInitializerlessAccountContract(signingKey);
-    return await getAccountContractAddress(accountContract, secret, salt);
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
+ */ export async function getSchnorrInitializerlessAccountContractAddress(signingPrivateKey, salt, secretKey) {
+    const resolvedSecretKey = secretKey ?? await deriveSecretKeyFromSigningKey(signingPrivateKey);
+    const accountContract = new SchnorrInitializerlessAccountContract(signingPrivateKey);
+    return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
 }

package/dest/schnorr/private_immutable/index.d.ts

@@ -15,9 +15,9 @@ export declare class SchnorrAccountContract extends SchnorrBaseAccountContract {
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
  */
-export declare function getSchnorrAccountContractAddress(secret: Fr, salt: Fr, signingPrivateKey?: GrumpkinScalar): Promise<AztecAddress>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zY2hub3JyL3ByaXZhdGVfaW1tdXRhYmxlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQU0xRCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVwRSxlQUFPLE1BQU0sOEJBQThCLGtCQUEyRSxDQUFDO0FBRXZIOzs7O0dBSUc7QUFDSCxxQkFBYSxzQkFBdUIsU0FBUSwwQkFBMEI7SUFDcEUsWUFBWSxpQkFBaUIsRUFBRSxjQUFjLEVBRTVDO0lBRVEsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBRXhEO0NBQ0Y7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQixnQ0FBZ0MsQ0FDcEQsTUFBTSxFQUFFLEVBQUUsRUFDVixJQUFJLEVBQUUsRUFBRSxFQUNSLGlCQUFpQixDQUFDLEVBQUUsY0FBYyxHQUNqQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBSXZCIn0=
+export declare function getSchnorrAccountContractAddress(signingPrivateKey: GrumpkinScalar, salt: Fr, secretKey?: Fr): Promise<AztecAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zY2hub3JyL3ByaXZhdGVfaW1tdXRhYmxlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQU0xRCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVwRSxlQUFPLE1BQU0sOEJBQThCLGtCQUEyRSxDQUFDO0FBRXZIOzs7O0dBSUc7QUFDSCxxQkFBYSxzQkFBdUIsU0FBUSwwQkFBMEI7SUFDcEUsWUFBWSxpQkFBaUIsRUFBRSxjQUFjLEVBRTVDO0lBRVEsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBRXhEO0NBQ0Y7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQixnQ0FBZ0MsQ0FDcEQsaUJBQWlCLEVBQUUsY0FBYyxFQUNqQyxJQUFJLEVBQUUsRUFBRSxFQUNSLFNBQVMsQ0FBQyxFQUFFLEVBQUUsR0FDYixPQUFPLENBQUMsWUFBWSxDQUFDLENBSXZCIn0=

package/dest/schnorr/private_immutable/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schnorr/private_immutable/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,eAAO,MAAM,8BAA8B,kBAA2E,CAAC;AAEvH;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,0BAA0B;IACpE,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,EAAE,EACR,iBAAiB,CAAC,EAAE,cAAc,GACjC,OAAO,CAAC,YAAY,CAAC,CAIvB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schnorr/private_immutable/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,eAAO,MAAM,8BAA8B,kBAA2E,CAAC;AAEvH;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,0BAA0B;IACpE,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,iBAAiB,EAAE,cAAc,EACjC,IAAI,EAAE,EAAE,EACR,SAAS,CAAC,EAAE,EAAE,GACb,OAAO,CAAC,YAAY,CAAC,CAIvB"}

package/dest/schnorr/private_immutable/index.js

@@ -5,10 +5,10 @@
  * @packageDocumentation
  */ import { getAccountContractAddress } from '@aztec/aztec.js/account';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 import SchnorrAccountContractJson from '../../../artifacts/SchnorrAccount.json' with {
     type: 'json'
 };
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
 import { SchnorrBaseAccountContract } from '../account_contract.js';
 export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson);
 /**
@@ -25,11 +25,11 @@ export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccoun
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
- */ export async function getSchnorrAccountContractAddress(secret, salt, signingPrivateKey) {
-    const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-    const accountContract = new SchnorrAccountContract(signingKey);
-    return await getAccountContractAddress(accountContract, secret, salt);
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
+ */ export async function getSchnorrAccountContractAddress(signingPrivateKey, salt, secretKey) {
+    const resolvedSecretKey = secretKey ?? await deriveSecretKeyFromSigningKey(signingPrivateKey);
+    const accountContract = new SchnorrAccountContract(signingPrivateKey);
+    return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
 }

package/dest/schnorr/private_immutable/lazy.d.ts

@@ -19,9 +19,9 @@ export declare class SchnorrAccountContract extends SchnorrBaseAccountContract {
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
  */
-export declare function getSchnorrAccountContractAddress(secret: Fr, salt: Fr, signingPrivateKey?: GrumpkinScalar): Promise<AztecAddress>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NjaG5vcnIvcHJpdmF0ZV9pbW11dGFibGUvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHaEUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFcEU7OztHQUdHO0FBQ0gsd0JBQXNCLGlDQUFpQyw4QkFRdEQ7QUFFRDs7OztHQUlHO0FBQ0gscUJBQWEsc0JBQXVCLFNBQVEsMEJBQTBCO0lBQ3BFLFlBQVksaUJBQWlCLEVBQUUsY0FBYyxFQUU1QztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsZ0NBQWdDLENBQ3BELE1BQU0sRUFBRSxFQUFFLEVBQ1YsSUFBSSxFQUFFLEVBQUUsRUFDUixpQkFBaUIsQ0FBQyxFQUFFLGNBQWMsR0FDakMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUl2QiJ9
+export declare function getSchnorrAccountContractAddress(signingPrivateKey: GrumpkinScalar, salt: Fr, secretKey?: Fr): Promise<AztecAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NjaG5vcnIvcHJpdmF0ZV9pbW11dGFibGUvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHaEUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFcEU7OztHQUdHO0FBQ0gsd0JBQXNCLGlDQUFpQyw4QkFRdEQ7QUFFRDs7OztHQUlHO0FBQ0gscUJBQWEsc0JBQXVCLFNBQVEsMEJBQTBCO0lBQ3BFLFlBQVksaUJBQWlCLEVBQUUsY0FBYyxFQUU1QztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsZ0NBQWdDLENBQ3BELGlCQUFpQixFQUFFLGNBQWMsRUFDakMsSUFBSSxFQUFFLEVBQUUsRUFDUixTQUFTLENBQUMsRUFBRSxFQUFFLEdBQ2IsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUl2QiJ9

package/dest/schnorr/private_immutable/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/schnorr/private_immutable/lazy.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,iCAAiC,8BAQtD;AAED;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,0BAA0B;IACpE,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,EAAE,EACR,iBAAiB,CAAC,EAAE,cAAc,GACjC,OAAO,CAAC,YAAY,CAAC,CAIvB"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/schnorr/private_immutable/lazy.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,iCAAiC,8BAQtD;AAED;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,0BAA0B;IACpE,YAAY,iBAAiB,EAAE,cAAc,EAE5C;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,iBAAiB,EAAE,cAAc,EACjC,IAAI,EAAE,EAAE,EACR,SAAS,CAAC,EAAE,EAAE,GACb,OAAO,CAAC,YAAY,CAAC,CAIvB"}

package/dest/schnorr/private_immutable/lazy.js

@@ -5,7 +5,7 @@
  * @packageDocumentation
  */ import { getAccountContractAddress } from '@aztec/aztec.js/account';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
 import { SchnorrBaseAccountContract } from '../account_contract.js';
 /**
  * Lazily loads the contract artifact
@@ -33,11 +33,11 @@ import { SchnorrBaseAccountContract } from '../account_contract.js';
 }
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
- */ export async function getSchnorrAccountContractAddress(secret, salt, signingPrivateKey) {
-    const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-    const accountContract = new SchnorrAccountContract(signingKey);
-    return await getAccountContractAddress(accountContract, secret, salt);
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
+ */ export async function getSchnorrAccountContractAddress(signingPrivateKey, salt, secretKey) {
+    const resolvedSecretKey = secretKey ?? await deriveSecretKeyFromSigningKey(signingPrivateKey);
+    const accountContract = new SchnorrAccountContract(signingPrivateKey);
+    return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
 }

package/dest/testing/configuration.d.ts

@@ -34,4 +34,4 @@ export interface InitialAccountData {
      */
     type?: InitialAccountType;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlndXJhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvY29uZmlndXJhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR2hFLGVBQU8sTUFBTSx3QkFBd0IsTUFJcEMsQ0FBQztBQUVGLGVBQU8sTUFBTSw0QkFBNEIsK0NBRXhDLENBQUM7QUFFRixlQUFPLE1BQU0seUJBQXlCLCtDQUErQixDQUFDO0FBRXRFLGVBQU8sTUFBTSwwQkFBMEIsTUFBOEIsQ0FBQztBQUV0RTs7R0FFRztBQUNILE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxTQUFTLEdBQUcseUJBQXlCLENBQUM7QUFFdkU7O0dBRUc7QUFDSCxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDOztPQUVHO0lBQ0gsTUFBTSxFQUFFLEVBQUUsQ0FBQztJQUNYOztPQUVHO0lBQ0gsVUFBVSxFQUFFLGNBQWMsQ0FBQztJQUMzQjs7T0FFRztJQUNILElBQUksRUFBRSxFQUFFLENBQUM7SUFDVDs7T0FFRztJQUNILE9BQU8sRUFBRSxZQUFZLENBQUM7SUFDdEI7O09BRUc7SUFDSCxJQUFJLENBQUMsRUFBRSxrQkFBa0IsQ0FBQztDQUMzQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlndXJhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvY29uZmlndXJhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR2hFLGVBQU8sTUFBTSx3QkFBd0IsTUFJcEMsQ0FBQztBQUVGLGVBQU8sTUFBTSw0QkFBNEIsK0NBRXhDLENBQUM7QUFFRixlQUFPLE1BQU0seUJBQXlCLCtDQUlyQyxDQUFDO0FBRUYsZUFBTyxNQUFNLDBCQUEwQixNQUE4QixDQUFDO0FBRXRFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGtCQUFrQixHQUFHLFNBQVMsR0FBRyx5QkFBeUIsQ0FBQztBQUV2RTs7R0FFRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakM7O09BRUc7SUFDSCxNQUFNLEVBQUUsRUFBRSxDQUFDO0lBQ1g7O09BRUc7SUFDSCxVQUFVLEVBQUUsY0FBYyxDQUFDO0lBQzNCOztPQUVHO0lBQ0gsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUNUOztPQUVHO0lBQ0gsT0FBTyxFQUFFLFlBQVksQ0FBQztJQUN0Qjs7T0FFRztJQUNILElBQUksQ0FBQyxFQUFFLGtCQUFrQixDQUFDO0NBQzNCIn0=

package/dest/testing/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/testing/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,eAAO,MAAM,wBAAwB,MAIpC,CAAC;AAEF,eAAO,MAAM,4BAA4B,+CAExC,CAAC;AAEF,eAAO,MAAM,yBAAyB,+CAA+B,CAAC;AAEtE,eAAO,MAAM,0BAA0B,MAA8B,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,yBAAyB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,MAAM,EAAE,EAAE,CAAC;IACX;;OAEG;IACH,UAAU,EAAE,cAAc,CAAC;IAC3B;;OAEG;IACH,IAAI,EAAE,EAAE,CAAC;IACT;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,kBAAkB,CAAC;CAC3B"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/testing/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,eAAO,MAAM,wBAAwB,MAIpC,CAAC;AAEF,eAAO,MAAM,4BAA4B,+CAExC,CAAC;AAEF,eAAO,MAAM,yBAAyB,+CAIrC,CAAC;AAEF,eAAO,MAAM,0BAA0B,MAA8B,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,yBAAyB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,MAAM,EAAE,EAAE,CAAC;IACX;;OAEG;IACH,UAAU,EAAE,cAAc,CAAC;IAC3B;;OAEG;IACH,IAAI,EAAE,EAAE,CAAC;IACT;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,kBAAkB,CAAC;CAC3B"}

package/dest/testing/configuration.js

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';
 export const INITIAL_TEST_SECRET_KEYS = [
     Fr.fromHexString('2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281'),
@@ -6,8 +7,11 @@ export const INITIAL_TEST_SECRET_KEYS = [
     Fr.fromHexString('0f6addf0da06c33293df974a565b03d1ab096090d907d98055a8b7f4954e120c')
 ];
 export const INITIAL_TEST_ENCRYPTION_KEYS = INITIAL_TEST_SECRET_KEYS.map((secretKey)=>deriveMasterIncomingViewingSecretKey(secretKey));
-// TODO(#5837): come up with a standard signing key derivation scheme instead of using ivsk_m as signing keys here
-export const INITIAL_TEST_SIGNING_KEYS = INITIAL_TEST_ENCRYPTION_KEYS;
+export const INITIAL_TEST_SIGNING_KEYS = [
+    GrumpkinScalar.fromHexString('0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f'),
+    GrumpkinScalar.fromHexString('202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e'),
+    GrumpkinScalar.fromHexString('404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e')
+];
 export const INITIAL_TEST_ACCOUNT_SALTS = [
     Fr.ZERO,
     Fr.ZERO,

package/dest/testing/index.d.ts

@@ -8,4 +8,4 @@ export declare function getInitialTestAccountsData(): Promise<InitialAccountData
  * Generate a fixed amount of random schnorr account contract instances of the given type
  */
 export declare function generateSchnorrAccounts(numberOfAccounts: number, type?: InitialAccountType): Promise<InitialAccountData[]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVdBLE9BQU8sRUFLTCxLQUFLLGtCQUFrQixFQUN2QixLQUFLLGtCQUFrQixFQUN4QixNQUFNLG9CQUFvQixDQUFDO0FBRTVCLE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIsNEJBQTRCLEVBQzVCLHdCQUF3QixFQUN4Qix5QkFBeUIsRUFDekIsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxrQkFBa0IsR0FDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQVM1Qjs7R0FFRztBQUNILHdCQUFnQiwwQkFBMEIsSUFBSSxPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQWMxRTtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLElBQUksR0FBRSxrQkFBOEMsR0FDbkQsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FjL0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVdBLE9BQU8sRUFJTCxLQUFLLGtCQUFrQixFQUN2QixLQUFLLGtCQUFrQixFQUN4QixNQUFNLG9CQUFvQixDQUFDO0FBRTVCLE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIsNEJBQTRCLEVBQzVCLHdCQUF3QixFQUN4Qix5QkFBeUIsRUFDekIsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxrQkFBa0IsR0FDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQVM1Qjs7R0FFRztBQUNILHdCQUFnQiwwQkFBMEIsSUFBSSxPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQWMxRTtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLElBQUksR0FBRSxrQkFBOEMsR0FDbkQsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FlL0IifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAKL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACxB,yBAAyB,EACzB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,GACxB,MAAM,oBAAoB,CAAC;AAS5B;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAc1E;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,MAAM,EACxB,IAAI,GAAE,kBAA8C,GACnD,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAc/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACxB,yBAAyB,EACzB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,GACxB,MAAM,oBAAoB,CAAC;AAS5B;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAc1E;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,MAAM,EACxB,IAAI,GAAE,kBAA8C,GACnD,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAe/B"}

package/dest/testing/index.js

@@ -3,39 +3,41 @@
  *
  * @packageDocumentation
  */ import { Fr } from '@aztec/aztec.js/fields';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { getSchnorrInitializerlessAccountContractAddress } from '../schnorr/initializerless/index.js';
 import { getSchnorrAccountContractAddress } from '../schnorr/private_immutable/index.js';
-import { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_ENCRYPTION_KEYS, INITIAL_TEST_SECRET_KEYS, INITIAL_TEST_SIGNING_KEYS } from './configuration.js';
+import { deriveSecretKeyFromSigningKey } from '../utils/key_derivation.js';
+import { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_SECRET_KEYS, INITIAL_TEST_SIGNING_KEYS } from './configuration.js';
 export { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_ENCRYPTION_KEYS, INITIAL_TEST_SECRET_KEYS, INITIAL_TEST_SIGNING_KEYS } from './configuration.js';
-/** Derives the account contract address for the given type */ function getTestAccountAddress(type, secret, salt, signingKey) {
-    return type === 'schnorr' ? getSchnorrAccountContractAddress(secret, salt, signingKey) : getSchnorrInitializerlessAccountContractAddress(secret, salt, signingKey);
+/** Derives the account contract address for the given type */ function getTestAccountAddress(type, signingKey, salt, secret) {
+    return type === 'schnorr' ? getSchnorrAccountContractAddress(signingKey, salt, secret) : getSchnorrInitializerlessAccountContractAddress(signingKey, salt, secret);
 }
 /**
  * Gets the basic information for initial test accounts.
  */ export function getInitialTestAccountsData() {
     return Promise.all(INITIAL_TEST_SECRET_KEYS.map(async (secret, i)=>({
             secret,
-            signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
+            signingKey: INITIAL_TEST_SIGNING_KEYS[i],
             salt: INITIAL_TEST_ACCOUNT_SALTS[i],
             type: 'schnorr_initializerless',
-            address: await getSchnorrInitializerlessAccountContractAddress(secret, INITIAL_TEST_ACCOUNT_SALTS[i], INITIAL_TEST_SIGNING_KEYS[i])
+            address: await getSchnorrInitializerlessAccountContractAddress(INITIAL_TEST_SIGNING_KEYS[i], INITIAL_TEST_ACCOUNT_SALTS[i], secret)
         })));
 }
 /**
  * Generate a fixed amount of random schnorr account contract instances of the given type
  */ export async function generateSchnorrAccounts(numberOfAccounts, type = 'schnorr_initializerless') {
-    const secrets = Array.from({
+    const signingKeys = Array.from({
         length: numberOfAccounts
-    }, ()=>Fr.random());
-    return await Promise.all(secrets.map(async (secret)=>{
+    }, ()=>GrumpkinScalar.random());
+    return await Promise.all(signingKeys.map(async (signingKey)=>{
         const salt = Fr.random();
+        const secret = await deriveSecretKeyFromSigningKey(signingKey);
         return {
             secret,
-            signingKey: deriveSigningKey(secret),
+            signingKey,
             salt,
             type,
-            address: await getTestAccountAddress(type, secret, salt)
+            address: await getTestAccountAddress(type, signingKey, salt, secret)
         };
     }));
 }

package/dest/testing/lazy.d.ts

@@ -8,4 +8,4 @@ export declare function getInitialTestAccountsData(): Promise<InitialAccountData
  * Generate a fixed amount of random schnorr account contract instances of the given type
  */
 export declare function generateSchnorrAccounts(numberOfAccounts: number, type?: InitialAccountType): Promise<InitialAccountData[]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQSxPQUFPLEVBS0wsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxrQkFBa0IsRUFDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QixPQUFPLEVBQUUsMEJBQTBCLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQVMxRjs7R0FFRztBQUNILHdCQUFnQiwwQkFBMEIsSUFBSSxPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQWMxRTtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLElBQUksR0FBRSxrQkFBOEMsR0FDbkQsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FjL0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQSxPQUFPLEVBSUwsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxrQkFBa0IsRUFDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QixPQUFPLEVBQUUsMEJBQTBCLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQVMxRjs7R0FFRztBQUNILHdCQUFnQiwwQkFBMEIsSUFBSSxPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQWMxRTtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLElBQUksR0FBRSxrQkFBOEMsR0FDbkQsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FlL0IifQ==

package/dest/testing/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/testing/lazy.ts"],"names":[],"mappings":"AAWA,OAAO,EAKL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAS1F;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAc1E;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,MAAM,EACxB,IAAI,GAAE,kBAA8C,GACnD,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAc/B"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/testing/lazy.ts"],"names":[],"mappings":"AAWA,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAS1F;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAc1E;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,MAAM,EACxB,IAAI,GAAE,kBAA8C,GACnD,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAe/B"}

package/dest/testing/lazy.js

@@ -3,39 +3,41 @@
  *
  * @packageDocumentation
  */ import { Fr } from '@aztec/aztec.js/fields';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { getSchnorrInitializerlessAccountContractAddress } from '../schnorr/initializerless/lazy.js';
 import { getSchnorrAccountContractAddress } from '../schnorr/private_immutable/lazy.js';
-import { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_ENCRYPTION_KEYS, INITIAL_TEST_SECRET_KEYS, INITIAL_TEST_SIGNING_KEYS } from './configuration.js';
+import { deriveSecretKeyFromSigningKey } from '../utils/key_derivation.js';
+import { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_SECRET_KEYS, INITIAL_TEST_SIGNING_KEYS } from './configuration.js';
 export { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_SECRET_KEYS } from './configuration.js';
-/** Derives the account contract address for the given type */ function getTestAccountAddress(type, secret, salt, signingKey) {
-    return type === 'schnorr' ? getSchnorrAccountContractAddress(secret, salt, signingKey) : getSchnorrInitializerlessAccountContractAddress(secret, salt, signingKey);
+/** Derives the account contract address for the given type */ function getTestAccountAddress(type, signingKey, salt, secret) {
+    return type === 'schnorr' ? getSchnorrAccountContractAddress(signingKey, salt, secret) : getSchnorrInitializerlessAccountContractAddress(signingKey, salt, secret);
 }
 /**
  * Gets the basic information for initial test accounts.
  */ export function getInitialTestAccountsData() {
     return Promise.all(INITIAL_TEST_SECRET_KEYS.map(async (secret, i)=>({
             secret,
-            signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
+            signingKey: INITIAL_TEST_SIGNING_KEYS[i],
             salt: INITIAL_TEST_ACCOUNT_SALTS[i],
             type: 'schnorr_initializerless',
-            address: await getSchnorrInitializerlessAccountContractAddress(secret, INITIAL_TEST_ACCOUNT_SALTS[i], INITIAL_TEST_SIGNING_KEYS[i])
+            address: await getSchnorrInitializerlessAccountContractAddress(INITIAL_TEST_SIGNING_KEYS[i], INITIAL_TEST_ACCOUNT_SALTS[i], secret)
         })));
 }
 /**
  * Generate a fixed amount of random schnorr account contract instances of the given type
  */ export async function generateSchnorrAccounts(numberOfAccounts, type = 'schnorr_initializerless') {
-    const secrets = Array.from({
+    const signingKeys = Array.from({
         length: numberOfAccounts
-    }, ()=>Fr.random());
-    return await Promise.all(secrets.map(async (secret)=>{
+    }, ()=>GrumpkinScalar.random());
+    return await Promise.all(signingKeys.map(async (signingKey)=>{
         const salt = Fr.random();
+        const secret = await deriveSecretKeyFromSigningKey(signingKey);
         return {
             secret,
-            signingKey: deriveSigningKey(secret),
+            signingKey,
             salt,
             type,
-            address: await getTestAccountAddress(type, secret, salt)
+            address: await getTestAccountAddress(type, signingKey, salt, secret)
         };
     }));
 }

package/dest/utils/index.d.ts

@@ -1,2 +1,3 @@
+export * from './key_derivation.js';
 export * from './ssh_agent.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdCQUFnQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsZ0JBQWdCLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC"}

package/dest/utils/index.js

@@ -1 +1,2 @@
+export * from './key_derivation.js';
 export * from './ssh_agent.js';

package/dest/utils/key_derivation.d.ts

@@ -0,0 +1,9 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+/**
+ * Derives the privacy secret key (the seed for the viewing/nullifier keyset that PXE holds) from the account's signing
+ * key. The signing key is the ownership root the user controls; the privacy keyset hangs off it through this one-way
+ * hash, so a value handled by PXE can never be used to recover the signing key.
+ */
+export declare function deriveSecretKeyFromSigningKey(signingKey: GrumpkinScalar): Promise<Fr>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X2Rlcml2YXRpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9rZXlfZGVyaXZhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUl4RTs7OztHQUlHO0FBQ0gsd0JBQWdCLDZCQUE2QixDQUFDLFVBQVUsRUFBRSxjQUFjLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVyRiJ9

package/dest/utils/key_derivation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"key_derivation.d.ts","sourceRoot":"","sources":["../../src/utils/key_derivation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAIxE;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,EAAE,CAAC,CAErF"}

package/dest/utils/key_derivation.js

@@ -0,0 +1,16 @@
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { sha256ToField } from '@aztec/foundation/crypto/sha256';
+const SIGNING_KEY_TO_SECRET_KEY_SEPARATOR = sha256ToField([
+    Buffer.from('@aztec/accounts/signing_key_to_secret_key')
+]);
+/**
+ * Derives the privacy secret key (the seed for the viewing/nullifier keyset that PXE holds) from the account's signing
+ * key. The signing key is the ownership root the user controls; the privacy keyset hangs off it through this one-way
+ * hash, so a value handled by PXE can never be used to recover the signing key.
+ */ export function deriveSecretKeyFromSigningKey(signingKey) {
+    return poseidon2Hash([
+        SIGNING_KEY_TO_SECRET_KEY_SEPARATOR,
+        signingKey.hi,
+        signingKey.lo
+    ]);
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aztec/accounts",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/accounts",
   "description": "Implementation of sample account contracts for Aztec Network",
-  "version": "5.0.0-rc.2",
+  "version": "5.0.0",
   "type": "module",
   "exports": {
     "./defaults": "./dest/defaults/index.js",
@@ -79,11 +79,11 @@
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "5.0.0-rc.2",
-    "@aztec/entrypoints": "5.0.0-rc.2",
-    "@aztec/ethereum": "5.0.0-rc.2",
-    "@aztec/foundation": "5.0.0-rc.2",
-    "@aztec/stdlib": "5.0.0-rc.2",
+    "@aztec/aztec.js": "5.0.0",
+    "@aztec/entrypoints": "5.0.0",
+    "@aztec/ethereum": "5.0.0",
+    "@aztec/foundation": "5.0.0",
+    "@aztec/stdlib": "5.0.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/schnorr/initializerless/index.ts

@@ -11,10 +11,10 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
 import SchnorrInitializerlessAccountContractJson from '../../../artifacts/SchnorrInitializerlessAccount.json' with { type: 'json' };
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
 import { SchnorrBaseAccountContract } from '../account_contract.js';
 
 export const SchnorrInitializerlessAccountContractArtifact = loadContractArtifact(
@@ -47,16 +47,16 @@ export class SchnorrInitializerlessAccountContract extends SchnorrBaseAccountCon
 
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
  */
 export async function getSchnorrInitializerlessAccountContractAddress(
-  secret: Fr,
+  signingPrivateKey: GrumpkinScalar,
   salt: Fr,
-  signingPrivateKey?: GrumpkinScalar,
+  secretKey?: Fr,
 ): Promise<AztecAddress> {
-  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-  const accountContract = new SchnorrInitializerlessAccountContract(signingKey);
-  return await getAccountContractAddress(accountContract, secret, salt);
+  const resolvedSecretKey = secretKey ?? (await deriveSecretKeyFromSigningKey(signingPrivateKey));
+  const accountContract = new SchnorrInitializerlessAccountContract(signingPrivateKey);
+  return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
 }

package/src/schnorr/initializerless/lazy.ts

@@ -11,8 +11,8 @@ import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
 import { SchnorrBaseAccountContract } from '../account_contract.js';
 
 /**
@@ -55,16 +55,16 @@ export class SchnorrInitializerlessAccountContract extends SchnorrBaseAccountCon
 
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
  */
 export async function getSchnorrInitializerlessAccountContractAddress(
-  secret: Fr,
+  signingPrivateKey: GrumpkinScalar,
   salt: Fr,
-  signingPrivateKey?: GrumpkinScalar,
+  secretKey?: Fr,
 ): Promise<AztecAddress> {
-  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-  const accountContract = new SchnorrInitializerlessAccountContract(signingKey);
-  return await getAccountContractAddress(accountContract, secret, salt);
+  const resolvedSecretKey = secretKey ?? (await deriveSecretKeyFromSigningKey(signingPrivateKey));
+  const accountContract = new SchnorrInitializerlessAccountContract(signingPrivateKey);
+  return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
 }

package/src/schnorr/private_immutable/index.ts

@@ -10,10 +10,10 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
 import SchnorrAccountContractJson from '../../../artifacts/SchnorrAccount.json' with { type: 'json' };
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
 import { SchnorrBaseAccountContract } from '../account_contract.js';
 
 export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson as NoirCompiledContract);
@@ -35,16 +35,16 @@ export class SchnorrAccountContract extends SchnorrBaseAccountContract {
 
 /**
  * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
+ * @param signingPrivateKey - The account's signing private key.
  * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
  */
 export async function getSchnorrAccountContractAddress(
-  secret: Fr,
+  signingPrivateKey: GrumpkinScalar,
   salt: Fr,
-  signingPrivateKey?: GrumpkinScalar,
+  secretKey?: Fr,
 ): Promise<AztecAddress> {
-  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-  const accountContract = new SchnorrAccountContract(signingKey);
-  return await getAccountContractAddress(accountContract, secret, salt);
+  const resolvedSecretKey = secretKey ?? (await deriveSecretKeyFromSigningKey(signingPrivateKey));
+  const accountContract = new SchnorrAccountContract(signingPrivateKey);
+  return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
 }