@aztec/aztec.js 0.81.0 → 0.82.1-alpha-testnet.1

package/dest/account/{contract.d.ts → account_contract.d.ts}

@@ -1,7 +1,8 @@
+import type { AuthWitnessProvider } from '@aztec/entrypoints/interfaces';
 import { Fr } from '@aztec/foundation/fields';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';
-import type { AccountInterface, AuthWitnessProvider } from './interface.js';
+import type { AccountInterface } from './interface.js';
 /**
  * An account contract instance. Knows its artifact, deployment arguments, how to create
  * transaction execution requests out of function calls, and how to authorize actions.
@@ -39,4 +40,4 @@ export interface AccountContract {
  * Compute the address of an account contract from secret and salt.
  */
 export declare function getAccountContractAddress(accountContract: AccountContract, secret: Fr, salt: Fr): Promise<import("../index.js").AztecAddress>;
-//# sourceMappingURL=contract.d.ts.map
+//# sourceMappingURL=account_contract.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../src/account/account_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGvD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;OAEG;IACH,4BAA4B,IAAI,OAAO,CACnC;QACE,2DAA2D;QAC3D,eAAe,EAAE,MAAM,CAAC;QACxB,2DAA2D;QAC3D,eAAe,EAAE,GAAG,EAAE,CAAC;KACxB,GACD,SAAS,CACZ,CAAC;IAEF;;;;;;;OAOG;IACH,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,gBAAgB,CAAC;IAE7E;;;OAGG;IACH,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,mBAAmB,CAAC;CACvE;AAGD;;GAEG;AACH,wBAAsB,yBAAyB,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,+CAcrG"}

package/dest/account/index.d.ts

@@ -7,9 +7,8 @@
  * @packageDocumentation
  */
 import type { Fr } from '@aztec/foundation/fields';
-export { type AccountContract, getAccountContractAddress } from './contract.js';
-export { type AccountInterface, type AuthWitnessProvider } from './interface.js';
-export * from './wallet.js';
+export { type AccountContract, getAccountContractAddress } from './account_contract.js';
+export { type AccountInterface } from './interface.js';
 /** A contract deployment salt. */
 export type Salt = Fr | number | bigint;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,eAAe,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACjF,cAAc,aAAa,CAAC;AAE5B,kCAAkC;AAClC,MAAM,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,eAAe,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,kCAAkC;AAClC,MAAM,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM,CAAC"}

package/dest/account/index.js

@@ -5,5 +5,4 @@
  * on ECDSA or Schnorr signatures.
  *
  * @packageDocumentation
- */ export { getAccountContractAddress } from './contract.js';
-export * from './wallet.js';
+ */ export { getAccountContractAddress } from './account_contract.js';

package/dest/account/interface.d.ts

@@ -1,19 +1,7 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import type { AuthWitnessProvider, EntrypointInterface } from '@aztec/entrypoints/interfaces';
 import type { Fr } from '@aztec/foundation/fields';
