@aztec/aztec.js 0.1.0-alpha22 → 0.1.0-alpha24

package/src/contract_deployer/deploy_method.ts

@@ -1,11 +1,16 @@
-import { AztecRPC, getContractDeploymentInfo } from '@aztec/aztec-rpc';
-import { CircuitsWasm, ContractDeploymentData, TxContext } from '@aztec/circuits.js';
+import {
+  CircuitsWasm,
+  ContractDeploymentData,
+  PartialContractAddress,
+  TxContext,
+  getContractDeploymentInfo,
+} from '@aztec/circuits.js';
 import { ContractAbi } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { PublicKey } from '@aztec/key-store';
-import { ExecutionRequest, PackedArguments, PartialContractAddress, Tx, TxExecutionRequest } from '@aztec/types';
+import { AztecRPC, ExecutionRequest, PackedArguments, PublicKey, Tx, TxExecutionRequest } from '@aztec/types';
+
 import { BaseWallet, Wallet } from '../aztec_rpc_client/wallet.js';
 import { Contract, ContractFunctionInteraction, SendMethodOptions } from '../contract/index.js';
 
@@ -81,10 +86,8 @@ 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 { address, constructorHash, functionTreeRoot, partialAddress } = await getContractDeploymentInfo(
       this.abi,
@@ -137,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,11 @@ 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';
+// export * from '@aztec/aztec-rpc';
+
+export { AztecAddress, EthAddress, Point, Fr } from '@aztec/circuits.js';
+export { AztecRPC } from '@aztec/types';

package/src/utils/account.ts

@@ -1,17 +1,12 @@
-import { AztecRPC, TxStatus, getContractDeploymentInfo } from '@aztec/aztec-rpc';
-import { CircuitsWasm, Fr } 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 { SchnorrAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { AztecRPC, TxStatus } from '@aztec/types';
+
 import { AccountWallet, Wallet } from '../aztec_rpc_client/wallet.js';
-import {
-  AccountCollection,
-  AccountContract,
-  ContractDeployer,
-  SchnorrAuthProvider,
-  generatePublicKey,
-} from '../index.js';
-import { Schnorr } from '@aztec/circuits.js/barretenberg';
+import { AccountCollection, ContractDeployer, SingleKeyAccountContract, generatePublicKey } from '../index.js';
 
 /**
  * Creates an Aztec Account.
@@ -19,21 +14,21 @@ import { Schnorr } from '@aztec/circuits.js/barretenberg';
  */
 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, accountContractAbi);
+    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();
@@ -49,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);
@@ -68,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/pub_key.ts

@@ -1,4 +1,5 @@
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+
 import { Point } from '../index.js';
 
 /**

package/tsconfig.json

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

package/dest/account_impl/account_contract.d.ts

@@ -1,45 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { AztecAddress, CircuitsWasm, Fr, TxContext } from '@aztec/circuits.js';
-import { PublicKey } from '@aztec/key-store';
-import { ExecutionRequest, PartialContractAddress, TxExecutionRequest } from '@aztec/types';
-import { AccountImplementation } from './index.js';
-import { ContractAbi } from '@aztec/foundation/abi';
-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,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG7F,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAmB,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAG7G,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,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,108 +0,0 @@
-import { encodeArguments } from '@aztec/acir-simulator';
-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 partition from 'lodash.partition';
-import { generateFunctionSelector } from '../index.js';
-/**
- * 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2NvdW50X2ltcGwvYWNjb3VudF9jb250cmFjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxFQUFFLFlBQVksRUFBZ0IsRUFBRSxFQUFFLFlBQVksRUFBYSxNQUFNLG9CQUFvQixDQUFDO0FBQzdGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbEQsT0FBTyxFQUFvQixlQUFlLEVBQTBCLGtCQUFrQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzdHLE9BQU8sU0FBUyxNQUFNLGtCQUFrQixDQUFDO0FBQ3pDLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUt2RDs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQzFCLFlBQ1UsT0FBcUIsRUFDckIsTUFBaUIsRUFDakIsWUFBcUQsRUFDckQsc0JBQThDLEVBQzlDLFdBQXdCLEVBQ3hCLElBQWtCO1FBTGxCLFlBQU8sR0FBUCxPQUFPLENBQWM7UUFDckIsV0FBTSxHQUFOLE1BQU0sQ0FBVztRQUNqQixpQkFBWSxHQUFaLFlBQVksQ0FBeUM7UUFDckQsMkJBQXNCLEdBQXRCLHNCQUFzQixDQUF3QjtRQUM5QyxnQkFBVyxHQUFYLFdBQVcsQ0FBYTtRQUN4QixTQUFJLEdBQUosSUFBSSxDQUFjO0lBQ3pCLENBQUM7SUFFSixVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3RCLENBQUM7SUFFRCxLQUFLLENBQUMsNEJBQTRCLENBQ2hDLFVBQThCLEVBQzlCLFNBQW9CO1FBRXBCLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFD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

package/dest/auth/ecdsa.d.ts

@@ -1,13 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { AztecAddress } from '../index.js';
-import { AuthPayload } from './index.js';
-import { EntrypointPayload } from '../account_impl/account_contract.js';
-/**
- * An ecdsa implementation of auth provider.
- */
-export declare class EcdsaAuthProvider {
-    private privKey;
-    constructor(privKey: Buffer);
-    authenticateTx(payload: EntrypointPayload, payloadHash: Buffer, _address: AztecAddress): Promise<AuthPayload>;
-}
-//# sourceMappingURL=ecdsa.d.ts.map

