@aztec/aztec.js 0.1.0-alpha21 → 0.1.0-alpha23

package/src/utils/account.ts

@@ -1,14 +1,16 @@
-import { AztecRPC, TxStatus, getContractDeploymentInfo } from '@aztec/aztec-rpc';
-import { AztecAddress, CircuitsWasm, Fr, Point } from '@aztec/circuits.js';
+import { CircuitsWasm, Fr, getContractDeploymentInfo } from '@aztec/circuits.js';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { EcdsaAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { AztecRPC, TxStatus } from '@aztec/types';
+import { SchnorrAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
+
 import { AccountWallet, Wallet } from '../aztec_rpc_client/wallet.js';
 import {
   AccountCollection,
   AccountContract,
   ContractDeployer,
-  EcdsaAuthProvider,
+  SchnorrAuthProvider,
   generatePublicKey,
 } from '../index.js';
 
@@ -19,41 +21,71 @@ import {
 export async function createAccounts(
   aztecRpcClient: AztecRPC,
   privateKey?: Buffer,
+  salt = Fr.random(),
   numberOfAccounts = 1,
   logger = createDebugLogger('aztec:aztec.js:accounts'),
 ): Promise<Wallet> {
+  const accountAbi = SchnorrAccountContractAbi;
   const accountImpls = new AccountCollection();
-  const results: [AztecAddress, Point][] = [];
   const wasm = await CircuitsWasm.get();
   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 : randomBytes(32);
-    const accountAbi = EcdsaAccountContractAbi;
     const publicKey = await generatePublicKey(privKey);
-    const salt = Fr.random();
     const deploymentInfo = await getContractDeploymentInfo(accountAbi, [], salt, publicKey);
     await aztecRpcClient.addAccount(privKey, deploymentInfo.address, deploymentInfo.partialAddress, accountAbi);
     const contractDeployer = new ContractDeployer(accountAbi, aztecRpcClient, publicKey);
     const tx = contractDeployer.deploy().send({ contractAddressSalt: salt });
-    await tx.isMined(0, 0.1);
+    await tx.isMined(0, 0.5);
     const receipt = await tx.getReceipt();
     if (receipt.status !== TxStatus.MINED) {
       throw new Error(`Deployment tx not mined (status is ${receipt.status})`);
     }
     const address = receipt.contractAddress!;
+    if (!address.equals(deploymentInfo.address)) {
+      throw new Error(
+        `Deployment address does not match for account contract (expected ${deploymentInfo.address.toString()} got ${address.toString()})`,
+      );
+    }
     logger(`Created account ${address.toString()} with public key ${publicKey.toString()}`);
     accountImpls.registerAccount(
       address,
       new AccountContract(
         address,
         publicKey,
-        new EcdsaAuthProvider(privKey),
+        new SchnorrAuthProvider(await Schnorr.new(), privKey),
         deploymentInfo.partialAddress,
         accountAbi,
         wasm,
       ),
     );
-    results.push([address, publicKey]);
   }
   return new AccountWallet(aztecRpcClient, accountImpls);
 }
+
+/**
+ * Gets the Aztec accounts that are stored in an Aztec RPC instance.
+ * @param aztecRpcClient - An instance of the Aztec RPC interface.
+ * @param numberOfAccounts - The number of accounts to fetch.
+ * @returns An AccountWallet implementation that includes all the accounts found.
+ */
+export async function getAccountWallet(aztecRpcClient: AztecRPC, privateKey: Buffer, salt: Fr) {
+  const wasm = await CircuitsWasm.get();
+  const accountCollection = new AccountCollection();
+  const publicKey = await generatePublicKey(privateKey);
+  const address = await aztecRpcClient.getAccountAddress(publicKey);
+  const deploymentInfo = await getContractDeploymentInfo(SchnorrAccountContractAbi, [], salt, publicKey);
+
+  accountCollection.registerAccount(
+    address,
+    new AccountContract(
+      address,
+      publicKey,
+      new SchnorrAuthProvider(await Schnorr.new(), privateKey),
+      deploymentInfo.partialAddress,
+      SchnorrAccountContractAbi,
+      wasm,
+    ),
+  );
+  return new AccountWallet(aztecRpcClient, accountCollection);
+}

package/src/utils/index.ts

@@ -1,3 +1,4 @@
 export * from './secrets.js';
 export * from './account.js';
 export * from './pub_key.js';
+export * from './l1_contracts.js';

package/src/utils/l1_contracts.ts

@@ -0,0 +1,40 @@
+import { EthAddress } from '@aztec/circuits.js';
+
+/**
+ * A dictionary of the Aztec-deployed L1 contracts.
+ */
+export type L1ContractAddresses = {
+  /**
+   * Address fo the main Aztec rollup contract.
+   */
+  rollup: EthAddress;
+  /**
+   * Address of the contract that emits events on public contract deployment.
+   */
+  contractDeploymentEmitter: EthAddress;
+  /**
+   * Address of the L1/L2 messaging inbox contract.
+   */
+  inbox: EthAddress;
+
+  /**
+   * Registry Address.
+   */
+  registry: EthAddress;
+};
+
+/**
+ * string dictionary of aztec contract addresses that we receive over http.
+ */
+type L1ContractAddressesResp = {
+  [K in keyof L1ContractAddresses]: string;
+};
+
+export const getL1ContractAddresses = async (url: string): Promise<L1ContractAddresses> => {
+  const reqUrl = new URL(`${url}/api/l1-contract-addresses`);
+  const response = (await (await fetch(reqUrl.toString())).json()) as unknown as L1ContractAddressesResp;
+  const result = Object.fromEntries(
+    Object.entries(response).map(([key, value]) => [key, EthAddress.fromString(value)]),
+  );
+  return result as L1ContractAddresses;
+};

package/src/utils/pub_key.ts

@@ -1,19 +1,6 @@
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
-import { Point } from '../index.js';
 
-/**
- * Converts a Point type to a public key represented by BigInt coordinates
- * @param point - The Point to convert.
- * @returns An object with x & y coordinates represented as bigints.
- */
-export function pointToPublicKey(point: Point) {
-  const x = point.x.toBigInt();
-  const y = point.y.toBigInt();
-  return {
-    x,
-    y,
-  };
-}
+import { Point } from '../index.js';
 
 /**
  * Method for generating a public grumpkin key from a private key.

package/tsconfig.json

@@ -6,9 +6,6 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
-    {
-      "path": "../aztec-rpc"
-    },
     {
       "path": "../circuits.js"
     },
@@ -16,10 +13,10 @@
       "path": "../foundation"
     },
     {
-      "path": "../key-store"
+      "path": "../noir-contracts"
     },
     {
-      "path": "../noir-contracts"
+      "path": "../types"
     }
   ],
   "include": ["src"]