@aztec/aztec.js 0.80.0 → 0.82.0

package/dest/entrypoint/payload.d.ts

@@ -1,128 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import type { Tuple } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { FunctionCall } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { GasSettings } from '@aztec/stdlib/gas';
-import { HashedValues } from '@aztec/stdlib/tx';
-import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
-/**
- * Fee payment options for a transaction.
- */
-export type FeeOptions = {
-    /** The fee payment method to use */
-    paymentMethod: FeePaymentMethod;
-    /** The gas settings */
-    gasSettings: GasSettings;
-};
-/** Fee options as set by a user. */
-export type UserFeeOptions = {
-    /** The fee payment method to use */
-    paymentMethod?: FeePaymentMethod;
-    /** The gas settings */
-    gasSettings?: Partial<FieldsOf<GasSettings>>;
-    /** Percentage to pad the base fee by, if empty, defaults to 0.5 */
-    baseFeePadding?: number;
-    /** Whether to run an initial simulation of the tx with high gas limit to figure out actual gas settings. */
-    estimateGas?: boolean;
-    /** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */
-    estimatedGasPadding?: number;
-};
-/** Encoded function call for account contract entrypoint */
-type EncodedFunctionCall = {
-    /** Arguments hash for the call */
-    args_hash: Fr;
-    /** Selector of the function to call */
-    function_selector: Fr;
-    /** Address of the contract to call */
-    target_address: Fr;
-    /** Whether the function is public or private */
-    is_public: boolean;
-    /** Whether the function can alter state */
-    is_static: boolean;
-};
-/** Assembles an entrypoint payload */
-export declare abstract class EntrypointPayload {
-    private functionCalls;
-    private _hashedArguments;
-    private generatorIndex;
-    private _nonce;
-    protected constructor(functionCalls: EncodedFunctionCall[], _hashedArguments: HashedValues[], generatorIndex: number, _nonce: Fr);
-    protected static create(functionCalls: FunctionCall[]): Promise<{
-        encodedFunctionCalls: {
-            args_hash: Fr;
-            function_selector: Fr;
-            target_address: Fr;
-            is_public: boolean;
-            is_static: boolean;
-        }[];
-        hashedArguments: HashedValues[];
-    }>;
-    /**
-     * The function calls to execute. This uses snake_case naming so that it is compatible with Noir encoding
-     * @internal
-     */
-    get function_calls(): EncodedFunctionCall[];
-    /**
-     * The nonce
-     * @internal
-     */
-    get nonce(): Fr;
-    /**
-     * The hashed arguments for the function calls
-     */
-    get hashedArguments(): HashedValues[];
-    /**
-     * Serializes the payload to an array of fields
-     * @returns The fields of the payload
-     */
-    abstract toFields(): Fr[];
-    /**
-     * Hashes the payload
-     * @returns The hash of the payload
-     */
-    hash(): Promise<Fr>;
-    /** Serializes the function calls to an array of fields. */
-    protected functionCallsToFields(): Fr[];
-    /**
-     * Creates an execution payload for a dapp from a set of function calls
-     * @param functionCalls - The function calls to execute
-     * @returns The execution payload
-     */
-    static fromFunctionCalls(functionCalls: FunctionCall[]): Promise<AppEntrypointPayload>;
-    /**
-     * Creates an execution payload for the app-portion of a transaction from a set of function calls
-     * @param functionCalls - The function calls to execute
-     * @param nonce - The nonce for the payload, used to emit a nullifier identifying the call
-     * @returns The execution payload
-     */
-    static fromAppExecution(functionCalls: FunctionCall[] | Tuple<FunctionCall, 4>, nonce?: Fr): Promise<AppEntrypointPayload>;
-    /**
-     * Creates an execution payload to pay the fee for a transaction
-     * @param sender - The address sending this payload
-     * @param feeOpts - The fee payment options
-     * @returns The execution payload
-     */
-    static fromFeeOptions(sender: AztecAddress, feeOpts?: FeeOptions): Promise<FeeEntrypointPayload>;
-}
-/** Entrypoint payload for app phase execution. */
-declare class AppEntrypointPayload extends EntrypointPayload {
-    toFields(): Fr[];
-}
-/** Entrypoint payload for fee payment to be run during setup phase. */
-declare class FeeEntrypointPayload extends EntrypointPayload {
-    #private;
-    constructor(functionCalls: EncodedFunctionCall[], hashedArguments: HashedValues[], generatorIndex: number, nonce: Fr, isFeePayer: boolean);
-    toFields(): Fr[];
-    /** Whether the sender should be appointed as fee payer. */
-    get is_fee_payer(): boolean;
-}
-/**
- * Computes a hash of a combined payload.
- * @param appPayload - An app payload.
- * @param feePayload - A fee payload.
- * @returns A hash of a combined payload.
- */
-export declare function computeCombinedPayloadHash(appPayload: AppEntrypointPayload, feePayload: FeeEntrypointPayload): Promise<Fr>;
-export {};
-//# sourceMappingURL=payload.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../src/entrypoint/payload.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,oCAAoC;IACpC,aAAa,EAAE,gBAAgB,CAAC;IAChC,uBAAuB;IACvB,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAGF,oCAAoC;AACpC,MAAM,MAAM,cAAc,GAAG;IAC3B,oCAAoC;IACpC,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,uBAAuB;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7C,mEAAmE;IACnE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4GAA4G;IAC5G,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,qHAAqH;IACrH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAUF,4DAA4D;AAC5D,KAAK,mBAAmB,GAAG;IACzB,kCAAkC;IAClC,SAAS,EAAE,EAAE,CAAC;IACd,uCAAuC;IACvC,iBAAiB,EAAE,EAAE,CAAC;IACtB,sCAAsC;IACtC,cAAc,EAAE,EAAE,CAAC;IACnB,gDAAgD;IAChD,SAAS,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAGF,sCAAsC;AACtC,8BAAsB,iBAAiB;IAEnC,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,MAAM;IAJhB,SAAS,aACC,aAAa,EAAE,mBAAmB,EAAE,EACpC,gBAAgB,EAAE,YAAY,EAAE,EAChC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,EAAE;qBAGG,MAAM,CAAC,aAAa,EAAE,YAAY,EAAE;;;;;;;;;;IAuB3D;;;OAGG;IACH,IAAI,cAAc,0BAEjB;IAGD;;;OAGG;IACH,IAAI,KAAK,OAER;IAED;;OAEG;IACH,IAAI,eAAe,mBAElB;IAED;;;OAGG;IACH,QAAQ,CAAC,QAAQ,IAAI,EAAE,EAAE;IAEzB;;;OAGG;IACH,IAAI;IAIJ,2DAA2D;IAC3D,SAAS,CAAC,qBAAqB;IAU/B;;;;OAIG;WACU,iBAAiB,CAAC,aAAa,EAAE,YAAY,EAAE;IAK5D;;;;;OAKG;WACU,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,KAAK,KAAc;IASzG;;;;;OAKG;WACU,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,UAAU;CAcvE;AAED,kDAAkD;AAClD,cAAM,oBAAqB,SAAQ,iBAAiB;IACzC,QAAQ,IAAI,EAAE,EAAE;CAG1B;AAED,uEAAuE;AACvE,cAAM,oBAAqB,SAAQ,iBAAiB;;gBAIhD,aAAa,EAAE,mBAAmB,EAAE,EACpC,eAAe,EAAE,YAAY,EAAE,EAC/B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,EAAE,EACT,UAAU,EAAE,OAAO;IAMZ,QAAQ,IAAI,EAAE,EAAE;IAKzB,2DAA2D;IAC3D,IAAI,YAAY,YAEf;CAEF;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,oBAAoB,EAChC,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,EAAE,CAAC,CAKb"}

