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

package/src/account_impl/stored_key_account_contract.ts

@@ -0,0 +1,80 @@
+import { AztecAddress, CircuitsWasm, FunctionData, TxContext } from '@aztec/circuits.js';
+import { Signer } from '@aztec/circuits.js/barretenberg';
+import { ContractAbi, encodeArguments, generateFunctionSelector } from '@aztec/foundation/abi';
+import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { ExecutionRequest, PackedArguments, TxExecutionRequest } from '@aztec/types';
+
+import partition from 'lodash.partition';
+
+import EcdsaAccountContractAbi from '../abis/ecdsa_account_contract.json' assert { type: 'json' };
+import { buildPayload, hashPayload } from './entrypoint_payload.js';
+import { AccountImplementation } from './index.js';
+
+/**
+ * Account contract implementation that keeps a signing public key in storage, and is retrieved on
+ * every new request in order to validate the payload signature.
+ */
+export class StoredKeyAccountContract implements AccountImplementation {
+  private log: DebugLogger;
+
+  constructor(private address: AztecAddress, private privateKey: Buffer, private signer: Signer) {
+    this.log = createDebugLogger('aztec:client:accounts:stored_key');
+  }
+
+  getAddress(): AztecAddress {
+    return this.address;
+  }
+
+  async createAuthenticatedTxRequest(
+    executions: ExecutionRequest[],
+    txContext: TxContext,
+  ): Promise<TxExecutionRequest> {
+    this.checkSender(executions);
+    this.checkIsNotDeployment(txContext);
+
+    const [privateCalls, publicCalls] = partition(executions, exec => exec.functionData.isPrivate);
+    const wasm = await CircuitsWasm.get();
+    const { payload, packedArguments: callsPackedArguments } = await buildPayload(privateCalls, publicCalls);
+    const hash = hashPayload(payload);
+    const signature = this.signer.constructSignature(hash, this.privateKey).toBuffer();
+    this.log(`Signed challenge ${hash.toString('hex')} as ${signature.toString('hex')}`);
+
+    const args = [payload, signature];
+    const abi = this.getEntrypointAbi();
+    const selector = generateFunctionSelector(abi.name, abi.parameters);
+    const packedArgs = await PackedArguments.fromArgs(encodeArguments(abi, args), wasm);
+    const txRequest = TxExecutionRequest.from({
+      argsHash: packedArgs.hash,
+      origin: this.address,
+      functionData: new FunctionData(selector, true, false),
+      txContext,
+      packedArguments: [...callsPackedArguments, packedArgs],
+    });
+
+    return txRequest;
+  }
+
+  private getEntrypointAbi() {
+    // We use the EcdsaAccountContractAbi because it implements the interface we need, but ideally
+    // we should have an interface that defines the entrypoint for StoredKeyAccountContracts and
+    // load the abi from it.
+    const abi = (EcdsaAccountContractAbi as any as ContractAbi).functions.find(f => f.name === 'entrypoint');
+    if (!abi) throw new Error(`Entrypoint abi for account contract not found`);
+    return abi;
+  }
+
+  private checkIsNotDeployment(txContext: TxContext) {
+    if (txContext.isContractDeploymentTx) {
+      throw new Error(`Cannot yet deploy contracts from an account contract`);
+    }
+  }
+
+  private checkSender(executions: ExecutionRequest[]) {
+    const wrongSender = executions.find(e => !e.from.equals(this.address));
+    if (wrongSender) {
+      throw new Error(
+        `Sender ${wrongSender.from.toString()} does not match account address ${this.address.toString()}`,
+      );
+    }
+  }
+}

package/src/aztec_rpc_client/aztec_rpc_client.ts

@@ -1,16 +1,17 @@
 import { AztecAddress, EthAddress, Fr, Point } from '@aztec/circuits.js';