-import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { CompleteAddress } from '@aztec/stdlib/contract';
-import type { EntrypointInterface } from '../entrypoint/entrypoint.js';
-/** Creates authorization witnesses. */
-export interface AuthWitnessProvider {
-    /**
-     * Computes an authentication witness from either a message hash
-     * @param messageHash - The message hash to approve
-     * @returns The authentication witness
-     */
-    createAuthWit(messageHash: Fr | Buffer): Promise<AuthWitness>;
-}
 /**
  * Handler for interfacing with an account. Knows how to create transaction execution
  * requests and authorize actions for its corresponding account.

package/dest/account/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/account/interface.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGvE,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/D;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB,EAAE,mBAAmB;IAChF,qDAAqD;IACrD,kBAAkB,IAAI,eAAe,CAAC;IAEtC,4CAA4C;IAC5C,UAAU,IAAI,YAAY,CAAC;IAE3B,4CAA4C;IAC5C,UAAU,IAAI,EAAE,CAAC;IAEjB,kDAAkD;IAClD,UAAU,IAAI,EAAE,CAAC;CAClB"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/account/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAC9F,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB,EAAE,mBAAmB;IAChF,qDAAqD;IACrD,kBAAkB,IAAI,eAAe,CAAC;IAEtC,4CAA4C;IAC5C,UAAU,IAAI,YAAY,CAAC;IAE3B,4CAA4C;IAC5C,UAAU,IAAI,EAAE,CAAC;IAEjB,kDAAkD;IAClD,UAAU,IAAI,EAAE,CAAC;CAClB"}

package/dest/account/interface.js

@@ -1,3 +1,4 @@
+// docs:start:account-interface
 /**
  * Handler for interfacing with an account. Knows how to create transaction execution
  * requests and authorize actions for its corresponding account.

package/dest/account_manager/account_manager.d.ts

@@ -0,0 +1,106 @@
+import { Fr } from '@aztec/foundation/fields';
+import { CompleteAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { GasSettings } from '@aztec/stdlib/gas';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { AccountContract } from '../account/account_contract.js';
+import type { Salt } from '../account/index.js';
+import type { AccountInterface } from '../account/interface.js';
+import { type DeployOptions } from '../contract/deploy_method.js';
+import { type WaitOpts } from '../contract/sent_tx.js';
+import { AccountWalletWithSecretKey, type Wallet } from '../wallet/index.js';
+import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
+/**
+ * Options to deploy an account contract.
+ */
+export type DeployAccountOptions = Pick<DeployOptions, 'fee' | 'skipClassRegistration' | 'skipPublicDeployment' | 'skipInitialization'> & {
+    /**
+     * Wallet used for deploying the account contract. Must be funded in order to pay for the fee.
+     */
+    deployWallet?: Wallet;
+};
+/**
+ * Manages a user account. Provides methods for calculating the account's address, deploying the account contract,
+ * and creating and registering the user wallet in the PXE Service.
+ */
+export declare class AccountManager {
+    #private;
+    private pxe;
+    private secretKey;
+    private accountContract;
+    private instance;
+    /**
+     * Deployment salt for the account contract
+     */
+    readonly salt: Salt;
+    private constructor();
+    static create(pxe: PXE, secretKey: Fr, accountContract: AccountContract, salt?: Salt): Promise<AccountManager>;
+    protected getPublicKeys(): import("@aztec/stdlib/keys").PublicKeys;
+    protected getPublicKeysHash(): Fr | Promise<Fr>;
+    /**
+     * Returns the entrypoint for this account as defined by its account contract.
+     * @returns An entrypoint.
+     */
+    getAccount(): Promise<AccountInterface>;
+    /**
+     * Gets the calculated complete address associated with this account.
+     * Does not require the account to be deployed or registered.
+     * @returns The address, partial address, and encryption public key.
+     */
+    getCompleteAddress(): Promise<CompleteAddress>;
+    /**
+     * Gets the address for this given account.
+     * Does not require the account to be deployed or registered.
+     * @returns The address.
+     */
+    getAddress(): import("../index.js").AztecAddress;
+    /**
+     * Returns the contract instance definition associated with this account.
+     * Does not require the account to be deployed or registered.
+     * @returns ContractInstance instance.
+     */
+    getInstance(): ContractInstanceWithAddress;
+    /**
+     * Returns a Wallet instance associated with this account. Use it to create Contract
+     * instances to be interacted with from this account.
+     * @returns A Wallet instance.
+     */
+    getWallet(): Promise<AccountWalletWithSecretKey>;
+    /**
+     * Registers this account in the PXE Service and returns the associated wallet. Registering
+     * the account on the PXE Service is required for managing private state associated with it.
+     * Use the returned wallet to create Contract instances to be interacted with from this account.
+     * @param opts - Options to wait for the account to be synched.
+     * @returns A Wallet instance.
+     */
+    register(): Promise<AccountWalletWithSecretKey>;
+    /**
+     * Deploys the account contract that backs this account.
+     * Does not register the associated class nor publicly deploy the instance by default.
+     * Uses the salt provided in the constructor or a randomly generated one.
+     * Registers the account in the PXE Service before deploying the contract.
+     * @param opts - Fee options to be used for the deployment.
+     * @returns A SentTx object that can be waited to get the associated Wallet.
+     */
+    deploy(opts?: DeployAccountOptions): DeployAccountSentTx;
+    /**
+     * Estimates the gas needed to deploy the account contract that backs this account.
+     * This method is here to ensure that the fee payment method is correctly set up in case
+     * the account contract needs to pay for its own deployment.
+     * @param opts - Fee options to be used for the deployment.
+     * @returns The gas estimations for the account contract deployment and initialization.
+     */
+    estimateDeploymentGas(opts?: DeployAccountOptions): Promise<Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>>;
+    /**
+     * Deploys the account contract that backs this account if needed and awaits the tx to be mined.
+     * Uses the salt provided in the constructor or a randomly generated one. If no initialization
+     * is required it skips the transaction, and only registers the account in the PXE Service.
+     * @param opts - Options to wait for the tx to be mined.
+     * @returns A Wallet instance.
+     */
+    waitSetup(opts?: DeployAccountOptions & WaitOpts): Promise<AccountWalletWithSecretKey>;
+    /**
+     * Returns whether this account contract has a constructor and needs deployment.
+     */
+    isDeployable(): Promise<boolean>;
+}
+//# sourceMappingURL=account_manager.d.ts.map

