@aztec/aztec.js 0.1.0-alpha29 → 0.1.0-alpha31

package/dest/main.js.LICENSE.txt

@@ -7,6 +7,4 @@
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */

package/dest/utils/defaults.d.ts

@@ -0,0 +1,5 @@
+/** Default L1 chain ID to use when constructing txs (matches hardhat and anvil's default). */
+export declare const DEFAULT_CHAIN_ID = 31337;
+/** Default protocol version to use. */
+export declare const DEFAULT_VERSION = 1;
+//# sourceMappingURL=defaults.d.ts.map

package/dest/utils/defaults.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/utils/defaults.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,uCAAuC;AACvC,eAAO,MAAM,eAAe,IAAI,CAAC"}

package/dest/utils/defaults.js

@@ -0,0 +1,5 @@
+/** Default L1 chain ID to use when constructing txs (matches hardhat and anvil's default). */
+export const DEFAULT_CHAIN_ID = 31337;
+/** Default protocol version to use. */
+export const DEFAULT_VERSION = 1;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZGVmYXVsdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsOEZBQThGO0FBQzlGLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLEtBQUssQ0FBQztBQUN0Qyx1Q0FBdUM7QUFDdkMsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLENBQUMsQ0FBQyJ9

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@aztec/aztec.js",
-  "version": "0.1.0-alpha29",
+  "version": "0.1.0-alpha31",
   "exports": {
     "node": "./dest/index.js",
     "default": "./dest/main.js"
   },
   "type": "module",
   "dependencies": {
-    "@aztec/circuits.js": "0.1.0-alpha29",
-    "@aztec/foundation": "0.1.0-alpha29",
-    "@aztec/types": "0.1.0-alpha29",
+    "@aztec/circuits.js": "0.1.0-alpha31",
+    "@aztec/foundation": "0.1.0-alpha31",
+    "@aztec/types": "0.1.0-alpha31",
+    "lodash.every": "^4.6.0",
     "lodash.partition": "^4.6.0",
     "tslib": "^2.4.0"
   }

package/src/account_impl/account_collection.ts

@@ -1,7 +1,7 @@
-import { AztecAddress, TxContext } from '@aztec/circuits.js';
-import { ExecutionRequest, TxExecutionRequest } from '@aztec/types';
+import { AztecAddress } from '@aztec/circuits.js';
+import { FunctionCall, TxExecutionRequest } from '@aztec/types';
 
