@aztec/aztec.js 0.0.1-commit.d3ec352c → 0.0.1-commit.e61ad554

package/dest/utils/node.js

@@ -1,4 +1,6 @@
 import { retryUntil } from '@aztec/foundation/retry';
+import { SortedTxStatuses, TxStatus } from '@aztec/stdlib/tx';
+import { DefaultWaitOpts } from '../contract/wait_opts.js';
 export const waitForNode = async (node, logger)=>{
     await retryUntil(async ()=>{
         try {
@@ -12,4 +14,48 @@ export const waitForNode = async (node, logger)=>{
         return undefined;
     }, 'RPC Get Node Info');
 };
+/** Returns true if the receipt status is at least the desired status level. */ function hasReachedStatus(receipt, desiredStatus) {
+    return SortedTxStatuses.indexOf(receipt.status) >= SortedTxStatuses.indexOf(desiredStatus);
+}
+/**
+ * Waits for a transaction to be mined and returns its receipt.
+ * @param node - The Aztec node to query for transaction status
+ * @param txHash - The hash of the transaction to wait for
+ * @param opts - Optional configuration for waiting behavior
+ * @returns The transaction receipt
+ * @throws If the transaction fails and dontThrowOnRevert is not set
+ */ export async function waitForTx(node, txHash, opts) {
+    const startTime = Date.now();
+    const ignoreDroppedReceiptsFor = opts?.ignoreDroppedReceiptsFor ?? DefaultWaitOpts.ignoreDroppedReceiptsFor;
+    const waitForStatus = opts?.waitForStatus ?? TxStatus.CHECKPOINTED;
+    const receipt = await retryUntil(async ()=>{
+        const txReceipt = await node.getTxReceipt(txHash);
+        // If receipt is not yet available, try again
+        if (txReceipt.isPending()) {
+            return undefined;
+        }
+        // If the tx was "dropped", either return it or ignore based on timing.
+        // We can ignore it at first because the transaction may have been sent to node 1, and now we're asking node 2 for the receipt.
+        // If we don't allow a short grace period, we could incorrectly return a TxReceipt with status DROPPED.
+        if (txReceipt.isDropped()) {
+            const elapsedSeconds = (Date.now() - startTime) / 1000;
+            if (!ignoreDroppedReceiptsFor || elapsedSeconds > ignoreDroppedReceiptsFor) {
+                return txReceipt;
+            }
+            return undefined;
+        }
+        // Check if the receipt has reached the desired status level
+        if (!hasReachedStatus(txReceipt, waitForStatus)) {
+            return undefined;
+        }
+        return txReceipt;
+    }, 'isMined', opts?.timeout ?? DefaultWaitOpts.timeout, opts?.interval ?? DefaultWaitOpts.interval);
+    if (!receipt.isMined()) {
+        throw new Error(`Transaction ${txHash.toString()} was ${receipt.status}. Reason: ${receipt.error ?? 'unknown'}`);
+    }
+    if (!receipt.hasExecutionSucceeded() && !opts?.dontThrowOnRevert) {
+        throw new Error(`Transaction ${txHash.toString()} reverted: ${receipt.executionResult}. Reason: ${receipt.error ?? 'unknown'}`);
+    }
+    return receipt;
+}
 export { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';

package/dest/utils/pub_key.d.ts

@@ -1,4 +1,4 @@
-import type { GrumpkinScalar } from '@aztec/foundation/fields';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { PublicKey } from '@aztec/stdlib/keys';
 /**
  * Method for generating a public grumpkin key from a private key.
@@ -6,4 +6,4 @@ import type { PublicKey } from '@aztec/stdlib/keys';
  * @returns The generated public key.
  */
 export declare function generatePublicKey(privateKey: GrumpkinScalar): Promise<PublicKey>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3B1Yl9rZXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQ7Ozs7R0FJRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxVQUFVLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FFaEYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3B1Yl9rZXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQ7Ozs7R0FJRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxVQUFVLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FFaEYifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAEhF"}
+{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAEhF"}

package/dest/utils/pub_key.js

@@ -1,4 +1,4 @@
-import { Grumpkin } from '@aztec/foundation/crypto';
+import { Grumpkin } from '@aztec/foundation/crypto/grumpkin';
 /**
  * Method for generating a public grumpkin key from a private key.
  * @param privateKey - The private key.

package/dest/wallet/account_entrypoint_meta_payment_method.d.ts

@@ -1,9 +1,8 @@
-import { type ContractArtifact, type FunctionArtifact } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
 import { ExecutionPayload } from '@aztec/stdlib/tx';
+import type { Account } from '../account/account.js';
 import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
-import type { Wallet } from './index.js';
 /**
  * Fee payment method that allows an account contract to pay for its own deployment
  * It works by rerouting the provided fee payment method through the account's entrypoint,
@@ -20,15 +19,13 @@ import type { Wallet } from './index.js';
  * This class can be seen in action in DeployAccountMethod.ts#getSelfPaymentMethod
  */
 export declare class AccountEntrypointMetaPaymentMethod implements FeePaymentMethod {
-    private wallet;
-    private artifact;
-    private feePaymentNameOrArtifact;
-    private accountAddress;
+    private account;
     private paymentMethod?;
-    constructor(wallet: Wallet, artifact: ContractArtifact, feePaymentNameOrArtifact: string | FunctionArtifact, accountAddress: AztecAddress, paymentMethod?: FeePaymentMethod | undefined);
+    private feeEntrypointOptions?;
+    constructor(account: Account, paymentMethod?: FeePaymentMethod | undefined, feeEntrypointOptions?: any);
     getAsset(): Promise<AztecAddress>;
     getExecutionPayload(): Promise<ExecutionPayload>;
     getFeePayer(): Promise<AztecAddress>;
     getGasSettings(): GasSettings | undefined;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YWxsZXQvYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssZ0JBQWdCLEVBS3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRXpDOzs7Ozs7Ozs7Ozs7OztHQWNHO0FBQ0gscUJBQWEsa0NBQW1DLFlBQVcsZ0JBQWdCO0lBRXZFLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFFBQVE7SUFDaEIsT0FBTyxDQUFDLHdCQUF3QjtJQUNoQyxPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsYUFBYSxDQUFDO0lBTHhCLFlBQ1UsTUFBTSxFQUFFLE1BQU0sRUFDZCxRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLHdCQUF3QixFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsRUFDbkQsY0FBYyxFQUFFLFlBQVksRUFDNUIsYUFBYSxDQUFDLDhCQUFrQixFQUN0QztJQUVKLFFBQVEsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRWhDO0lBRUssbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBa0RyRDtJQUVELFdBQVcsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRW5DO0lBRUQsY0FBYyxJQUFJLFdBQVcsR0FBRyxTQUFTLENBRXhDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YWxsZXQvYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFckU7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxxQkFBYSxrQ0FBbUMsWUFBVyxnQkFBZ0I7SUFFdkUsT0FBTyxDQUFDLE9BQU87SUFDZixPQUFPLENBQUMsYUFBYSxDQUFDO0lBQ3RCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQztJQUgvQixZQUNVLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLGFBQWEsQ0FBQyw4QkFBa0IsRUFDaEMsb0JBQW9CLENBQUMsS0FBSyxFQUNoQztJQUVKLFFBQVEsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRWhDO0lBRUssbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBNkJyRDtJQUVELFdBQVcsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRW5DO0lBRUQsY0FBYyxJQUFJLFdBQVcsR0FBRyxTQUFTLENBRXhDO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"account_entrypoint_meta_payment_method.d.ts","sourceRoot":"","sources":["../../src/wallet/account_entrypoint_meta_payment_method.ts"],"names":[],"mappings":"AAGA,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;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;;;;;;;;;;;;;GAcG;AACH,qBAAa,kCAAmC,YAAW,gBAAgB;IAEvE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,wBAAwB;IAChC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,aAAa,CAAC;IALxB,YACU,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,wBAAwB,EAAE,MAAM,GAAG,gBAAgB,EACnD,cAAc,EAAE,YAAY,EAC5B,aAAa,CAAC,8BAAkB,EACtC;IAEJ,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAEhC;IAEK,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAkDrD;IAED,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAEnC;IAED,cAAc,IAAI,WAAW,GAAG,SAAS,CAExC;CACF"}
+{"version":3,"file":"account_entrypoint_meta_payment_method.d.ts","sourceRoot":"","sources":["../../src/wallet/account_entrypoint_meta_payment_method.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;;;;;;;;;;;;;GAcG;AACH,qBAAa,kCAAmC,YAAW,gBAAgB;IAEvE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,oBAAoB,CAAC;IAH/B,YACU,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,8BAAkB,EAChC,oBAAoB,CAAC,KAAK,EAChC;IAEJ,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAEhC;IAEK,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CA6BrD;IAED,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAEnC;IAED,cAAc,IAAI,WAAW,GAAG,SAAS,CAExC;CACF"}

package/dest/wallet/account_entrypoint_meta_payment_method.js

@@ -1,7 +1,5 @@
 import { AccountFeePaymentMethodOptions } from '@aztec/entrypoints/account';
-import { EncodedAppEntrypointCalls } from '@aztec/entrypoints/encoding';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { FunctionCall, FunctionSelector, encodeArguments, getFunctionArtifactByName } from '@aztec/stdlib/abi';
 import { ExecutionPayload } from '@aztec/stdlib/tx';
 /**
  * Fee payment method that allows an account contract to pay for its own deployment
@@ -18,57 +16,44 @@ import { ExecutionPayload } from '@aztec/stdlib/tx';
  *
  * This class can be seen in action in DeployAccountMethod.ts#getSelfPaymentMethod
  */ export class AccountEntrypointMetaPaymentMethod {
-    wallet;
-    artifact;
-    feePaymentNameOrArtifact;
-    accountAddress;
+    account;
     paymentMethod;
-    constructor(wallet, artifact, feePaymentNameOrArtifact, accountAddress, paymentMethod){
-        this.wallet = wallet;
-        this.artifact = artifact;
-        this.feePaymentNameOrArtifact = feePaymentNameOrArtifact;
-        this.accountAddress = accountAddress;
+    feeEntrypointOptions;
+    constructor(account, paymentMethod, feeEntrypointOptions){
+        this.account = account;
         this.paymentMethod = paymentMethod;
+        this.feeEntrypointOptions = feeEntrypointOptions;
     }
     getAsset() {
         return this.paymentMethod?.getAsset() ?? Promise.resolve(ProtocolContractAddress.FeeJuice);
     }
     async getExecutionPayload() {
-        // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
-        // It can be empty because the account might attempt to pay for the tx fee using its own
-        // FeeJuice balance
-        const { calls: feeCalls, authWitnesses: feeAuthwitnesses } = await this.paymentMethod?.getExecutionPayload() ?? ExecutionPayload.empty();
-        // Encode the calls for the fee
-        const feePayer = await this.paymentMethod?.getFeePayer() ?? this.accountAddress;
-        const isFeePayer = feePayer.equals(this.accountAddress);
-        let accountFeePaymentMethodOptions = AccountFeePaymentMethodOptions.EXTERNAL;
-        if (isFeePayer) {
-            // If the account is the fee payer, and the incoming fee payload has calls
-            // it can only be FeeJuicePaymentMethodWithClaim
-            // If the payload has no calls, it's paying using
-            // its own fee juice balance
-            accountFeePaymentMethodOptions = feeCalls.length === 0 ? AccountFeePaymentMethodOptions.PREEXISTING_FEE_JUICE : AccountFeePaymentMethodOptions.FEE_JUICE_WITH_CLAIM;
+        // Get the execution payload for the fee
+        const innerPayload = await this.paymentMethod?.getExecutionPayload() ?? ExecutionPayload.empty();
+        // If no fee entrypoint options were provided, compute them based on the wrapped payment method
+        // This mimics how the actual account contract works when invoked directly:
+        // - If we are the fee payer, are there calls in the inner payload? In that case, those calls can
+        //   only be claiming fee juice, so we use FEE_JUICE_WITH_CLAIM
+        // - If we are the fee payer, but there are no calls, then we assume the account already has
+        //   fee juice and can pay directly with PREEXISTING_FEE_JUICE
+        // - If we are not the fee payer, then EXTERNAL is used
+        let options = this.feeEntrypointOptions;
+        if (!options) {
+            const feePayer = await this.paymentMethod?.getFeePayer() ?? this.account.getAddress();
+            const isFeePayer = feePayer.equals(this.account.getAddress());
+            let accountFeePaymentMethodOptions = AccountFeePaymentMethodOptions.EXTERNAL;
+            if (isFeePayer) {
+                accountFeePaymentMethodOptions = innerPayload.calls.length === 0 ? AccountFeePaymentMethodOptions.PREEXISTING_FEE_JUICE : AccountFeePaymentMethodOptions.FEE_JUICE_WITH_CLAIM;
+            }
+            options = {
+                feePaymentMethodOptions: accountFeePaymentMethodOptions
+            };
         }
-        const feeEncodedCalls = await EncodedAppEntrypointCalls.create(feeCalls);
-        // Get the entrypoint args
-        const args = [
-            feeEncodedCalls,
-            accountFeePaymentMethodOptions,
-            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, false, feePaymentArtifact.isStatic, encodeArguments(feePaymentArtifact, args), feePaymentArtifact.returnTypes);
-        // Compute the authwitness required to verify the combined payload
-        const payloadAuthWitness = await this.wallet.createAuthWit(this.accountAddress, await feeEncodedCalls.hash());
-        return new ExecutionPayload([
-            entrypointCall
-        ], [
-            payloadAuthWitness,
-            ...feeAuthwitnesses
-        ], [], feeEncodedCalls.hashedArguments, feePayer);
+        // Use the generic wrapping mechanism from the account interface
+        return this.account.wrapExecutionPayload(innerPayload, options);
     }
     getFeePayer() {
-        return this.paymentMethod?.getFeePayer() ?? Promise.resolve(this.accountAddress);
+        return this.paymentMethod?.getFeePayer() ?? Promise.resolve(this.account.getAddress());
     }
     getGasSettings() {
         return this.paymentMethod?.getGasSettings();

package/dest/wallet/account_manager.d.ts

@@ -1,9 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { CompleteAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { AccountContract } from '../account/account_contract.js';
 import { AccountWithSecretKey } from '../account/account_with_secret_key.js';
 import type { Salt } from '../account/index.js';
-import type { AccountInterface } from '../account/interface.js';
 import { DeployAccountMethod } from './deploy_account_method.js';
 import type { Wallet } from './wallet.js';
 /**
@@ -15,16 +14,14 @@ export declare class AccountManager {
     private secretKey;
     private accountContract;
     private instance;
+    /**
+     * Contract instantiation salt for the account contract
+     */
     readonly salt: Salt;
     private constructor();
     static create(wallet: Wallet, 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.
-     */
-    getAccountInterface(): Promise<AccountInterface>;
     /**
      * Gets the calculated complete address associated with this account.
      * Does not require the account to have been published for public execution.
@@ -35,7 +32,7 @@ export declare class AccountManager {
      * Returns the secret key used to derive the rest of the privacy keys for this contract
      */
     getSecretKey(): Fr;
-    get address(): import("../api/addresses.js").AztecAddress;
+    get address(): import("@aztec/stdlib/aztec-address").AztecAddress;
     /**
      * Returns the contract instance definition associated with this account.
      * Does not require the account to have been published for public execution.
@@ -63,4 +60,4 @@ export declare class AccountManager {
      */
     hasInitializer(): Promise<boolean>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2FjY291bnRfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUNMLGVBQWUsRUFDZixLQUFLLDJCQUEyQixFQUVqQyxNQUFNLHdCQUF3QixDQUFDO0FBR2hDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTFDOzs7R0FHRztBQUNILHFCQUFhLGNBQWM7SUFFdkIsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsZUFBZTtJQUN2QixPQUFPLENBQUMsUUFBUTthQUlBLElBQUksRUFBRSxJQUFJO0lBUjVCLE9BQU8sZUFTSDtJQUVKLE9BQWEsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksQ0FBQyxFQUFFLElBQUksMkJBa0IvRjtJQUVELFNBQVMsQ0FBQyxhQUFhLDRDQUV0QjtJQUVELFNBQVMsQ0FBQyxpQkFBaUIscUJBRTFCO0lBRUQ7OztPQUdHO0lBQ1UsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBSTVEO0lBRUQ7Ozs7T0FJRztJQUNJLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFcEQ7SUFFRDs7T0FFRztJQUNJLFlBQVksT0FFbEI7SUFFRCxJQUFJLE9BQU8sK0NBRVY7SUFFRDs7OztPQUlHO0lBQ0ksV0FBVyxJQUFJLDJCQUEyQixDQUVoRDtJQUVEOzs7O09BSUc7SUFDVSxVQUFVLElBQUksT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBR3ZEO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtCLElBQUksZUFBZSxDQUVwQztJQUVEOzs7T0FHRztJQUNVLGVBQWUsSUFBSSxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0F3QjNEO0lBRUQ7O09BRUc7SUFDVSxjQUFjLHFCQUUxQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2FjY291bnRfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLGVBQWUsRUFDZixLQUFLLDJCQUEyQixFQUVqQyxNQUFNLHdCQUF3QixDQUFDO0FBR2hDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWhELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxxQkFBYSxjQUFjO0lBRXZCLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLGVBQWU7SUFDdkIsT0FBTyxDQUFDLFFBQVE7SUFDaEI7O09BRUc7YUFDYSxJQUFJLEVBQUUsSUFBSTtJQVI1QixPQUFPLGVBU0g7SUFFSixPQUFhLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsZUFBZSxFQUFFLGVBQWUsRUFBRSxJQUFJLENBQUMsRUFBRSxJQUFJLDJCQWtCL0Y7SUFFRCxTQUFTLENBQUMsYUFBYSw0Q0FFdEI7SUFFRCxTQUFTLENBQUMsaUJBQWlCLHFCQUUxQjtJQUVEOzs7O09BSUc7SUFDSSxrQkFBa0IsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBRXBEO0lBRUQ7O09BRUc7SUFDSSxZQUFZLE9BRWxCO0lBRUQsSUFBSSxPQUFPLHVEQUVWO0lBRUQ7Ozs7T0FJRztJQUNJLFdBQVcsSUFBSSwyQkFBMkIsQ0FFaEQ7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxJQUFJLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUl2RDtJQUVEOzs7T0FHRztJQUNILGtCQUFrQixJQUFJLGVBQWUsQ0FFcEM7SUFFRDs7O09BR0c7SUFDVSxlQUFlLElBQUksT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBMEIzRDtJQUVEOztPQUVHO0lBQ1UsY0FBYyxxQkFFMUI7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/wallet/account_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;;GAGG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;aAIA,IAAI,EAAE,IAAI;IAR5B,OAAO,eASH;IAEJ,OAAa,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI,2BAkB/F;IAED,SAAS,CAAC,aAAa,4CAEtB;IAED,SAAS,CAAC,iBAAiB,qBAE1B;IAED;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAI5D;IAED;;;;OAIG;IACI,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAEpD;IAED;;OAEG;IACI,YAAY,OAElB;IAED,IAAI,OAAO,+CAEV;IAED;;;;OAIG;IACI,WAAW,IAAI,2BAA2B,CAEhD;IAED;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAGvD;IAED;;;OAGG;IACH,kBAAkB,IAAI,eAAe,CAEpC;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAwB3D;IAED;;OAEG;IACU,cAAc,qBAE1B;CACF"}
+{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/wallet/account_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,eAAe,EACf,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;;GAGG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;IAChB;;OAEG;aACa,IAAI,EAAE,IAAI;IAR5B,OAAO,eASH;IAEJ,OAAa,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI,2BAkB/F;IAED,SAAS,CAAC,aAAa,4CAEtB;IAED,SAAS,CAAC,iBAAiB,qBAE1B;IAED;;;;OAIG;IACI,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAEpD;IAED;;OAEG;IACI,YAAY,OAElB;IAED,IAAI,OAAO,uDAEV;IAED;;;;OAIG;IACI,WAAW,IAAI,2BAA2B,CAEhD;IAED;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAIvD;IAED;;;OAGG;IACH,kBAAkB,IAAI,eAAe,CAEpC;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,CA0B3D;IAED;;OAEG;IACU,cAAc,qBAE1B;CACF"}

package/dest/wallet/account_manager.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { CompleteAddress, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { deriveKeys } from '@aztec/stdlib/keys';
 import { AccountWithSecretKey } from '../account/account_with_secret_key.js';
@@ -45,14 +45,6 @@ import { DeployAccountMethod } from './deploy_account_method.js';
         return this.getPublicKeys().hash();
     }
     /**
-   * Returns the entrypoint for this account as defined by its account contract.
-   * @returns An entrypoint.
-   */ async getAccountInterface() {
-        const chainInfo = await this.wallet.getChainInfo();
-        const completeAddress = await this.getCompleteAddress();
-        return this.accountContract.getInterface(completeAddress, chainInfo);
-    }
-    /**
    * Gets the calculated complete address associated with this account.
    * Does not require the account to have been published for public execution.
    * @returns The address, partial address, and encryption public key.
@@ -79,8 +71,9 @@ import { DeployAccountMethod } from './deploy_account_method.js';
    * instances to be interacted with from this account.
    * @returns A Wallet instance.
    */ async getAccount() {
-        const accountInterface = await this.getAccountInterface();
-        return new AccountWithSecretKey(accountInterface, this.secretKey, this.salt);
+        const completeAddress = await this.getCompleteAddress();
+        const account = this.accountContract.getAccount(completeAddress);
+        return new AccountWithSecretKey(account, this.secretKey, this.salt);
     }
     /**
    * Returns the account contract that backs this account.
@@ -103,7 +96,8 @@ import { DeployAccountMethod } from './deploy_account_method.js';
             constructorName: undefined,
             constructorArgs: undefined
         };
-        return new DeployAccountMethod(this.getPublicKeys(), this.wallet, artifact, (instance)=>Contract.at(instance.address, artifact, this.wallet), new Fr(this.salt), constructorArgs, constructorName);
+        const account = await this.getAccount();
+        return new DeployAccountMethod(this.getPublicKeys(), this.wallet, artifact, (instance)=>Contract.at(instance.address, artifact, this.wallet), new Fr(this.salt), account, constructorArgs, constructorName);
     }
     /**
    * Returns whether this account contract has an initializer function.

package/dest/wallet/deploy_account_method.d.ts

@@ -1,23 +1,49 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { ContractArtifact, FunctionArtifact } from '@aztec/stdlib/abi';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { PublicKeys } from '@aztec/stdlib/keys';
 import { ExecutionPayload } from '@aztec/stdlib/tx';
+import type { Account } from '../account/account.js';
 import type { Contract } from '../contract/contract.js';
 import type { ContractBase } from '../contract/contract_base.js';
-import { DeployMethod, type DeployOptions, type RequestDeployOptions, type SimulateDeployOptions } from '../contract/deploy_method.js';
+import { DeployMethod, type DeployOptionsWithoutWait, type RequestDeployOptions, type SimulateDeployOptions } from '../contract/deploy_method.js';
+import type { FeePaymentMethodOption, InteractionWaitOptions } from '../contract/interaction_options.js';
 import type { Wallet } from './index.js';
+/**
+ * Extended fee payment method option for account deployments that includes entrypoint wrapping options
+ */
+export type DeployAccountFeePaymentMethodOption = FeePaymentMethodOption & {
+    /** Optional entrypoint-specific options for wrapping execution payloads */
+    feeEntrypointOptions?: unknown;
+};
 /**
  * The configuration options for the request method. Omits the contractAddressSalt, since
  * for account contracts that is fixed in the constructor
  */
-export type RequestDeployAccountOptions = Omit<RequestDeployOptions, 'contractAddressSalt'>;
+export type RequestDeployAccountOptions = Omit<RequestDeployOptions, 'contractAddressSalt' | 'fee'> & {
+    /** Fee options specific to account deployment */
+    fee?: DeployAccountFeePaymentMethodOption;
+};
+/**
+ * Base configuration options for the send/prove methods without wait parameter. Omits:
+ * - The contractAddressSalt, since for account contracts that is fixed in the constructor.
+ * - UniversalDeployment flag, since account contracts are always deployed with it set to true
+ */
+export type DeployAccountOptionsWithoutWait = Omit<DeployOptionsWithoutWait, 'contractAddressSalt' | 'universalDeploy'>;
 /**
  * The configuration options for the send/prove methods. Omits:
  * - The contractAddressSalt, since for account contracts that is fixed in the constructor.
  * - UniversalDeployment flag, since account contracts are always deployed with it set to true
  */
-export type DeployAccountOptions = Omit<DeployOptions, 'contractAddressSalt' | 'universalDeploy'>;
+export type DeployAccountOptions<W extends InteractionWaitOptions = undefined> = DeployAccountOptionsWithoutWait & {
+    /**
+     * Whether to wait for the transaction to be mined.
+     * - undefined (default): wait with default options and return TxReceipt
+     * - WaitOpts object: wait with custom options and return TxReceipt
+     * - false: return txHash immediately without waiting
+     */
+    wait?: W;
+};
 /**
  * The configuration options for the simulate method. Omits the contractAddressSalt, since
  * for account contracts that is fixed in the constructor
@@ -29,7 +55,8 @@ export type SimulateDeployAccountOptions = Omit<SimulateDeployOptions, 'contract
  */
 export declare class DeployAccountMethod<TContract extends ContractBase = Contract> extends DeployMethod<TContract> {
     private salt;
-    constructor(publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract, salt: Fr, args?: any[], constructorNameOrArtifact?: string | FunctionArtifact);
+    private account;
+    constructor(publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract, salt: Fr, account: Account, args?: any[], constructorNameOrArtifact?: string | FunctionArtifact);
     /**
      * Returns a FeePaymentMethod that routes the original one provided as an argument
      * through the account's entrypoint. This allows an account contract to pay
@@ -38,6 +65,7 @@ export declare class DeployAccountMethod<TContract extends ContractBase = Contra
      * 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.
+     * @param feeEntrypointOptions - Optional entrypoint-specific options for wrapping. If not provided, will be auto-computed based on the payment method.
      * @returns A FeePaymentMethod that routes the original one through the account's entrypoint (AccountEntrypointMetaPaymentMethod)
      */
     private getSelfFeePaymentMethod;
@@ -47,6 +75,6 @@ export declare class DeployAccountMethod<TContract extends ContractBase = Contra
      * @returns The execution payload for this operation
      */
     request(opts?: RequestDeployAccountOptions): Promise<ExecutionPayload>;
-    convertDeployOptionsToRequestOptions(options: DeployOptions): RequestDeployOptions;
+    convertDeployOptionsToRequestOptions(options: DeployAccountOptionsWithoutWait): RequestDeployOptions;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2FjY291bnRfbWV0aG9kLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2RlcGxveV9hY2NvdW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEVBQ0wsWUFBWSxFQUNaLEtBQUssYUFBYSxFQUNsQixLQUFLLG9CQUFvQixFQUN6QixLQUFLLHFCQUFxQixFQUMzQixNQUFNLDhCQUE4QixDQUFDO0FBR3RDLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV6Qzs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sMkJBQTJCLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFLHFCQUFxQixDQUFDLENBQUM7QUFFNUY7Ozs7R0FJRztBQUNILE1BQU0sTUFBTSxvQkFBb0IsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLHFCQUFxQixHQUFHLGlCQUFpQixDQUFDLENBQUM7QUFFbEc7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLDRCQUE0QixHQUFHLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDO0FBRTlGOzs7R0FHRztBQUNILHFCQUFhLG1CQUFtQixDQUFDLFNBQVMsU0FBUyxZQUFZLEdBQUcsUUFBUSxDQUFFLFNBQVEsWUFBWSxDQUFDLFNBQVMsQ0FBQztJQU12RyxPQUFPLENBQUMsSUFBSTtJQUxkLFlBQ0UsVUFBVSxFQUFFLFVBQVUsRUFDdEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLGNBQWMsRUFBRSxDQUFDLFFBQVEsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLEVBQUUsTUFBTSxLQUFLLFNBQVMsRUFDNUUsSUFBSSxFQUFFLEVBQUUsRUFDaEIsSUFBSSxHQUFFLEdBQUcsRUFBTyxFQUNoQix5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsRUFHdEQ7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDSCxPQUFPLENBQUMsdUJBQXVCO0lBYS9COzs7O09BSUc7SUFDbUIsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQThCM0Y7SUFFUSxvQ0FBb0MsQ0FBQyxPQUFPLEVBQUUsYUFBYSxHQUFHLG9CQUFvQixDQVMxRjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2FjY291bnRfbWV0aG9kLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2RlcGxveV9hY2NvdW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEVBQ0wsWUFBWSxFQUNaLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssb0JBQW9CLEVBQ3pCLEtBQUsscUJBQXFCLEVBQzNCLE1BQU0sOEJBQThCLENBQUM7QUFDdEMsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUd6RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFekM7O0dBRUc7QUFDSCxNQUFNLE1BQU0sbUNBQW1DLEdBQUcsc0JBQXNCLEdBQUc7SUFDekUsMkVBQTJFO0lBQzNFLG9CQUFvQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ2hDLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sMkJBQTJCLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFLHFCQUFxQixHQUFHLEtBQUssQ0FBQyxHQUFHO0lBQ3BHLGlEQUFpRDtJQUNqRCxHQUFHLENBQUMsRUFBRSxtQ0FBbUMsQ0FBQztDQUMzQyxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILE1BQU0sTUFBTSwrQkFBK0IsR0FBRyxJQUFJLENBQUMsd0JBQXdCLEVBQUUscUJBQXFCLEdBQUcsaUJBQWlCLENBQUMsQ0FBQztBQUV4SDs7OztHQUlHO0FBQ0gsTUFBTSxNQUFNLG9CQUFvQixDQUFDLENBQUMsU0FBUyxzQkFBc0IsR0FBRyxTQUFTLElBQUksK0JBQStCLEdBQUc7SUFDakg7Ozs7O09BS0c7SUFDSCxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7Q0FDVixDQUFDO0FBRUY7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLDRCQUE0QixHQUFHLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDO0FBRTlGOzs7R0FHRztBQUNILHFCQUFhLG1CQUFtQixDQUFDLFNBQVMsU0FBUyxZQUFZLEdBQUcsUUFBUSxDQUFFLFNBQVEsWUFBWSxDQUFDLFNBQVMsQ0FBQztJQU12RyxPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxPQUFPO0lBTmpCLFlBQ0UsVUFBVSxFQUFFLFVBQVUsRUFDdEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLGNBQWMsRUFBRSxDQUFDLFFBQVEsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLEVBQUUsTUFBTSxLQUFLLFNBQVMsRUFDNUUsSUFBSSxFQUFFLEVBQUUsRUFDUixPQUFPLEVBQUUsT0FBTyxFQUN4QixJQUFJLEdBQUUsR0FBRyxFQUFPLEVBQ2hCLHlCQUF5QixDQUFDLEVBQUUsTUFBTSxHQUFHLGdCQUFnQixFQUd0RDtJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSCxPQUFPLENBQUMsdUJBQXVCO0lBTy9COzs7O09BSUc7SUFDbUIsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQThCM0Y7SUFFUSxvQ0FBb0MsQ0FBQyxPQUFPLEVBQUUsK0JBQStCLEdBQUcsb0JBQW9CLENBUzVHO0NBQ0YifQ==

package/dest/wallet/deploy_account_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_account_method.d.ts","sourceRoot":"","sources":["../../src/wallet/deploy_account_method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA0B,MAAM,kBAAkB,CAAC;AAE5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EACL,YAAY,EACZ,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,CAAC;AAE5F;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,aAAa,EAAE,qBAAqB,GAAG,iBAAiB,CAAC,CAAC;AAElG;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC;AAE9F;;;GAGG;AACH,qBAAa,mBAAmB,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,CAAE,SAAQ,YAAY,CAAC,SAAS,CAAC;IAMvG,OAAO,CAAC,IAAI;IALd,YACE,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,CAAC,QAAQ,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,KAAK,SAAS,EAC5E,IAAI,EAAE,EAAE,EAChB,IAAI,GAAE,GAAG,EAAO,EAChB,yBAAyB,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAGtD;IAED;;;;;;;;;OASG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;;;OAIG;IACmB,OAAO,CAAC,IAAI,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8B3F;IAEQ,oCAAoC,CAAC,OAAO,EAAE,aAAa,GAAG,oBAAoB,CAS1F;CACF"}
+{"version":3,"file":"deploy_account_method.d.ts","sourceRoot":"","sources":["../../src/wallet/deploy_account_method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA0B,MAAM,kBAAkB,CAAC;AAE5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EACL,YAAY,EACZ,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAGzG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;GAEG;AACH,MAAM,MAAM,mCAAmC,GAAG,sBAAsB,GAAG;IACzE,2EAA2E;IAC3E,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAAC,oBAAoB,EAAE,qBAAqB,GAAG,KAAK,CAAC,GAAG;IACpG,iDAAiD;IACjD,GAAG,CAAC,EAAE,mCAAmC,CAAC;CAC3C,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,+BAA+B,GAAG,IAAI,CAAC,wBAAwB,EAAE,qBAAqB,GAAG,iBAAiB,CAAC,CAAC;AAExH;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,sBAAsB,GAAG,SAAS,IAAI,+BAA+B,GAAG;IACjH;;;;;OAKG;IACH,IAAI,CAAC,EAAE,CAAC,CAAC;CACV,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC;AAE9F;;;GAGG;AACH,qBAAa,mBAAmB,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,CAAE,SAAQ,YAAY,CAAC,SAAS,CAAC;IAMvG,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IANjB,YACE,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,CAAC,QAAQ,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,KAAK,SAAS,EAC5E,IAAI,EAAE,EAAE,EACR,OAAO,EAAE,OAAO,EACxB,IAAI,GAAE,GAAG,EAAO,EAChB,yBAAyB,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAGtD;IAED;;;;;;;;;;OAUG;IACH,OAAO,CAAC,uBAAuB;IAO/B;;;;OAIG;IACmB,OAAO,CAAC,IAAI,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8B3F;IAEQ,oCAAoC,CAAC,OAAO,EAAE,+BAA+B,GAAG,oBAAoB,CAS5G;CACF"}

package/dest/wallet/deploy_account_method.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
 import { DeployMethod } from '../contract/deploy_method.js';
@@ -8,8 +8,9 @@ import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_pa
  * contracts that can pay for their own fee, plus some preconfigured options to avoid errors.
  */ export class DeployAccountMethod extends DeployMethod {
     salt;
-    constructor(publicKeys, wallet, artifact, postDeployCtor, salt, args = [], constructorNameOrArtifact){
-        super(publicKeys, wallet, artifact, postDeployCtor, args, constructorNameOrArtifact), this.salt = salt;
+    account;
+    constructor(publicKeys, wallet, artifact, postDeployCtor, salt, account, args = [], constructorNameOrArtifact){
+        super(publicKeys, wallet, artifact, postDeployCtor, args, constructorNameOrArtifact), this.salt = salt, this.account = account;
     }
     /**
    * Returns a FeePaymentMethod that routes the original one provided as an argument
@@ -19,12 +20,13 @@ import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_pa
    * 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.
+   * @param feeEntrypointOptions - Optional entrypoint-specific options for wrapping. If not provided, will be auto-computed based on the payment method.
    * @returns A FeePaymentMethod that routes the original one through the account's entrypoint (AccountEntrypointMetaPaymentMethod)
-   */ getSelfFeePaymentMethod(originalPaymentMethod) {
+   */ getSelfFeePaymentMethod(originalPaymentMethod, feeEntrypointOptions) {
         if (!this.address) {
             throw new Error('Instance is not yet constructed. This is a bug!');
         }
-        return new AccountEntrypointMetaPaymentMethod(this.wallet, this.artifact, 'entrypoint', this.address, originalPaymentMethod);
+        return new AccountEntrypointMetaPaymentMethod(this.account, originalPaymentMethod, feeEntrypointOptions);
     }
     /**
    * Returns the execution payload that allows this operation to happen on chain.
@@ -51,7 +53,7 @@ import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_pa
         ];
         // If this is a self-deployment, manage the fee accordingly
         if (opts?.deployer?.equals(AztecAddress.ZERO)) {
-            const feePaymentMethod = this.getSelfFeePaymentMethod(opts?.fee?.paymentMethod);
+            const feePaymentMethod = this.getSelfFeePaymentMethod(opts?.fee?.paymentMethod, opts?.fee?.feeEntrypointOptions);
             const feeExecutionPayload = await feePaymentMethod.getExecutionPayload();
             // Notice they are reversed (fee payment usually goes first):
             // this is because we need to construct the contract BEFORE it can pay for its own fee