package/dest/entrypoint/payload.js

@@ -1,143 +0,0 @@
-import { GeneratorIndex } from '@aztec/constants';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import { FunctionCall, FunctionType } from '@aztec/stdlib/abi';
-import { HashedValues } from '@aztec/stdlib/tx';
-// docs:end:user_fee_options
-// These must match the values defined in:
-// - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
-const APP_MAX_CALLS = 4;
-// - and noir-projects/aztec-nr/aztec/src/entrypoint/fee.nr
-const FEE_MAX_CALLS = 2;
-/* eslint-enable camelcase */ /** Assembles an entrypoint payload */ export class EntrypointPayload {
-    functionCalls;
-    _hashedArguments;
-    generatorIndex;
-    _nonce;
-    constructor(functionCalls, _hashedArguments, generatorIndex, _nonce){
-        this.functionCalls = functionCalls;
-        this._hashedArguments = _hashedArguments;
-        this.generatorIndex = generatorIndex;
-        this._nonce = _nonce;
-    }
-    static async create(functionCalls) {
-        const hashedArguments = [];
-        for (const call of functionCalls){
-            hashedArguments.push(await HashedValues.fromValues(call.args));
-        }
-        /* eslint-disable camelcase */ const encodedFunctionCalls = functionCalls.map((call, index)=>({
-                args_hash: hashedArguments[index].hash,
-                function_selector: call.selector.toField(),
-                target_address: call.to.toField(),
-                is_public: call.type == FunctionType.PUBLIC,
-                is_static: call.isStatic
-            }));
-        /* eslint-enable camelcase */ return {
-            encodedFunctionCalls,
-            hashedArguments
-        };
-    }
-    /* eslint-disable camelcase */ /**
-   * The function calls to execute. This uses snake_case naming so that it is compatible with Noir encoding
-   * @internal
-   */ get function_calls() {
-        return this.functionCalls;
-    }
-    /* eslint-enable camelcase */ /**
-   * The nonce
-   * @internal
-   */ get nonce() {
-        return this._nonce;
-    }
-    /**
-   * The hashed arguments for the function calls
-   */ get hashedArguments() {
-        return this._hashedArguments;
-    }
-    /**
-   * Hashes the payload
-   * @returns The hash of the payload
-   */ hash() {
-        return poseidon2HashWithSeparator(this.toFields(), this.generatorIndex);
-    }
-    /** Serializes the function calls to an array of fields. */ functionCallsToFields() {
-        return this.functionCalls.flatMap((call)=>[
-                call.args_hash,
-                call.function_selector,
-                call.target_address,
-                new Fr(call.is_public),
-                new Fr(call.is_static)
-            ]);
-    }
-    /**
-   * Creates an execution payload for a dapp from a set of function calls
-   * @param functionCalls - The function calls to execute
-   * @returns The execution payload
-   */ static async fromFunctionCalls(functionCalls) {
-        const { encodedFunctionCalls, hashedArguments } = await this.create(functionCalls);
-        return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, 0, Fr.random());
-    }
-    /**
-   * Creates an execution payload for the app-portion of a transaction from a set of function calls
-   * @param functionCalls - The function calls to execute
-   * @param nonce - The nonce for the payload, used to emit a nullifier identifying the call
-   * @returns The execution payload
-   */ static async fromAppExecution(functionCalls, nonce = Fr.random()) {
-        if (functionCalls.length > APP_MAX_CALLS) {
-            throw new Error(`Expected at most ${APP_MAX_CALLS} function calls, got ${functionCalls.length}`);
-        }
-        const paddedCalls = padArrayEnd(functionCalls, FunctionCall.empty(), APP_MAX_CALLS);
-        const { encodedFunctionCalls, hashedArguments } = await this.create(paddedCalls);
-        return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, GeneratorIndex.SIGNATURE_PAYLOAD, nonce);
-    }
-    /**
-   * Creates an execution payload to pay the fee for a transaction
-   * @param sender - The address sending this payload
-   * @param feeOpts - The fee payment options
-   * @returns The execution payload
-   */ static async fromFeeOptions(sender, feeOpts) {
-        const calls = await feeOpts?.paymentMethod.getFunctionCalls(feeOpts?.gasSettings) ?? [];
-        const feePayer = await feeOpts?.paymentMethod.getFeePayer(feeOpts?.gasSettings);
-        const isFeePayer = !!feePayer && feePayer.equals(sender);
-        const paddedCalls = padArrayEnd(calls, FunctionCall.empty(), FEE_MAX_CALLS);
-        const { encodedFunctionCalls, hashedArguments } = await this.create(paddedCalls);
-        return new FeeEntrypointPayload(encodedFunctionCalls, hashedArguments, GeneratorIndex.FEE_PAYLOAD, Fr.random(), isFeePayer);
-    }
-}
-/** Entrypoint payload for app phase execution. */ class AppEntrypointPayload extends EntrypointPayload {
-    toFields() {
-        return [
-            ...this.functionCallsToFields(),
-            this.nonce
-        ];
-    }
-}
-/** Entrypoint payload for fee payment to be run during setup phase. */ class FeeEntrypointPayload extends EntrypointPayload {
-    #isFeePayer;
-    constructor(functionCalls, hashedArguments, generatorIndex, nonce, isFeePayer){
-        super(functionCalls, hashedArguments, generatorIndex, nonce);
-        this.#isFeePayer = isFeePayer;
-    }
-    toFields() {
-        return [
-            ...this.functionCallsToFields(),
-            this.nonce,
-            new Fr(this.#isFeePayer)
-        ];
-    }
-    /* eslint-disable camelcase */ /** Whether the sender should be appointed as fee payer. */ get is_fee_payer() {
-        return this.#isFeePayer;
-    }
-}
-/**
- * Computes a hash of a combined payload.
- * @param appPayload - An app payload.
- * @param feePayload - A fee payload.
- * @returns A hash of a combined payload.
- */ export async function computeCombinedPayloadHash(appPayload, feePayload) {
-    return poseidon2HashWithSeparator([
-        await appPayload.hash(),
-        await feePayload.hash()
-    ], GeneratorIndex.COMBINED_PAYLOAD);
-}

package/dest/fee/fee_payment_method.d.ts

@@ -1,22 +0,0 @@
-import type { FunctionCall } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { GasSettings } from '@aztec/stdlib/gas';
-/**
- * Holds information about how the fee for a transaction is to be paid.
- */
-export interface FeePaymentMethod {
-    /** The asset used to pay the fee. */
-    getAsset(): Promise<AztecAddress>;
-    /**
-     * Creates a function call to pay the fee in the given asset.
-     * @param gasSettings - The gas limits and max fees.
-     * @returns The function call to pay the fee.
-     */
-    getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]>;
-    /**
-     * The expected fee payer for this tx.
-     * @param gasSettings - The gas limits and max fees.
-     */
-    getFeePayer(gasSettings: GasSettings): Promise<AztecAddress>;
-}
-//# sourceMappingURL=fee_payment_method.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC;;;;OAIG;IACH,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IACpE;;;OAGG;IACH,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC9D"}