package/dest/auth/ecdsa.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ecdsa.d.ts","sourceRoot":"","sources":["../../src/auth/ecdsa.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;GAEG;AACH,qBAAa,iBAAiB;IAChB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,MAAM;IACnC,cAAc,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;CAK9G"}

package/dest/auth/ecdsa.js

@@ -1,17 +0,0 @@
-import { secp256k1 } from '@noble/curves/secp256k1';
-import { EcdsaSignature } from '@aztec/circuits.js/barretenberg';
-/**
- * An ecdsa implementation of auth provider.
- */
-export class EcdsaAuthProvider {
-    constructor(privKey) {
-        this.privKey = privKey;
-    }
-    authenticateTx(payload, payloadHash, _address) {
-        const sig = secp256k1.sign(payloadHash, this.privKey);
-        if (sig.recovery === undefined)
-            throw new Error(`Missing recovery from signature`);
-        return Promise.resolve(EcdsaSignature.fromBigInts(sig.r, sig.s, sig.recovery));
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWNkc2EuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXV0aC9lY2RzYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBTWpFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGlCQUFpQjtJQUM1QixZQUFvQixPQUFlO1FBQWYsWUFBTyxHQUFQLE9BQU8sQ0FBUTtJQUFHLENBQUM7SUFDdkMsY0FBYyxDQUFDLE9BQTBCLEVBQUUsV0FBbUIsRUFBRSxRQUFzQjtRQUNwRixNQUFNLEdBQUcsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdEQsSUFBSSxHQUFHLENBQUMsUUFBUSxLQUFLLFNBQVM7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7UUFDbkYsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ2pGLENBQUM7Q0FDRiJ9

package/dest/auth/index.d.ts

@@ -1,19 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { AztecAddress, Fr } from '@aztec/circuits.js';
-import { EntrypointPayload } from '../account_impl/account_contract.js';
-export * from './ecdsa.js';
-export * from './schnorr.js';
-/**
- * An interface for the payload returned from auth operations.
- */
-export interface AuthPayload {
-    toBuffer(): Buffer;
-    toFields(): Fr[];
-}
-/**
- * A dummy implementation of the auth provider
- */
-export declare class DummyAuthProvider {
-    authenticateTx(_payload: EntrypointPayload, _payloadHash: Buffer, _address: AztecAddress): Promise<AuthPayload>;
-}
-//# sourceMappingURL=index.d.ts.map

package/dest/auth/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,IAAI,EAAE,EAAE,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,cAAc,CAAC,QAAQ,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;CAMhH"}

package/dest/auth/index.js

@@ -1,14 +0,0 @@
-export * from './ecdsa.js';
-export * from './schnorr.js';
-/**
- * A dummy implementation of the auth provider
- */
-export class DummyAuthProvider {
-    authenticateTx(_payload, _payloadHash, _address) {
-        return Promise.resolve({
-            toBuffer: () => Buffer.alloc(0),
-            toFields: () => [],
-        });
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXV0aC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLGNBQWMsQ0FBQztBQVU3Qjs7R0FFRztBQUNILE1BQU0sT0FBTyxpQkFBaUI7SUFDNUIsY0FBYyxDQUFDLFFBQTJCLEVBQUUsWUFBb0IsRUFBRSxRQUFzQjtRQUN0RixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUM7WUFDckIsUUFBUSxFQUFFLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1lBQy9CLFFBQVEsRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFO1NBQ0osQ0FBQyxDQUFDO0lBQ3BCLENBQUM7Q0FDRiJ9

package/dest/auth/schnorr.d.ts

@@ -1,13 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { Schnorr } from '@aztec/circuits.js/barretenberg';
-import { AuthPayload, AztecAddress, EntrypointPayload } from '@aztec/aztec.js';
-/**
- * Implementation of a schnorr signature provider
- */
-export declare class SchnorrAuthProvider {
-    private signer;
-    private privateKey;
-    constructor(signer: Schnorr, privateKey: Buffer);
-    authenticateTx(_payload: EntrypointPayload, _payloadHash: Buffer, _address: AztecAddress): Promise<AuthPayload>;
-}
-//# sourceMappingURL=schnorr.d.ts.map

package/dest/auth/schnorr.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"schnorr.d.ts","sourceRoot":"","sources":["../../src/auth/schnorr.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAE/E;;GAEG;AACH,qBAAa,mBAAmB;IAClB,OAAO,CAAC,MAAM;IAAW,OAAO,CAAC,UAAU;gBAAnC,MAAM,EAAE,OAAO,EAAU,UAAU,EAAE,MAAM;IAC/D,cAAc,CAAC,QAAQ,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;CAIhH"}

package/dest/auth/schnorr.js

@@ -1,14 +0,0 @@
-/**
- * Implementation of a schnorr signature provider
- */
-export class SchnorrAuthProvider {
-    constructor(signer, privateKey) {
-        this.signer = signer;
-        this.privateKey = privateKey;
-    }
-    authenticateTx(_payload, _payloadHash, _address) {
-        const sig = this.signer.constructSignature(_payloadHash, this.privateKey);
-        return Promise.resolve(sig);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Nobm9yci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hdXRoL3NjaG5vcnIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0E7O0dBRUc7QUFDSCxNQUFNLE9BQU8sbUJBQW1CO0lBQzlCLFlBQW9CLE1BQWUsRUFBVSxVQUFrQjtRQUEzQyxXQUFNLEdBQU4sTUFBTSxDQUFTO1FBQVUsZUFBVSxHQUFWLFVBQVUsQ0FBUTtJQUFHLENBQUM7SUFDbkUsY0FBYyxDQUFDLFFBQTJCLEVBQUUsWUFBb0IsRUFBRSxRQUFzQjtRQUN0RixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLFlBQVksRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDMUUsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQWtCLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0YifQ==

package/src/account_impl/account_contract.ts

@@ -1,173 +0,0 @@
-import { encodeArguments } from '@aztec/acir-simulator';
-import { AztecAddress, CircuitsWasm, Fr, FunctionData, TxContext } from '@aztec/circuits.js';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { sha256 } from '@aztec/foundation/crypto';
-import { PublicKey } from '@aztec/key-store';
-import { ExecutionRequest, PackedArguments, PartialContractAddress, TxExecutionRequest } from '@aztec/types';
-import partition from 'lodash.partition';
-import { generateFunctionSelector } from '../index.js';
-import { AccountImplementation } from './index.js';
-import { ContractAbi } from '@aztec/foundation/abi';
-import { EcdsaAuthProvider, SchnorrAuthProvider } from '../auth/index.js';
-
-/**
- * Account backed by an account contract
- */
-export class AccountContract implements AccountImplementation {
-  constructor(
-    private address: AztecAddress,
-    private pubKey: PublicKey,
-    private authProvider: EcdsaAuthProvider | SchnorrAuthProvider,
-    private partialContractAddress: PartialContractAddress,
-    private contractAbi: ContractAbi,
-    private wasm: CircuitsWasm,
-  ) {}
-
-  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).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;
-  }
-
-  private 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;
-  }
-
-  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()}`,
-      );
-    }
-  }
-}
-
-const ACCOUNT_MAX_PRIVATE_CALLS = 1;
-const ACCOUNT_MAX_PUBLIC_CALLS = 1;
-
-/** 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 = {
-  // eslint-disable-next-line camelcase
-  /** Concatenated arguments for every call */
-  flattened_args_hashes: Fr[];
-  // eslint-disable-next-line camelcase
-  /** Concatenated selectors for every call */
-  flattened_selectors: Fr[];
-  // eslint-disable-next-line camelcase
-  /** Concatenated target addresses for every call */
-  flattened_targets: Fr[];
-  /** A nonce for replay protection */
-  nonce: Fr;
-};
-
-/** Assembles an entrypoint payload from a set of private and public function calls */
-async function buildPayload(
-  privateCalls: FunctionCall[],
-  publicCalls: FunctionCall[],
-  wasm: CircuitsWasm,
-): Promise<{
-  /**
-   * The payload for the entrypoint function
-   */
-  payload: EntrypointPayload;
-  /**
-   * The packed arguments of functions called
-   */
-  packedArguments: PackedArguments[];
-}> {
-  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: EntrypointPayload) {
-  // 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: EntrypointPayload) {
-  return [
-    ...payload.flattened_args_hashes,
-    ...payload.flattened_selectors,
-    ...payload.flattened_targets,
-    payload.nonce,
-  ];
-}