package/dest/account_manager/account_manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/account_manager/account_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGxE,OAAO,EAAE,0BAA0B,EAAoB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,aAAa,EACb,KAAK,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,oBAAoB,CAChF,GAAG;IACF;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,qBAAa,cAAc;;IAEvB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;IAChB;;OAEG;aACa,IAAI,EAAE,IAAI;IAR5B,OAAO;WAWM,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI;IAoB1F,SAAS,CAAC,aAAa;IAIvB,SAAS,CAAC,iBAAiB;IAI3B;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAMpD;;;;OAIG;IACI,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC;IAIrD;;;;OAIG;IACI,UAAU;IAIjB;;;;OAIG;IACI,WAAW,IAAI,2BAA2B;IAIjD;;;;OAIG;IACU,SAAS,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAK7D;;;;;;OAMG;IACU,QAAQ,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAqF5D;;;;;;;OAOG;IACI,MAAM,CAAC,IAAI,CAAC,EAAE,oBAAoB,GAAG,mBAAmB;IA2B/D;;;;;;OAMG;IACU,qBAAqB,CAChC,IAAI,CAAC,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,CAAC;IAgBhE;;;;;;OAMG;IACU,SAAS,CAAC,IAAI,GAAE,oBAAoB,GAAG,QAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAKpH;;OAEG;IACU,YAAY;CAG1B"}

package/dest/account_manager/account_manager.js