package/dest/fee/fee_payment_method.js

@@ -1,3 +0,0 @@
-/**
- * Holds information about how the fee for a transaction is to be paid.
- */ export { };

package/src/account/wallet.ts

@@ -1,13 +0,0 @@
-import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-
-import type { IntentAction, IntentInnerHash } from '../utils/authwit.js';
-import type { AccountInterface } from './interface.js';
-
-/**
- * The wallet interface.
- */
-export type Wallet = AccountInterface &
-  PXE & {
-    createAuthWit(intent: IntentInnerHash | IntentAction): Promise<AuthWitness>;
-  };

package/src/api/entrypoint.ts

@@ -1 +0,0 @@
-export * from '../entrypoint/entrypoint.js';

package/src/entrypoint/default_entrypoint.ts

@@ -1,39 +0,0 @@
-import { FunctionType } from '@aztec/stdlib/abi';
-import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
-
-import type { EntrypointInterface, ExecutionRequestInit } from './entrypoint.js';
-
-/**
- * Default implementation of the entrypoint interface. It calls a function on a contract directly
- */
-export class DefaultEntrypoint implements EntrypointInterface {
-  constructor(private chainId: number, private protocolVersion: number) {}
-
-  async createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
-    const { fee, calls, authWitnesses = [], hashedArguments = [], capsules = [] } = exec;
-
-    if (calls.length > 1) {
-      throw new Error(`Expected a single call, got ${calls.length}`);
-    }
-
-    const call = calls[0];
-
-    if (call.type !== FunctionType.PRIVATE) {
-      throw new Error('Public entrypoints are not allowed');
-    }
-
-    const entrypointHashedValues = await HashedValues.fromValues(call.args);
-    const txContext = new TxContext(this.chainId, this.protocolVersion, fee.gasSettings);
-    return Promise.resolve(
-      new TxExecutionRequest(
-        call.to,
-        call.selector,
-        entrypointHashedValues.hash,
-        txContext,
-        [...hashedArguments, entrypointHashedValues],
-        authWitnesses,
-        capsules,
-      ),
-    );
-  }
-}

