@aztec/accounts 0.24.0 → 0.26.1

package/src/defaults/account_interface.ts

@@ -1,10 +1,9 @@
 import { AccountInterface, AuthWitnessProvider, EntrypointInterface, FeeOptions } from '@aztec/aztec.js/account';
 import { AuthWitness, FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
 import { CompleteAddress, Fr } from '@aztec/circuits.js';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import { NodeInfo } from '@aztec/types/interfaces';
 
-import { DefaultAccountEntrypoint } from './account_entrypoint.js';
-
 /**
  * Default implementation for an account interface. Requires that the account uses the default
  * entrypoint signature, which accept an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module

package/src/defaults/index.ts

@@ -6,8 +6,5 @@
  * @packageDocumentation
  */
 
-export * from './entrypoint_payload.js';
-export * from './account_entrypoint.js';
 export * from './account_interface.js';
 export * from './account_contract.js';
-export * from './constants.js';

package/src/testing/configuration.ts

@@ -62,7 +62,11 @@ export async function deployInitialTestAccounts(pxe: PXE) {
   const deployMethods = await Promise.all(
     accounts.map(async x => {
       const deployMethod = await x.account.getDeployMethod();
-      await deployMethod.create({ contractAddressSalt: x.account.salt });
+      await deployMethod.create({
+        contractAddressSalt: x.account.salt,
+        skipClassRegistration: true,
+        skipPublicDeployment: true,
+      });
       await deployMethod.simulate({});
       return deployMethod;
     }),

package/src/testing/create_account.ts

@@ -28,7 +28,13 @@ export async function createAccounts(pxe: PXE, numberOfAccounts = 1): Promise<Ac
     // Unfortunately the function below is not stateless and we call it here because it takes a long time to run and
     // the results get stored within the account object. By calling it here we increase the probability of all the
     // accounts being deployed in the same block because it makes the deploy() method basically instant.
-    await account.getDeployMethod().then(d => d.simulate({ contractAddressSalt: account.salt }));
+    await account.getDeployMethod().then(d =>
+      d.simulate({
+        contractAddressSalt: account.salt,
+        skipClassRegistration: true,
+        skipPublicDeployment: true,
+      }),
+    );
     accounts.push(account);
   }
 

package/dest/defaults/account_entrypoint.d.ts

@@ -1,17 +0,0 @@
-import { AuthWitnessProvider, EntrypointInterface, FeeOptions } from '@aztec/aztec.js/account';
-import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/circuits.js';
-/**
- * Implementation for an entrypoint interface that follows the default entrypoint signature
- * for an account, which accepts an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
- */
-export declare class DefaultAccountEntrypoint implements EntrypointInterface {
-    private address;
-    private auth;
-    private chainId;
-    private version;
-    constructor(address: AztecAddress, auth: AuthWitnessProvider, chainId?: number, version?: number);
-    createTxExecutionRequest(executions: FunctionCall[], feeOpts?: FeeOptions): Promise<TxExecutionRequest>;
-    private getEntrypointAbi;
-}
-//# sourceMappingURL=account_entrypoint.d.ts.map

package/dest/defaults/account_entrypoint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"account_entrypoint.d.ts","sourceRoot":"","sources":["../../src/defaults/account_entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAmB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,YAAY,EAA+C,MAAM,oBAAoB,CAAC;AAM/F;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,mBAAmB;IAEhE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAHP,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,MAAyB,EAClC,OAAO,GAAE,MAAwB;IAGrC,wBAAwB,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0B7G,OAAO,CAAC,gBAAgB;CA8FzB"}

package/dest/defaults/account_entrypoint.js

@@ -1,129 +0,0 @@
-import { PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
-import { Fr, FunctionData, GeneratorIndex, TxContext } from '@aztec/circuits.js';
-import { encodeArguments } from '@aztec/foundation/abi';
-import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
-import { buildAppPayload, buildFeePayload, hashPayload } from './entrypoint_payload.js';
-/**
- * Implementation for an entrypoint interface that follows the default entrypoint signature
- * for an account, which accepts an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
- */
-export class DefaultAccountEntrypoint {
-    constructor(address, auth, chainId = DEFAULT_CHAIN_ID, version = DEFAULT_VERSION) {
-        this.address = address;
-        this.auth = auth;
-        this.chainId = chainId;
-        this.version = version;
-    }
-    async createTxExecutionRequest(executions, feeOpts) {
-        const { payload: appPayload, packedArguments: appPackedArguments } = buildAppPayload(executions);
-        const { payload: feePayload, packedArguments: feePackedArguments } = buildFeePayload(feeOpts);
-        const abi = this.getEntrypointAbi();
-        const entrypointPackedArgs = PackedArguments.fromArgs(encodeArguments(abi, [appPayload, feePayload]));
-        const appAuthWitness = await this.auth.createAuthWitness(Fr.fromBuffer(hashPayload(appPayload, GeneratorIndex.SIGNATURE_PAYLOAD)));
-        const feeAuthWitness = await this.auth.createAuthWitness(Fr.fromBuffer(hashPayload(feePayload, GeneratorIndex.FEE_PAYLOAD)));
-        const txRequest = TxExecutionRequest.from({
-            argsHash: entrypointPackedArgs.hash,
-            origin: this.address,
-            functionData: FunctionData.fromAbi(abi),
-            txContext: TxContext.empty(this.chainId, this.version),
-            packedArguments: [...appPackedArguments, ...feePackedArguments, entrypointPackedArgs],
-            authWitnesses: [appAuthWitness, feeAuthWitness],
-        });
-        return txRequest;
-    }
-    getEntrypointAbi() {
-        return {
-            name: 'entrypoint',
-            functionType: 'secret',
-            isInternal: 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: 'nonce', type: { kind: 'field' } },
-                        ],
-                    },
-                    visibility: 'public',
-                },
-                {
-                    name: 'fee_payload',
-                    type: {
-                        kind: 'struct',
-                        path: 'authwit::entrypoint::fee::FeePayload',
-                        fields: [
-                            {
-                                name: 'function_calls',
-                                type: {
-                                    kind: 'array',
-                                    length: 2,
-                                    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: 'nonce', type: { kind: 'field' } },
-                        ],
-                    },
-                    visibility: 'public',
-                },
-            ],
-            returnTypes: [],
-        };
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9lbnRyeXBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlZmF1bHRzL2FjY291bnRfZW50cnlwb2ludC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWdCLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3pGLE9BQU8sRUFBZ0IsRUFBRSxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDL0YsT0FBTyxFQUFlLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXJFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNuRSxPQUFPLEVBQUUsZUFBZSxFQUFFLGVBQWUsRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4Rjs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sd0JBQXdCO0lBQ25DLFlBQ1UsT0FBcUIsRUFDckIsSUFBeUIsRUFDekIsVUFBa0IsZ0JBQWdCLEVBQ2xDLFVBQWtCLGVBQWU7UUFIakMsWUFBTyxHQUFQLE9BQU8sQ0FBYztRQUNyQixTQUFJLEdBQUosSUFBSSxDQUFxQjtRQUN6QixZQUFPLEdBQVAsT0FBTyxDQUEyQjtRQUNsQyxZQUFPLEdBQVAsT0FBTyxDQUEwQjtJQUN4QyxDQUFDO0lBRUosS0FBSyxDQUFDLHdCQUF3QixDQUFDLFVBQTBCLEVBQUUsT0FBb0I7UUFDN0UsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsZUFBZSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pHLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxHQUFHLGVBQWUsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUU5RixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsZ0JB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

package/dest/defaults/constants.d.ts

@@ -1,5 +0,0 @@
-/** Default L1 chain ID to use when constructing txs (matches hardhat and anvil's default). */
-export declare const DEFAULT_CHAIN_ID = 31337;
-/** Default protocol version to use. */
-export declare const DEFAULT_VERSION = 1;
-//# sourceMappingURL=constants.d.ts.map

package/dest/defaults/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/defaults/constants.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,uCAAuC;AACvC,eAAO,MAAM,eAAe,IAAI,CAAC"}

package/dest/defaults/constants.js

@@ -1,5 +0,0 @@
-/** Default L1 chain ID to use when constructing txs (matches hardhat and anvil's default). */
-export const DEFAULT_CHAIN_ID = 31337;
-/** Default protocol version to use. */
-export const DEFAULT_VERSION = 1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlZmF1bHRzL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw4RkFBOEY7QUFDOUYsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxDQUFDO0FBQ3RDLHVDQUF1QztBQUN2QyxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBQyxDQUFDIn0=

package/dest/defaults/entrypoint_payload.d.ts

@@ -1,37 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { FeeOptions } from '@aztec/aztec.js/account';
-import { Fr } from '@aztec/aztec.js/fields';
-import { FunctionCall, PackedArguments } from '@aztec/circuit-types';
-/** Encoded function call for account contract entrypoint */
-type EntrypointFunctionCall = {
-    /** 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;
-};
-/** Encoded payload for the account contract entrypoint */
-type EntrypointPayload = {
-    /** Encoded function calls to execute */
-    function_calls: EntrypointFunctionCall[];
-    /** A nonce for replay protection */
-    nonce: Fr;
-};
-/** Represents a generic payload to be executed in the context of an account contract */
-export type PayloadWithArguments = {
-    /** The payload to be run */
-    payload: EntrypointPayload;
-    /** The packed arguments for the function calls */
-    packedArguments: PackedArguments[];
-};
-/** Assembles an entrypoint app payload from a set of private and public function calls */
-export declare function buildAppPayload(calls: FunctionCall[]): PayloadWithArguments;
-/** Creates the payload for paying the fee for a transaction */
-export declare function buildFeePayload(feeOpts?: FeeOptions): PayloadWithArguments;
-/** Hashes a payload to a 32-byte buffer */
-export declare function hashPayload(payload: EntrypointPayload, generatorIndex: number): Buffer;
-export {};
-//# sourceMappingURL=entrypoint_payload.d.ts.map

package/dest/defaults/entrypoint_payload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"entrypoint_payload.d.ts","sourceRoot":"","sources":["../../src/defaults/entrypoint_payload.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAqB,MAAM,sBAAsB,CAAC;AAUxF,4DAA4D;AAC5D,KAAK,sBAAsB,GAAG;IAE5B,kCAAkC;IAClC,SAAS,EAAE,EAAE,CAAC;IAEd,uCAAuC;IACvC,iBAAiB,EAAE,EAAE,CAAC;IAEtB,sCAAsC;IACtC,cAAc,EAAE,EAAE,CAAC;IAEnB,gDAAgD;IAChD,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,0DAA0D;AAC1D,KAAK,iBAAiB,GAAG;IAEvB,wCAAwC;IACxC,cAAc,EAAE,sBAAsB,EAAE,CAAC;IACzC,oCAAoC;IACpC,KAAK,EAAE,EAAE,CAAC;CACX,CAAC;AAEF,wFAAwF;AACxF,MAAM,MAAM,oBAAoB,GAAG;IACjC,4BAA4B;IAC5B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,kDAAkD;IAClD,eAAe,EAAE,eAAe,EAAE,CAAC;CACpC,CAAC;AAsCF,0FAA0F;AAC1F,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,oBAAoB,CAE3E;AAED,+DAA+D;AAC/D,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,oBAAoB,CAG1E;AAED,2CAA2C;AAC3C,wBAAgB,WAAW,CAAC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,UAK7E"}

package/dest/defaults/entrypoint_payload.js

@@ -1,67 +0,0 @@
-import { Fr } from '@aztec/aztec.js/fields';
-import { PackedArguments, emptyFunctionCall } from '@aztec/circuit-types';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { pedersenHash } from '@aztec/foundation/crypto';
-// These must match the values defined in:
-// - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
-const ACCOUNT_MAX_CALLS = 4;
-// - and noir-projects/aztec-nr/aztec/src/entrypoint/fee.nr
-const FEE_MAX_CALLS = 2;
-/**
- * Builds a payload to be sent to the account contract
- * @param calls - The function calls to run
- * @param maxCalls - The maximum number of call expected to be run. Used for padding
- * @returns A payload object and packed arguments
- */
-function buildPayload(calls, maxCalls) {
-    const nonce = Fr.random();
-    const paddedCalls = padArrayEnd(calls, emptyFunctionCall(), maxCalls);
-    const packedArguments = [];
-    for (const call of paddedCalls) {
-        packedArguments.push(PackedArguments.fromArgs(call.args));
-    }
-    const formattedCalls = paddedCalls.map((call, index) => ({
-        // eslint-disable-next-line camelcase
-        args_hash: packedArguments[index].hash,
-        // eslint-disable-next-line camelcase
-        function_selector: call.functionData.selector.toField(),
-        // eslint-disable-next-line camelcase
-        target_address: call.to.toField(),
-        // eslint-disable-next-line camelcase
-        is_public: !call.functionData.isPrivate,
-    }));
-    return {
-        payload: {
-            // eslint-disable-next-line camelcase
-            function_calls: formattedCalls,
-            nonce,
-        },
-        packedArguments,
-    };
-}
-/** Assembles an entrypoint app payload from a set of private and public function calls */
-export function buildAppPayload(calls) {
-    return buildPayload(calls, ACCOUNT_MAX_CALLS);
-}
-/** Creates the payload for paying the fee for a transaction */
-export function buildFeePayload(feeOpts) {
-    const calls = feeOpts?.paymentMethod.getFunctionCalls(new Fr(feeOpts.maxFee)) ?? [];
-    return buildPayload(calls, FEE_MAX_CALLS);
-}
-/** Hashes a payload to a 32-byte buffer */
-export function hashPayload(payload, generatorIndex) {
-    return pedersenHash(flattenPayload(payload).map(fr => fr.toBuffer()), generatorIndex);
-}
-/** Flattens an payload */
-function flattenPayload(payload) {
-    return [
-        ...payload.function_calls.flatMap(call => [
-            call.args_hash,
-            call.function_selector,
-            call.target_address,
-            new Fr(call.is_public),
-        ]),
-        payload.nonce,
-    ];
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50cnlwb2ludF9wYXlsb2FkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlZmF1bHRzL2VudHJ5cG9pbnRfcGF5bG9hZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFnQixlQUFlLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXhELDBDQUEwQztBQUMxQyx1REFBdUQ7QUFDdkQsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLENBQUM7QUFDNUIsMkRBQTJEO0FBQzNELE1BQU0sYUFBYSxHQUFHLENBQUMsQ0FBQztBQW1DeEI7Ozs7O0dBS0c7QUFDSCxTQUFTLFlBQVksQ0FBQyxLQUFxQixFQUFFLFFBQWdCO0lBQzNELE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUUxQixNQUFNLFdBQVcsR0FBRyxXQUFXLENBQUMsS0FBSyxFQUFFLGlCQUFpQixFQUFFLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDdEUsTUFBTSxlQUFlLEdBQXNCLEVBQUUsQ0FBQztJQUM5QyxLQUFLLE1BQU0sSUFBSSxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQy9CLGVBQWUsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQsTUFBTSxjQUFjLEdBQTZCLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pGLHFDQUFxQztRQUNyQyxTQUFTLEVBQUUsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUk7UUFDdEMscUNBQXFDO1FBQ3JDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRTtRQUN2RCxxQ0FBcUM7UUFDckMsY0FBYyxFQUFFLElBQUksQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFO1FBQ2pDLHFDQUFxQztRQUNyQyxTQUFTLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLFNBQVM7S0FDeEMsQ0FBQyxDQUFDLENBQUM7SUFFSixPQUFPO1FBQ0wsT0FBTyxFQUFFO1lBQ1AscUNBQXFDO1lBQ3JDLGNBQWMsRUFBRSxjQUFjO1lBQzlCLEtBQUs7U0FDTjtRQUNELGVBQWU7S0FDaEIsQ0FBQztBQUNKLENBQUM7QUFFRCwwRkFBMEY7QUFDMUYsTUFBTSxVQUFVLGVBQWUsQ0FBQyxLQUFxQjtJQUNuRCxPQUFPLFlBQVksQ0FBQyxLQUFLLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztBQUNoRCxDQUFDO0FBRUQsK0RBQStEO0FBQy9ELE1BQU0sVUFBVSxlQUFlLENBQUMsT0FBb0I7SUFDbEQsTUFBTSxLQUFLLEdBQUcsT0FBTyxFQUFFLGFBQWEsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDcEYsT0FBTyxZQUFZLENBQUMsS0FBSyxFQUFFLGFBQWEsQ0FBQyxDQUFDO0FBQzVDLENBQUM7QUFFRCwyQ0FBMkM7QUFDM0MsTUFBTSxVQUFVLFdBQVcsQ0FBQyxPQUEwQixFQUFFLGNBQXNCO0lBQzVFLE9BQU8sWUFBWSxDQUNqQixjQUFjLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLEVBQ2hELGNBQWMsQ0FDZixDQUFDO0FBQ0osQ0FBQztBQUVELDBCQUEwQjtBQUMxQixTQUFTLGNBQWMsQ0FBQyxPQUEwQjtJQUNoRCxPQUFPO1FBQ0wsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3hDLElBQUksQ0FBQyxTQUFTO1lBQ2QsSUFBSSxDQUFDLGlCQUFpQjtZQUN0QixJQUFJLENBQUMsY0FBYztZQUNuQixJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO1NBQ3ZCLENBQUM7UUFDRixPQUFPLENBQUMsS0FBSztLQUNkLENBQUM7QUFDSixDQUFDIn0=

package/src/defaults/account_entrypoint.ts

@@ -1,141 +0,0 @@
-import { AuthWitnessProvider, EntrypointInterface, FeeOptions } from '@aztec/aztec.js/account';
-import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
-import { AztecAddress, Fr, FunctionData, GeneratorIndex, TxContext } from '@aztec/circuits.js';
-import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
-
-import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
-import { buildAppPayload, buildFeePayload, hashPayload } from './entrypoint_payload.js';
-
-/**
- * Implementation for an entrypoint interface that follows the default entrypoint signature
- * for an account, which accepts an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
- */
-export class DefaultAccountEntrypoint implements EntrypointInterface {
-  constructor(
-    private address: AztecAddress,
-    private auth: AuthWitnessProvider,
-    private chainId: number = DEFAULT_CHAIN_ID,
-    private version: number = DEFAULT_VERSION,
-  ) {}
-
-  async createTxExecutionRequest(executions: FunctionCall[], feeOpts?: FeeOptions): Promise<TxExecutionRequest> {
-    const { payload: appPayload, packedArguments: appPackedArguments } = buildAppPayload(executions);
-    const { payload: feePayload, packedArguments: feePackedArguments } = buildFeePayload(feeOpts);
-
-    const abi = this.getEntrypointAbi();
-    const entrypointPackedArgs = PackedArguments.fromArgs(encodeArguments(abi, [appPayload, feePayload]));
-
-    const appAuthWitness = await this.auth.createAuthWitness(
-      Fr.fromBuffer(hashPayload(appPayload, GeneratorIndex.SIGNATURE_PAYLOAD)),
-    );
-    const feeAuthWitness = await this.auth.createAuthWitness(
-      Fr.fromBuffer(hashPayload(feePayload, GeneratorIndex.FEE_PAYLOAD)),
-    );
-
-    const txRequest = TxExecutionRequest.from({
-      argsHash: entrypointPackedArgs.hash,
-      origin: this.address,
-      functionData: FunctionData.fromAbi(abi),
-      txContext: TxContext.empty(this.chainId, this.version),
-      packedArguments: [...appPackedArguments, ...feePackedArguments, entrypointPackedArgs],
-      authWitnesses: [appAuthWitness, feeAuthWitness],
-    });
-
-    return txRequest;
-  }
-
-  private getEntrypointAbi() {
-    return {
-      name: 'entrypoint',
-      functionType: 'secret',
-      isInternal: 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: 'nonce', type: { kind: 'field' } },
-            ],
-          },
-          visibility: 'public',
-        },
-        {
-          name: 'fee_payload',
-          type: {
-            kind: 'struct',
-            path: 'authwit::entrypoint::fee::FeePayload',
-            fields: [
-              {
-                name: 'function_calls',
-                type: {
-                  kind: 'array',
-                  length: 2,
-                  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: 'nonce', type: { kind: 'field' } },
-            ],
-          },
-          visibility: 'public',
-        },
-      ],
-      returnTypes: [],
-    } as FunctionAbi;
-  }
-}