@@ -0,0 +1,216 @@
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
+import { Fr } from '@aztec/foundation/fields';
+import { CompleteAddress } from '@aztec/stdlib/contract';
+import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { deriveKeys } from '@aztec/stdlib/keys';
+import { Contract } from '../contract/contract.js';
+import { DeployMethod } from '../contract/deploy_method.js';
+import { DefaultWaitOpts } from '../contract/sent_tx.js';
+import { AccountEntrypointMetaPaymentMethod } from '../fee/account_entrypoint_meta_payment_method.js';
+import { FeeJuicePaymentMethod } from '../index.js';
+import { AccountWalletWithSecretKey, SignerlessWallet } from '../wallet/index.js';
+import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
+/**
+ * Manages a user account. Provides methods for calculating the account's address, deploying the account contract,
+ * and creating and registering the user wallet in the PXE Service.
+ */ export class AccountManager {
+    pxe;
+    secretKey;
+    accountContract;
+    instance;
+    salt;
+    constructor(pxe, secretKey, accountContract, instance, /**
+     * Deployment salt for the account contract
+     */ salt){
+        this.pxe = pxe;
+        this.secretKey = secretKey;
+        this.accountContract = accountContract;
+        this.instance = instance;
+        this.salt = salt;
+    }
+    static async create(pxe, secretKey, accountContract, salt) {
+        const { publicKeys } = await deriveKeys(secretKey);
+        salt = salt !== undefined ? new Fr(salt) : Fr.random();
+        const { constructorName, constructorArgs } = await accountContract.getDeploymentFunctionAndArgs() ?? {
+            constructorName: undefined,
+            constructorArgs: undefined
+        };
+        const artifact = await accountContract.getContractArtifact();
+        const instance = await getContractInstanceFromDeployParams(artifact, {
+            constructorArtifact: constructorName,
+            constructorArgs,
+            salt: salt,
+            publicKeys
+        });
+        return new AccountManager(pxe, secretKey, accountContract, instance, salt);
+    }
+    getPublicKeys() {
+        return this.instance.publicKeys;
+    }
+    getPublicKeysHash() {
+        return this.getPublicKeys().hash();
+    }
+    /**
+   * Returns the entrypoint for this account as defined by its account contract.
+   * @returns An entrypoint.
+   */ async getAccount() {
+        const nodeInfo = await this.pxe.getNodeInfo();
+        const completeAddress = await this.getCompleteAddress();
+        return this.accountContract.getInterface(completeAddress, nodeInfo);
+    }
+    /**
+   * Gets the calculated complete address associated with this account.
+   * Does not require the account to be deployed or registered.
+   * @returns The address, partial address, and encryption public key.
+   */ getCompleteAddress() {
+        return CompleteAddress.fromSecretKeyAndInstance(this.secretKey, this.instance);
+    }
+    /**
+   * Gets the address for this given account.
+   * Does not require the account to be deployed or registered.
+   * @returns The address.
+   */ getAddress() {
+        return this.instance.address;
+    }
+    /**
+   * Returns the contract instance definition associated with this account.
+   * Does not require the account to be deployed or registered.
+   * @returns ContractInstance instance.
+   */ getInstance() {
+        return this.instance;
+    }
+    /**
+   * Returns a Wallet instance associated with this account. Use it to create Contract
+   * instances to be interacted with from this account.
+   * @returns A Wallet instance.
+   */ async getWallet() {
+        const entrypoint = await this.getAccount();
+        return new AccountWalletWithSecretKey(this.pxe, entrypoint, this.secretKey, this.salt);
+    }
+    /**
+   * Registers this account in the PXE Service and returns the associated wallet. Registering
+   * the account on the PXE Service is required for managing private state associated with it.
+   * Use the returned wallet to create Contract instances to be interacted with from this account.
+   * @param opts - Options to wait for the account to be synched.
+   * @returns A Wallet instance.
+   */ async register() {
+        await this.pxe.registerContract({
+            artifact: await this.accountContract.getContractArtifact(),
+            instance: this.getInstance()
+        });
+        await this.pxe.registerAccount(this.secretKey, (await this.getCompleteAddress()).partialAddress);
+        return this.getWallet();
+    }
+    /**
+   * Returns the pre-populated deployment method to deploy the account contract that backs this account.
+   * If no wallet is provided, it uses a signerless wallet with the multi call entrypoint
+   * @param deployWallet - Wallet used for deploying the account contract.
+   * @returns A DeployMethod instance that deploys this account contract
+   */ async #getDeployMethod(deployWallet) {
+        const artifact = await this.accountContract.getContractArtifact();
+        if (!await this.isDeployable()) {
+            throw new Error(`Account contract ${artifact.name} does not require deployment.`);
+        }
+        const completeAddress = await this.getCompleteAddress();
+        await this.pxe.registerAccount(this.secretKey, completeAddress.partialAddress);
+        const { constructorName, constructorArgs } = await this.accountContract.getDeploymentFunctionAndArgs() ?? {
+            constructorName: undefined,
+            constructorArgs: undefined
+        };
+        if (deployWallet) {
+            // If deploying using an existing wallet/account, treat it like regular contract deployment.
+            const thisWallet = await this.getWallet();
+            return new DeployMethod(this.getPublicKeys(), deployWallet, artifact, (address)=>Contract.at(address, artifact, thisWallet), constructorArgs, constructorName);
+        }
+        const { l1ChainId: chainId, protocolVersion } = await this.pxe.getNodeInfo();
+        // We use a signerless wallet with the multi call entrypoint in order to make multiple calls in one go.
+        // If we used getWallet, the deployment would get routed via the account contract entrypoint
+        // and it can't be used unless the contract is initialized.
+        const wallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
+        return new DeployMethod(this.getPublicKeys(), wallet, artifact, (address)=>Contract.at(address, artifact, wallet), constructorArgs, constructorName);
+    }
+    /**
+   * Returns a FeePaymentMethod that routes the original one provided as an argument
+   * through the account's entrypoint. This allows an account contract to pay
+   * for its own deployment and initialization.
+   *
+   * For more details on how the fee payment routing works see documentation of AccountEntrypointMetaPaymentMethod class.
+   *
+   * @param originalPaymentMethod - originalPaymentMethod The original payment method to be wrapped.
+   * @returns A FeePaymentMethod that routes the original one through the account's entrypoint (AccountEntrypointMetaPaymentMethod)
+   */ async #getSelfPaymentMethod(originalPaymentMethod) {
+        const artifact = await this.accountContract.getContractArtifact();
+        const wallet = await this.getWallet();
+        const address = wallet.getAddress();
+        return new AccountEntrypointMetaPaymentMethod(artifact, wallet, 'entrypoint', address, originalPaymentMethod ?? new FeeJuicePaymentMethod(address));
+    }
+    /**
+   * Deploys the account contract that backs this account.
+   * Does not register the associated class nor publicly deploy the instance by default.
+   * Uses the salt provided in the constructor or a randomly generated one.
+   * Registers the account in the PXE Service before deploying the contract.
+   * @param opts - Fee options to be used for the deployment.
+   * @returns A SentTx object that can be waited to get the associated Wallet.
+   */ deploy(opts) {
+        let deployMethod;
+        const sentTx = this.#getDeployMethod(opts?.deployWallet).then((method)=>{
+            deployMethod = method;
+            if (!opts?.deployWallet && opts?.fee) {
+                return this.#getSelfPaymentMethod(opts?.fee?.paymentMethod);
+            }
+        }).then((maybeWrappedPaymentMethod)=>{
+            let fee = opts?.fee;
+            if (maybeWrappedPaymentMethod) {
+                fee = {
+                    ...opts?.fee,
+                    paymentMethod: maybeWrappedPaymentMethod
+                };
+            }
+            return deployMethod.send({
+                contractAddressSalt: new Fr(this.salt),
+                skipClassRegistration: opts?.skipClassRegistration ?? true,
+                skipPublicDeployment: opts?.skipPublicDeployment ?? true,
+                skipInitialization: opts?.skipInitialization ?? false,
+                universalDeploy: true,
+                fee
+            });
+        }).then((tx)=>tx.getTxHash());
+        return new DeployAccountSentTx(this.pxe, sentTx, this.getWallet());
+    }
+    /**
+   * Estimates the gas needed to deploy the account contract that backs this account.
+   * This method is here to ensure that the fee payment method is correctly set up in case
+   * the account contract needs to pay for its own deployment.
+   * @param opts - Fee options to be used for the deployment.
+   * @returns The gas estimations for the account contract deployment and initialization.
+   */ async estimateDeploymentGas(opts) {
+        const deployMethod = await this.#getDeployMethod(opts?.deployWallet);
+        const fee = !opts?.deployWallet && opts?.fee ? {
+            ...opts.fee,
+            paymentMethod: await this.#getSelfPaymentMethod(opts.fee.paymentMethod)
+        } : opts?.fee;
+        return deployMethod.estimateGas({
+            contractAddressSalt: new Fr(this.salt),
+            skipClassRegistration: opts?.skipClassRegistration ?? true,
+            skipPublicDeployment: opts?.skipPublicDeployment ?? true,
+            skipInitialization: opts?.skipInitialization ?? false,
+            universalDeploy: true,
+            fee
+        });
+    }
+    /**
+   * Deploys the account contract that backs this account if needed and awaits the tx to be mined.
+   * Uses the salt provided in the constructor or a randomly generated one. If no initialization
+   * is required it skips the transaction, and only registers the account in the PXE Service.
+   * @param opts - Options to wait for the tx to be mined.
+   * @returns A Wallet instance.
+   */ async waitSetup(opts = DefaultWaitOpts) {
+        await (await this.isDeployable() ? this.deploy(opts).wait(opts) : this.register());
+        return this.getWallet();
+    }
+    /**
+   * Returns whether this account contract has a constructor and needs deployment.
+   */ async isDeployable() {
+        return await this.accountContract.getDeploymentFunctionAndArgs() !== undefined;
+    }
+}

