@aztec/accounts 0.0.1-commit.3469e52 → 0.0.1-commit.350e0a4d

package/src/testing/lazy.ts

@@ -4,19 +4,29 @@
  * @packageDocumentation
  */
 import { Fr } from '@aztec/aztec.js/fields';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 
-import { getSchnorrAccountContractAddress } from '../schnorr/lazy.js';
+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,
   type InitialAccountData,
+  type InitialAccountType,
 } 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: InitialAccountType, secret: Fr, salt: Fr, signingKey?: GrumpkinScalar) {
+  return type === 'schnorr'
+    ? getSchnorrAccountContractAddress(secret, salt, signingKey)
+    : getSchnorrInitializerlessAccountContractAddress(secret, salt, signingKey);
+}
+
 /**
  * Gets the basic information for initial test accounts.
  */
@@ -26,7 +36,8 @@ export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
       secret,
       signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
       salt: INITIAL_TEST_ACCOUNT_SALTS[i],
-      address: await getSchnorrAccountContractAddress(
+      type: 'schnorr_initializerless' as const,
+      address: await getSchnorrInitializerlessAccountContractAddress(
         secret,
         INITIAL_TEST_ACCOUNT_SALTS[i],
         INITIAL_TEST_SIGNING_KEYS[i],
@@ -36,9 +47,12 @@ export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
 }
 
 /**
- * Generate a fixed amount of random schnorr account contract instance.
+ * Generate a fixed amount of random schnorr account contract instances of the given type
  */
-export async function generateSchnorrAccounts(numberOfAccounts: number): Promise<InitialAccountData[]> {
+export async function generateSchnorrAccounts(
+  numberOfAccounts: number,
+  type: InitialAccountType = 'schnorr_initializerless',
+): Promise<InitialAccountData[]> {
   const secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
   return await Promise.all(
     secrets.map(async secret => {
@@ -47,7 +61,8 @@ export async function generateSchnorrAccounts(numberOfAccounts: number): Promise
         secret,
         signingKey: deriveSigningKey(secret),
         salt,
-        address: await getSchnorrAccountContractAddress(secret, salt),
+        type,
+        address: await getTestAccountAddress(type, secret, salt),
       };
     }),
   );

package/src/utils/ssh_agent.ts

@@ -41,6 +41,7 @@ type StoredKey = {
 export function getIdentities(): Promise<StoredKey[]> {
   return new Promise((resolve, reject) => {
     const stream = connectToAgent();
+    stream.on('error', reject);
     stream.on('connect', () => {
       const request = Buffer.concat([
         Buffer.from([0, 0, 0, 5 + 4]), // length
@@ -96,6 +97,7 @@ export function getIdentities(): Promise<StoredKey[]> {
 export function signWithAgent(keyType: Buffer, curveName: Buffer, publicKey: Buffer, data: Buffer) {
   return new Promise<Buffer>((resolve, reject) => {
     const stream = connectToAgent();
+    stream.on('error', reject);
     stream.on('connect', () => {
       // Construct the key blob
       const keyBlob = Buffer.concat([