@aztec/accounts 0.35.1 → 0.37.0

package/src/defaults/account_contract.ts

@@ -1,5 +1,6 @@
 import { type AccountContract, type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account';
 import { type CompleteAddress } from '@aztec/circuit-types';
+import { type Fr } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type NodeInfo } from '@aztec/types/interfaces';
 
@@ -19,7 +20,7 @@ export abstract class DefaultAccountContract implements AccountContract {
     return this.artifact;
   }
 
-  getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface {
-    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, nodeInfo);
+  getInterface(address: CompleteAddress, publicKeysHash: Fr, nodeInfo: NodeInfo): AccountInterface {
+    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, publicKeysHash, nodeInfo);
   }
 }

package/src/defaults/account_interface.ts

@@ -17,6 +17,7 @@ export class DefaultAccountInterface implements AccountInterface {
   constructor(
     private authWitnessProvider: AuthWitnessProvider,
     private address: CompleteAddress,
+    private publicKeysHash: Fr,
     nodeInfo: Pick<NodeInfo, 'chainId' | 'protocolVersion'>,
   ) {
     this.entrypoint = new DefaultAccountEntrypoint(
@@ -37,6 +38,10 @@ export class DefaultAccountInterface implements AccountInterface {
     return this.authWitnessProvider.createAuthWit(messageHash);
   }
 
+  getPublicKeysHash(): Fr {
+    return this.publicKeysHash;
+  }
+
   getCompleteAddress(): CompleteAddress {
     return this.address;
   }

package/src/ecdsa/index.ts

@@ -6,8 +6,8 @@
  */
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
-import { type GrumpkinPrivateKey, type PXE } from '@aztec/circuit-types';
-import { type AztecAddress } from '@aztec/circuits.js';
+import { type PXE } from '@aztec/circuit-types';
+import { type AztecAddress, type Fr } from '@aztec/circuits.js';
 
 import { EcdsaAccountContract } from './account_contract.js';
 
@@ -17,17 +17,12 @@ export { EcdsaAccountContract };
 /**
  * Creates an Account that relies on an ECDSA signing key for authentication.
  * @param pxe - An PXE server instance.
- * @param encryptionPrivateKey - Grumpkin key used for note encryption.
+ * @param secretKey - Secret key used to derive all the keystore keys.
  * @param signingPrivateKey - Secp256k1 key used for signing transactions.
  * @param salt - Deployment salt.
  */
-export function getEcdsaAccount(
-  pxe: PXE,
-  encryptionPrivateKey: GrumpkinPrivateKey,
-  signingPrivateKey: Buffer,
-  salt?: Salt,
-): AccountManager {
-  return new AccountManager(pxe, encryptionPrivateKey, new EcdsaAccountContract(signingPrivateKey), salt);
+export function getEcdsaAccount(pxe: PXE, secretKey: Fr, signingPrivateKey: Buffer, salt?: Salt): AccountManager {
+  return new AccountManager(pxe, secretKey, new EcdsaAccountContract(signingPrivateKey), salt);
 }
 
 /**

package/src/schnorr/index.ts

@@ -7,7 +7,7 @@
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
 import { type GrumpkinPrivateKey, type PXE } from '@aztec/circuit-types';
-import { type AztecAddress } from '@aztec/circuits.js';
+import { type AztecAddress, type Fr } from '@aztec/circuits.js';
 
 import { SchnorrAccountContract } from './account_contract.js';
 
@@ -18,17 +18,17 @@ export { SchnorrAccountContractArtifact } from './artifact.js';
 /**
  * Creates an Account Manager that relies on a Grumpkin signing key for authentication.
  * @param pxe - An PXE server instance.
- * @param encryptionPrivateKey - Grumpkin key used for note encryption.
+ * @param secretKey - Secret key used to derive all the keystore keys.
  * @param signingPrivateKey - Grumpkin key used for signing transactions.
  * @param salt - Deployment salt.
  */
 export function getSchnorrAccount(
   pxe: PXE,
-  encryptionPrivateKey: GrumpkinPrivateKey,
+  secretKey: Fr,
   signingPrivateKey: GrumpkinPrivateKey,
   salt?: Salt,
 ): AccountManager {
-  return new AccountManager(pxe, encryptionPrivateKey, new SchnorrAccountContract(signingPrivateKey), salt);
+  return new AccountManager(pxe, secretKey, new SchnorrAccountContract(signingPrivateKey), salt);
 }
 
 /**

package/src/single_key/index.ts

@@ -7,7 +7,8 @@
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
 import { type GrumpkinPrivateKey, type PXE } from '@aztec/circuit-types';
-import { type AztecAddress } from '@aztec/circuits.js';
+import { type AztecAddress, type Fr, GeneratorIndex } from '@aztec/circuits.js';
+import { sha512ToGrumpkinScalar } from '@aztec/foundation/crypto';
 
 import { SingleKeyAccountContract } from './account_contract.js';
 
@@ -18,20 +19,12 @@ export { SchnorrSingleKeyAccountContractArtifact as SingleKeyAccountContractArti
 /**
  * Creates an Account that uses the same Grumpkin key for encryption and authentication.
  * @param pxe - An PXE server instance.
- * @param encryptionAndSigningPrivateKey - Grumpkin key used for note encryption and signing transactions.
- * @param salt - Deployment salt .
+ * @param secretKey - Secret key used to derive all the keystore keys (in this case also used to get signing key).
+ * @param salt - Deployment salt.
  */
-export function getSingleKeyAccount(
-  pxe: PXE,
-  encryptionAndSigningPrivateKey: GrumpkinPrivateKey,
-  salt?: Salt,
-): AccountManager {
-  return new AccountManager(
-    pxe,
-    encryptionAndSigningPrivateKey,
-    new SingleKeyAccountContract(encryptionAndSigningPrivateKey),
-    salt,
-  );
+export function getSingleKeyAccount(pxe: PXE, secretKey: Fr, salt?: Salt): AccountManager {
+  const encryptionPrivateKey = sha512ToGrumpkinScalar([secretKey, GeneratorIndex.IVSK_M]);
+  return new AccountManager(pxe, secretKey, new SingleKeyAccountContract(encryptionPrivateKey), salt);
 }
 
 /**

package/src/testing/configuration.ts

@@ -1,16 +1,22 @@
 import { generatePublicKey } from '@aztec/aztec.js';
-import { type AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet';
+import { type AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
 import { type PXE } from '@aztec/circuit-types';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { GeneratorIndex } from '@aztec/circuits.js/constants';
+import { sha512ToGrumpkinScalar } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
 
 import { getSchnorrAccount } from '../schnorr/index.js';
 
-export const INITIAL_TEST_ENCRYPTION_KEYS = [
-  GrumpkinScalar.fromString('2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281'),
-  GrumpkinScalar.fromString('aebd1b4be76efa44f5ee655c20bf9ea60f7ae44b9a7fd1fd9f189c7a0b0cdae'),
-  GrumpkinScalar.fromString('0f6addf0da06c33293df974a565b03d1ab096090d907d98055a8b7f4954e120c'),
+export const INITIAL_TEST_SECRET_KEYS = [
+  Fr.fromString('2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281'),
+  Fr.fromString('aebd1b4be76efa44f5ee655c20bf9ea60f7ae44b9a7fd1fd9f189c7a0b0cdae'),
+  Fr.fromString('0f6addf0da06c33293df974a565b03d1ab096090d907d98055a8b7f4954e120c'),
 ];
 
+export const INITIAL_TEST_ENCRYPTION_KEYS = INITIAL_TEST_SECRET_KEYS.map(secretKey =>
+  sha512ToGrumpkinScalar([secretKey, GeneratorIndex.IVSK_M]),
+);
+// 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_ACCOUNT_SALTS = [Fr.ZERO, Fr.ZERO, Fr.ZERO];
@@ -20,9 +26,9 @@ export const INITIAL_TEST_ACCOUNT_SALTS = [Fr.ZERO, Fr.ZERO, Fr.ZERO];
  * @param pxe - PXE instance.
  * @returns A set of AccountWallet implementations for each of the initial accounts.
  */
-export function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithPrivateKey[]> {
+export function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
   return Promise.all(
-    INITIAL_TEST_ENCRYPTION_KEYS.map((encryptionKey, i) =>
+    INITIAL_TEST_SECRET_KEYS.map((encryptionKey, i) =>
       getSchnorrAccount(pxe, encryptionKey!, INITIAL_TEST_SIGNING_KEYS[i]!, INITIAL_TEST_ACCOUNT_SALTS[i]).getWallet(),
     ),
   );
@@ -33,15 +39,18 @@ export function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWi
  * @param pxe - PXE instance.
  * @returns A set of AccountWallet implementations for each of the initial accounts.
  */
-export async function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithPrivateKey[]> {
+export async function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
   const registeredAccounts = await pxe.getRegisteredAccounts();
   return Promise.all(
-    INITIAL_TEST_ENCRYPTION_KEYS.filter(initialKey => {
-      const publicKey = generatePublicKey(initialKey);
+    INITIAL_TEST_SECRET_KEYS.filter(initialSecretKey => {
+      const initialEncryptionKey = sha512ToGrumpkinScalar([initialSecretKey, GeneratorIndex.IVSK_M]);
+      const publicKey = generatePublicKey(initialEncryptionKey);
       return registeredAccounts.find(registered => registered.publicKey.equals(publicKey)) != undefined;
-    }).map((encryptionKey, i) =>
-      getSchnorrAccount(pxe, encryptionKey!, INITIAL_TEST_SIGNING_KEYS[i]!, INITIAL_TEST_ACCOUNT_SALTS[i]).getWallet(),
-    ),
+    }).map(secretKey => {
+      const signingKey = sha512ToGrumpkinScalar([secretKey, GeneratorIndex.IVSK_M]);
+      // TODO(#5726): use actual salt here instead of hardcoding Fr.ZERO
+      return getSchnorrAccount(pxe, secretKey, signingKey, Fr.ZERO).getWallet();
+    }),
   );
 }
 
@@ -51,11 +60,11 @@ export async function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountW
  * @returns The set of deployed Account objects and associated private encryption keys
  */
 export async function deployInitialTestAccounts(pxe: PXE) {
-  const accounts = INITIAL_TEST_ENCRYPTION_KEYS.map((privateKey, i) => {
-    const account = getSchnorrAccount(pxe, privateKey, INITIAL_TEST_SIGNING_KEYS[i], INITIAL_TEST_ACCOUNT_SALTS[i]);
+  const accounts = INITIAL_TEST_SECRET_KEYS.map((secretKey, i) => {
+    const account = getSchnorrAccount(pxe, secretKey, INITIAL_TEST_SIGNING_KEYS[i], INITIAL_TEST_ACCOUNT_SALTS[i]);
     return {
       account,
-      privateKey,
+      secretKey,
     };
   });
   // Attempt to get as much parallelism as possible

package/src/testing/create_account.ts

@@ -1,6 +1,7 @@
-import { type AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet';
+import { type AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
 import { type PXE } from '@aztec/circuit-types';
-import { GrumpkinScalar } from '@aztec/circuits.js';
+import { Fr, GeneratorIndex } from '@aztec/circuits.js';
+import { sha512ToGrumpkinScalar } from '@aztec/foundation/crypto';
 
 import { getSchnorrAccount } from '../schnorr/index.js';
 
@@ -9,8 +10,10 @@ import { getSchnorrAccount } from '../schnorr/index.js';
  * @param pxe - PXE.
  * @returns - A wallet for a fresh account.
  */
-export function createAccount(pxe: PXE): Promise<AccountWalletWithPrivateKey> {
-  return getSchnorrAccount(pxe, GrumpkinScalar.random(), GrumpkinScalar.random()).waitSetup();
+export function createAccount(pxe: PXE): Promise<AccountWalletWithSecretKey> {
+  const secretKey = Fr.random();
+  const signingKey = sha512ToGrumpkinScalar([secretKey, GeneratorIndex.IVSK_M]);
+  return getSchnorrAccount(pxe, secretKey, signingKey).waitSetup();
 }
 
 /**
@@ -19,12 +22,14 @@ export function createAccount(pxe: PXE): Promise<AccountWalletWithPrivateKey> {
  * @param numberOfAccounts - How many accounts to create.
  * @returns The created account wallets.
  */
-export async function createAccounts(pxe: PXE, numberOfAccounts = 1): Promise<AccountWalletWithPrivateKey[]> {
+export async function createAccounts(pxe: PXE, numberOfAccounts = 1): Promise<AccountWalletWithSecretKey[]> {
   const accounts = [];
 
   // Prepare deployments
   for (let i = 0; i < numberOfAccounts; ++i) {
-    const account = getSchnorrAccount(pxe, GrumpkinScalar.random(), GrumpkinScalar.random());
+    const secretKey = Fr.random();
+    const signingKey = sha512ToGrumpkinScalar([secretKey, GeneratorIndex.IVSK_M]);
+    const account = getSchnorrAccount(pxe, secretKey, signingKey);
     // Unfortunately the function below is not stateless and we call it here because it takes a long time to run and
     // the results get stored within the account object. By calling it here we increase the probability of all the
     // accounts being deployed in the same block because it makes the deploy() method basically instant.