package/src/defaults/constants.ts

@@ -1,4 +0,0 @@
-/** Default L1 chain ID to use when constructing txs (matches hardhat and anvil's default). */
-export const DEFAULT_CHAIN_ID = 31337;
-/** Default protocol version to use. */
-export const DEFAULT_VERSION = 1;

package/src/defaults/entrypoint_payload.ts

@@ -1,112 +0,0 @@
-import { FeeOptions } from '@aztec/aztec.js/account';
-import { Fr } from '@aztec/aztec.js/fields';
-import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/circuit-types';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { pedersenHash } from '@aztec/foundation/crypto';
-
-// These must match the values defined in:
-// - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
-const ACCOUNT_MAX_CALLS = 4;
-// - and noir-projects/aztec-nr/aztec/src/entrypoint/fee.nr
-const FEE_MAX_CALLS = 2;
-
-/** Encoded function call for account contract entrypoint */
-type EntrypointFunctionCall = {
-  // eslint-disable-next-line camelcase
-  /** Arguments hash for the call */
-  args_hash: Fr;
-  // eslint-disable-next-line camelcase
-  /** Selector of the function to call */
-  function_selector: Fr;
-  // eslint-disable-next-line camelcase
-  /** Address of the contract to call */
-  target_address: Fr;
-  // eslint-disable-next-line camelcase
-  /** Whether the function is public or private */
-  is_public: boolean;
-};
-
-/** Encoded payload for the account contract entrypoint */
-type EntrypointPayload = {
-  // eslint-disable-next-line camelcase
-  /** Encoded function calls to execute */
-  function_calls: EntrypointFunctionCall[];
-  /** A nonce for replay protection */
-  nonce: Fr;
-};
-
-/** Represents a generic payload to be executed in the context of an account contract */
-export type PayloadWithArguments = {
-  /** The payload to be run */
-  payload: EntrypointPayload;
-  /** The packed arguments for the function calls */
-  packedArguments: PackedArguments[];
-};
-
-/**
- * Builds a payload to be sent to the account contract
- * @param calls - The function calls to run
- * @param maxCalls - The maximum number of call expected to be run. Used for padding
- * @returns A payload object and packed arguments
- */
-function buildPayload(calls: FunctionCall[], maxCalls: number): PayloadWithArguments {
-  const nonce = Fr.random();
-
-  const paddedCalls = padArrayEnd(calls, emptyFunctionCall(), maxCalls);
-  const packedArguments: PackedArguments[] = [];
-  for (const call of paddedCalls) {
-    packedArguments.push(PackedArguments.fromArgs(call.args));
-  }
-
-  const formattedCalls: EntrypointFunctionCall[] = paddedCalls.map((call, index) => ({
-    // eslint-disable-next-line camelcase
-    args_hash: packedArguments[index].hash,
-    // eslint-disable-next-line camelcase
-    function_selector: call.functionData.selector.toField(),
-    // eslint-disable-next-line camelcase
-    target_address: call.to.toField(),
-    // eslint-disable-next-line camelcase
-    is_public: !call.functionData.isPrivate,
-  }));
-
-  return {
-    payload: {
-      // eslint-disable-next-line camelcase
-      function_calls: formattedCalls,
-      nonce,
-    },
-    packedArguments,
-  };
-}
-
-/** Assembles an entrypoint app payload from a set of private and public function calls */
-export function buildAppPayload(calls: FunctionCall[]): PayloadWithArguments {
-  return buildPayload(calls, ACCOUNT_MAX_CALLS);
-}
-
-/** Creates the payload for paying the fee for a transaction */
-export function buildFeePayload(feeOpts?: FeeOptions): PayloadWithArguments {
-  const calls = feeOpts?.paymentMethod.getFunctionCalls(new Fr(feeOpts.maxFee)) ?? [];
-  return buildPayload(calls, FEE_MAX_CALLS);
-}
-
-/** Hashes a payload to a 32-byte buffer */
-export function hashPayload(payload: EntrypointPayload, generatorIndex: number) {
-  return pedersenHash(
-    flattenPayload(payload).map(fr => fr.toBuffer()),
-    generatorIndex,
-  );
-}
-
-/** Flattens an payload */
-function flattenPayload(payload: EntrypointPayload) {
-  return [
-    ...payload.function_calls.flatMap(call => [
-      call.args_hash,
-      call.function_selector,
-      call.target_address,
-      new Fr(call.is_public),
-    ]),
-    payload.nonce,
-  ];
-}