@aztec/aztec.js 0.82.0 → 0.82.1

package/dest/account_manager/account_manager.d.ts

@@ -1,11 +1,11 @@
 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 { Contract } from '../contract/contract.js';
-import { DeployMethod, type DeployOptions } from '../contract/deploy_method.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';
@@ -23,6 +23,7 @@ export type DeployAccountOptions = Pick<DeployOptions, 'fee' | 'skipClassRegistr
  * and creating and registering the user wallet in the PXE Service.
  */
 export declare class AccountManager {
+    #private;
     private pxe;
     private secretKey;
     private accountContract;
@@ -72,14 +73,6 @@ export declare class AccountManager {
      * @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.
@@ -89,6 +82,14 @@ export declare class AccountManager {
      * @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

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

@@ -1 +1 @@
-{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/account_manager/account_manager.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,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,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,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE/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;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"}
+{"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

@@ -1,3 +1,4 @@
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import { Fr } from '@aztec/foundation/fields';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
@@ -5,9 +6,9 @@ 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 { DefaultMultiCallEntrypoint } from '../entrypoint/default_multi_call_entrypoint.js';
+import { AccountEntrypointMetaPaymentMethod } from '../fee/account_entrypoint_meta_payment_method.js';
+import { FeeJuicePaymentMethod } from '../index.js';
 import { AccountWalletWithSecretKey, SignerlessWallet } from '../wallet/index.js';
-import { DeployAccountMethod } from './deploy_account_method.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,
@@ -102,11 +103,10 @@ import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
     }
     /**
    * 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.
+   * 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) {
+   * @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.`);
@@ -127,7 +127,22 @@ import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
         // 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 DeployAccountMethod(this.accountContract.getAuthWitnessProvider(completeAddress), this.getPublicKeys(), wallet, artifact, constructorArgs, constructorName, 'entrypoint');
+        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.
@@ -137,17 +152,53 @@ import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
    * @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) {
-        const sentTx = this.getDeployMethod(opts?.deployWallet).then((deployMethod)=>deployMethod.send({
+        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: opts?.fee
-            })).then((tx)=>tx.getTxHash());
+                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.

package/dest/account_manager/index.d.ts

@@ -1,4 +1,3 @@
 export { AccountManager, type DeployAccountOptions } from './account_manager.js';
-export { DeployAccountMethod } from './deploy_account_method.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,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjF,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"}

package/dest/account_manager/index.js

@@ -1,3 +1,2 @@
 export { AccountManager } from './account_manager.js';
-export { DeployAccountMethod } from './deploy_account_method.js';
 export { DeployAccountSentTx } from './deploy_account_sent_tx.js';

package/dest/api/fee.d.ts

@@ -3,4 +3,5 @@ export { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
 export { PrivateFeePaymentMethod } from '../fee/private_fee_payment_method.js';
 export { PublicFeePaymentMethod } from '../fee/public_fee_payment_method.js';
 export { FeeJuicePaymentMethodWithClaim } from '../fee/fee_juice_payment_method_with_claim.js';
+export { SponsoredFeePaymentMethod } from '../fee/sponsored_fee_payment.js';
 //# sourceMappingURL=fee.d.ts.map

package/dest/api/fee.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee.d.ts","sourceRoot":"","sources":["../../src/api/fee.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,+CAA+C,CAAC"}
+{"version":3,"file":"fee.d.ts","sourceRoot":"","sources":["../../src/api/fee.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,+CAA+C,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC"}

package/dest/api/fee.js

@@ -2,3 +2,4 @@ export { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
 export { PrivateFeePaymentMethod } from '../fee/private_fee_payment_method.js';
 export { PublicFeePaymentMethod } from '../fee/public_fee_payment_method.js';
 export { FeeJuicePaymentMethodWithClaim } from '../fee/fee_juice_payment_method_with_claim.js';
+export { SponsoredFeePaymentMethod } from '../fee/sponsored_fee_payment.js';

package/dest/api/fee_testing.d.ts

@@ -0,0 +1,2 @@
+export { SponsoredFeePaymentMethod } from '../fee/sponsored_fee_payment.js';
+//# sourceMappingURL=fee_testing.d.ts.map

package/dest/api/fee_testing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fee_testing.d.ts","sourceRoot":"","sources":["../../src/api/fee_testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC"}

package/dest/api/fee_testing.js

@@ -0,0 +1 @@
+export { SponsoredFeePaymentMethod } from '../fee/sponsored_fee_payment.js';

package/dest/contract/deploy_proven_tx.js

@@ -12,7 +12,7 @@ import { ProvenTx } from './proven_tx.js';
    * Sends the transaction to the network via the provided wallet.
    */ send() {
         const promise = (()=>{
-            return this.wallet.sendTx(this.getPlainDataTx());
+            return this.wallet.sendTx(this);
         })();
         return new DeploySentTx(this.wallet, promise, this.postDeployCtor, this.instanceGetter);
     }

package/dest/contract/proven_tx.d.ts

@@ -7,7 +7,6 @@ import { SentTx } from './sent_tx.js';
 export declare class ProvenTx extends Tx {
     protected wallet: Wallet;
     constructor(wallet: Wallet, tx: Tx);
-    protected getPlainDataTx(): Tx;
     /**
      * Sends the transaction to the network via the provided wallet.
      */

package/dest/contract/proven_tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proven_tx.d.ts","sourceRoot":"","sources":["../../src/contract/proven_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,qBAAa,QAAS,SAAQ,EAAE;IAClB,SAAS,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;IAW5C,SAAS,CAAC,cAAc,IAAI,EAAE;IAU9B;;OAEG;IACI,IAAI,IAAI,MAAM;CAOtB"}
+{"version":3,"file":"proven_tx.d.ts","sourceRoot":"","sources":["../../src/contract/proven_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,qBAAa,QAAS,SAAQ,EAAE;IAClB,SAAS,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;IAI5C;;OAEG;IACI,IAAI,IAAI,MAAM;CAOtB"}

package/dest/contract/proven_tx.js

@@ -5,17 +5,13 @@ import { SentTx } from './sent_tx.js';
  */ export class ProvenTx extends Tx {
     wallet;
     constructor(wallet, tx){
-        super(tx.data, tx.clientIvcProof, tx.contractClassLogs, tx.enqueuedPublicFunctionCalls, tx.publicTeardownFunctionCall), this.wallet = wallet;
-    }
-    // Clone the TX data to get a serializable object.
-    getPlainDataTx() {
-        return new Tx(this.data, this.clientIvcProof, this.contractClassLogs, this.enqueuedPublicFunctionCalls, this.publicTeardownFunctionCall);
+        super(tx.data, tx.clientIvcProof, tx.contractClassLogs, tx.publicFunctionCalldata), this.wallet = wallet;
     }
     /**
    * Sends the transaction to the network via the provided wallet.
    */ send() {
         const promise = (()=>{
-            return this.wallet.sendTx(this.getPlainDataTx());
+            return this.wallet.sendTx(this);
         })();
         return new SentTx(this.wallet, promise);
     }

package/dest/fee/account_entrypoint_meta_payment_method.d.ts

@@ -0,0 +1,31 @@
+import type { AuthWitnessProvider, FeePaymentMethod } from '@aztec/entrypoints/interfaces';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { type ContractArtifact, type FunctionArtifact } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
+/**
+ * Fee payment method that allows a contract to pay for its own deployment
+ * It works by rerouting the provided fee payment method through the account's entrypoint,
+ * which sets itself as fee payer.
+ *
+ * Usually, in order to pay fees it is necessary to obtain an ExecutionPayload that encodes the necessary information
+ * that is sent to the user's account entrypoint, that has plumbing to handle a fee payload.
+ * If there's no account contract yet (it's being deployed) a MultiCallContract is used, which doesn't have a concept of fees or
+ * how to handle this payload.
+ * HOWEVER, the account contract's entrypoint does, so this method reshapes that fee payload into a call to the account contract entrypoint
+ * being deployed with the original fee payload.
+ *
+ * This class can be seen in action in AccountManager.ts#getSelfPaymentMethod
+ */
+export declare class AccountEntrypointMetaPaymentMethod implements FeePaymentMethod {
+    private artifact;
+    private authWitnessProvider;
+    private feePaymentNameOrArtifact;
+    private accountAddress;
+    private paymentMethod;
+    constructor(artifact: ContractArtifact, authWitnessProvider: AuthWitnessProvider, feePaymentNameOrArtifact: string | FunctionArtifact, accountAddress: AztecAddress, paymentMethod: FeePaymentMethod);
+    getAsset(): Promise<AztecAddress>;
+    getExecutionPayload(gasSettings: GasSettings): Promise<ExecutionPayload>;
+    getFeePayer(gasSettings: GasSettings): Promise<AztecAddress>;
+}
+//# sourceMappingURL=account_entrypoint_meta_payment_method.d.ts.map

package/dest/fee/account_entrypoint_meta_payment_method.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account_entrypoint_meta_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/account_entrypoint_meta_payment_method.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAKtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;;;;;;;;GAaG;AACH,qBAAa,kCAAmC,YAAW,gBAAgB;IAEvE,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,wBAAwB;IAChC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,aAAa;gBAJb,QAAQ,EAAE,gBAAgB,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,wBAAwB,EAAE,MAAM,GAAG,gBAAgB,EACnD,cAAc,EAAE,YAAY,EAC5B,aAAa,EAAE,gBAAgB;IAGzC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAI3B,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyC9E,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;CAG7D"}

package/dest/fee/account_entrypoint_meta_payment_method.js

@@ -0,0 +1,64 @@
+import { EncodedAppEntrypointCalls, EncodedCallsForEntrypoint, computeCombinedPayloadHash } from '@aztec/entrypoints/encoding';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { FunctionCall, FunctionSelector, encodeArguments, getFunctionArtifactByName } from '@aztec/stdlib/abi';
+/**
+ * Fee payment method that allows a contract to pay for its own deployment
+ * It works by rerouting the provided fee payment method through the account's entrypoint,
+ * which sets itself as fee payer.
+ *
+ * Usually, in order to pay fees it is necessary to obtain an ExecutionPayload that encodes the necessary information
+ * that is sent to the user's account entrypoint, that has plumbing to handle a fee payload.
+ * If there's no account contract yet (it's being deployed) a MultiCallContract is used, which doesn't have a concept of fees or
+ * how to handle this payload.
+ * HOWEVER, the account contract's entrypoint does, so this method reshapes that fee payload into a call to the account contract entrypoint
+ * being deployed with the original fee payload.
+ *
+ * This class can be seen in action in AccountManager.ts#getSelfPaymentMethod
+ */ export class AccountEntrypointMetaPaymentMethod {
+    artifact;
+    authWitnessProvider;
+    feePaymentNameOrArtifact;
+    accountAddress;
+    paymentMethod;
+    constructor(artifact, authWitnessProvider, feePaymentNameOrArtifact, accountAddress, paymentMethod){
+        this.artifact = artifact;
+        this.authWitnessProvider = authWitnessProvider;
+        this.feePaymentNameOrArtifact = feePaymentNameOrArtifact;
+        this.accountAddress = accountAddress;
+        this.paymentMethod = paymentMethod;
+    }
+    getAsset() {
+        return this.paymentMethod.getAsset();
+    }
+    async getExecutionPayload(gasSettings) {
+        const emptyAppCalls = await EncodedAppEntrypointCalls.fromAppExecution([]);
+        // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
+        const { calls: feeCalls, authWitnesses: feeAuthwitnesses } = await this.paymentMethod.getExecutionPayload(gasSettings);
+        // Encode the calls for the fee
+        const feePayer = await this.paymentMethod.getFeePayer(gasSettings);
+        const isFeePayer = feePayer.equals(this.accountAddress);
+        const feeEncodedCalls = await EncodedCallsForEntrypoint.fromFeeCalls(feeCalls, isFeePayer);
+        // Get the entrypoint args
+        const args = [
+            emptyAppCalls,
+            feeEncodedCalls,
+            false
+        ];
+        const feePaymentArtifact = typeof this.feePaymentNameOrArtifact === 'string' ? getFunctionArtifactByName(this.artifact, this.feePaymentNameOrArtifact) : this.feePaymentNameOrArtifact;
+        const entrypointCall = new FunctionCall(feePaymentArtifact.name, this.accountAddress, await FunctionSelector.fromNameAndParameters(feePaymentArtifact.name, feePaymentArtifact.parameters), feePaymentArtifact.functionType, feePaymentArtifact.isStatic, encodeArguments(feePaymentArtifact, args), feePaymentArtifact.returnTypes);
+        // Compute the authwitness required to verify the combined payload
+        const combinedPayloadAuthWitness = await this.authWitnessProvider.createAuthWit(await computeCombinedPayloadHash(emptyAppCalls, feeEncodedCalls));
+        return new ExecutionPayload([
+            entrypointCall
+        ], [
+            combinedPayloadAuthWitness,
+            ...feeAuthwitnesses
+        ], [], [
+            ...emptyAppCalls.hashedArguments,
+            ...feeEncodedCalls.hashedArguments
+        ]);
+    }
+    getFeePayer(gasSettings) {
+        return this.paymentMethod.getFeePayer(gasSettings);
+    }
+}

package/dest/fee/sponsored_fee_payment.d.ts

@@ -0,0 +1,15 @@
+import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+/**
+ * A fee payment method that uses a contract that blindly sponsors transactions.
+ * This contract is expected to be prefunded in testing environments.
+ */
+export declare class SponsoredFeePaymentMethod implements FeePaymentMethod {
+    private paymentContract;
+    constructor(paymentContract: AztecAddress);
+    getAsset(): Promise<AztecAddress>;
+    getFeePayer(): Promise<AztecAddress>;
+    getExecutionPayload(): Promise<ExecutionPayload>;
+}
+//# sourceMappingURL=sponsored_fee_payment.d.ts.map

package/dest/fee/sponsored_fee_payment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sponsored_fee_payment.d.ts","sourceRoot":"","sources":["../../src/fee/sponsored_fee_payment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,gBAAgB;IACpD,OAAO,CAAC,eAAe;gBAAf,eAAe,EAAE,YAAY;IAEjD,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAIjC,WAAW;IAIL,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAiBvD"}

package/dest/fee/sponsored_fee_payment.js

@@ -0,0 +1,30 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+/**
+ * A fee payment method that uses a contract that blindly sponsors transactions.
+ * This contract is expected to be prefunded in testing environments.
+ */ export class SponsoredFeePaymentMethod {
+    paymentContract;
+    constructor(paymentContract){
+        this.paymentContract = paymentContract;
+    }
+    getAsset() {
+        throw new Error('Asset is not required for sponsored fpc.');
+    }
+    getFeePayer() {
+        return Promise.resolve(this.paymentContract);
+    }
+    async getExecutionPayload() {
+        return new ExecutionPayload([
+            {
+                name: 'sponsor_unconditionally',
+                to: this.paymentContract,
+                selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
+                type: FunctionType.PRIVATE,
+                isStatic: false,
+                args: [],
+                returnTypes: []
+            }
+        ], [], []);
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAE3F,8BAA8B;AAC9B,MAAM,MAAM,cAAc,GAAG;IAC3B,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;IACZ,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,gCAAgC;AAChC,MAAM,MAAM,eAAe,GAAG;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,GAAG,EAAE,CAAC;CACxB,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GAAG;IACzB,6BAA6B;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,4BAA4B;IAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;CACpD,CAAC;AAGF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,yBAAyB,WAAkB,eAAe,GAAG,YAAY,YAAY,cAAc,gBAiB/G,CAAC;AAGF;;;;;;IAMI;AACJ,eAAO,MAAM,uCAAuC,WAAkB,YAAY,UAAU,YAAY,gBAMvG,CAAC;AAEF;;;;;;;IAOI;AACJ,eAAO,MAAM,iCAAiC,WACpC,YAAY,UACZ,YAAY,GAAG,2BAA2B,gBAQnD,CAAC"}
+{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAE3F,8BAA8B;AAC9B,MAAM,MAAM,cAAc,GAAG;IAC3B,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;IACZ,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,gCAAgC;AAChC,MAAM,MAAM,eAAe,GAAG;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,GAAG,EAAE,CAAC;CACxB,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GAAG;IACzB,6BAA6B;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,4BAA4B;IAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;CACpD,CAAC;AAGF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,yBAAyB,WAAkB,eAAe,GAAG,YAAY,YAAY,cAAc,gBAiB/G,CAAC;AAGF;;;;;;IAMI;AACJ,eAAO,MAAM,uCAAuC,WAAkB,YAAY,UAAU,YAAY,gBAEvG,CAAC;AAEF;;;;;;;IAOI;AACJ,eAAO,MAAM,iCAAiC,WACpC,YAAY,UACZ,YAAY,GAAG,2BAA2B,gBAInD,CAAC"}

package/dest/utils/authwit.js

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/stdlib/auth-witness';
-import { HashedValues } from '@aztec/stdlib/tx';
+import { computeVarArgsHash } from '@aztec/stdlib/hash';
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 // docs:start:authwit_computeAuthWitMessageHash
 /**
@@ -45,7 +45,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
     return computeInnerAuthWitHash([
         caller.toField(),
         fnCall.selector.toField(),
-        (await HashedValues.fromValues(fnCall.args)).hash
+        await computeVarArgsHash(fnCall.args)
     ]);
 };
 /**
@@ -60,6 +60,6 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
     return computeInnerAuthWitHash([
         caller.toField(),
         action.selector.toField(),
-        (await HashedValues.fromValues(action.args)).hash
+        await computeVarArgsHash(action.args)
     ]);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aztec/aztec.js",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
-  "version": "0.82.0",
+  "version": "0.82.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -23,7 +23,8 @@
     "./tx_hash": "./dest/api/tx_hash.js",
     "./wallet": "./dest/api/wallet.js",
     "./utils": "./dest/api/utils.js",
-    "./testing": "./dest/api/testing.js"
+    "./testing": "./dest/api/testing.js",
+    "./fee/testing": "./dest/api/fee_testing.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -79,13 +80,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.82.0",
-    "@aztec/entrypoints": "0.82.0",
-    "@aztec/ethereum": "0.82.0",
-    "@aztec/foundation": "0.82.0",
-    "@aztec/l1-artifacts": "0.82.0",
-    "@aztec/protocol-contracts": "0.82.0",
-    "@aztec/stdlib": "0.82.0",
+    "@aztec/constants": "0.82.1",
+    "@aztec/entrypoints": "0.82.1",
+    "@aztec/ethereum": "0.82.1",
+    "@aztec/foundation": "0.82.1",
+    "@aztec/l1-artifacts": "0.82.1",
+    "@aztec/protocol-contracts": "0.82.1",
+    "@aztec/stdlib": "0.82.1",
     "axios": "^1.7.2",
     "tslib": "^2.4.0",
     "viem": "2.23.7"

package/src/account_manager/account_manager.ts

@@ -1,6 +1,8 @@
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import { Fr } from '@aztec/foundation/fields';
 import { CompleteAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import type { GasSettings } from '@aztec/stdlib/gas';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
 import { deriveKeys } from '@aztec/stdlib/keys';
 
@@ -10,9 +12,9 @@ import type { AccountInterface } from '../account/interface.js';
 import { Contract } from '../contract/contract.js';
 import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js';
 import { DefaultWaitOpts, type WaitOpts } from '../contract/sent_tx.js';
-import { DefaultMultiCallEntrypoint } from '../entrypoint/default_multi_call_entrypoint.js';
+import { AccountEntrypointMetaPaymentMethod } from '../fee/account_entrypoint_meta_payment_method.js';
+import { FeeJuicePaymentMethod, type FeePaymentMethod } from '../index.js';
 import { AccountWalletWithSecretKey, SignerlessWallet, type Wallet } from '../wallet/index.js';
-import { DeployAccountMethod } from './deploy_account_method.js';
 import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
 
 /**
@@ -139,12 +141,11 @@ export class AccountManager {
 
   /**
    * 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.
+   * 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.
+   * @returns A DeployMethod instance that deploys this account contract
    */
-  public async getDeployMethod(deployWallet?: Wallet) {
+  async #getDeployMethod(deployWallet?: Wallet): Promise<DeployMethod> {
     const artifact = await this.accountContract.getContractArtifact();
 
     if (!(await this.isDeployable())) {
@@ -179,14 +180,36 @@ export class AccountManager {
     // and it can't be used unless the contract is initialized.
     const wallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
 
-    return new DeployAccountMethod(
-      this.accountContract.getAuthWitnessProvider(completeAddress),
+    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?: FeePaymentMethod) {
+    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),
     );
   }
 
@@ -199,21 +222,57 @@ export class AccountManager {
    * @returns A SentTx object that can be waited to get the associated Wallet.
    */
   public deploy(opts?: DeployAccountOptions): DeployAccountSentTx {
-    const sentTx = this.getDeployMethod(opts?.deployWallet)
-      .then(deployMethod =>
-        deployMethod.send({
+    let deployMethod: 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: opts?.fee,
-        }),
-      )
+          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.
+   */
+  public async estimateDeploymentGas(
+    opts?: DeployAccountOptions,
+  ): Promise<Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>> {
+    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