package/src/entrypoint/entrypoint.ts

@@ -1,60 +0,0 @@
-import type { Fr } from '@aztec/foundation/fields';
-import type { FunctionCall } from '@aztec/stdlib/abi';
-import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import type { Capsule, HashedValues, TxExecutionRequest } from '@aztec/stdlib/tx';
-
-import { EntrypointPayload, type FeeOptions, computeCombinedPayloadHash } from './payload.js';
-
-export { EntrypointPayload, type FeeOptions, computeCombinedPayloadHash };
-
-export { DefaultEntrypoint } from './default_entrypoint.js';
-export { DefaultMultiCallEntrypoint } from './default_multi_call_entrypoint.js';
-
-/** Encodes the calls to be done in a transaction. */
-export type ExecutionRequestInit = {
-  /** The function calls to be executed. */
-  calls: FunctionCall[];
-  /** Any transient auth witnesses needed for this execution */
-  authWitnesses?: AuthWitness[];
-  /** Any transient hashed arguments for this execution */
-  hashedArguments?: HashedValues[];
-  /** Data passed through an oracle for this execution. */
-  capsules?: Capsule[];
-  /** How the fee is going to be payed */
-  fee: FeeOptions;
-  /** An optional nonce. Used to repeat a previous tx with a higher fee so that the first one is cancelled */
-  nonce?: Fr;
-  /** Whether the transaction can be cancelled. If true, an extra nullifier will be emitted: H(nonce, GENERATOR_INDEX__TX_NULLIFIER) */
-  cancellable?: boolean;
-};
-
-/**
- * Merges an array of ExecutionRequestInits.
- */
-export function mergeExecutionRequestInits(
-  requests: Pick<ExecutionRequestInit, 'calls' | 'authWitnesses' | 'hashedArguments' | 'capsules'>[],
-  { nonce, cancellable }: Pick<ExecutionRequestInit, 'nonce' | 'cancellable'> = {},
-): Omit<ExecutionRequestInit, 'fee'> {
-  const calls = requests.map(r => r.calls).flat();
-  const authWitnesses = requests.map(r => r.authWitnesses ?? []).flat();
-  const hashedArguments = requests.map(r => r.hashedArguments ?? []).flat();
-  const capsules = requests.map(r => r.capsules ?? []).flat();
-  return {
-    calls,
-    authWitnesses,
-    hashedArguments,
-    capsules,
-    nonce,
-    cancellable,
-  };
-}
-
-/** Creates transaction execution requests out of a set of function calls. */
-export interface EntrypointInterface {
-  /**
-   * Generates an execution request out of set of function calls.
-   * @param execution - The execution intents to be run.
-   * @returns The authenticated transaction execution request.
-   */
-  createTxExecutionRequest(execution: ExecutionRequestInit): Promise<TxExecutionRequest>;
-}

