@aztec/aztec.js 0.0.1-commit.c7c42ec → 0.0.1-commit.d1f2d6c

package/src/deployment/broadcast_function.ts

@@ -16,7 +16,7 @@ import {
 import { Capsule } from '@aztec/stdlib/tx';
 
 import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { getClassRegistryContract } from '../contract/protocol_contracts.js';
+import { ContractClassRegistryContract } from '../contract/protocol_contracts/contract-class-registry.js';
 import type { Wallet } from '../wallet/index.js';
 
 /**
@@ -58,7 +58,7 @@ export async function broadcastPrivateFunction(
 
   const vkHash = await computeVerificationKeyHash(privateFunctionArtifact);
 
-  const classRegistry = await getClassRegistryContract(wallet);
+  const classRegistry = ContractClassRegistryContract.at(wallet);
   const bytecode = bufferAsFields(
     privateFunctionArtifact.bytecode,
     MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
@@ -121,7 +121,7 @@ export async function broadcastUtilityFunction(
     privateFunctionsArtifactTreeRoot,
   } = await createUtilityFunctionMembershipProof(selector, artifact);
 
-  const classRegistry = await getClassRegistryContract(wallet);
+  const classRegistry = ContractClassRegistryContract.at(wallet);
   const bytecode = bufferAsFields(
     utilityFunctionArtifact.bytecode,
     MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,

package/src/deployment/publish_class.ts

@@ -9,7 +9,7 @@ import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { Capsule } from '@aztec/stdlib/tx';
 
 import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { getClassRegistryContract } from '../contract/protocol_contracts.js';
+import { ContractClassRegistryContract } from '../contract/protocol_contracts/contract-class-registry.js';
 import type { Wallet } from '../wallet/index.js';
 
 /** Sets up a call to publish a contract class given its artifact. */
@@ -19,7 +19,7 @@ export async function publishContractClass(
 ): Promise<ContractFunctionInteraction> {
   const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment, packedBytecode } =
     await getContractClassFromArtifact(artifact);
-  const classRegistry = await getClassRegistryContract(wallet);
+  const classRegistry = ContractClassRegistryContract.at(wallet);
 
   const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
   return classRegistry.methods.publish(artifactHash, privateFunctionsRoot, publicBytecodeCommitment).with({

package/src/deployment/publish_instance.ts

@@ -1,7 +1,7 @@
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
 import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { getInstanceRegistryContract } from '../contract/protocol_contracts.js';
+import { ContractInstanceRegistryContract } from '../contract/protocol_contracts/contract-instance-registry.js';
 import type { Wallet } from '../wallet/wallet.js';
 
 /**
@@ -9,11 +9,8 @@ import type { Wallet } from '../wallet/wallet.js';
  * @param wallet - The wallet to use for the publication (setup) tx.
  * @param instance - The instance to publish.
  */
-export async function publishInstance(
-  wallet: Wallet,
-  instance: ContractInstanceWithAddress,
-): Promise<ContractFunctionInteraction> {
-  const contractInstanceRegistry = await getInstanceRegistryContract(wallet);
+export function publishInstance(wallet: Wallet, instance: ContractInstanceWithAddress): ContractFunctionInteraction {
+  const contractInstanceRegistry = ContractInstanceRegistryContract.at(wallet);
   const { salt, currentContractClassId: contractClassId, publicKeys, deployer: instanceDeployer } = instance;
   const isUniversalDeploy = instanceDeployer.isZero();
   return contractInstanceRegistry.methods.publish_for_public_execution(

package/src/ethereum/portal_manager.ts

@@ -1,5 +1,6 @@
 import type { ExtendedViemWalletClient, ViemContract } from '@aztec/ethereum/types';
 import { extractEvent } from '@aztec/ethereum/utils';
+import type { EpochNumber } from '@aztec/foundation/branded-types';
 import { sha256ToField } from '@aztec/foundation/crypto/sha256';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -408,26 +409,26 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
    * Withdraws funds from the portal by consuming an L2 to L1 message. Returns once the tx is mined on L1.
    * @param amount - Amount to withdraw.
    * @param recipient - Who will receive the funds.
-   * @param blockNumber - L2 block number of the message.
+   * @param epochNumber - Epoch number of the message.
    * @param messageIndex - Index of the message.
    * @param siblingPath - Sibling path of the message.
    */
   public async withdrawFunds(
     amount: bigint,
     recipient: EthAddress,
-    blockNumber: bigint,
+    epochNumber: EpochNumber,
     messageIndex: bigint,
     siblingPath: SiblingPath<number>,
   ) {
     this.logger.info(
-      `Sending L1 tx to consume message at block ${blockNumber} index ${messageIndex} to withdraw ${amount}`,
+      `Sending L1 tx to consume message at epoch ${epochNumber} index ${messageIndex} to withdraw ${amount}`,
     );
 
     const messageLeafId = getL2ToL1MessageLeafId({ leafIndex: messageIndex, siblingPath });
-    const isConsumedBefore = await this.outbox.read.hasMessageBeenConsumedAtCheckpoint([blockNumber, messageLeafId]);
+    const isConsumedBefore = await this.outbox.read.hasMessageBeenConsumedAtEpoch([BigInt(epochNumber), messageLeafId]);
     if (isConsumedBefore) {
       throw new Error(
-        `L1 to L2 message at block ${blockNumber} index ${messageIndex} height ${siblingPath.pathSize} has already been consumed`,
+        `L2 to L1 message at epoch ${epochNumber} index ${messageIndex} height ${siblingPath.pathSize} has already been consumed`,
       );
     }
 
@@ -436,7 +437,7 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
       recipient.toString(),
       amount,
       false,
-      BigInt(blockNumber),
+      BigInt(epochNumber),
       messageIndex,
       siblingPath.toBufferArray().map((buf: Buffer): Hex => `0x${buf.toString('hex')}`),
     ]);
@@ -445,10 +446,10 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
       hash: await this.extendedClient.writeContract(withdrawRequest),
     });
 
-    const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtCheckpoint([blockNumber, messageLeafId]);
+    const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtEpoch([BigInt(epochNumber), messageLeafId]);
     if (!isConsumedAfter) {
       throw new Error(
-        `L1 to L2 message at block ${blockNumber} index ${messageIndex} height ${siblingPath.pathSize} not consumed after withdrawal`,
+        `L2 to L1 message at epoch ${epochNumber} index ${messageIndex} height ${siblingPath.pathSize} not consumed after withdrawal`,
       );
     }
   }

package/src/scripts/generate_protocol_contract_types.ts

@@ -0,0 +1,150 @@
+/**
+ * Generates type-safe contract wrappers for protocol contracts.
+ * These wrappers use a minimal artifact (without bytecode) since PXE already has the full artifacts registered.
+ */
+import { generateTypescriptContractInterface } from '@aztec/builder/codegen';
+import {
+  type ContractArtifact,
+  type FunctionAbi,
+  FunctionType,
+  getAllFunctionAbis,
+  loadContractArtifact,
+} from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import { promises as fs } from 'fs';
+import path from 'path';
+
+const log = console.log;
+
+const noirContractsRoot = path.join(import.meta.dirname, '../../../../noir-projects/noir-contracts');
+const srcPath = path.join(noirContractsRoot, 'target');
+const outputDir = path.join(import.meta.dirname, '../contract/protocol_contracts');
+
+function toKebabCase(str: string): string {
+  return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+}
+
+function functionTypeToEnum(type: FunctionType): string {
+  switch (type) {
+    case FunctionType.PRIVATE:
+      return 'FunctionType.PRIVATE';
+    case FunctionType.PUBLIC:
+      return 'FunctionType.PUBLIC';
+    case FunctionType.UTILITY:
+      return 'FunctionType.UTILITY';
+  }
+}
+
+function generateFunctionAbiJson(abi: FunctionAbi): string {
+  const baseObj = {
+    name: abi.name,
+    isOnlySelf: abi.isOnlySelf,
+    isStatic: abi.isStatic,
+    isInitializer: abi.isInitializer,
+    parameters: abi.parameters,
+    returnTypes: abi.returnTypes,
+    errorTypes: abi.errorTypes,
+  };
+  const jsonStr = JSON.stringify(baseObj);
+  return jsonStr.replace('{', `{ functionType: ${functionTypeToEnum(abi.functionType)},`);
+}
+
+function generateProtocolContractArtifact(input: ContractArtifact): string {
+  const allAbis = getAllFunctionAbis(input);
+  const functionAbis = input.functions.map(f => allAbis.find(abi => abi.name === f.name)!);
+  const nonDispatchAbis = input.nonDispatchPublicFunctions;
+
+  const functionsArray = functionAbis
+    .map(abi => `{ ...${generateFunctionAbiJson(abi)}, bytecode: Buffer.from([]), debugSymbols: '' }`)
+    .join(',\n    ');
+
+  const nonDispatchArray = nonDispatchAbis.map(abi => generateFunctionAbiJson(abi)).join(',\n    ');
+
+  return `{
+  name: '${input.name}',
+  functions: [
+    ${functionsArray}
+  ],
+  nonDispatchPublicFunctions: [
+    ${nonDispatchArray}
+  ],
+  outputs: { structs: {}, globals: {} },
+  storageLayout: {},
+  fileMap: {},
+}`;
+}
+
+async function generateProtocolContractInterface(
+  input: ContractArtifact,
+  protocolContractName: string,
+): Promise<string> {
+  const baseInterface = await generateTypescriptContractInterface(input);
+
+  // Match everything between "public declare methods: {" and the closing "};"
+  const methodsMatch = baseInterface.match(/public declare methods: \{([\s\S]*?)\n  \};/);
+  if (!methodsMatch) {
+    throw new Error('Could not extract methods from generated interface');
+  }
+
+  const artifactCode = generateProtocolContractArtifact(input);
+  const contractName = `${input.name}Contract`;
+
+  return `
+/* Autogenerated file, do not edit! */
+
+/* eslint-disable */
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { FunctionType } from '@aztec/stdlib/abi';
+
+import type { ContractArtifact } from '../../api/abi.js';
+import { PublicKeys } from '../../api/keys.js';
+import type { AztecAddressLike, EthAddressLike, FieldLike, FunctionSelectorLike, WrappedFieldLike } from '../../utils/abi_types.js';
+import { ContractBase, type ContractMethod } from '../contract_base.js';
+import { ContractFunctionInteraction } from '../contract_function_interaction.js';
+import type { Wallet } from '../../wallet/wallet.js';
+
+const ${contractName}Artifact: ContractArtifact = ${artifactCode};
+
+export class ${contractName} extends ContractBase {
+  private constructor(wallet: Wallet) {
+    super(ProtocolContractAddress.${protocolContractName}, ${contractName}Artifact, wallet);
+  }
+
+  public static at(wallet: Wallet): ${contractName} {
+    return new ${contractName}(wallet);
+  }
+
+  public declare methods: {${methodsMatch[1]}
+  };
+}
+`;
+}
+
+async function main() {
+  await fs.rm(outputDir, { recursive: true, force: true });
+  await fs.mkdir(outputDir, { recursive: true });
+
+  const srcNames = JSON.parse(
+    await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'),
+  ) as string[];
+
+  for (const srcName of srcNames) {
+    // srcName is like "auth_registry_contract-AuthRegistry", split to get the contract name
+    const name = srcName.split('-')[1];
+    const artifactPath = path.join(srcPath, `${srcName}.json`);
+    const json = JSON.parse(await fs.readFile(artifactPath, 'utf8')) as NoirCompiledContract;
+    const contractArtifact = loadContractArtifact(json);
+
+    const content = await generateProtocolContractInterface(contractArtifact, name);
+    const fileName = `${toKebabCase(name)}.ts`;
+    await fs.writeFile(path.join(outputDir, fileName), content);
+
+    log(`Generated ${fileName}`);
+  }
+}
+
+main().catch(err => {
+  console.error('Error generating protocol contract types:', err);
+  process.exit(1);
+});

package/src/utils/authwit.ts

@@ -5,16 +5,18 @@ import { type ABIParameterVisibility, type FunctionAbi, type FunctionCall, Funct
 import { AuthWitness, computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computeVarArgsHash } from '@aztec/stdlib/hash';
-import type { TxProfileResult } from '@aztec/stdlib/tx';
+import type { TxHash, TxProfileResult, TxReceipt } from '@aztec/stdlib/tx';
 
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 import type {
+  InteractionWaitOptions,
   ProfileInteractionOptions,
   SendInteractionOptions,
+  SendInteractionOptionsWithoutWait,
+  SendReturn,
   SimulateInteractionOptions,
   SimulationReturn,
 } from '../contract/interaction_options.js';
-import type { SentTx } from '../contract/sent_tx.js';
 import type { Wallet } from '../wallet/index.js';
 
 /** Intent with an inner hash */
@@ -42,7 +44,7 @@ export type ContractFunctionInteractionCallIntent = {
 };
 
 /** Identifies ContractFunctionInteractionCallIntents */
-function isContractFunctionIntractionCallIntent(
+export function isContractFunctionInteractionCallIntent(
   messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent,
 ): messageHashOrIntent is ContractFunctionInteractionCallIntent {
   return (
@@ -81,7 +83,7 @@ export const computeAuthWitMessageHash = async (
   const version = metadata.version;
 
   if ('caller' in intent) {
-    const call = isContractFunctionIntractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
+    const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
     return computeOuterAuthWitHash(
       call.to,
       chainId,
@@ -154,7 +156,7 @@ export async function lookupValidity(
 }> {
   let innerHash, consumer;
   if ('caller' in intent) {
-    const call = isContractFunctionIntractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
+    const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
     innerHash = await computeInnerAuthWitHashFromAction(intent.caller, call);
     consumer = call.to;
   } else {
@@ -286,9 +288,19 @@ export class SetPublicAuthwitContractInteraction extends ContractFunctionInterac
    * Overrides the send method, adding the sender of the authwit (authorizer) as from
    * and preventing misuse
    * @param options - An optional object containing 'fee' options information
-   * @returns A SentTx instance for tracking the transaction status and information.
+   * @returns A TxReceipt (if wait is true/undefined) or TxHash (if wait is false)
    */
-  public override send(options: Omit<SendInteractionOptions, 'from'> = {}): SentTx {
+  // Overload for when wait is not specified at all - returns TxReceipt
+  public override send(options?: Omit<SendInteractionOptionsWithoutWait, 'from'>): Promise<TxReceipt>;
+  // Generic overload for explicit wait values
+  // eslint-disable-next-line jsdoc/require-jsdoc
+  public override send<W extends InteractionWaitOptions>(
+    options?: Omit<SendInteractionOptions<W>, 'from'>,
+  ): Promise<SendReturn<W>>;
+  // eslint-disable-next-line jsdoc/require-jsdoc
+  public override send(
+    options?: Omit<SendInteractionOptions<InteractionWaitOptions>, 'from'>,
+  ): Promise<TxReceipt | TxHash> {
     return super.send({ ...options, from: this.from });
   }
 

package/src/utils/node.ts

@@ -1,6 +1,10 @@
 import type { Logger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
+import { SortedTxStatuses, TxStatus } from '@aztec/stdlib/tx';
+
+import { DefaultWaitOpts, type WaitOpts } from '../contract/wait_opts.js';
 
 export const waitForNode = async (node: AztecNode, logger?: Logger) => {
   await retryUntil(async () => {
@@ -16,4 +20,62 @@ export const waitForNode = async (node: AztecNode, logger?: Logger) => {
   }, 'RPC Get Node Info');
 };
 
+/** Returns true if the receipt status is at least the desired status level. */
+function hasReachedStatus(receipt: TxReceipt, desiredStatus: TxStatus): boolean {
+  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: AztecNode, txHash: TxHash, opts?: WaitOpts): Promise<TxReceipt> {
+  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, type AztecNode } from '@aztec/stdlib/interfaces/client';

package/src/wallet/account_entrypoint_meta_payment_method.ts

@@ -1,20 +1,11 @@
 import { AccountFeePaymentMethodOptions } from '@aztec/entrypoints/account';
-import { EncodedAppEntrypointCalls } from '@aztec/entrypoints/encoding';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import {
-  type ContractArtifact,
-  type FunctionArtifact,
-  FunctionCall,
-  FunctionSelector,
-  encodeArguments,
-  getFunctionArtifactByName,
-} 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
@@ -33,11 +24,9 @@ import type { Wallet } from './index.js';
  */
 export class AccountEntrypointMetaPaymentMethod implements FeePaymentMethod {
   constructor(
-    private wallet: Wallet,
-    private artifact: ContractArtifact,
-    private feePaymentNameOrArtifact: string | FunctionArtifact,
-    private accountAddress: AztecAddress,
+    private account: Account,
     private paymentMethod?: FeePaymentMethod,
+    private feeEntrypointOptions?: any,
   ) {}
 
   getAsset(): Promise<AztecAddress> {
@@ -45,59 +34,38 @@ export class AccountEntrypointMetaPaymentMethod implements FeePaymentMethod {
   }
 
   async getExecutionPayload(): Promise<ExecutionPayload> {
-    // 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;
-    }
-    const feeEncodedCalls = await EncodedAppEntrypointCalls.create(feeCalls);
+    // Get the execution payload for the fee
+    const innerPayload = (await this.paymentMethod?.getExecutionPayload()) ?? ExecutionPayload.empty();
 
-    // Get the entrypoint args
-    const args = [feeEncodedCalls, accountFeePaymentMethodOptions, false];
-    const feePaymentArtifact =
-      typeof this.feePaymentNameOrArtifact === 'string'
-        ? getFunctionArtifactByName(this.artifact, this.feePaymentNameOrArtifact)
-        : this.feePaymentNameOrArtifact;
+    // 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());
 
-    const entrypointCall = new FunctionCall(
-      feePaymentArtifact.name,
-      this.accountAddress,
-      await FunctionSelector.fromNameAndParameters(feePaymentArtifact.name, feePaymentArtifact.parameters),
-      feePaymentArtifact.functionType,
-      false /** hideMsgSender -- set to `false`, because it's not applicable for an entrypoint function (only for enqueued public calls) */,
-      feePaymentArtifact.isStatic,
-      encodeArguments(feePaymentArtifact, args),
-      feePaymentArtifact.returnTypes,
-    );
+      let accountFeePaymentMethodOptions = AccountFeePaymentMethodOptions.EXTERNAL;
+      if (isFeePayer) {
+        accountFeePaymentMethodOptions =
+          innerPayload.calls.length === 0
+            ? AccountFeePaymentMethodOptions.PREEXISTING_FEE_JUICE
+            : AccountFeePaymentMethodOptions.FEE_JUICE_WITH_CLAIM;
+      }
 
-    // Compute the authwitness required to verify the combined payload
-    const payloadAuthWitness = await this.wallet.createAuthWit(this.accountAddress, await feeEncodedCalls.hash());
+      options = { feePaymentMethodOptions: accountFeePaymentMethodOptions };
+    }
 
-    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(): Promise<AztecAddress> {
-    return this.paymentMethod?.getFeePayer() ?? Promise.resolve(this.accountAddress);
+    return this.paymentMethod?.getFeePayer() ?? Promise.resolve(this.account.getAddress());
   }
 
   getGasSettings(): GasSettings | undefined {

package/src/wallet/account_manager.ts

@@ -9,7 +9,6 @@ import { deriveKeys } from '@aztec/stdlib/keys';
 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 { Contract } from '../contract/contract.js';
 import { DeployAccountMethod } from './deploy_account_method.js';
 import type { Wallet } from './wallet.js';
@@ -58,16 +57,6 @@ export class AccountManager {
     return this.getPublicKeys().hash();
   }
 
-  /**
-   * Returns the entrypoint for this account as defined by its account contract.
-   * @returns An entrypoint.
-   */
-  public async getAccountInterface(): Promise<AccountInterface> {
-    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.
@@ -103,8 +92,9 @@ export class AccountManager {
    * @returns A Wallet instance.
    */
   public async getAccount(): Promise<AccountWithSecretKey> {
-    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);
   }
 
   /**
@@ -134,12 +124,14 @@ export class AccountManager {
       constructorArgs: undefined,
     };
 
+    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,
     );