@aztec/entrypoints 0.0.0-test.0

package/README.md

@@ -0,0 +1,8 @@
+# Account Entrypoints
+
+This package contains different transaction entrypoints for the Aztec Network.
+
+## Available entrypoints
+
+- **Account entrypoint**: this entrypoint encodes the payload to start an interaction through an Account Contract. It is meant to be used with accounts implementing the interface defined by `@aztec/accounts`.
+- **DApp entrypoint**: this encodes the payload so that it may run a dapp directly, instead of going through an account contract.

package/dest/account_entrypoint.d.ts

@@ -0,0 +1,18 @@
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { type EntrypointInterface, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { TxExecutionRequest } from '@aztec/stdlib/tx';
+/**
+ * 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(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
+    private getEntrypointAbi;
+}
+//# sourceMappingURL=account_entrypoint.d.ts.map

package/dest/account_entrypoint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account_entrypoint.d.ts","sourceRoot":"","sources":["../src/account_entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,KAAK,mBAAmB,EAExB,KAAK,oBAAoB,EAE1B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI/E;;;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,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA2BvF,OAAO,CAAC,gBAAgB;CAqGzB"}

package/dest/account_entrypoint.js

@@ -0,0 +1,230 @@
+import { EntrypointPayload, computeCombinedPayloadHash } from '@aztec/aztec.js/entrypoint';
+import { FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
+import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
+import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.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 {
+    address;
+    auth;
+    chainId;
+    version;
+    constructor(address, auth, chainId = DEFAULT_CHAIN_ID, version = DEFAULT_VERSION){
+        this.address = address;
+        this.auth = auth;
+        this.chainId = chainId;
+        this.version = version;
+    }
+    async createTxExecutionRequest(exec) {
+        const { calls, fee, nonce, cancellable, capsules = [] } = exec;
+        const appPayload = await EntrypointPayload.fromAppExecution(calls, nonce);
+        const feePayload = await EntrypointPayload.fromFeeOptions(this.address, fee);
+        const abi = this.getEntrypointAbi();
+        const entrypointHashedArgs = await HashedValues.fromValues(encodeArguments(abi, [
+            appPayload,
+            feePayload,
+            !!cancellable
+        ]));
+        const combinedPayloadAuthWitness = await this.auth.createAuthWit(await computeCombinedPayloadHash(appPayload, feePayload));
+        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: [
+                ...appPayload.hashedArguments,
+                ...feePayload.hashedArguments,
+                entrypointHashedArgs
+            ],
+            authWitnesses: [
+                combinedPayloadAuthWitness
+            ],
+            capsules
+        });
+        return 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'
+                },
+                {
+                    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: 'is_static',
+                                                type: {
+                                                    kind: 'boolean'
+                                                }
+                                            }
+                                        ]
+                                    }
+                                }
+                            },
+                            {
+                                name: 'nonce',
+                                type: {
+                                    kind: 'field'
+                                }
+                            },
+                            {
+                                name: 'is_fee_payer',
+                                type: {
+                                    kind: 'boolean'
+                                }
+                            }
+                        ]
+                    },
+                    visibility: 'public'
+                },
+                {
+                    name: 'cancellable',
+                    type: {
+                        kind: 'boolean'
+                    }
+                }
+            ],
+            returnTypes: [],
+            errorTypes: {}
+        };
+    }
+}

package/dest/constants.d.ts

@@ -0,0 +1,5 @@
+/** 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/constants.d.ts.map

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

package/dest/constants.js

@@ -0,0 +1,2 @@
+/** 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/dest/dapp_entrypoint.d.ts

@@ -0,0 +1,19 @@
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { type EntrypointInterface, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { TxExecutionRequest } from '@aztec/stdlib/tx';
+/**
+ * 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 DefaultDappEntrypoint implements EntrypointInterface {
+    private userAddress;
+    private userAuthWitnessProvider;
+    private dappEntrypointAddress;
+    private chainId;
+    private version;
+    constructor(userAddress: AztecAddress, userAuthWitnessProvider: AuthWitnessProvider, dappEntrypointAddress: AztecAddress, chainId?: number, version?: number);
+    createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
+    private getEntrypointAbi;
+}
+//# sourceMappingURL=dapp_entrypoint.d.ts.map

package/dest/dapp_entrypoint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dapp_entrypoint.d.ts","sourceRoot":"","sources":["../src/dapp_entrypoint.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,KAAK,mBAAmB,EAAqB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEpH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI/E;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,mBAAmB;IAE7D,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,uBAAuB;IAC/B,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAJP,WAAW,EAAE,YAAY,EACzB,uBAAuB,EAAE,mBAAmB,EAC5C,qBAAqB,EAAE,YAAY,EACnC,OAAO,GAAE,MAAyB,EAClC,OAAO,GAAE,MAAwB;IAGrC,wBAAwB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAqCvF,OAAO,CAAC,gBAAgB;CAiEzB"}

package/dest/dapp_entrypoint.js

@@ -0,0 +1,172 @@
+import { Fr, computeAuthWitMessageHash, computeInnerAuthWitHash } from '@aztec/aztec.js';
+import { EntrypointPayload } from '@aztec/aztec.js/entrypoint';
+import { FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
+import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
+import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.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 DefaultDappEntrypoint {
+    userAddress;
+    userAuthWitnessProvider;
+    dappEntrypointAddress;
+    chainId;
+    version;
+    constructor(userAddress, userAuthWitnessProvider, dappEntrypointAddress, chainId = DEFAULT_CHAIN_ID, version = DEFAULT_VERSION){
+        this.userAddress = userAddress;
+        this.userAuthWitnessProvider = userAuthWitnessProvider;
+        this.dappEntrypointAddress = dappEntrypointAddress;
+        this.chainId = chainId;
+        this.version = version;
+    }
+    async createTxExecutionRequest(exec) {
+        const { calls, fee, capsules = [] } = exec;
+        if (calls.length !== 1) {
+            throw new Error(`Expected exactly 1 function call, got ${calls.length}`);
+        }
+        const payload = await EntrypointPayload.fromFunctionCalls(calls);
+        const abi = this.getEntrypointAbi();
+        const entrypointHashedArgs = await HashedValues.fromValues(encodeArguments(abi, [
+            payload,
+            this.userAddress
+        ]));
+        const functionSelector = await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters);
+        // Default msg_sender for entrypoints is now Fr.max_value rather than 0 addr (see #7190 & #7404)
+        const innerHash = await computeInnerAuthWitHash([
+            Fr.MAX_FIELD_VALUE,
+            functionSelector.toField(),
+            entrypointHashedArgs.hash
+        ]);
+        const outerHash = await computeAuthWitMessageHash({
+            consumer: this.dappEntrypointAddress,
+            innerHash
+        }, {
+            chainId: new Fr(this.chainId),
+            version: new Fr(this.version)
+        });
+        const authWitness = await this.userAuthWitnessProvider.createAuthWit(outerHash);
+        const txRequest = TxExecutionRequest.from({
+            firstCallArgsHash: entrypointHashedArgs.hash,
+            origin: this.dappEntrypointAddress,
+            functionSelector,
+            txContext: new TxContext(this.chainId, this.version, fee.gasSettings),
+            argsOfCalls: [
+                ...payload.hashedArguments,
+                entrypointHashedArgs
+            ],
+            authWitnesses: [
+                authWitness
+            ],
+            capsules
+        });
+        return txRequest;
+    }
+    getEntrypointAbi() {
+        return {
+            name: 'entrypoint',
+            isInitializer: false,
+            functionType: 'private',
+            isInternal: false,
+            isStatic: false,
+            parameters: [
+                {
+                    name: 'payload',
+                    type: {
+                        kind: 'struct',
+                        path: 'dapp_payload::DAppPayload',
+                        fields: [
+                            {
+                                name: 'function_calls',
+                                type: {
+                                    kind: 'array',
+                                    length: 1,
+                                    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::aztec_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'
+                },
+                {
+                    name: 'user_address',
+                    type: {
+                        kind: 'struct',
+                        path: 'authwit::aztec::protocol_types::address::aztec_address::AztecAddress',
+                        fields: [
+                            {
+                                name: 'inner',
+                                type: {
+                                    kind: 'field'
+                                }
+                            }
+                        ]
+                    },
+                    visibility: 'public'
+                }
+            ],
+            returnTypes: [],
+            errorTypes: {}
+        };
+    }
+}

package/dest/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * The `@aztec/accounts/defaults` export provides the base class {@link DefaultAccountContract} for implementing account contracts that use the default entrypoint payload module.
+ *
+ * Read more in {@link https://docs.aztec.network/developers/tutorials/codealong/contract_tutorials/write_accounts_contract | Writing an account contract}.
+ *
+ * @packageDocumentation
+ */
+export * from './account_entrypoint.js';
+export * from './dapp_entrypoint.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC"}

package/dest/index.js

@@ -0,0 +1,8 @@
+/**
+ * The `@aztec/accounts/defaults` export provides the base class {@link DefaultAccountContract} for implementing account contracts that use the default entrypoint payload module.
+ *
+ * Read more in {@link https://docs.aztec.network/developers/tutorials/codealong/contract_tutorials/write_accounts_contract | Writing an account contract}.
+ *
+ * @packageDocumentation
+ */ export * from './account_entrypoint.js';
+export * from './dapp_entrypoint.js';

package/package.json

@@ -0,0 +1,85 @@
+{
+  "name": "@aztec/entrypoints",
+  "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/entrypoints",
+  "description": "Implementation of sample contract entrypoints for the Aztec Network",
+  "version": "0.0.0-test.0",
+  "type": "module",
+  "exports": {
+    "./dapp": "./dest/dapp_entrypoint.js",
+    "./account": "./dest/account_entrypoint.js"
+  },
+  "typedocOptions": {
+    "entryPoints": [
+      "./src/index.ts"
+    ],
+    "name": "Entrypoints",
+    "tsconfig": "./tsconfig.json"
+  },
+  "scripts": {
+    "build": "yarn clean && tsc -b",
+    "build:dev": "tsc -b --watch",
+    "build:ts": "tsc -b",
+    "clean": "rm -rf ./dest .tsbuildinfo",
+    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
+    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+  },
+  "inherits": [
+    "../package.common.json"
+  ],
+  "jest": {
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
+    },
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
+    "rootDir": "./src",
+    "transform": {
+      "^.+\\.tsx?$": [
+        "@swc/jest",
+        {
+          "jsc": {
+            "parser": {
+              "syntax": "typescript",
+              "decorators": true
+            },
+            "transform": {
+              "decoratorVersion": "2022-03"
+            }
+          }
+        }
+      ]
+    },
+    "extensionsToTreatAsEsm": [
+      ".ts"
+    ],
+    "reporters": [
+      "default"
+    ],
+    "testTimeout": 120000,
+    "setupFiles": [
+      "../../foundation/src/jest/setup.mjs"
+    ]
+  },
+  "dependencies": {
+    "@aztec/aztec.js": "0.0.0-test.0",
+    "@aztec/foundation": "0.0.0-test.0",
+    "@aztec/protocol-contracts": "0.0.0-test.0",
+    "@aztec/stdlib": "0.0.0-test.0",
+    "tslib": "^2.4.0"
+  },
+  "devDependencies": {
+    "@jest/globals": "^29.5.0",
+    "@types/jest": "^29.5.0",
+    "jest": "^29.5.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.4"
+  },
+  "files": [
+    "dest",
+    "src",
+    "!*.test.*"
+  ],
+  "engines": {
+    "node": ">=18"
+  }
+}