-import { AccountImplementation } from './index.js';
+import { AccountImplementation, CreateTxRequestOpts } from './index.js';
 
 /**
  * A concrete account implementation that manages multiple accounts.
@@ -23,14 +23,13 @@ export class AccountCollection implements AccountImplementation {
     return AztecAddress.fromString(this.accounts.keys().next().value as string);
   }
 
-  public createAuthenticatedTxRequest(
-    executions: ExecutionRequest[],
-    txContext: TxContext,
+  public createTxExecutionRequest(
+    executions: FunctionCall[],
+    opts: CreateTxRequestOpts = {},
   ): Promise<TxExecutionRequest> {
-    // TODO: Check all executions have the same origin
-    const sender = executions[0].from;
+    const sender = opts.origin ?? this.getAddress();
     const impl = this.accounts.get(sender.toString());
     if (!impl) throw new Error(`No account implementation registered for ${sender}`);
-    return impl.createAuthenticatedTxRequest(executions, txContext);
+    return impl.createTxExecutionRequest(executions, opts);
   }
 }

package/src/account_impl/entrypoint_payload.ts

@@ -1,7 +1,7 @@
 import { CircuitsWasm, Fr } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { sha256 } from '@aztec/foundation/crypto';
-import { ExecutionRequest, PackedArguments, emptyExecutionRequest } from '@aztec/types';
+import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/types';
 
 // These must match the values defined in yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
 const ACCOUNT_MAX_PRIVATE_CALLS = 2;
@@ -24,8 +24,8 @@ export type EntrypointPayload = {
 
 /** Assembles an entrypoint payload from a set of private and public function calls */
 export async function buildPayload(
-  privateCalls: ExecutionRequest[],
-  publicCalls: ExecutionRequest[],
+  privateCalls: FunctionCall[],
+  publicCalls: FunctionCall[],
 ): Promise<{
   /** The payload for the entrypoint function */
   payload: EntrypointPayload;
@@ -35,8 +35,8 @@ export async function buildPayload(
   const nonce = Fr.random();
 
   const calls = [
-    ...padArrayEnd(privateCalls, emptyExecutionRequest(), ACCOUNT_MAX_PRIVATE_CALLS),
-    ...padArrayEnd(publicCalls, emptyExecutionRequest(), ACCOUNT_MAX_PUBLIC_CALLS),
+    ...padArrayEnd(privateCalls, emptyFunctionCall(), ACCOUNT_MAX_PRIVATE_CALLS),
+    ...padArrayEnd(publicCalls, emptyFunctionCall(), ACCOUNT_MAX_PUBLIC_CALLS),
   ];
 
   const packedArguments = [];

package/src/account_impl/index.ts

@@ -1,9 +1,15 @@
-import { AztecAddress, TxContext } from '@aztec/circuits.js';
-import { ExecutionRequest, TxExecutionRequest } from '@aztec/types';
+import { AztecAddress } from '@aztec/circuits.js';
+import { FunctionCall, TxExecutionRequest } from '@aztec/types';
 
+export * from './account_collection.js';
 export * from './single_key_account_contract.js';
 export * from './stored_key_account_contract.js';
-export * from './account_collection.js';
+
+/** Options for creating a tx request out of a set of function calls. */
+export type CreateTxRequestOpts = {
+  /** Origin of the tx. Needs to be an address managed by this account. */
+  origin?: AztecAddress;
+};
 
 /** Represents an implementation for a user account contract. Knows how to encode and sign a tx for that particular implementation. */
 export interface AccountImplementation {
@@ -15,9 +21,9 @@ export interface AccountImplementation {
 
   /**
    * Generates an authenticated request out of set of intents
-   * @param executions - The execution intent to be authenticated.
-   * @param txContext - The tx context under with the execution is to be made.
+   * @param executions - The execution intents to be run.
+   * @param opts - Options.
    * @returns The authenticated transaction execution request.
    */
-  createAuthenticatedTxRequest(executions: ExecutionRequest[], txContext: TxContext): Promise<TxExecutionRequest>;
+  createTxExecutionRequest(executions: FunctionCall[], opts?: CreateTxRequestOpts): Promise<TxExecutionRequest>;
 }

package/src/account_impl/single_key_account_contract.ts

@@ -8,14 +8,15 @@ import {
 } from '@aztec/circuits.js';
 import { Signer } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi, encodeArguments } from '@aztec/foundation/abi';
-import { ExecutionRequest, PackedArguments, TxExecutionRequest } from '@aztec/types';
+import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types';
 
 import partition from 'lodash.partition';
 
 import SchnorrSingleKeyAccountContractAbi from '../abis/schnorr_single_key_account_contract.json' assert { type: 'json' };
 import { generatePublicKey } from '../index.js';
+import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from '../utils/defaults.js';
 import { buildPayload, hashPayload } from './entrypoint_payload.js';
-import { AccountImplementation } from './index.js';
+import { AccountImplementation, CreateTxRequestOpts } from './index.js';
 
 /**
  * Account contract implementation that uses a single key for signing and encryption. This public key is not
@@ -28,18 +29,21 @@ export class SingleKeyAccountContract implements AccountImplementation {
     private partialContractAddress: PartialContractAddress,
     private privateKey: PrivateKey,
     private signer: Signer,
+    private chainId: number = DEFAULT_CHAIN_ID,
+    private version: number = DEFAULT_VERSION,
   ) {}
 
   getAddress(): AztecAddress {
     return this.address;
   }
 
-  async createAuthenticatedTxRequest(
-    executions: ExecutionRequest[],
-    txContext: TxContext,
+  async createTxExecutionRequest(
+    executions: FunctionCall[],
+    opts: CreateTxRequestOpts = {},
   ): Promise<TxExecutionRequest> {
-    this.checkSender(executions);
-    this.checkIsNotDeployment(txContext);
+    if (opts.origin && !opts.origin.equals(this.address)) {
+      throw new Error(`Sender ${opts.origin.toString()} does not match account address ${this.address.toString()}`);
+    }
 
     const [privateCalls, publicCalls] = partition(executions, exec => exec.functionData.isPrivate);
     const wasm = await CircuitsWasm.get();
@@ -55,7 +59,7 @@ export class SingleKeyAccountContract implements AccountImplementation {
       argsHash: packedArgs.hash,
       origin: this.address,
       functionData: FunctionData.fromAbi(abi),
-      txContext,
+      txContext: TxContext.empty(this.chainId, this.version),
       packedArguments: [...callsPackedArguments, packedArgs],
     });
 
@@ -70,19 +74,4 @@ export class SingleKeyAccountContract implements AccountImplementation {
     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/account_impl/stored_key_account_contract.ts

@@ -2,13 +2,14 @@ import { AztecAddress, CircuitsWasm, FunctionData, PrivateKey, TxContext } from
 import { Signer } from '@aztec/circuits.js/barretenberg';
 import { ContractAbi, encodeArguments } from '@aztec/foundation/abi';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
-import { ExecutionRequest, PackedArguments, TxExecutionRequest } from '@aztec/types';
+import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types';
 
 import partition from 'lodash.partition';
 
 import EcdsaAccountContractAbi from '../abis/ecdsa_account_contract.json' assert { type: 'json' };
+import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from '../utils/defaults.js';
 import { buildPayload, hashPayload } from './entrypoint_payload.js';
-import { AccountImplementation } from './index.js';
+import { AccountImplementation, CreateTxRequestOpts } from './index.js';
 
 /**
  * Account contract implementation that keeps a signing public key in storage, and is retrieved on
@@ -17,7 +18,13 @@ import { AccountImplementation } from './index.js';
 export class StoredKeyAccountContract implements AccountImplementation {
   private log: DebugLogger;
 
-  constructor(private address: AztecAddress, private privateKey: PrivateKey, private signer: Signer) {
+  constructor(
+    private address: AztecAddress,
+    private privateKey: PrivateKey,
+    private signer: Signer,
+    private chainId: number = DEFAULT_CHAIN_ID,
+    private version: number = DEFAULT_VERSION,
+  ) {
     this.log = createDebugLogger('aztec:client:accounts:stored_key');
   }
 
@@ -25,12 +32,13 @@ export class StoredKeyAccountContract implements AccountImplementation {
     return this.address;
   }
 
-  async createAuthenticatedTxRequest(
-    executions: ExecutionRequest[],
-    txContext: TxContext,
+  async createTxExecutionRequest(
+    executions: FunctionCall[],
+    opts: CreateTxRequestOpts = {},
   ): Promise<TxExecutionRequest> {
-    this.checkSender(executions);
-    this.checkIsNotDeployment(txContext);
+    if (opts.origin && !opts.origin.equals(this.address)) {
+      throw new Error(`Sender ${opts.origin.toString()} does not match account address ${this.address.toString()}`);
+    }
 
     const [privateCalls, publicCalls] = partition(executions, exec => exec.functionData.isPrivate);
     const wasm = await CircuitsWasm.get();
@@ -46,7 +54,7 @@ export class StoredKeyAccountContract implements AccountImplementation {
       argsHash: packedArgs.hash,
       origin: this.address,
       functionData: FunctionData.fromAbi(abi),
-      txContext,
+      txContext: TxContext.empty(this.chainId, this.version),
       packedArguments: [...callsPackedArguments, packedArgs],
     });
 
@@ -61,19 +69,4 @@ export class StoredKeyAccountContract implements AccountImplementation {
     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/wallet.ts

@@ -1,19 +1,20 @@
-import { AztecAddress, Fr, PartialContractAddress, PrivateKey, PublicKey, TxContext } from '@aztec/circuits.js';
+import { AztecAddress, Fr, PartialContractAddress, PrivateKey, PublicKey } from '@aztec/circuits.js';
 import {
   AztecRPC,
   ContractData,
   ContractPublicData,
   DeployedContract,
-  ExecutionRequest,
+  FunctionCall,
   L2BlockL2Logs,
   NodeInfo,
+  SyncStatus,
   Tx,
   TxExecutionRequest,
   TxHash,
   TxReceipt,
 } from '@aztec/types';
 
-import { AccountImplementation } from '../account_impl/index.js';
+import { AccountImplementation, CreateTxRequestOpts } from '../account_impl/index.js';
 
 /**
  * The wallet interface.
@@ -25,11 +26,10 @@ export type Wallet = AccountImplementation & AztecRPC;
  */
 export abstract class BaseWallet implements Wallet {
   constructor(protected readonly rpc: AztecRPC) {}
+
   abstract getAddress(): AztecAddress;
-  abstract createAuthenticatedTxRequest(
-    executions: ExecutionRequest[],
-    txContext: TxContext,
-  ): Promise<TxExecutionRequest>;
+  abstract createTxExecutionRequest(execs: FunctionCall[], opts?: CreateTxRequestOpts): Promise<TxExecutionRequest>;
+
   addAccount(privKey: PrivateKey, address: AztecAddress, partialContractAddress: Fr): Promise<AztecAddress> {
     return this.rpc.addAccount(privKey, address, partialContractAddress);
   }
@@ -94,6 +94,9 @@ export abstract class BaseWallet implements Wallet {
   isAccountSynchronised(account: AztecAddress) {
     return this.rpc.isAccountSynchronised(account);
   }
+  getSyncStatus(): Promise<SyncStatus> {
+    return this.rpc.getSyncStatus();
+  }
 }
 
 /**
@@ -106,7 +109,7 @@ export class AccountWallet extends BaseWallet {
   getAddress(): AztecAddress {
     return this.accountImpl.getAddress();
   }
-  createAuthenticatedTxRequest(executions: ExecutionRequest[], txContext: TxContext): Promise<TxExecutionRequest> {
-    return this.accountImpl.createAuthenticatedTxRequest(executions, txContext);
+  createTxExecutionRequest(executions: FunctionCall[], opts: CreateTxRequestOpts = {}): Promise<TxExecutionRequest> {
+    return this.accountImpl.createTxExecutionRequest(executions, opts);
   }
 }

package/src/contract/base_contract_interaction.ts

@@ -0,0 +1,62 @@
+import { AztecAddress } from '@aztec/circuits.js';
+import { AztecRPC, Tx, TxExecutionRequest } from '@aztec/types';
+
+import { SentTx } from './sent_tx.js';
+
+/**
+ * Represents options for calling a (constrained) function in a contract.
+ * Allows the user to specify the sender address and nonce for a transaction.
+ */
+export interface SendMethodOptions {
+  /**
+   * Sender's address initiating the transaction.
+   */
+  origin?: AztecAddress;
+}
+
+/**
+ * Base class for an interaction with a contract, be it a deployment, a function call, or a batch.
+ * Implements the sequence create/simulate/send.
+ */
+export abstract class BaseContractInteraction {
+  protected tx?: Tx;
+  protected txRequest?: TxExecutionRequest;
+
+  constructor(protected rpc: AztecRPC) {}
+
+  /**
+   * Create a transaction execution request ready to be simulated.
+   * @param options - An optional object containing additional configuration for the transaction.
+   * @returns A transaction execution request.
+   */
+  public abstract create(options?: SendMethodOptions): Promise<TxExecutionRequest>;
+
+  /**
+   * Simulates a transaction execution request and returns a tx object ready to be sent.
+   * @param options - optional arguments to be used in the creation of the transaction
+   * @returns The resulting transaction
+   */
+  public async simulate(options: SendMethodOptions = {}): Promise<Tx> {
+    const txRequest = this.txRequest ?? (await this.create(options));
+    this.tx = await this.rpc.simulateTx(txRequest);
+    return this.tx;
+  }
+
+  /**
+   * Sends a transaction to the contract function with the specified options.
+   * This function throws an error if called on an unconstrained function.
+   * It creates and signs the transaction if necessary, and returns a SentTx instance,
+   * which can be used to track the transaction status, receipt, and events.
+   * @param options - An optional object containing 'from' property representing
+   * the AztecAddress of the sender. If not provided, the default address is used.
+   * @returns A SentTx instance for tracking the transaction status and information.
+   */
+  public send(options: SendMethodOptions = {}) {
+    const promise = (async () => {
+      const tx = this.tx ?? (await this.simulate(options));
+      return this.rpc.sendTx(tx);
+    })();
+
+    return new SentTx(this.rpc, promise);
+  }
+}

package/src/contract/batch_call.ts

@@ -0,0 +1,22 @@
+import { FunctionCall, TxExecutionRequest, Wallet } from '../index.js';
+import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js';
+
+/** A batch of function calls to be sent as a single transaction through a wallet. */
+export class BatchCall extends BaseContractInteraction {
+  constructor(protected wallet: Wallet, protected calls: FunctionCall[]) {
+    super(wallet);
+  }
+
+  /**
+   * Create a transaction execution request that represents this batch, encoded and authenticated by the
+   * user's wallet, ready to be simulated.
+   * @param options - An optional object containing additional configuration for the transaction.
+   * @returns A Promise that resolves to a transaction instance.
+   */
+  public async create(options?: SendMethodOptions | undefined): Promise<TxExecutionRequest> {
+    if (!this.txRequest) {
+      this.txRequest = await this.wallet.createTxExecutionRequest(this.calls, options);
+    }
+    return this.txRequest;
+  }
+}

package/src/contract/contract.test.ts

@@ -93,13 +93,14 @@ describe('Contract Class', () => {
 
   beforeEach(() => {
     wallet = mock<Wallet>();
-    wallet.createAuthenticatedTxRequest.mockResolvedValue(mockTxRequest);
+    wallet.createTxExecutionRequest.mockResolvedValue(mockTxRequest);
     wallet.isContractDeployed.mockResolvedValue(true);
     wallet.sendTx.mockResolvedValue(mockTxHash);
     wallet.viewTx.mockResolvedValue(mockViewResultValue);
     wallet.getTxReceipt.mockResolvedValue(mockTxReceipt);
     wallet.getNodeInfo.mockResolvedValue(mockNodeInfo);
     wallet.simulateTx.mockResolvedValue(mockTx);
+    wallet.getAccounts.mockResolvedValue([account]);
   });
 
   it('should create and send a contract method tx', async () => {
@@ -114,7 +115,7 @@ describe('Contract Class', () => {
 
     expect(txHash).toBe(mockTxHash);
     expect(receipt).toBe(mockTxReceipt);
-    expect(wallet.createAuthenticatedTxRequest).toHaveBeenCalledTimes(1);
+    expect(wallet.createTxExecutionRequest).toHaveBeenCalledTimes(1);
     expect(wallet.sendTx).toHaveBeenCalledTimes(1);
     expect(wallet.sendTx).toHaveBeenCalledWith(mockTx);
   });
@@ -129,13 +130,9 @@ describe('Contract Class', () => {
     expect(result).toBe(mockViewResultValue);
   });
 
-  it('should not call send on an unconstrained function', async () => {
+  it('should not call create on an unconstrained function', async () => {
     const fooContract = await Contract.create(contractAddress, defaultAbi, wallet);
-    expect(() =>
-      fooContract.methods.qux().send({
-        origin: account,
-      }),
-    ).toThrow();
+    await expect(fooContract.methods.qux().create({ origin: account })).rejects.toThrow();
   });
 
   it('should not call view on a secret or open function', async () => {

package/src/contract/contract_function_interaction.ts

@@ -1,24 +1,11 @@
-import { AztecAddress, Fr, FunctionData, TxContext } from '@aztec/circuits.js';
+import { AztecAddress, FunctionData } from '@aztec/circuits.js';
 import { FunctionAbi, FunctionType, encodeArguments } from '@aztec/foundation/abi';
-import { ExecutionRequest, Tx, TxExecutionRequest } from '@aztec/types';
+import { FunctionCall, TxExecutionRequest } from '@aztec/types';
 
 import { Wallet } from '../aztec_rpc_client/wallet.js';
-import { SentTx } from './sent_tx.js';
+import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js';
 
-/**
- * Represents options for calling a (constrained) function in a contract.
- * Allows the user to specify the sender address and nonce for a transaction.
- */
-export interface SendMethodOptions {
-  /**
-   * Sender's address initiating the transaction.
-   */
-  origin?: AztecAddress;
-  /**
-   * The nonce representing the order of transactions sent by the address.
-   */
-  nonce?: Fr;
-}
+export { SendMethodOptions };
 
 /**
  * Represents the options for a view method in a contract function interaction.
@@ -33,29 +20,24 @@ export interface ViewMethodOptions {
 
 /**
  * This is the class that is returned when calling e.g. `contract.methods.myMethod(arg0, arg1)`.
- * It contains available interactions one can call on a method.
+ * It contains available interactions one can call on a method, including view.
  */
-export class ContractFunctionInteraction {
-  protected tx?: Tx;
-  protected txRequest?: TxExecutionRequest;
-
+export class ContractFunctionInteraction extends BaseContractInteraction {
   constructor(
     protected wallet: Wallet,
     protected contractAddress: AztecAddress,
     protected functionDao: FunctionAbi,
     protected args: any[],
   ) {
+    super(wallet);
     if (args.some(arg => arg === undefined || arg === null)) {
       throw new Error('All function interaction arguments must be defined and not null. Received: ' + args);
     }
   }
 
   /**
-   * Create an Aztec transaction instance by combining the transaction request and its signature.
-   * This function will first check if a signature exists, and if not, it will call the `sign` method
-   * to obtain the signature before creating the transaction. Throws an error if the function is
-   * of unconstrained type or if the transaction request and signature are missing.
-   *
+   * Create a transaction execution request that represents this call, encoded and authenticated by the
+   * user's wallet, ready to be simulated.
    * @param options - An optional object containing additional configuration for the transaction.
    * @returns A Promise that resolves to a transaction instance.
    */
@@ -64,76 +46,27 @@ export class ContractFunctionInteraction {
       throw new Error("Can't call `create` on an unconstrained function.");
     }
     if (!this.txRequest) {
-      const executionRequest = this.getExecutionRequest(this.contractAddress, options.origin);
-      const nodeInfo = await this.wallet.getNodeInfo();
-      const txContext = TxContext.empty(new Fr(nodeInfo.chainId), new Fr(nodeInfo.version));
-      const txRequest = await this.wallet.createAuthenticatedTxRequest([executionRequest], txContext);
-      this.txRequest = txRequest;
+      this.txRequest = await this.wallet.createTxExecutionRequest([this.request()], options);
     }
     return this.txRequest;
   }
 
-  /**
-   * Simulates a transaction's execution.
-   * @param options - optional arguments to be used in the creation of the transaction
-   * @returns The resulting transaction
-   */
-  public async simulate(options: SendMethodOptions = {}): Promise<Tx> {
-    const txRequest = this.txRequest ?? (await this.create(options));
-    this.tx = await this.wallet.simulateTx(txRequest);
-    return this.tx;
-  }
-
   /**
    * Returns an execution request that represents this operation. Useful as a building
    * block for constructing batch requests.
    * @param options - An optional object containing additional configuration for the transaction.
-   * @returns An execution request.
+   * @returns An execution request wrapped in promise.
    */
-  public request(options: SendMethodOptions = {}): ExecutionRequest {
-    return this.getExecutionRequest(this.contractAddress, options.origin);
-  }
-
-  protected getExecutionRequest(to: AztecAddress, from?: AztecAddress): ExecutionRequest {
-    const flatArgs = encodeArguments(this.functionDao, this.args);
-    from = from ?? this.wallet.getAddress();
-
-    return {
-      args: flatArgs,
-      functionData: FunctionData.fromAbi(this.functionDao),
-      to,
-      from,
-    };
-  }
-
-  /**
-   * Sends a transaction to the contract function with the specified options.
-   * This function throws an error if called on an unconstrained function.
-   * It creates and signs the transaction if necessary, and returns a SentTx instance,
-   * which can be used to track the transaction status, receipt, and events.
-   *
-   * @param options - An optional object containing 'from' property representing
-   * the AztecAddress of the sender. If not provided, the default address is used.
-   * @returns A SentTx instance for tracking the transaction status and information.
-   */
-  public send(options: SendMethodOptions = {}) {
-    if (this.functionDao.functionType === FunctionType.UNCONSTRAINED) {
-      throw new Error("Can't call `send` on an unconstrained function.");
-    }
-
-    const promise = (async () => {
-      const tx = this.tx ?? (await this.simulate(options));
-      return this.wallet.sendTx(tx);
-    })();
-
-    return new SentTx(this.wallet, promise);
+  public request(): FunctionCall {
+    const args = encodeArguments(this.functionDao, this.args);
+    const functionData = FunctionData.fromAbi(this.functionDao);
+    return { args, functionData, to: this.contractAddress };
   }
 
   /**
    * Execute a view (read-only) transaction on an unconstrained function.
    * This method is used to call functions that do not modify the contract state and only return data.
    * Throws an error if called on a non-unconstrained function.
-   *
    * @param options - An optional object containing additional configuration for the transaction.
    * @returns The result of the view transaction as returned by the contract function.
    */

package/src/contract/index.ts

@@ -2,3 +2,4 @@ export * from './contract.js';
 export * from './contract_function_interaction.js';
 export * from './sent_tx.js';
 export * from './contract_base.js';
+export * from './batch_call.js';