package/src/entrypoint/payload.ts

@@ -1,238 +0,0 @@
-import { GeneratorIndex } from '@aztec/constants';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import type { Tuple } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { FunctionCall, FunctionType } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { GasSettings } from '@aztec/stdlib/gas';
-import { HashedValues } from '@aztec/stdlib/tx';
-
-import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
-
-/**
- * Fee payment options for a transaction.
- */
-export type FeeOptions = {
-  /** The fee payment method to use */
-  paymentMethod: FeePaymentMethod;
-  /** The gas settings */
-  gasSettings: GasSettings;
-};
-
-// docs:start:user_fee_options
-/** Fee options as set by a user. */
-export type UserFeeOptions = {
-  /** The fee payment method to use */
-  paymentMethod?: FeePaymentMethod;
-  /** The gas settings */
-  gasSettings?: Partial<FieldsOf<GasSettings>>;
-  /** Percentage to pad the base fee by, if empty, defaults to 0.5 */
-  baseFeePadding?: number;
-  /** Whether to run an initial simulation of the tx with high gas limit to figure out actual gas settings. */
-  estimateGas?: boolean;
-  /** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */
-  estimatedGasPadding?: number;
-};
-// docs:end:user_fee_options
-
-// These must match the values defined in:
-// - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
-const APP_MAX_CALLS = 4;
-// - and noir-projects/aztec-nr/aztec/src/entrypoint/fee.nr
-const FEE_MAX_CALLS = 2;
-
-/* eslint-disable camelcase */
-/** Encoded function call for account contract entrypoint */
-type EncodedFunctionCall = {
-  /** Arguments hash for the call */
-  args_hash: Fr;
-  /** Selector of the function to call */
-  function_selector: Fr;
-  /** Address of the contract to call */
-  target_address: Fr;
-  /** Whether the function is public or private */
-  is_public: boolean;
-  /** Whether the function can alter state */
-  is_static: boolean;
-};
-/* eslint-enable camelcase */
-
-/** Assembles an entrypoint payload */
-export abstract class EntrypointPayload {
-  protected constructor(
-    private functionCalls: EncodedFunctionCall[],
-    private _hashedArguments: HashedValues[],
-    private generatorIndex: number,
-    private _nonce: Fr,
-  ) {}
-
-  protected static async create(functionCalls: FunctionCall[]) {
-    const hashedArguments: HashedValues[] = [];
-    for (const call of functionCalls) {
-      hashedArguments.push(await HashedValues.fromValues(call.args));
-    }
-
-    /* eslint-disable camelcase */
-    const encodedFunctionCalls = functionCalls.map((call, index) => ({
-      args_hash: hashedArguments[index].hash,
-      function_selector: call.selector.toField(),
-      target_address: call.to.toField(),
-      is_public: call.type == FunctionType.PUBLIC,
-      is_static: call.isStatic,
-    }));
-    /* eslint-enable camelcase */
-
-    return {
-      encodedFunctionCalls,
-      hashedArguments,
-    };
-  }
-
-  /* eslint-disable camelcase */
-  /**
-   * The function calls to execute. This uses snake_case naming so that it is compatible with Noir encoding
-   * @internal
-   */
-  get function_calls() {
-    return this.functionCalls;
-  }
-  /* eslint-enable camelcase */
-
-  /**
-   * The nonce
-   * @internal
-   */
-  get nonce() {
-    return this._nonce;
-  }
-
-  /**
-   * The hashed arguments for the function calls
-   */
-  get hashedArguments() {
-    return this._hashedArguments;
-  }
-
-  /**
-   * Serializes the payload to an array of fields
-   * @returns The fields of the payload
-   */
-  abstract toFields(): Fr[];
-
-  /**
-   * Hashes the payload
-   * @returns The hash of the payload
-   */
-  hash() {
-    return poseidon2HashWithSeparator(this.toFields(), this.generatorIndex);
-  }
-
-  /** Serializes the function calls to an array of fields. */
-  protected functionCallsToFields() {
-    return this.functionCalls.flatMap(call => [
-      call.args_hash,
-      call.function_selector,
-      call.target_address,
-      new Fr(call.is_public),
-      new Fr(call.is_static),
-    ]);
-  }
-
-  /**
-   * Creates an execution payload for a dapp from a set of function calls
-   * @param functionCalls - The function calls to execute
-   * @returns The execution payload
-   */
-  static async fromFunctionCalls(functionCalls: FunctionCall[]) {
-    const { encodedFunctionCalls, hashedArguments } = await this.create(functionCalls);
-    return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, 0, Fr.random());
-  }
-
-  /**
-   * Creates an execution payload for the app-portion of a transaction from a set of function calls
-   * @param functionCalls - The function calls to execute
-   * @param nonce - The nonce for the payload, used to emit a nullifier identifying the call
-   * @returns The execution payload
-   */
-  static async fromAppExecution(functionCalls: FunctionCall[] | Tuple<FunctionCall, 4>, nonce = Fr.random()) {
-    if (functionCalls.length > APP_MAX_CALLS) {
-      throw new Error(`Expected at most ${APP_MAX_CALLS} function calls, got ${functionCalls.length}`);
-    }
-    const paddedCalls = padArrayEnd(functionCalls, FunctionCall.empty(), APP_MAX_CALLS);
-    const { encodedFunctionCalls, hashedArguments } = await this.create(paddedCalls);
-    return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, GeneratorIndex.SIGNATURE_PAYLOAD, nonce);
-  }
-
-  /**
-   * Creates an execution payload to pay the fee for a transaction
-   * @param sender - The address sending this payload
-   * @param feeOpts - The fee payment options
-   * @returns The execution payload
-   */
-  static async fromFeeOptions(sender: AztecAddress, feeOpts?: FeeOptions) {
-    const calls = (await feeOpts?.paymentMethod.getFunctionCalls(feeOpts?.gasSettings)) ?? [];
-    const feePayer = await feeOpts?.paymentMethod.getFeePayer(feeOpts?.gasSettings);
-    const isFeePayer = !!feePayer && feePayer.equals(sender);
-    const paddedCalls = padArrayEnd(calls, FunctionCall.empty(), FEE_MAX_CALLS);
-    const { encodedFunctionCalls, hashedArguments } = await this.create(paddedCalls);
-    return new FeeEntrypointPayload(
-      encodedFunctionCalls,
-      hashedArguments,
-      GeneratorIndex.FEE_PAYLOAD,
-      Fr.random(),
-      isFeePayer,
-    );
-  }
-}
-
-/** Entrypoint payload for app phase execution. */
-class AppEntrypointPayload extends EntrypointPayload {
-  override toFields(): Fr[] {
-    return [...this.functionCallsToFields(), this.nonce];
-  }
-}
-
-/** Entrypoint payload for fee payment to be run during setup phase. */
-class FeeEntrypointPayload extends EntrypointPayload {
-  #isFeePayer: boolean;
-
-  constructor(
-    functionCalls: EncodedFunctionCall[],
-    hashedArguments: HashedValues[],
-    generatorIndex: number,
-    nonce: Fr,
-    isFeePayer: boolean,
-  ) {
-    super(functionCalls, hashedArguments, generatorIndex, nonce);
-    this.#isFeePayer = isFeePayer;
-  }
-
-  override toFields(): Fr[] {
-    return [...this.functionCallsToFields(), this.nonce, new Fr(this.#isFeePayer)];
-  }
-
-  /* eslint-disable camelcase */
-  /** Whether the sender should be appointed as fee payer. */
-  get is_fee_payer() {
-    return this.#isFeePayer;
-  }
-  /* eslint-enable camelcase */
-}
-
-/**
- * Computes a hash of a combined payload.
- * @param appPayload - An app payload.
- * @param feePayload - A fee payload.
- * @returns A hash of a combined payload.
- */
-export async function computeCombinedPayloadHash(
-  appPayload: AppEntrypointPayload,
-  feePayload: FeeEntrypointPayload,
-): Promise<Fr> {
-  return poseidon2HashWithSeparator(
-    [await appPayload.hash(), await feePayload.hash()],
-    GeneratorIndex.COMBINED_PAYLOAD,
-  );
-}