package/src/account_entrypoint.ts

@@ -0,0 +1,154 @@
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import {
+  type EntrypointInterface,
+  EntrypointPayload,
+  type ExecutionRequestInit,
+  computeCombinedPayloadHash,
+} from '@aztec/aztec.js/entrypoint';
+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';
+
+import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.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(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
+    const { calls, fee, nonce, cancellable, capsules = [] } = exec;
+    const appPayload = await EntrypointPayload.fromAppExecution(calls, nonce);
+    const feePayload = await EntrypointPayload.fromFeeOptions(this.address, fee);
+
+    const abi = this.getEntrypointAbi();
+    const entrypointHashedArgs = await HashedValues.fromValues(
+      encodeArguments(abi, [appPayload, feePayload, !!cancellable]),
+    );
+
+    const combinedPayloadAuthWitness = await this.auth.createAuthWit(
+      await computeCombinedPayloadHash(appPayload, feePayload),
+    );
+
+    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: [...appPayload.hashedArguments, ...feePayload.hashedArguments, entrypointHashedArgs],
+      authWitnesses: [combinedPayloadAuthWitness],
+      capsules,
+    });
+
+    return 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',
+        },
+        {
+          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: 'is_static', type: { kind: 'boolean' } },
+                    ],
+                  },
+                },
+              },
+              { name: 'nonce', type: { kind: 'field' } },
+              { name: 'is_fee_payer', type: { kind: 'boolean' } },
+            ],
+          },
+          visibility: 'public',
+        },
+        { name: 'cancellable', type: { kind: 'boolean' } },
+      ],
+      returnTypes: [],
+      errorTypes: {},
+    } as FunctionAbi;
+  }
+}

