@aztec/accounts 5.0.0-rc.1 → 5.0.0

package/src/schnorr/private_immutable/lazy.ts

@@ -10,8 +10,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';
 
 /**
@@ -45,16 +45,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);
 }

package/src/testing/configuration.ts

@@ -12,8 +12,12 @@ export const INITIAL_TEST_SECRET_KEYS = [
 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, Fr.ZERO];
 

package/src/testing/index.ts

@@ -4,14 +4,13 @@
  * @packageDocumentation
  */
 import { Fr } from '@aztec/aztec.js/fields';
-import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
-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 { deriveSecretKeyFromSigningKey } from '../utils/key_derivation.js';
 import {
   INITIAL_TEST_ACCOUNT_SALTS,
-  INITIAL_TEST_ENCRYPTION_KEYS,
   INITIAL_TEST_SECRET_KEYS,
   INITIAL_TEST_SIGNING_KEYS,
   type InitialAccountData,
@@ -28,10 +27,10 @@ export {
 } from './configuration.js';
 
 /** Derives the account contract address for the given type */
-function getTestAccountAddress(type: InitialAccountType, secret: Fr, salt: Fr, signingKey?: GrumpkinScalar) {
+function getTestAccountAddress(type: InitialAccountType, signingKey: GrumpkinScalar, salt: Fr, secret?: Fr) {
   return type === 'schnorr'
-    ? getSchnorrAccountContractAddress(secret, salt, signingKey)
-    : getSchnorrInitializerlessAccountContractAddress(secret, salt, signingKey);
+    ? getSchnorrAccountContractAddress(signingKey, salt, secret)
+    : getSchnorrInitializerlessAccountContractAddress(signingKey, salt, secret);
 }
 
 /**
@@ -41,13 +40,13 @@ export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
   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' as const,
       address: await getSchnorrInitializerlessAccountContractAddress(
-        secret,
-        INITIAL_TEST_ACCOUNT_SALTS[i],
         INITIAL_TEST_SIGNING_KEYS[i],
+        INITIAL_TEST_ACCOUNT_SALTS[i],
+        secret,
       ),
     })),
   );
@@ -60,16 +59,17 @@ export async function generateSchnorrAccounts(
   numberOfAccounts: number,
   type: InitialAccountType = 'schnorr_initializerless',
 ): Promise<InitialAccountData[]> {
-  const secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
+  const signingKeys = Array.from({ length: numberOfAccounts }, () => GrumpkinScalar.random());
   return await Promise.all(
-    secrets.map(async secret => {
+    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/src/testing/lazy.ts

@@ -4,14 +4,13 @@
  * @packageDocumentation
  */
 import { Fr } from '@aztec/aztec.js/fields';
-import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
-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 { deriveSecretKeyFromSigningKey } from '../utils/key_derivation.js';
 import {
   INITIAL_TEST_ACCOUNT_SALTS,
-  INITIAL_TEST_ENCRYPTION_KEYS,
   INITIAL_TEST_SECRET_KEYS,
   INITIAL_TEST_SIGNING_KEYS,
   type InitialAccountData,
@@ -21,10 +20,10 @@ import {
 export { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_SECRET_KEYS } from './configuration.js';
 
 /** Derives the account contract address for the given type */
-function getTestAccountAddress(type: InitialAccountType, secret: Fr, salt: Fr, signingKey?: GrumpkinScalar) {
+function getTestAccountAddress(type: InitialAccountType, signingKey: GrumpkinScalar, salt: Fr, secret?: Fr) {
   return type === 'schnorr'
-    ? getSchnorrAccountContractAddress(secret, salt, signingKey)
-    : getSchnorrInitializerlessAccountContractAddress(secret, salt, signingKey);
+    ? getSchnorrAccountContractAddress(signingKey, salt, secret)
+    : getSchnorrInitializerlessAccountContractAddress(signingKey, salt, secret);
 }
 
 /**
@@ -34,13 +33,13 @@ export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
   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' as const,
       address: await getSchnorrInitializerlessAccountContractAddress(
-        secret,
-        INITIAL_TEST_ACCOUNT_SALTS[i],
         INITIAL_TEST_SIGNING_KEYS[i],
+        INITIAL_TEST_ACCOUNT_SALTS[i],
+        secret,
       ),
     })),
   );
@@ -53,16 +52,17 @@ export async function generateSchnorrAccounts(
   numberOfAccounts: number,
   type: InitialAccountType = 'schnorr_initializerless',
 ): Promise<InitialAccountData[]> {
-  const secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
+  const signingKeys = Array.from({ length: numberOfAccounts }, () => GrumpkinScalar.random());
   return await Promise.all(
-    secrets.map(async secret => {
+    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/src/utils/index.ts

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

package/src/utils/key_derivation.ts

@@ -0,0 +1,15 @@
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { sha256ToField } from '@aztec/foundation/crypto/sha256';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+
+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: GrumpkinScalar): Promise<Fr> {
+  return poseidon2Hash([SIGNING_KEY_TO_SECRET_KEY_SEPARATOR, signingKey.hi, signingKey.lo]);
+}