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

package/src/contract_deployer/deploy_method.ts

@@ -1,18 +1,18 @@
 import {
-  CircuitsWasm,
   ContractDeploymentData,
+  FunctionData,
   PartialContractAddress,
   TxContext,
   getContractDeploymentInfo,
 } from '@aztec/circuits.js';
-import { ContractAbi } from '@aztec/foundation/abi';
+import { ContractAbi, FunctionAbi, encodeArguments } 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 { AztecRPC, ExecutionRequest, PackedArguments, PublicKey, Tx, TxExecutionRequest } from '@aztec/types';
+import { AztecRPC, PackedArguments, PublicKey, Tx, TxExecutionRequest } from '@aztec/types';
 
-import { BaseWallet, Wallet } from '../aztec_rpc_client/wallet.js';
-import { Contract, ContractBase, ContractFunctionInteraction, SendMethodOptions } from '../contract/index.js';
+import { BaseContractInteraction } from '../contract/base_contract_interaction.js';
+import { Contract, ContractBase, SendMethodOptions } from '../contract/index.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
 
 /**
@@ -30,51 +30,25 @@ export interface DeployOptions extends SendMethodOptions {
   contractAddressSalt?: Fr;
 }
 
-/**
- * Simple wallet implementation for use when deploying contracts only.
- */
-class DeployerWallet extends BaseWallet {
-  getAddress(): AztecAddress {
-    return AztecAddress.ZERO;
-  }
-  async createAuthenticatedTxRequest(
-    executions: ExecutionRequest[],
-    txContext: TxContext,
-  ): Promise<TxExecutionRequest> {
-    if (executions.length !== 1) {
-      throw new Error(`Deployer wallet can only run one execution at a time (requested ${executions.length})`);
-    }
-    const [execution] = executions;
-    const wasm = await CircuitsWasm.get();
-    const packedArguments = await PackedArguments.fromArgs(execution.args, wasm);
-    return Promise.resolve(
-      new TxExecutionRequest(execution.to, execution.functionData, packedArguments.hash, txContext, [packedArguments]),
-    );
-  }
-}
-
 /**
  * Creates a TxRequest from a contract ABI, for contract deployment.
  * Extends the ContractFunctionInteraction class.
  */
-export class DeployMethod<TContract extends ContractBase = Contract> extends ContractFunctionInteraction {
-  /**
-   * The partially computed contract address. Known after creation of the deployment transaction.
-   */
+export class DeployMethod<TContract extends ContractBase = Contract> extends BaseContractInteraction {
+  /** The partially computed contract address. Known after creation of the deployment transaction. */
   public partialContractAddress?: PartialContractAddress = undefined;
 
-  /**
-   * The complete contract address.
-   */
+  /** The complete contract address. */
   public completeContractAddress?: AztecAddress = undefined;
 
-  constructor(private publicKey: PublicKey, private arc: AztecRPC, private abi: ContractAbi, args: any[] = []) {
-    const constructorAbi = abi.functions.find(f => f.name === 'constructor');
-    if (!constructorAbi) {
-      throw new Error('Cannot find constructor in the ABI.');
-    }
+  /** Constructor function to call. */
+  private constructorAbi: FunctionAbi;
 
-    super(new DeployerWallet(arc), AztecAddress.ZERO, constructorAbi, args);
+  constructor(private publicKey: PublicKey, private arc: AztecRPC, private abi: ContractAbi, private args: any[] = []) {
+    super(arc);
+    const constructorAbi = abi.functions.find(f => f.name === 'constructor');
+    if (!constructorAbi) throw new Error('Cannot find constructor in the ABI.');
+    this.constructorAbi = constructorAbi;
   }
 
   /**
@@ -90,7 +64,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Con
     const portalContract = options.portalContract ?? EthAddress.ZERO;
     const contractAddressSalt = options.contractAddressSalt ?? Fr.random();
 
-    const { chainId, version } = await this.wallet.getNodeInfo();
+    const { chainId, version } = await this.rpc.getNodeInfo();
 
     const { address, constructorHash, functionTreeRoot, partialAddress } = await getContractDeploymentInfo(
       this.abi,
@@ -108,15 +82,25 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Con
     );
 
     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);
+    const args = encodeArguments(this.constructorAbi, this.args);
+    const functionData = FunctionData.fromAbi(this.constructorAbi);
+    const execution = { args, functionData, to: address };
+    const packedArguments = await PackedArguments.fromArgs(execution.args);
+
+    const txRequest = TxExecutionRequest.from({
+      origin: execution.to,
+      functionData: execution.functionData,
+      argsHash: packedArguments.hash,
+      txContext,
+      packedArguments: [packedArguments],
+    });
 
     this.txRequest = txRequest;
     this.partialContractAddress = partialAddress;
     this.completeContractAddress = address;
 
     // TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
-    await this.wallet.addContracts([{ abi: this.abi, address, portalContract }]);
+    await this.rpc.addContracts([{ abi: this.abi, address, portalContract }]);
 
     return this.txRequest;
   }
@@ -139,22 +123,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Con
    * @param options - Deployment options.
    * @returns The simulated tx.
    */
-  public async simulate(options: DeployOptions): Promise<Tx> {
-    const txRequest = this.txRequest ?? (await this.create(options));
-
-    this.tx = await this.wallet.simulateTx(txRequest);
-    return this.tx;
-  }
-
-  /**
-   * Creates a contract abstraction given a wallet.
-   * @param withWallet - The wallet to provide to the contract abstraction
-   * @returns - The generated contract abstraction.
-   */
-  public async getContract(withWallet: Wallet) {
-    if (!this.completeContractAddress) {
-      throw new Error(`Cannot get a contract instance for a contract not yet deployed`);
-    }
-    return await Contract.create(this.completeContractAddress, this.abi, withWallet);
+  public simulate(options: DeployOptions): Promise<Tx> {
+    return super.simulate(options);
   }
 }

package/src/contract_deployer/deploy_sent_tx.ts

@@ -46,7 +46,7 @@ export class DeploySentTx<TContract extends ContractBase = Contract> extends Sen
   }
 
   protected getContractInstance(wallet?: Wallet, address?: AztecAddress): Promise<TContract> {
-    const isWallet = (rpc: AztecRPC | Wallet): rpc is Wallet => !!(rpc as Wallet).createAuthenticatedTxRequest;
+    const isWallet = (rpc: AztecRPC | Wallet): rpc is Wallet => !!(rpc as Wallet).createTxExecutionRequest;
     const contractWallet = wallet ?? (isWallet(this.arc) && this.arc);
     if (!contractWallet) throw new Error(`A wallet is required for creating a contract instance`);
     if (!address) throw new Error(`Contract address is missing from transaction receipt`);

package/src/index.ts

@@ -15,7 +15,7 @@ export {
   ContractDeploymentTx,
   ContractPublicData,
   DeployedContract,
-  ExecutionRequest,
+  FunctionCall,
   L2BlockL2Logs,
   NodeInfo,
   PackedArguments,
@@ -26,7 +26,7 @@ export {
   TxHash,
   TxReceipt,
   TxStatus,
-  emptyExecutionRequest,
+  emptyFunctionCall,
 } from '@aztec/types';
 
 export { createDebugLogger } from '@aztec/foundation/log';

package/src/utils/defaults.ts

@@ -0,0 +1,4 @@
+/** 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;