@aztec/aztec.js 0.82.0 → 0.82.1

package/src/account_manager/index.ts

@@ -1,3 +1,2 @@
 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';

package/src/api/fee.ts

@@ -3,3 +3,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/src/api/fee_testing.ts

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

package/src/contract/deploy_proven_tx.ts

@@ -25,7 +25,7 @@ export class DeployProvenTx<TContract extends Contract = Contract> extends Prove
    */
   public override send(): DeploySentTx<TContract> {
     const promise = (() => {
-      return this.wallet.sendTx(this.getPlainDataTx());
+      return this.wallet.sendTx(this);
     })();
 
     return new DeploySentTx(this.wallet, promise, this.postDeployCtor, this.instanceGetter);

package/src/contract/proven_tx.ts

@@ -8,24 +8,7 @@ import { SentTx } from './sent_tx.js';
  */
 export class ProvenTx extends Tx {
   constructor(protected wallet: Wallet, tx: Tx) {
-    super(
-      tx.data,
-      tx.clientIvcProof,
-      tx.contractClassLogs,
-      tx.enqueuedPublicFunctionCalls,
-      tx.publicTeardownFunctionCall,
-    );
-  }
-
-  // Clone the TX data to get a serializable object.
-  protected getPlainDataTx(): Tx {
-    return new Tx(
-      this.data,
-      this.clientIvcProof,
-      this.contractClassLogs,
-      this.enqueuedPublicFunctionCalls,
-      this.publicTeardownFunctionCall,
-    );
+    super(tx.data, tx.clientIvcProof, tx.contractClassLogs, tx.publicFunctionCalldata);
   }
 
   /**
@@ -33,7 +16,7 @@ export class ProvenTx extends Tx {
    */
   public send(): SentTx {
     const promise = (() => {
-      return this.wallet.sendTx(this.getPlainDataTx());
+      return this.wallet.sendTx(this);
     })();
 
     return new SentTx(this.wallet, promise);

package/src/fee/account_entrypoint_meta_payment_method.ts

@@ -0,0 +1,90 @@
+import {
+  EncodedAppEntrypointCalls,
+  EncodedCallsForEntrypoint,
+  computeCombinedPayloadHash,
+} from '@aztec/entrypoints/encoding';
+import type { AuthWitnessProvider, FeePaymentMethod } from '@aztec/entrypoints/interfaces';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+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';
+
+/**
+ * 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 implements FeePaymentMethod {
+  constructor(
+    private artifact: ContractArtifact,
+    private authWitnessProvider: AuthWitnessProvider,
+    private feePaymentNameOrArtifact: string | FunctionArtifact,
+    private accountAddress: AztecAddress,
+    private paymentMethod: FeePaymentMethod,
+  ) {}
+
+  getAsset(): Promise<AztecAddress> {
+    return this.paymentMethod.getAsset();
+  }
+
+  async getExecutionPayload(gasSettings: GasSettings): Promise<ExecutionPayload> {
+    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: GasSettings): Promise<AztecAddress> {
+    return this.paymentMethod.getFeePayer(gasSettings);
+  }
+}

package/src/fee/sponsored_fee_payment.ts

@@ -0,0 +1,38 @@
+import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+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 class SponsoredFeePaymentMethod implements FeePaymentMethod {
+  constructor(private paymentContract: AztecAddress) {}
+
+  getAsset(): Promise<AztecAddress> {
+    throw new Error('Asset is not required for sponsored fpc.');
+  }
+
+  getFeePayer() {
+    return Promise.resolve(this.paymentContract);
+  }
+
+  async getExecutionPayload(): Promise<ExecutionPayload> {
+    return new ExecutionPayload(
+      [
+        {
+          name: 'sponsor_unconditionally',
+          to: this.paymentContract,
+          selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
+          type: FunctionType.PRIVATE,
+          isStatic: false,
+          args: [],
+          returnTypes: [],
+        },
+      ],
+      [],
+      [],
+    );
+  }
+}

package/src/utils/authwit.ts

@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields';
 import type { FunctionCall } from '@aztec/stdlib/abi';
 import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { HashedValues } from '@aztec/stdlib/tx';
+import { computeVarArgsHash } from '@aztec/stdlib/hash';
 
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 
@@ -80,11 +80,7 @@ export const computeAuthWitMessageHash = async (intent: IntentInnerHash | Intent
  * @returns The inner hash for the function call
  **/
 export const computeInnerAuthWitHashFromFunctionCall = async (caller: AztecAddress, fnCall: FunctionCall) => {
-  return computeInnerAuthWitHash([
-    caller.toField(),
-    fnCall.selector.toField(),
-    (await HashedValues.fromValues(fnCall.args)).hash,
-  ]);
+  return computeInnerAuthWitHash([caller.toField(), fnCall.selector.toField(), await computeVarArgsHash(fnCall.args)]);
 };
 
 /**
@@ -100,9 +96,5 @@ export const computeInnerAuthWitHashFromAction = async (
   action: FunctionCall | ContractFunctionInteraction,
 ) => {
   action = action instanceof ContractFunctionInteraction ? (await action.request()).calls[0] : action;
-  return computeInnerAuthWitHash([
-    caller.toField(),
-    action.selector.toField(),
-    (await HashedValues.fromValues(action.args)).hash,
-  ]);
+  return computeInnerAuthWitHash([caller.toField(), action.selector.toField(), await computeVarArgsHash(action.args)]);
 };

package/dest/account_manager/deploy_account_method.d.ts

@@ -1,15 +0,0 @@
-import type { AuthWitnessProvider } from '@aztec/entrypoints/interfaces';
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { type ContractArtifact, type FunctionArtifact } from '@aztec/stdlib/abi';
-import type { PublicKeys } from '@aztec/stdlib/keys';
-import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js';
-import type { Wallet } from '../wallet/wallet.js';
-/**
- * Contract interaction for deploying an account contract. Handles fee preparation and contract initialization.
- */
-export declare class DeployAccountMethod extends DeployMethod {
-    #private;
-    constructor(authWitnessProvider: AuthWitnessProvider, publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, args?: any[], constructorNameOrArtifact?: string | FunctionArtifact, feePaymentNameOrArtifact?: string | FunctionArtifact);
-    protected getInitializeExecutionPayload(options: DeployOptions): Promise<ExecutionPayload>;
-}
-//# sourceMappingURL=deploy_account_method.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"deploy_account_method.d.ts","sourceRoot":"","sources":["../../src/account_manager/deploy_account_method.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AACtF,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAA6B,MAAM,mBAAmB,CAAC;AAC5G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,YAAY;;gBAKjD,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,GAAG,EAAO,EAChB,yBAAyB,CAAC,EAAE,MAAM,GAAG,gBAAgB,EACrD,wBAAwB,CAAC,EAAE,MAAM,GAAG,gBAAgB;cAkB7B,6BAA6B,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAuC1G"}

package/dest/account_manager/deploy_account_method.js

@@ -1,51 +0,0 @@
-import { EncodedAppEntrypointCalls, EncodedCallsForEntrypoint, computeCombinedPayloadHash } from '@aztec/entrypoints/encoding';
-import { mergeExecutionPayloads } from '@aztec/entrypoints/payload';
-import { getFunctionArtifactByName } from '@aztec/stdlib/abi';
-import { Contract } from '../contract/contract.js';
-import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { DeployMethod } from '../contract/deploy_method.js';
-/**
- * Contract interaction for deploying an account contract. Handles fee preparation and contract initialization.
- */ export class DeployAccountMethod extends DeployMethod {
-    #authWitnessProvider;
-    #feePaymentArtifact;
-    constructor(authWitnessProvider, publicKeys, wallet, artifact, args = [], constructorNameOrArtifact, feePaymentNameOrArtifact){
-        super(publicKeys, wallet, artifact, (address, wallet)=>Contract.at(address, artifact, wallet), args, constructorNameOrArtifact);
-        this.#authWitnessProvider = authWitnessProvider;
-        this.#feePaymentArtifact = typeof feePaymentNameOrArtifact === 'string' ? getFunctionArtifactByName(artifact, feePaymentNameOrArtifact) : feePaymentNameOrArtifact;
-    }
-    async getInitializeExecutionPayload(options) {
-        let exec = await super.getInitializeExecutionPayload(options);
-        if (options.fee && this.#feePaymentArtifact) {
-            const { address } = await this.getInstance();
-            const emptyAppCalls = await EncodedAppEntrypointCalls.fromAppExecution([]);
-            const fee = await this.getDefaultFeeOptions(options.fee);
-            // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
-            const { calls: feeCalls, authWitnesses: feeAuthwitnesses } = await fee.paymentMethod.getExecutionPayload(fee.gasSettings);
-            // Encode the calls for the fee
-            const feePayer = await fee.paymentMethod.getFeePayer(fee.gasSettings);
-            const isFeePayer = feePayer.equals(address);
-            const feeEncodedCalls = await EncodedCallsForEntrypoint.fromFeeCalls(feeCalls, isFeePayer);
-            // Get the entrypoint args
-            const args = [
-                emptyAppCalls,
-                feeEncodedCalls,
-                false
-            ];
-            // Compute the authwitness required to verify the combined payload
-            const combinedPayloadAuthWitness = await this.#authWitnessProvider.createAuthWit(await computeCombinedPayloadHash(emptyAppCalls, feeEncodedCalls));
-            const call = new ContractFunctionInteraction(this.wallet, address, this.#feePaymentArtifact, args, [
-                combinedPayloadAuthWitness,
-                ...feeAuthwitnesses
-            ], [], [
-                ...emptyAppCalls.hashedArguments,
-                ...feeEncodedCalls.hashedArguments
-            ]);
-            exec = mergeExecutionPayloads([
-                exec,
-                await call.request()
-            ]);
-        }
-        return exec;
-    }
-}

package/dest/entrypoint/default_multi_call_entrypoint.d.ts

@@ -1,16 +0,0 @@
-import type { EntrypointInterface, FeeOptions } from '@aztec/entrypoints/interfaces';
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { TxExecutionRequest } from '@aztec/stdlib/tx';
-/**
- * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
- */
-export declare class DefaultMultiCallEntrypoint implements EntrypointInterface {
-    private chainId;
-    private version;
-    private address;
-    constructor(chainId: number, version: number, address?: AztecAddress);
-    createTxExecutionRequest(exec: ExecutionPayload, fee: FeeOptions): Promise<TxExecutionRequest>;
-    private getEntrypointAbi;
-}
-//# sourceMappingURL=default_multi_call_entrypoint.d.ts.map

package/dest/entrypoint/default_multi_call_entrypoint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"default_multi_call_entrypoint.d.ts","sourceRoot":"","sources":["../../src/entrypoint/default_multi_call_entrypoint.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E;;GAEG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAElE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAA0D;IAGvE,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAyBpG,OAAO,CAAC,gBAAgB;CAwDzB"}

package/dest/entrypoint/default_multi_call_entrypoint.js

@@ -1,134 +0,0 @@
-import { EncodedCallsForEntrypoint } from '@aztec/entrypoints/encoding';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
-import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
-/**
- * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
- */ export class DefaultMultiCallEntrypoint {
-    chainId;
-    version;
-    address;
-    constructor(chainId, version, address = ProtocolContractAddress.MultiCallEntrypoint){
-        this.chainId = chainId;
-        this.version = version;
-        this.address = address;
-    }
-    async createTxExecutionRequest(exec, fee) {
-        // Initial request with calls, authWitnesses and capsules
-        const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
-        // Encode the calls
-        const encodedCalls = await EncodedCallsForEntrypoint.fromAppExecution(calls);
-        // Obtain the entrypoint hashed args, built from the encoded calls
-        const abi = this.getEntrypointAbi();
-        const entrypointHashedArgs = await HashedValues.fromValues(encodeArguments(abi, [
-            encodedCalls
-        ]));
-        // Assemble the tx request
-        const txRequest = TxExecutionRequest.from({
-            firstCallArgsHash: entrypointHashedArgs.hash,
-            origin: this.address,
-            functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-            txContext: new TxContext(this.chainId, this.version, fee.gasSettings),
-            argsOfCalls: [
-                ...encodedCalls.hashedArguments,
-                entrypointHashedArgs,
-                ...extraHashedArgs
-            ],
-            authWitnesses,
-            capsules
-        });
-        return Promise.resolve(txRequest);
-    }
-    getEntrypointAbi() {
-        return {
-            name: 'entrypoint',
-            isInitializer: false,
-            functionType: 'private',
-            isInternal: false,
-            isStatic: false,
-            parameters: [
-                {
-                    name: 'app_payload',
-                    type: {
-                        kind: 'struct',
-                        path: 'authwit::entrypoint::app::AppPayload',
-                        fields: [
-                            {
-                                name: 'function_calls',
-                                type: {
-                                    kind: 'array',
-                                    length: 4,
-                                    type: {
-                                        kind: 'struct',
-                                        path: 'authwit::entrypoint::function_call::FunctionCall',
-                                        fields: [
-                                            {
-                                                name: 'args_hash',
-                                                type: {
-                                                    kind: 'field'
-                                                }
-                                            },
-                                            {
-                                                name: 'function_selector',
-                                                type: {
-                                                    kind: 'struct',
-                                                    path: 'authwit::aztec::protocol_types::abis::function_selector::FunctionSelector',
-                                                    fields: [
-                                                        {
-                                                            name: 'inner',
-                                                            type: {
-                                                                kind: 'integer',
-                                                                sign: 'unsigned',
-                                                                width: 32
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            },
-                                            {
-                                                name: 'target_address',
-                                                type: {
-                                                    kind: 'struct',
-                                                    path: 'authwit::aztec::protocol_types::address::AztecAddress',
-                                                    fields: [
-                                                        {
-                                                            name: 'inner',
-                                                            type: {
-                                                                kind: 'field'
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            },
-                                            {
-                                                name: 'is_public',
-                                                type: {
-                                                    kind: 'boolean'
-                                                }
-                                            },
-                                            {
-                                                name: 'is_static',
-                                                type: {
-                                                    kind: 'boolean'
-                                                }
-                                            }
-                                        ]
-                                    }
-                                }
-                            },
-                            {
-                                name: 'nonce',
-                                type: {
-                                    kind: 'field'
-                                }
-                            }
-                        ]
-                    },
-                    visibility: 'public'
-                }
-            ],
-            returnTypes: [],
-            errorTypes: {}
-        };
-    }
-}

package/src/account_manager/deploy_account_method.ts

@@ -1,87 +0,0 @@
-import {
-  EncodedAppEntrypointCalls,
-  EncodedCallsForEntrypoint,
-  computeCombinedPayloadHash,
-} from '@aztec/entrypoints/encoding';
-import type { AuthWitnessProvider } from '@aztec/entrypoints/interfaces';
-import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
-import { type ContractArtifact, type FunctionArtifact, getFunctionArtifactByName } from '@aztec/stdlib/abi';
-import type { PublicKeys } from '@aztec/stdlib/keys';
-
-import { Contract } from '../contract/contract.js';
-import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js';
-import type { Wallet } from '../wallet/wallet.js';
-
-/**
- * Contract interaction for deploying an account contract. Handles fee preparation and contract initialization.
- */
-export class DeployAccountMethod extends DeployMethod {
-  #authWitnessProvider: AuthWitnessProvider;
-  #feePaymentArtifact: FunctionArtifact | undefined;
-
-  constructor(
-    authWitnessProvider: AuthWitnessProvider,
-    publicKeys: PublicKeys,
-    wallet: Wallet,
-    artifact: ContractArtifact,
-    args: any[] = [],
-    constructorNameOrArtifact?: string | FunctionArtifact,
-    feePaymentNameOrArtifact?: string | FunctionArtifact,
-  ) {
-    super(
-      publicKeys,
-      wallet,
-      artifact,
-      (address, wallet) => Contract.at(address, artifact, wallet),
-      args,
-      constructorNameOrArtifact,
-    );
-
-    this.#authWitnessProvider = authWitnessProvider;
-    this.#feePaymentArtifact =
-      typeof feePaymentNameOrArtifact === 'string'
-        ? getFunctionArtifactByName(artifact, feePaymentNameOrArtifact)
-        : feePaymentNameOrArtifact;
-  }
-
-  protected override async getInitializeExecutionPayload(options: DeployOptions): Promise<ExecutionPayload> {
-    let exec = await super.getInitializeExecutionPayload(options);
-
-    if (options.fee && this.#feePaymentArtifact) {
-      const { address } = await this.getInstance();
-      const emptyAppCalls = await EncodedAppEntrypointCalls.fromAppExecution([]);
-      const fee = await this.getDefaultFeeOptions(options.fee);
-      // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
-      const { calls: feeCalls, authWitnesses: feeAuthwitnesses } = await fee.paymentMethod.getExecutionPayload(
-        fee.gasSettings,
-      );
-      // Encode the calls for the fee
-      const feePayer = await fee.paymentMethod.getFeePayer(fee.gasSettings);
-      const isFeePayer = feePayer.equals(address);
-      const feeEncodedCalls = await EncodedCallsForEntrypoint.fromFeeCalls(feeCalls, isFeePayer);
-
-      // Get the entrypoint args
-      const args = [emptyAppCalls, feeEncodedCalls, false];
-
-      // Compute the authwitness required to verify the combined payload
-      const combinedPayloadAuthWitness = await this.#authWitnessProvider.createAuthWit(
-        await computeCombinedPayloadHash(emptyAppCalls, feeEncodedCalls),
-      );
-
-      const call = new ContractFunctionInteraction(
-        this.wallet,
-        address,
-        this.#feePaymentArtifact,
-        args,
-        [combinedPayloadAuthWitness, ...feeAuthwitnesses],
-        [],
-        [...emptyAppCalls.hashedArguments, ...feeEncodedCalls.hashedArguments],
-      );
-
-      exec = mergeExecutionPayloads([exec, await call.request()]);
-    }
-
-    return exec;
-  }
-}

package/src/entrypoint/default_multi_call_entrypoint.ts

@@ -1,100 +0,0 @@
-import { EncodedCallsForEntrypoint } from '@aztec/entrypoints/encoding';
-import type { EntrypointInterface, FeeOptions } from '@aztec/entrypoints/interfaces';
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
-
-/**
- * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
- */
-export class DefaultMultiCallEntrypoint implements EntrypointInterface {
-  constructor(
-    private chainId: number,
-    private version: number,
-    private address: AztecAddress = ProtocolContractAddress.MultiCallEntrypoint,
-  ) {}
-
-  async createTxExecutionRequest(exec: ExecutionPayload, fee: FeeOptions): Promise<TxExecutionRequest> {
-    // Initial request with calls, authWitnesses and capsules
-    const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
-
-    // Encode the calls
-    const encodedCalls = await EncodedCallsForEntrypoint.fromAppExecution(calls);
-
-    // Obtain the entrypoint hashed args, built from the encoded calls
-    const abi = this.getEntrypointAbi();
-    const entrypointHashedArgs = await HashedValues.fromValues(encodeArguments(abi, [encodedCalls]));
-
-    // Assemble the tx request
-    const txRequest = TxExecutionRequest.from({
-      firstCallArgsHash: entrypointHashedArgs.hash,
-      origin: this.address,
-      functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-      txContext: new TxContext(this.chainId, this.version, fee.gasSettings),
-      argsOfCalls: [...encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs],
-      authWitnesses,
-      capsules,
-    });
-
-    return Promise.resolve(txRequest);
-  }
-
-  private getEntrypointAbi() {
-    return {
-      name: 'entrypoint',
-      isInitializer: false,
-      functionType: 'private',
-      isInternal: false,
-      isStatic: false,
-      parameters: [
-        {
-          name: 'app_payload',
-          type: {
-            kind: 'struct',
-            path: 'authwit::entrypoint::app::AppPayload',
-            fields: [
-              {
-                name: 'function_calls',
-                type: {
-                  kind: 'array',
-                  length: 4,
-                  type: {
-                    kind: 'struct',
-                    path: 'authwit::entrypoint::function_call::FunctionCall',
-                    fields: [
-                      { name: 'args_hash', type: { kind: 'field' } },
-                      {
-                        name: 'function_selector',
-                        type: {
-                          kind: 'struct',
-                          path: 'authwit::aztec::protocol_types::abis::function_selector::FunctionSelector',
-                          fields: [{ name: 'inner', type: { kind: 'integer', sign: 'unsigned', width: 32 } }],
-                        },
-                      },
-                      {
-                        name: 'target_address',
-                        type: {
-                          kind: 'struct',
-                          path: 'authwit::aztec::protocol_types::address::AztecAddress',
-                          fields: [{ name: 'inner', type: { kind: 'field' } }],
-                        },
-                      },
-                      { name: 'is_public', type: { kind: 'boolean' } },
-                      { name: 'is_static', type: { kind: 'boolean' } },
-                    ],
-                  },
-                },
-              },
-              { name: 'nonce', type: { kind: 'field' } },
-            ],
-          },
-          visibility: 'public',
-        },
-      ],
-      returnTypes: [],
-      errorTypes: {},
-    } as FunctionAbi;
-  }
-}