@aztec/aztec.js 0.1.0-alpha62 → 0.6.2

package/src/account/contract/schnorr_account_contract.ts

@@ -1,6 +1,6 @@
 import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi } from '@aztec/foundation/abi';
-import { CompleteAddress, NodeInfo, PrivateKey } from '@aztec/types';
+import { CompleteAddress, GrumpkinPrivateKey, NodeInfo } from '@aztec/types';
 
 import SchnorrAccountContractAbi from '../../abis/schnorr_account_contract.json' assert { type: 'json' };
 import { StoredKeyAccountEntrypoint } from '../entrypoint/stored_key_account_entrypoint.js';
@@ -11,7 +11,7 @@ import { AccountContract } from './index.js';
  * verified against a Grumpkin public key stored in an immutable encrypted note.
  */
 export class SchnorrAccountContract implements AccountContract {
-  constructor(private signingPrivateKey: PrivateKey) {}
+  constructor(private signingPrivateKey: GrumpkinPrivateKey) {}
 
   public async getDeploymentArgs() {
     const signingPublicKey = await Schnorr.new().then(e => e.computePublicKey(this.signingPrivateKey));
@@ -19,7 +19,9 @@ export class SchnorrAccountContract implements AccountContract {
   }
 
   public async getEntrypoint({ address }: CompleteAddress, { chainId, version }: NodeInfo) {
-    return new StoredKeyAccountEntrypoint(address, this.signingPrivateKey, await Schnorr.new(), chainId, version);
+    const schnorr = await Schnorr.new();
+    const signClosure = (msg: Buffer) => schnorr.constructSignature(msg, this.signingPrivateKey);
+    return new StoredKeyAccountEntrypoint(address, signClosure, chainId, version);
   }
 
   public getContractAbi(): ContractAbi {

package/src/account/contract/single_key_account_contract.ts

@@ -1,6 +1,5 @@
-import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi } from '@aztec/foundation/abi';
-import { CompleteAddress, NodeInfo, PrivateKey } from '@aztec/types';
+import { CompleteAddress, GrumpkinPrivateKey, NodeInfo } from '@aztec/types';
 
 import SchnorrSingleKeyAccountContractAbi from '../../abis/schnorr_single_key_account_contract.json' assert { type: 'json' };
 import { SingleKeyAccountEntrypoint } from '../entrypoint/single_key_account_entrypoint.js';
@@ -11,20 +10,15 @@ import { AccountContract } from './index.js';
  * the note encryption key, relying on a single private key for both encryption and authentication.
  */
 export class SingleKeyAccountContract implements AccountContract {
-  constructor(private encryptionPrivateKey: PrivateKey) {}
+  constructor(private encryptionPrivateKey: GrumpkinPrivateKey) {}
 
   public getDeploymentArgs() {
     return Promise.resolve([]);
   }
 
-  public async getEntrypoint({ address, partialAddress }: CompleteAddress, { chainId, version }: NodeInfo) {
-    return new SingleKeyAccountEntrypoint(
-      address,
-      partialAddress,
-      this.encryptionPrivateKey,
-      await Schnorr.new(),
-      chainId,
-      version,
+  public getEntrypoint({ address, partialAddress }: CompleteAddress, { chainId, version }: NodeInfo) {
+    return Promise.resolve(
+      new SingleKeyAccountEntrypoint(address, partialAddress, this.encryptionPrivateKey, chainId, version),
     );
   }
 

package/src/account/entrypoint/auth_witness_account_entrypoint.ts

@@ -1,5 +1,5 @@
-import { AztecAddress, Fr, FunctionData, PartialAddress, PrivateKey, TxContext } from '@aztec/circuits.js';
-import { Signer } from '@aztec/circuits.js/barretenberg';
+import { AztecAddress, Fr, FunctionData, GrumpkinPrivateKey, PartialAddress, TxContext } from '@aztec/circuits.js';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi, FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
 import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types';
 
@@ -19,8 +19,8 @@ export class AuthWitnessAccountEntrypoint implements Entrypoint {
   constructor(
     private address: AztecAddress,
     private partialAddress: PartialAddress,
-    private privateKey: PrivateKey,
-    private signer: Signer,
+    private privateKey: GrumpkinPrivateKey,
+    private signer: Schnorr,
     private chainId: number = DEFAULT_CHAIN_ID,
     private version: number = DEFAULT_VERSION,
   ) {}

package/src/account/entrypoint/single_key_account_entrypoint.ts

@@ -1,5 +1,5 @@
-import { AztecAddress, FunctionData, PartialAddress, PrivateKey, TxContext } from '@aztec/circuits.js';
-import { Signer } from '@aztec/circuits.js/barretenberg';
+import { AztecAddress, FunctionData, GrumpkinPrivateKey, PartialAddress, TxContext } from '@aztec/circuits.js';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi, encodeArguments } from '@aztec/foundation/abi';
 import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types';
 
@@ -18,8 +18,7 @@ export class SingleKeyAccountEntrypoint implements Entrypoint {
   constructor(
     private address: AztecAddress,
     private partialAddress: PartialAddress,
-    private privateKey: PrivateKey,
-    private signer: Signer,
+    private privateKey: GrumpkinPrivateKey,
     private chainId: number = DEFAULT_CHAIN_ID,
     private version: number = DEFAULT_VERSION,
   ) {}
@@ -35,7 +34,8 @@ export class SingleKeyAccountEntrypoint implements Entrypoint {
     const { payload, packedArguments: callsPackedArguments } = await buildPayload(executions);
     const message = await hashPayload(payload);
 
-    const signature = this.signer.constructSignature(message, this.privateKey).toBuffer();
+    const signer = await Schnorr.new();
+    const signature = signer.constructSignature(message, this.privateKey).toBuffer();
     const publicKey = await generatePublicKey(this.privateKey);
     const args = [payload, publicKey.toBuffer(), signature, this.partialAddress];
     const abi = this.getEntrypointAbi();

package/src/account/entrypoint/stored_key_account_entrypoint.ts

@@ -1,5 +1,5 @@
-import { AztecAddress, FunctionData, PrivateKey, TxContext } from '@aztec/circuits.js';
-import { Signer } from '@aztec/circuits.js/barretenberg';
+import { AztecAddress, FunctionData, TxContext } from '@aztec/circuits.js';
+import { Signature } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi, encodeArguments } from '@aztec/foundation/abi';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types';
@@ -18,8 +18,7 @@ export class StoredKeyAccountEntrypoint implements Entrypoint {
 
   constructor(
     private address: AztecAddress,
-    private privateKey: PrivateKey,
-    private signer: Signer,
+    private sign: (msg: Buffer) => Signature,
     private chainId: number = DEFAULT_CHAIN_ID,
     private version: number = DEFAULT_VERSION,
   ) {
@@ -36,7 +35,7 @@ export class StoredKeyAccountEntrypoint implements Entrypoint {
 
     const { payload, packedArguments: callsPackedArguments } = await buildPayload(executions);
     const message = await hashPayload(payload);
-    const signature = this.signer.constructSignature(message, this.privateKey).toBuffer();
+    const signature = this.sign(message).toBuffer();
     this.log(`Signed challenge ${message.toString('hex')} as ${signature.toString('hex')}`);
 
     const args = [payload, signature];

package/src/account/index.ts

@@ -1,4 +1,4 @@
-import { AztecRPC, CompleteAddress, PrivateKey } from '@aztec/types';
+import { AztecRPC, CompleteAddress, GrumpkinPrivateKey } from '@aztec/types';
 
 import { AccountContract, AccountWallet, AztecAddress, Fr } from '../index.js';
 import { Account } from './account.js';
@@ -23,8 +23,8 @@ export type Salt = Fr | number | bigint;
  */
 export function getEcdsaAccount(
   rpc: AztecRPC,
-  encryptionPrivateKey: PrivateKey,
-  signingPrivateKey: PrivateKey,
+  encryptionPrivateKey: GrumpkinPrivateKey,
+  signingPrivateKey: Buffer,
   saltOrAddress?: Salt | CompleteAddress,
 ): Account {
   return new Account(rpc, encryptionPrivateKey, new EcdsaAccountContract(signingPrivateKey), saltOrAddress);
@@ -39,8 +39,8 @@ export function getEcdsaAccount(
  */
 export function getSchnorrAccount(
   rpc: AztecRPC,
-  encryptionPrivateKey: PrivateKey,
-  signingPrivateKey: PrivateKey,
+  encryptionPrivateKey: GrumpkinPrivateKey,
+  signingPrivateKey: GrumpkinPrivateKey,
   saltOrAddress?: Salt | CompleteAddress,
 ): Account {
   return new Account(rpc, encryptionPrivateKey, new SchnorrAccountContract(signingPrivateKey), saltOrAddress);
@@ -54,7 +54,7 @@ export function getSchnorrAccount(
  */
 export function getUnsafeSchnorrAccount(
   rpc: AztecRPC,
-  encryptionAndSigningPrivateKey: PrivateKey,
+  encryptionAndSigningPrivateKey: GrumpkinPrivateKey,
   saltOrAddress?: Salt | CompleteAddress,
 ): Account {
   return new Account(
@@ -75,7 +75,7 @@ export function getUnsafeSchnorrAccount(
 export function getUnsafeSchnorrWallet(
   rpc: AztecRPC,
   address: AztecAddress,
-  signingKey: PrivateKey,
+  signingKey: GrumpkinPrivateKey,
 ): Promise<AccountWallet> {
   return getWallet(rpc, address, new SingleKeyAccountContract(signingKey));
 }

package/src/aztec_rpc_client/aztec_rpc_client.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, CompleteAddress, EthAddress, Fr, Point, PrivateKey } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, EthAddress, Fr, GrumpkinScalar, Point } from '@aztec/circuits.js';
 import { createJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
 import {
   AztecRPC,
@@ -26,8 +26,8 @@ export const createAztecRpcClient = (url: string, fetch = defaultFetch): AztecRP
       TxHash,
       EthAddress,
       Point,
-      PrivateKey,
       Fr,
+      GrumpkinScalar,
       NotePreimage,
     },
     { Tx, TxReceipt, L2BlockL2Logs },

package/src/aztec_rpc_client/wallet.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, CircuitsWasm, Fr, PartialAddress, PrivateKey, TxContext } from '@aztec/circuits.js';
+import { AztecAddress, CircuitsWasm, Fr, GrumpkinPrivateKey, PartialAddress, TxContext } from '@aztec/circuits.js';
 import {
   AztecRPC,
   ContractData,
@@ -32,7 +32,7 @@ export abstract class BaseWallet implements Wallet {
 
   abstract createTxExecutionRequest(execs: FunctionCall[], opts?: CreateTxRequestOpts): Promise<TxExecutionRequest>;
 
-  registerAccount(privKey: PrivateKey, partialAddress: PartialAddress): Promise<void> {
+  registerAccount(privKey: GrumpkinPrivateKey, partialAddress: PartialAddress): Promise<void> {
     return this.rpc.registerAccount(privKey, partialAddress);
   }
   registerRecipient(account: CompleteAddress): Promise<void> {

package/src/index.ts

@@ -6,7 +6,7 @@ export * from './account/index.js';
 export * from './contract_deployer/deploy_method.js';
 export * from './sandbox/index.js';
 
-export { AztecAddress, EthAddress, Point, Fr } from '@aztec/circuits.js';
+export { AztecAddress, EthAddress, Point, Fr, GrumpkinScalar } from '@aztec/circuits.js';
 export {
   AztecRPC,
   ContractData,
@@ -17,7 +17,7 @@ export {
   NodeInfo,
   PackedArguments,
   PublicKey,
-  PrivateKey,
+  GrumpkinPrivateKey,
   SyncStatus,
   Tx,
   TxExecutionRequest,
@@ -27,5 +27,6 @@ export {
   emptyFunctionCall,
 } from '@aztec/types';
 
-export { createDebugLogger } from '@aztec/foundation/log';
+export { createDebugLogger, DebugLogger } from '@aztec/foundation/log';
+export { fileURLToPath } from '@aztec/foundation/url';
 export { sleep } from '@aztec/foundation/sleep';

package/src/sandbox/index.ts

@@ -1,4 +1,4 @@
-import { Fr, PrivateKey } from '@aztec/circuits.js';
+import { Fr, GrumpkinScalar } from '@aztec/circuits.js';
 import { ContractAbi } from '@aztec/foundation/abi';
 import { sleep } from '@aztec/foundation/sleep';
 
@@ -8,9 +8,9 @@ import SchnorrAccountContractAbi from '../abis/schnorr_account_contract.json' as
 import { AccountWallet, AztecRPC, EntrypointWallet, getAccountWallets, getSchnorrAccount } from '../index.js';
 
 export const INITIAL_SANDBOX_ENCRYPTION_KEYS = [
-  new PrivateKey(Buffer.from('b2803ec899f76f6b2ac011480d24028f1a29587f8a3a92f7ee9d48d8c085c284', 'hex')),
-  new PrivateKey(Buffer.from('6bb46e9a80da2ff7bfff71c2c50eaaa4b15f7ed5ad1ade4261b574ef80b0cdb0', 'hex')),
-  new PrivateKey(Buffer.from('0f6addf0da06c33293df974a565b03d1ab096090d907d98055a8b7f4954e120c', 'hex')),
+  GrumpkinScalar.fromString('2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281'),
+  GrumpkinScalar.fromString('aebd1b4be76efa44f5ee655c20bf9ea60f7ae44b9a7fd1fd9f189c7a0b0cdae'),
+  GrumpkinScalar.fromString('0f6addf0da06c33293df974a565b03d1ab096090d907d98055a8b7f4954e120c'),
 ];
 
 export const INITIAL_SANDBOX_SIGNING_KEYS = INITIAL_SANDBOX_ENCRYPTION_KEYS;

package/src/utils/account.ts

@@ -1,4 +1,4 @@
-import { Fr, PrivateKey, getContractDeploymentInfo } from '@aztec/circuits.js';
+import { Fr, GrumpkinPrivateKey, GrumpkinScalar, getContractDeploymentInfo } from '@aztec/circuits.js';
 import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi } from '@aztec/foundation/abi';
 import { createDebugLogger } from '@aztec/foundation/log';
@@ -15,7 +15,7 @@ import { ContractDeployer, EntrypointCollection, StoredKeyAccountEntrypoint, gen
 export async function createAccounts(
   aztecRpcClient: AztecRPC,
   accountContractAbi: ContractAbi,
-  privateKey?: PrivateKey,
+  privateKey?: GrumpkinPrivateKey,
   salt = Fr.random(),
   numberOfAccounts = 1,
   logger = createDebugLogger('aztec:aztec.js:accounts'),
@@ -24,7 +24,7 @@ export async function createAccounts(
 
   for (let i = 0; i < numberOfAccounts; ++i) {
     // TODO(#662): Let the aztec rpc server generate the keypair rather than hardcoding the private key
-    const privKey = i == 0 && privateKey ? privateKey : PrivateKey.random();
+    const privKey = i == 0 && privateKey ? privateKey : GrumpkinScalar.random();
     const publicKey = await generatePublicKey(privKey);
     const deploymentInfo = await getContractDeploymentInfo(accountContractAbi, [], salt, publicKey);
     await aztecRpcClient.registerAccount(privKey, deploymentInfo.completeAddress.partialAddress);
@@ -44,12 +44,7 @@ export async function createAccounts(
     logger(`Created account ${address.toString()} with public key ${publicKey.toString()}`);
     accountImpls.registerAccount(
       address,
-      new SingleKeyAccountEntrypoint(
-        address,
-        deploymentInfo.completeAddress.partialAddress,
-        privKey,
-        await Schnorr.new(),
-      ),
+      new SingleKeyAccountEntrypoint(address, deploymentInfo.completeAddress.partialAddress, privKey),
     );
   }
   return new EntrypointWallet(aztecRpcClient, accountImpls);
@@ -67,14 +62,16 @@ export async function createAccounts(
 export async function getAccountWallets(
   aztecRpcClient: AztecRPC,
   accountContractAbi: ContractAbi,
-  privateKeys: PrivateKey[],
-  signingKeys: PrivateKey[],
+  privateKeys: GrumpkinPrivateKey[],
+  signingKeys: GrumpkinPrivateKey[],
   salts: Fr[],
 ) {
   if (privateKeys.length != salts.length || signingKeys.length != privateKeys.length) {
     throw new Error('Keys and salts must be the same length');
   }
   const accountCollection = new EntrypointCollection();
+  const schnorr = await Schnorr.new();
+
   for (let i = 0; i < privateKeys.length; i++) {
     const publicKey = await generatePublicKey(privateKeys[i]);
     const signingPublicKey = await generatePublicKey(signingKeys[i]);
@@ -86,10 +83,9 @@ export async function getAccountWallets(
     );
     const address = deploymentInfo.completeAddress.address;
 
-    accountCollection.registerAccount(
-      address,
-      new StoredKeyAccountEntrypoint(address, signingKeys[i], await Schnorr.new()),
-    );
+    const signClosure = (msg: Buffer) => schnorr.constructSignature(msg, signingKeys[i]);
+
+    accountCollection.registerAccount(address, new StoredKeyAccountEntrypoint(address, signClosure));
   }
   return new EntrypointWallet(aztecRpcClient, accountCollection);
 }

package/src/utils/pub_key.ts

@@ -1,4 +1,4 @@
-import { PrivateKey, PublicKey } from '@aztec/circuits.js';
+import { GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 
 /**
@@ -6,7 +6,7 @@ import { Grumpkin } from '@aztec/circuits.js/barretenberg';
  * @param privateKey - The private key.
  * @returns The generated public key.
  */
-export async function generatePublicKey(privateKey: PrivateKey): Promise<PublicKey> {
+export async function generatePublicKey(privateKey: GrumpkinPrivateKey): Promise<PublicKey> {
   const grumpkin = await Grumpkin.new();
   return grumpkin.mul(grumpkin.generator(), privateKey);
 }