package/dest/account_manager/deploy_account_sent_tx.d.ts

@@ -1,8 +1,8 @@
 import type { FieldsOf } from '@aztec/foundation/types';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
 import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
-import type { Wallet } from '../account/index.js';
 import { SentTx, type WaitOpts } from '../contract/sent_tx.js';
+import type { Wallet } from '../wallet/wallet.js';
 /** Extends a transaction receipt with a wallet instance for the newly deployed contract. */
 export type DeployAccountTxReceipt = FieldsOf<TxReceipt> & {
     /** Wallet that corresponds to the newly deployed account contract. */
@@ -13,7 +13,7 @@ export type DeployAccountTxReceipt = FieldsOf<TxReceipt> & {
  */
 export declare class DeployAccountSentTx extends SentTx {
     private getWalletPromise;
-    constructor(pxe: PXE, txHashPromise: Promise<TxHash>, getWalletPromise: Promise<Wallet>);
+    constructor(pxeOrNode: AztecNode | PXE, txHashPromise: Promise<TxHash>, getWalletPromise: Promise<Wallet>);
     /**
      * Awaits for the tx to be mined and returns the contract instance. Throws if tx is not mined.
      * @param opts - Options for configuring the waiting for the tx to be mined.

package/dest/account_manager/deploy_account_sent_tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_account_sent_tx.d.ts","sourceRoot":"","sources":["../../src/account_manager/deploy_account_sent_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAmB,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEhF,4FAA4F;AAC5F,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG;IACzD,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,MAAM;IACS,OAAO,CAAC,gBAAgB;gBAAlE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,EAAU,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC;IAI/F;;;;OAIG;IACU,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAKxD;;;;OAIG;IACmB,IAAI,CAAC,IAAI,GAAE,QAA0B,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAK9F"}
+{"version":3,"file":"deploy_account_sent_tx.d.ts","sourceRoot":"","sources":["../../src/account_manager/deploy_account_sent_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAmB,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,4FAA4F;AAC5F,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG;IACzD,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,MAAM;IAC2B,OAAO,CAAC,gBAAgB;gBAApF,SAAS,EAAE,SAAS,GAAG,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,EAAU,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC;IAIjH;;;;OAIG;IACU,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAKxD;;;;OAIG;IACmB,IAAI,CAAC,IAAI,GAAE,QAA0B,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAK9F"}

package/dest/account_manager/deploy_account_sent_tx.js

@@ -3,8 +3,8 @@ import { DefaultWaitOpts, SentTx } from '../contract/sent_tx.js';
  * A deployment transaction for an account contract sent to the network, extending SentTx with methods to get the resulting wallet.
  */ export class DeployAccountSentTx extends SentTx {
     getWalletPromise;
-    constructor(pxe, txHashPromise, getWalletPromise){
-        super(pxe, txHashPromise), this.getWalletPromise = getWalletPromise;
+    constructor(pxeOrNode, txHashPromise, getWalletPromise){
+        super(pxeOrNode, txHashPromise), this.getWalletPromise = getWalletPromise;
     }
     /**
    * Awaits for the tx to be mined and returns the contract instance. Throws if tx is not mined.

package/dest/account_manager/index.d.ts

@@ -1,107 +1,3 @@
-import { Fr } from '@aztec/foundation/fields';
-import { CompleteAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-import type { AccountContract } from '../account/contract.js';
-import type { Salt, Wallet } from '../account/index.js';
-import type { AccountInterface } from '../account/interface.js';
-import { Contract } from '../contract/contract.js';
-import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js';
-import { type WaitOpts } from '../contract/sent_tx.js';
-import { AccountWalletWithSecretKey } from '../wallet/index.js';
-import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
-/**
- * Options to deploy an account contract.
- */
-export type DeployAccountOptions = Pick<DeployOptions, 'fee' | 'skipClassRegistration' | 'skipPublicDeployment' | 'skipInitialization'> & {
-    /**
-     * Wallet used for deploying the account contract. Must be funded in order to pay for the fee.
-     */
-    deployWallet?: Wallet;
-};
-/**
- * Manages a user account. Provides methods for calculating the account's address, deploying the account contract,
- * and creating and registering the user wallet in the PXE Service.
- */
-export declare class AccountManager {
-    private pxe;
-    private secretKey;
-    private accountContract;
-    private instance;
-    /**
-     * Deployment salt for the account contract
-     */
-    readonly salt: Salt;
-    private constructor();
-    static create(pxe: PXE, secretKey: Fr, accountContract: AccountContract, salt?: Salt): Promise<AccountManager>;
-    protected getPublicKeys(): import("@aztec/stdlib/keys").PublicKeys;
-    protected getPublicKeysHash(): Fr | Promise<Fr>;
-    /**
-     * Returns the entrypoint for this account as defined by its account contract.
-     * @returns An entrypoint.
-     */
-    getAccount(): Promise<AccountInterface>;
-    /**
-     * Gets the calculated complete address associated with this account.
-     * Does not require the account to be deployed or registered.
-     * @returns The address, partial address, and encryption public key.
-     */
-    getCompleteAddress(): Promise<CompleteAddress>;
-    /**
-     * Gets the address for this given account.
-     * Does not require the account to be deployed or registered.
-     * @returns The address.
-     */
-    getAddress(): import("../index.js").AztecAddress;
-    /**
-     * Returns the contract instance definition associated with this account.
-     * Does not require the account to be deployed or registered.
-     * @returns ContractInstance instance.
-     */
-    getInstance(): ContractInstanceWithAddress;
-    /**
-     * Returns a Wallet instance associated with this account. Use it to create Contract
-     * instances to be interacted with from this account.
-     * @returns A Wallet instance.
-     */
-    getWallet(): Promise<AccountWalletWithSecretKey>;
-    /**
-     * Registers this account in the PXE Service and returns the associated wallet. Registering
-     * the account on the PXE Service is required for managing private state associated with it.
-     * Use the returned wallet to create Contract instances to be interacted with from this account.
-     * @param opts - Options to wait for the account to be synched.
-     * @returns A Wallet instance.
-     */
-    register(): Promise<AccountWalletWithSecretKey>;
-    /**
-     * Returns the pre-populated deployment method to deploy the account contract that backs this account.
-     * Typically you will not need this method and can call `deploy` directly. Use this for having finer
-     * grained control on when to create, simulate, and send the deployment tx.
-     * @param deployWallet - Wallet used for deploying the account contract.
-     * @returns A DeployMethod instance that deploys this account contract.
-     */
-    getDeployMethod(deployWallet?: Wallet): Promise<DeployMethod<Contract>>;
-    /**
-     * Deploys the account contract that backs this account.
-     * Does not register the associated class nor publicly deploy the instance by default.
-     * Uses the salt provided in the constructor or a randomly generated one.
-     * Registers the account in the PXE Service before deploying the contract.
-     * @param opts - Fee options to be used for the deployment.
-     * @returns A SentTx object that can be waited to get the associated Wallet.
-     */
-    deploy(opts?: DeployAccountOptions): DeployAccountSentTx;
-    /**
-     * Deploys the account contract that backs this account if needed and awaits the tx to be mined.
-     * Uses the salt provided in the constructor or a randomly generated one. If no initialization
-     * is required it skips the transaction, and only registers the account in the PXE Service.
-     * @param opts - Options to wait for the tx to be mined.
-     * @returns A Wallet instance.
-     */
-    waitSetup(opts?: DeployAccountOptions & WaitOpts): Promise<AccountWalletWithSecretKey>;
-    /**
-     * Returns whether this account contract has a constructor and needs deployment.
-     */
-    isDeployable(): Promise<boolean>;
-}
-export { DeployAccountMethod } from './deploy_account_method.js';
+export { AccountManager, type DeployAccountOptions } from './account_manager.js';
 export { type DeployAccountTxReceipt, DeployAccountSentTx } from './deploy_account_sent_tx.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/account_manager/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAO,EAAE,0BAA0B,EAAoB,MAAM,oBAAoB,CAAC;AAElF,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,aAAa,EACb,KAAK,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,oBAAoB,CAChF,GAAG;IACF;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;IAChB;;OAEG;aACa,IAAI,EAAE,IAAI;IAR5B,OAAO;WAWM,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI;IAoB1F,SAAS,CAAC,aAAa;IAIvB,SAAS,CAAC,iBAAiB;IAI3B;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAMpD;;;;OAIG;IACI,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC;IAIrD;;;;OAIG;IACI,UAAU;IAIjB;;;;OAIG;IACI,WAAW,IAAI,2BAA2B;IAIjD;;;;OAIG;IACU,SAAS,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAK7D;;;;;;OAMG;IACU,QAAQ,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAW5D;;;;;;OAMG;IACU,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM;IA8ClD;;;;;;;OAOG;IACI,MAAM,CAAC,IAAI,CAAC,EAAE,oBAAoB,GAAG,mBAAmB;IAgB/D;;;;;;OAMG;IACU,SAAS,CAAC,IAAI,GAAE,oBAAoB,GAAG,QAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAKpH;;OAEG;IACU,YAAY;CAG1B;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,KAAK,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/account_manager/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC"}