-import { createJsonRpcClient } from '@aztec/foundation/json-rpc';
+import { createJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc';
 import {
   AztecRPC,
   ContractData,
   ContractDeploymentTx,
   ContractPublicData,
+  Tx,
   TxExecutionRequest,
   TxHash,
-  Tx,
+  TxReceipt,
 } from '@aztec/types';
 
-export const createAztecRpcClient = (url: string): AztecRPC =>
+export const createAztecRpcClient = (url: string, fetch = defaultFetch): AztecRPC =>
   createJsonRpcClient<AztecRPC>(
     url,
     {
@@ -23,6 +24,7 @@ export const createAztecRpcClient = (url: string): AztecRPC =>
       Point,
       Fr,
     },
-    { Tx, ContractDeploymentTx },
+    { Tx, ContractDeploymentTx, TxReceipt },
     false,
+    fetch,
   );

package/src/aztec_rpc_client/wallet.ts

@@ -1,5 +1,4 @@
-import { AztecAddress, Fr, Point, TxContext } from '@aztec/circuits.js';
-import { ContractAbi } from '@aztec/foundation/abi';
+import { AztecAddress, Fr, PartialContractAddress, Point, PublicKey, TxContext } from '@aztec/circuits.js';
 import {
   AztecRPC,
   ContractData,
@@ -31,22 +30,21 @@ export abstract class BaseWallet implements Wallet {
     executions: ExecutionRequest[],
     txContext: TxContext,
   ): Promise<TxExecutionRequest>;
-  addAccount(
-    privKey: Buffer,
+  addAccount(privKey: Buffer, address: AztecAddress, partialContractAddress: Fr): Promise<AztecAddress> {
+    return this.rpc.addAccount(privKey, address, partialContractAddress);
+  }
+  addPublicKeyAndPartialAddress(
     address: AztecAddress,
-    partialContractAddress: Fr,
-    abi?: ContractAbi | undefined,
-  ): Promise<AztecAddress> {
-    return this.rpc.addAccount(privKey, address, partialContractAddress, abi);
+    publicKey: PublicKey,
+    partialAddress: PartialContractAddress,
+  ): Promise<void> {
+    return this.rpc.addPublicKeyAndPartialAddress(address, publicKey, partialAddress);
   }
   getAccounts(): Promise<AztecAddress[]> {
     return this.rpc.getAccounts();
   }
-  getAccountPublicKey(address: AztecAddress): Promise<Point> {
-    return this.rpc.getAccountPublicKey(address);
-  }
-  getAccountAddress(publicKey: Point): Promise<AztecAddress> {
-    return this.rpc.getAccountAddress(publicKey);
+  getPublicKey(address: AztecAddress): Promise<Point> {
+    return this.rpc.getPublicKey(address);
   }
   addContracts(contracts: DeployedContract[]): Promise<void> {
     return this.rpc.addContracts(contracts);
@@ -54,8 +52,8 @@ export abstract class BaseWallet implements Wallet {
   isContractDeployed(contract: AztecAddress): Promise<boolean> {
     return this.rpc.isContractDeployed(contract);
   }
-  simulateTx(txRequest: TxExecutionRequest, optionalFromAddress?: AztecAddress | undefined): Promise<Tx> {
-    return this.rpc.simulateTx(txRequest, optionalFromAddress);
+  simulateTx(txRequest: TxExecutionRequest): Promise<Tx> {
+    return this.rpc.simulateTx(txRequest);
   }
   sendTx(tx: Tx): Promise<TxHash> {
     return this.rpc.sendTx(tx);
@@ -66,6 +64,9 @@ export abstract class BaseWallet implements Wallet {
   getStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any> {
     return this.rpc.getStorageAt(contract, storageSlot);
   }
+  getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any> {
+    return this.rpc.getPublicStorageAt(contract, storageSlot);
+  }
   viewTx(functionName: string, args: any[], to: AztecAddress, from?: AztecAddress | undefined): Promise<any> {
     return this.rpc.viewTx(functionName, args, to, from);
   }
@@ -84,6 +85,12 @@ export abstract class BaseWallet implements Wallet {
   getNodeInfo(): Promise<NodeInfo> {
     return this.rpc.getNodeInfo();
   }
+  getPublicKeyAndPartialAddress(address: AztecAddress): Promise<[Point, PartialContractAddress]> {
+    return this.rpc.getPublicKeyAndPartialAddress(address);
+  }
+  isAccountSynchronised(account: AztecAddress) {
+    return this.rpc.isAccountSynchronised(account);
+  }
 }
 
 /**

package/src/contract/contract.test.ts

@@ -1,11 +1,13 @@
-import { MockProxy, mock } from 'jest-mock-extended';
-import { DeployedContract, NodeInfo, Tx, TxHash, TxReceipt } from '@aztec/types';
+import { AztecAddress, EthAddress } from '@aztec/circuits.js';
 import { ABIParameterVisibility, ContractAbi, FunctionType } from '@aztec/foundation/abi';
 import { randomBytes } from '@aztec/foundation/crypto';
+import { DeployedContract, NodeInfo, Tx, TxHash, TxReceipt } from '@aztec/types';
 import { TxExecutionRequest } from '@aztec/types';
+
+import { MockProxy, mock } from 'jest-mock-extended';
+
 import { Wallet } from '../aztec_rpc_client/wallet.js';
 import { Contract } from './contract.js';
-import { AztecAddress, EthAddress } from '@aztec/circuits.js';
 
 describe('Contract Class', () => {
   let wallet: MockProxy<Wallet>;

package/src/contract/contract.ts

@@ -1,15 +1,16 @@
 import { ContractAbi, FunctionAbi, generateFunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { DeployedContract } from '@aztec/types';
+
 import { Wallet } from '../aztec_rpc_client/wallet.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
-import { DeployedContract } from '@aztec/types';
 
 /**
  * Type representing a contract method that returns a ContractFunctionInteraction instance
  * and has a readonly 'selector' property of type Buffer. Takes any number of arguments.
  */
-type ContractMethod = ((...args: any[]) => ContractFunctionInteraction) & {
+export type ContractMethod = ((...args: any[]) => ContractFunctionInteraction) & {
   /**
    * The unique identifier for a contract function in bytecode.
    */
@@ -41,7 +42,7 @@ export class Contract {
     /**
      * The wallet.
      */
-    private wallet: Wallet,
+    protected wallet: Wallet,
   ) {
     abi.functions.forEach((f: FunctionAbi) => {
       const interactionFunction = (...args: any[]) => {

package/src/contract/contract_function_interaction.ts

@@ -74,15 +74,15 @@ export class ContractFunctionInteraction {
    * @param options - optional arguments to be used in the creation of the transaction
    * @returns The resulting transaction
    */
-  public async simulate(options: SendMethodOptions): Promise<Tx> {
+  public async simulate(options: SendMethodOptions = {}): Promise<Tx> {
     const txRequest = this.txRequest ?? (await this.create(options));
-    // TODO: Why do we need from separately, and cannot get it from txRequest.origin? When would they differ?
-    this.tx = await this.wallet.simulateTx(txRequest, txRequest.origin);
+    this.tx = await this.wallet.simulateTx(txRequest);
     return this.tx;
   }
 
   protected getExecutionRequest(to: AztecAddress, from?: AztecAddress): ExecutionRequest {
     const flatArgs = encodeArguments(this.functionDao, this.args);
+    from = from ?? this.wallet.getAddress();
 
     const functionData = new FunctionData(
       generateFunctionSelector(this.functionDao.name, this.functionDao.parameters),
@@ -94,7 +94,7 @@ export class ContractFunctionInteraction {
       args: flatArgs,
       functionData,
       to,
-      from: from || AztecAddress.ZERO,
+      from,
     };
   }
 

package/src/contract_deployer/contract_deployer.test.ts

@@ -1,8 +1,9 @@
-import { randomBytes } from 'crypto';
-import { MockProxy, mock } from 'jest-mock-extended';
 import { AztecAddress, EthAddress, Fr, Point } from '@aztec/circuits.js';
 import { ContractAbi, FunctionType } from '@aztec/foundation/abi';
-import { AztecRPC, Tx, TxHash, TxReceipt, PublicKey } from '@aztec/types';
+import { AztecRPC, PublicKey, Tx, TxHash, TxReceipt } from '@aztec/types';
+
+import { randomBytes } from 'crypto';
+import { MockProxy, mock } from 'jest-mock-extended';
 
 import { ContractDeployer } from './contract_deployer.js';
 

package/src/contract_deployer/contract_deployer.ts

@@ -8,6 +8,7 @@ import { DeployMethod } from './deploy_method.js';
  * A class for deploying contract.
  */
 export class ContractDeployer {
+  // TODO: remove this?
   constructor(private abi: ContractAbi, private arc: AztecRPC, private publicKey?: PublicKey) {}
 
   /**

package/src/contract_deployer/deploy_method.ts

@@ -86,10 +86,10 @@ export class DeployMethod extends ContractFunctionInteraction {
    * @returns A Promise resolving to an object containing the signed transaction data and other relevant information.
    */
   public async create(options: DeployOptions = {}) {
-    const { portalContract, contractAddressSalt } = Object.assign(
-      { portalContract: EthAddress.ZERO, contractAddressSalt: Fr.random() },
-      options,
-    );
+    const portalContract = options.portalContract ?? EthAddress.ZERO;
+    const contractAddressSalt = options.contractAddressSalt ?? Fr.random();
+
+    const { chainId, version } = await this.wallet.getNodeInfo();
 
     const { address, constructorHash, functionTreeRoot, partialAddress } = await getContractDeploymentInfo(
       this.abi,
@@ -106,8 +106,6 @@ export class DeployMethod extends ContractFunctionInteraction {
       portalContract,
     );
 
-    const { chainId, version } = await this.wallet.getNodeInfo();
-
     const txContext = new TxContext(false, false, true, contractDeploymentData, new Fr(chainId), new Fr(version));
     const executionRequest = this.getExecutionRequest(address, AztecAddress.ZERO);
     const txRequest = await this.wallet.createAuthenticatedTxRequest([executionRequest], txContext);
@@ -142,17 +140,7 @@ export class DeployMethod extends ContractFunctionInteraction {
   public async simulate(options: DeployOptions): Promise<Tx> {
     const txRequest = this.txRequest ?? (await this.create(options));
 
-    // We need to tell the rpc server which account state to use to simulate
-    // the tx. In the context of a deployment, we need to use an account state
-    // that matches the account contract being deployed. But if what we deploy is
-    // an "application" contract, then there's no account state associated with it,
-    // so we just let the rpc server use whichever it wants. This is an accident
-    // of all simulations happening over an account state, which should not be necessary.
-    const rpcServerRegisteredAccounts = await this.wallet.getAccounts();
-    const deploymentAddress = this.completeContractAddress!;
-    const accountStateAddress = rpcServerRegisteredAccounts.includes(deploymentAddress) ? deploymentAddress : undefined;
-
-    this.tx = await this.wallet.simulateTx(txRequest, accountStateAddress);
+    this.tx = await this.wallet.simulateTx(txRequest);
     return this.tx;
   }
 

package/src/index.ts

@@ -2,8 +2,8 @@ export * from './contract/index.js';
 export * from './contract_deployer/index.js';
 export * from './utils/index.js';
 export * from './aztec_rpc_client/index.js';
-export * from './auth/index.js';
 export * from './account_impl/index.js';
+export * from './contract_deployer/deploy_method.js';
 
 // TODO - only export necessary stuffs
 // export * from '@aztec/aztec-rpc';

package/src/utils/account.ts

@@ -1,18 +1,12 @@
-import { CircuitsWasm, Fr, getContractDeploymentInfo } from '@aztec/circuits.js';
+import { Fr, getContractDeploymentInfo } from '@aztec/circuits.js';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
+import { ContractAbi } from '@aztec/foundation/abi';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 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,
-  SchnorrAuthProvider,
-  generatePublicKey,
-} from '../index.js';
+import { AccountCollection, ContractDeployer, SingleKeyAccountContract, generatePublicKey } from '../index.js';
 
 /**
  * Creates an Aztec Account.
@@ -20,21 +14,21 @@ import {
  */
 export async function createAccounts(
   aztecRpcClient: AztecRPC,
+  accountContractAbi: ContractAbi,
   privateKey?: Buffer,
   salt = Fr.random(),
   numberOfAccounts = 1,
   logger = createDebugLogger('aztec:aztec.js:accounts'),
 ): Promise<Wallet> {
-  const accountAbi = SchnorrAccountContractAbi;
   const accountImpls = new AccountCollection();
-  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 publicKey = await generatePublicKey(privKey);
-    const deploymentInfo = await getContractDeploymentInfo(accountAbi, [], salt, publicKey);
-    await aztecRpcClient.addAccount(privKey, deploymentInfo.address, deploymentInfo.partialAddress, accountAbi);
-    const contractDeployer = new ContractDeployer(accountAbi, aztecRpcClient, publicKey);
+    const deploymentInfo = await getContractDeploymentInfo(accountContractAbi, [], salt, publicKey);
+    await aztecRpcClient.addAccount(privKey, deploymentInfo.address, deploymentInfo.partialAddress);
+    const contractDeployer = new ContractDeployer(accountContractAbi, aztecRpcClient, publicKey);
     const tx = contractDeployer.deploy().send({ contractAddressSalt: salt });
     await tx.isMined(0, 0.5);
     const receipt = await tx.getReceipt();
@@ -50,14 +44,7 @@ export async function createAccounts(
     logger(`Created account ${address.toString()} with public key ${publicKey.toString()}`);
     accountImpls.registerAccount(
       address,
-      new AccountContract(
-        address,
-        publicKey,
-        new SchnorrAuthProvider(await Schnorr.new(), privKey),
-        deploymentInfo.partialAddress,
-        accountAbi,
-        wasm,
-      ),
+      new SingleKeyAccountContract(address, deploymentInfo.partialAddress, privKey, await Schnorr.new()),
     );
   }
   return new AccountWallet(aztecRpcClient, accountImpls);
@@ -69,23 +56,20 @@ export async function createAccounts(
  * @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();
+export async function getAccountWallet(
+  aztecRpcClient: AztecRPC,
+  accountContractAbi: ContractAbi,
+  privateKey: Buffer,
+  salt: Fr,
+) {
   const accountCollection = new AccountCollection();
   const publicKey = await generatePublicKey(privateKey);
-  const address = await aztecRpcClient.getAccountAddress(publicKey);
-  const deploymentInfo = await getContractDeploymentInfo(SchnorrAccountContractAbi, [], salt, publicKey);
+  const deploymentInfo = await getContractDeploymentInfo(accountContractAbi, [], salt, publicKey);
+  const address = deploymentInfo.address;
 
   accountCollection.registerAccount(
     address,
-    new AccountContract(
-      address,
-      publicKey,
-      new SchnorrAuthProvider(await Schnorr.new(), privateKey),
-      deploymentInfo.partialAddress,
-      SchnorrAccountContractAbi,
-      wasm,
-    ),
+    new SingleKeyAccountContract(address, deploymentInfo.partialAddress, privateKey, await Schnorr.new()),
   );
   return new AccountWallet(aztecRpcClient, accountCollection);
 }

package/src/utils/l1_contracts.ts

@@ -1,4 +1,5 @@
 import { EthAddress } from '@aztec/circuits.js';
+import { retryUntil } from '@aztec/foundation/retry';
 
 /**
  * A dictionary of the Aztec-deployed L1 contracts.
@@ -16,6 +17,14 @@ export type L1ContractAddresses = {
    * Address of the L1/L2 messaging inbox contract.
    */
   inbox: EthAddress;
+  /**
+   * Address of the L1/L2 messaging outbox contract.
+   */
+  outbox: EthAddress;
+  /**
+   * Address of the decoder helper contract
+   */
+  decoderHelper?: EthAddress;
 
   /**
    * Registry Address.
@@ -32,7 +41,18 @@ type L1ContractAddressesResp = {
 
 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 response = await retryUntil(
+    async () => {
+      try {
+        return (await (await fetch(reqUrl.toString())).json()) as unknown as L1ContractAddressesResp;
+      } catch (err) {
+        // do nothing
+      }
+    },
+    'isSandboxReady',
+    120,
+    1,
+  );
   const result = Object.fromEntries(
     Object.entries(response).map(([key, value]) => [key, EthAddress.fromString(value)]),
   );

package/tsconfig.json

@@ -12,12 +12,9 @@
     {
       "path": "../foundation"
     },
-    {
-      "path": "../noir-contracts"
-    },
     {
       "path": "../types"
     }
   ],
-  "include": ["src"]
+  "include": ["src", "src/**/*.json"]
 }

package/dest/account_impl/account_contract.d.ts

@@ -1,44 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { AztecAddress, CircuitsWasm, Fr, PartialContractAddress, TxContext } from '@aztec/circuits.js';
-import { ExecutionRequest, PublicKey, TxExecutionRequest } from '@aztec/types';
-import { ContractAbi } from '@aztec/foundation/abi';
-import { AccountImplementation } from './index.js';
-import { EcdsaAuthProvider, SchnorrAuthProvider } from '../auth/index.js';
-/**
- * Account backed by an account contract
- */
-export declare class AccountContract implements AccountImplementation {
-    private address;
-    private pubKey;
-    private authProvider;
-    private partialContractAddress;
-    private contractAbi;
-    private wasm;
-    constructor(address: AztecAddress, pubKey: PublicKey, authProvider: EcdsaAuthProvider | SchnorrAuthProvider, partialContractAddress: PartialContractAddress, contractAbi: ContractAbi, wasm: CircuitsWasm);
-    getAddress(): AztecAddress;
-    createAuthenticatedTxRequest(executions: ExecutionRequest[], txContext: TxContext): Promise<TxExecutionRequest>;
-    private getEntrypointAbi;
-    private checkIsNotDeployment;
-    private checkSender;
-}
-/** A call to a function in a noir contract */
-export type FunctionCall = {
-    /** The encoded arguments */
-    args: Fr[];
-    /** The function selector */
-    selector: Buffer;
-    /** The address of the contract */
-    target: AztecAddress;
-};
-/** Encoded payload for the account contract entrypoint */
-export type EntrypointPayload = {
-    /** Concatenated arguments for every call */
-    flattened_args_hashes: Fr[];
-    /** Concatenated selectors for every call */
-    flattened_selectors: Fr[];
-    /** Concatenated target addresses for every call */
-    flattened_targets: Fr[];
-    /** A nonce for replay protection */
-    nonce: Fr;
-};
-//# sourceMappingURL=account_contract.d.ts.map

package/dest/account_impl/account_contract.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../src/account_impl/account_contract.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,EAAgB,sBAAsB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGrH,OAAO,EAAE,gBAAgB,EAAmB,SAAS,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAChG,OAAO,EAAE,WAAW,EAA6C,MAAM,uBAAuB,CAAC;AAE/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE1E;;GAEG;AACH,qBAAa,eAAgB,YAAW,qBAAqB;IAEzD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,IAAI;gBALJ,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,iBAAiB,GAAG,mBAAmB,EACrD,sBAAsB,EAAE,sBAAsB,EAC9C,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,YAAY;IAG5B,UAAU,IAAI,YAAY;IAIpB,4BAA4B,CAChC,UAAU,EAAE,gBAAgB,EAAE,EAC9B,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,kBAAkB,CAAC;IAiC9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,WAAW;CAQpB;AAKD,8CAA8C;AAC9C,MAAM,MAAM,YAAY,GAAG;IACzB,4BAA4B;IAC5B,IAAI,EAAE,EAAE,EAAE,CAAC;IACX,4BAA4B;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,kCAAkC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,0DAA0D;AAC1D,MAAM,MAAM,iBAAiB,GAAG;IAE9B,4CAA4C;IAC5C,qBAAqB,EAAE,EAAE,EAAE,CAAC;IAE5B,4CAA4C;IAC5C,mBAAmB,EAAE,EAAE,EAAE,CAAC;IAE1B,mDAAmD;IACnD,iBAAiB,EAAE,EAAE,EAAE,CAAC;IACxB,oCAAoC;IACpC,KAAK,EAAE,EAAE,CAAC;CACX,CAAC"}

package/dest/account_impl/account_contract.js

@@ -1,107 +0,0 @@
-import partition from 'lodash.partition';
-import { AztecAddress, Fr, FunctionData } from '@aztec/circuits.js';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { sha256 } from '@aztec/foundation/crypto';
-import { PackedArguments, TxExecutionRequest } from '@aztec/types';
-import { encodeArguments, generateFunctionSelector } from '@aztec/foundation/abi';
-/**
- * Account backed by an account contract
- */
-export class AccountContract {
-    constructor(address, pubKey, authProvider, partialContractAddress, contractAbi, wasm) {
-        this.address = address;
-        this.pubKey = pubKey;
-        this.authProvider = authProvider;
-        this.partialContractAddress = partialContractAddress;
-        this.contractAbi = contractAbi;
-        this.wasm = wasm;
-    }
-    getAddress() {
-        return this.address;
-    }
-    async createAuthenticatedTxRequest(executions, txContext) {
-        this.checkSender(executions);
-        this.checkIsNotDeployment(txContext);
-        const [privateCalls, publicCalls] = partition(executions, exec => exec.functionData.isPrivate).map(execs => execs.map(exec => ({
-            args: exec.args,
-            selector: exec.functionData.functionSelectorBuffer,
-            target: exec.to,
-        })));
-        const { payload, packedArguments: callsPackedArguments } = await buildPayload(privateCalls, publicCalls, this.wasm);
-        const hash = hashPayload(payload);
-        const signature = await this.authProvider.authenticateTx(payload, hash, this.address);
-        const signatureAsFrArray = signature.toFields();
-        const publicKeyAsBuffer = this.pubKey.toBuffer();
-        const args = [payload, publicKeyAsBuffer, signatureAsFrArray, this.partialContractAddress];
-        const abi = this.getEntrypointAbi();
-        const selector = generateFunctionSelector(abi.name, abi.parameters);
-        const packedArgs = await PackedArguments.fromArgs(encodeArguments(abi, args), this.wasm);
-        const txRequest = TxExecutionRequest.from({
-            argsHash: packedArgs.hash,
-            origin: this.address,
-            functionData: new FunctionData(selector, true, false),
-            txContext,
-            packedArguments: [...callsPackedArguments, packedArgs],
-        });
-        return txRequest;
-    }
-    getEntrypointAbi() {
-        const abi = this.contractAbi.functions.find(f => f.name === 'entrypoint');
-        if (!abi)
-            throw new Error(`Entrypoint abi for account contract not found`);
-        return abi;
-    }
-    checkIsNotDeployment(txContext) {
-        if (txContext.isContractDeploymentTx) {
-            throw new Error(`Cannot yet deploy contracts from an account contract`);
-        }
-    }
-    checkSender(executions) {
-        const wrongSender = executions.find(e => !e.from.equals(this.address));
-        if (wrongSender) {
-            throw new Error(`Sender ${wrongSender.from.toString()} does not match account address ${this.address.toString()}`);
-        }
-    }
-}
-const ACCOUNT_MAX_PRIVATE_CALLS = 1;
-const ACCOUNT_MAX_PUBLIC_CALLS = 1;
-/** Assembles an entrypoint payload from a set of private and public function calls */
-async function buildPayload(privateCalls, publicCalls, wasm) {
-    const nonce = Fr.random();
-    const emptyCall = { args: [], selector: Buffer.alloc(32), target: AztecAddress.ZERO };
-    const calls = [
-        ...padArrayEnd(privateCalls, emptyCall, ACCOUNT_MAX_PRIVATE_CALLS),
-        ...padArrayEnd(publicCalls, emptyCall, ACCOUNT_MAX_PUBLIC_CALLS),
-    ];
-    const packedArguments = [];
-    for (const call of calls) {
-        packedArguments.push(await PackedArguments.fromArgs(call.args, wasm));
-    }
-    return {
-        payload: {
-            // eslint-disable-next-line camelcase
-            flattened_args_hashes: packedArguments.map(args => args.hash),
-            // eslint-disable-next-line camelcase
-            flattened_selectors: calls.map(call => Fr.fromBuffer(call.selector)),
-            // eslint-disable-next-line camelcase
-            flattened_targets: calls.map(call => call.target.toField()),
-            nonce,
-        },
-        packedArguments,
-    };
-}
-/** Hashes an entrypoint payload (useful for signing) */
-function hashPayload(payload) {
-    // TODO: Switch to keccak when avaiable in Noir
-    return sha256(Buffer.concat(flattenPayload(payload).map(fr => fr.toBuffer())));
-}
-/** Flattens an entrypoint payload */
-function flattenPayload(payload) {
-    return [
-        ...payload.flattened_args_hashes,
-        ...payload.flattened_selectors,
-        ...payload.flattened_targets,
-        payload.nonce,
-    ];
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2NvdW50X2ltcGwvYWNjb3VudF9jb250cmFjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLFNBQVMsTUFBTSxrQkFBa0IsQ0FBQztBQUN6QyxPQUFPLEVBQUUsWUFBWSxFQUFnQixFQUFFLEVBQUUsWUFBWSxFQUFxQyxNQUFNLG9CQUFvQixDQUFDO0FBQ3JILE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbEQsT0FBTyxFQUFvQixlQUFlLEVBQWEsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDaEcsT0FBTyxFQUFlLGVBQWUsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSy9GOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGVBQWU7SUFDMUIsWUFDVSxPQUFxQixFQUNyQixNQUFpQixFQUNqQixZQUFxRCxFQUNyRCxzQkFBOEMsRUFDOUMsV0FBd0IsRUFDeEIsSUFBa0I7UUFMbEIsWUFBTyxHQUFQLE9BQU8sQ0FBYztRQUNyQixXQUFNLEdBQU4sTUFBTSxDQUFXO1FBQ2pCLGlCQUFZLEdBQVosWUFBWSxDQUF5QztRQUNyRCwyQkFBc0IsR0FBdEIsc0JBQXNCLENBQXdCO1FBQzlDLGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBQ3hCLFNBQUksR0FBSixJQUFJLENBQWM7SUFDekIsQ0FBQztJQUVKLFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUVELEtBQUssQ0FBQyw0QkFBNEIsQ0FDaEMsVUFBOEIsRUFDOUIsU0FBb0I7UUFFcEIsSUFBSSxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM3QixJQUFJLENBQUMsb0JBQW9CLENBQUMsU0FBUyxDQUFDLENBQUM7UUFF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