package/src/constants.ts

@@ -0,0 +1,4 @@
+/** 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/dapp_entrypoint.ts

@@ -0,0 +1,125 @@
+import { Fr, computeAuthWitMessageHash, computeInnerAuthWitHash } from '@aztec/aztec.js';
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { type EntrypointInterface, EntrypointPayload, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
+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';
+
+import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.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 DefaultDappEntrypoint implements EntrypointInterface {
+  constructor(
+    private userAddress: AztecAddress,
+    private userAuthWitnessProvider: AuthWitnessProvider,
+    private dappEntrypointAddress: AztecAddress,
+    private chainId: number = DEFAULT_CHAIN_ID,
+    private version: number = DEFAULT_VERSION,
+  ) {}
+
+  async createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
+    const { calls, fee, capsules = [] } = exec;
+    if (calls.length !== 1) {
+      throw new Error(`Expected exactly 1 function call, got ${calls.length}`);
+    }
+
+    const payload = await EntrypointPayload.fromFunctionCalls(calls);
+
+    const abi = this.getEntrypointAbi();
+    const entrypointHashedArgs = await HashedValues.fromValues(encodeArguments(abi, [payload, this.userAddress]));
+    const functionSelector = await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters);
+    // Default msg_sender for entrypoints is now Fr.max_value rather than 0 addr (see #7190 & #7404)
+    const innerHash = await computeInnerAuthWitHash([
+      Fr.MAX_FIELD_VALUE,
+      functionSelector.toField(),
+      entrypointHashedArgs.hash,
+    ]);
+    const outerHash = await computeAuthWitMessageHash(
+      { consumer: this.dappEntrypointAddress, innerHash },
+      { chainId: new Fr(this.chainId), version: new Fr(this.version) },
+    );
+
+    const authWitness = await this.userAuthWitnessProvider.createAuthWit(outerHash);
+
+    const txRequest = TxExecutionRequest.from({
+      firstCallArgsHash: entrypointHashedArgs.hash,
+      origin: this.dappEntrypointAddress,
+      functionSelector,
+      txContext: new TxContext(this.chainId, this.version, fee.gasSettings),
+      argsOfCalls: [...payload.hashedArguments, entrypointHashedArgs],
+      authWitnesses: [authWitness],
+      capsules,
+    });
+
+    return txRequest;
+  }
+
+  private getEntrypointAbi() {
+    return {
+      name: 'entrypoint',
+      isInitializer: false,
+      functionType: 'private',
+      isInternal: false,
+      isStatic: false,
+      parameters: [
+        {
+          name: 'payload',
+          type: {
+            kind: 'struct',
+            path: 'dapp_payload::DAppPayload',
+            fields: [
+              {
+                name: 'function_calls',
+                type: {
+                  kind: 'array',
+                  length: 1,
+                  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::aztec_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',
+        },
+        {
+          name: 'user_address',
+          type: {
+            kind: 'struct',
+            path: 'authwit::aztec::protocol_types::address::aztec_address::AztecAddress',
+            fields: [{ name: 'inner', type: { kind: 'field' } }],
+          },
+          visibility: 'public',
+        },
+      ],
+      returnTypes: [],
+      errorTypes: {},
+    } as FunctionAbi;
+  }
+}

package/src/index.ts

@@ -0,0 +1,10 @@
+/**
+ * The `@aztec/accounts/defaults` export provides the base class {@link DefaultAccountContract} for implementing account contracts that use the default entrypoint payload module.
+ *
+ * Read more in {@link https://docs.aztec.network/developers/tutorials/codealong/contract_tutorials/write_accounts_contract | Writing an account contract}.
+ *
+ * @packageDocumentation
+ */
+
+export * from './account_entrypoint.js';
+export * from './dapp_entrypoint.js';