@aztec/end-to-end 0.0.1-commit.1bb068fb5 → 0.0.1-commit.217f559981

package/dest/test-wallet/worker_wallet_schema.d.ts

@@ -0,0 +1,274 @@
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Tx } from '@aztec/stdlib/tx';
+import { z } from 'zod';
+/** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */
+export declare const WorkerWalletSchema: {
+    getPrivateEvents: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/abi").EventMetadataDefinition, z.ZodTypeDef, any>, eventFilter: z.ZodType<import("@aztec/aztec.js/wallet").PrivateEventFilter, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").PrivateEvent<unknown>[], z.ZodTypeDef, any>>;
+    getChainInfo: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/entrypoints/interfaces").ChainInfo, z.ZodTypeDef, any>>;
+    getContractMetadata: z.ZodFunction<z.ZodTuple<[z.ZodType<AztecAddress, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").ContractMetadata, z.ZodTypeDef, any>>;
+    getContractClassMetadata: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/foundation/schemas").Fr, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").ContractClassMetadata, z.ZodTypeDef, any>>;
+    registerSender: z.ZodFunction<z.ZodTuple<[z.ZodType<AztecAddress, z.ZodTypeDef, any>, alias?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<string | undefined, z.ZodTypeDef, any>> | undefined], z.ZodUnknown>, z.ZodType<AztecAddress, z.ZodTypeDef, any>>;
+    getAddressBook: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").Aliased<AztecAddress>[], z.ZodTypeDef, any>>;
+    getAccounts: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").Aliased<AztecAddress>[], z.ZodTypeDef, any>>;
+    registerContract: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/contract").ContractInstanceWithAddress, z.ZodTypeDef, any>, artifact?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<import("@aztec/stdlib/abi").ContractArtifact | undefined, z.ZodTypeDef, any>> | undefined, secretKey?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<import("@aztec/foundation/schemas").Fr | undefined, z.ZodTypeDef, any>> | undefined], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/contract").ContractInstanceWithAddress, z.ZodTypeDef, any>>;
+    simulateTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SimulateOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxSimulationResult, z.ZodTypeDef, any>>;
+    executeUtility: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/abi").FunctionCall, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").ExecuteUtilityOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").UtilityExecutionResult, z.ZodTypeDef, any>>;
+    profileTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").ProfileOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxProfileResult, z.ZodTypeDef, any>>;
+    sendTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SendOptions<import("@aztec/aztec.js/contracts").InteractionWaitOptions>, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxHash | import("@aztec/stdlib/tx").TxReceipt, z.ZodTypeDef, any>>;
+    createAuthWit: z.ZodFunction<z.ZodTuple<[z.ZodType<AztecAddress, z.ZodTypeDef, any>, messageHashOrIntent: z.ZodType<import("@aztec/aztec.js/authorization").CallIntent | import("@aztec/aztec.js/authorization").IntentInnerHash, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, z.ZodTypeDef, any>>;
+    requestCapabilities: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/aztec.js/wallet").AppCapabilities, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").WalletCapabilities, z.ZodTypeDef, any>>;
+    batch: z.ZodFunction<z.ZodTuple<[z.ZodType<readonly import("@aztec/aztec.js/wallet").BatchedMethod[], z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<readonly import("@aztec/aztec.js/wallet").BatchedMethodResultWrapper<import("@aztec/aztec.js/wallet").BatchedMethod>[], z.ZodTypeDef, any>>;
+    proveTx: z.ZodFunction<z.ZodTuple<[z.ZodObject<{
+        calls: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            name: z.ZodString;
+            to: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
+            selector: import("@aztec/foundation/schemas").ZodFor<import("@aztec/stdlib/abi").FunctionSelector>;
+            type: z.ZodNativeEnum<typeof import("@aztec/stdlib/abi").FunctionType>;
+            isStatic: z.ZodBoolean;
+            hideMsgSender: z.ZodBoolean;
+            args: z.ZodArray<import("@aztec/foundation/schemas").ZodFor<import("@aztec/foundation/schemas").Fr>, "many">;
+            returnTypes: z.ZodArray<z.ZodType<import("@aztec/stdlib/abi").AbiType, z.ZodTypeDef, import("@aztec/stdlib/abi").AbiType>, "many">;
+        }, "strip", z.ZodTypeAny, {
+            name: string;
+            to: AztecAddress;
+            selector: import("@aztec/stdlib/abi").FunctionSelector;
+            type: import("@aztec/stdlib/abi").FunctionType;
+            isStatic: boolean;
+            hideMsgSender: boolean;
+            args: import("@aztec/foundation/schemas").Fr[];
+            returnTypes: import("@aztec/stdlib/abi").AbiType[];
+        }, {
+            name: string;
+            to?: any;
+            selector?: any;
+            type: import("@aztec/stdlib/abi").FunctionType;
+            isStatic: boolean;
+            hideMsgSender: boolean;
+            args: any[];
+            returnTypes: import("@aztec/stdlib/abi").AbiType[];
+        }>, import("@aztec/stdlib/abi").FunctionCall, {
+            name: string;
+            to?: any;
+            selector?: any;
+            type: import("@aztec/stdlib/abi").FunctionType;
+            isStatic: boolean;
+            hideMsgSender: boolean;
+            args: any[];
+            returnTypes: import("@aztec/stdlib/abi").AbiType[];
+        }>, "many">;
+        authWitnesses: z.ZodArray<z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, any, string>, "many">;
+        capsules: z.ZodArray<z.ZodType<import("@aztec/stdlib/tx").Capsule, any, string>, "many">;
+        extraHashedArgs: z.ZodArray<import("@aztec/foundation/schemas").ZodFor<import("@aztec/stdlib/tx").HashedValues>, "many">;
+        feePayer: import("@aztec/foundation/schemas").ZodNullableOptional<import("@aztec/foundation/schemas").ZodFor<AztecAddress>>;
+    }, "strip", z.ZodTypeAny, {
+        calls: import("@aztec/stdlib/abi").FunctionCall[];
+        authWitnesses: import("@aztec/stdlib/auth-witness").AuthWitness[];
+        capsules: import("@aztec/stdlib/tx").Capsule[];
+        extraHashedArgs: import("@aztec/stdlib/tx").HashedValues[];
+        feePayer?: AztecAddress | undefined;
+    }, {
+        calls: {
+            name: string;
+            to?: any;
+            selector?: any;
+            type: import("@aztec/stdlib/abi").FunctionType;
+            isStatic: boolean;
+            hideMsgSender: boolean;
+            args: any[];
+            returnTypes: import("@aztec/stdlib/abi").AbiType[];
+        }[];
+        authWitnesses: string[];
+        capsules: string[];
+        extraHashedArgs: any[];
+        feePayer?: any;
+    }>, z.ZodObject<{
+        from: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
+        authWitnesses: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, any, string>, "many">>;
+        capsules: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<import("@aztec/stdlib/tx").Capsule, any, string>, "many">>;
+        fee: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
+            gasSettings: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
+                gasLimits: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
+                    daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                    l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                }, "strip", z.ZodTypeAny, {
+                    daGas: number;
+                    l2Gas: number;
+                }, {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                }>, import("@aztec/stdlib/gas").Gas, {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                }>>;
+                teardownGasLimits: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
+                    daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                    l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                }, "strip", z.ZodTypeAny, {
+                    daGas: number;
+                    l2Gas: number;
+                }, {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                }>, import("@aztec/stdlib/gas").Gas, {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                }>>;
+                maxFeePerGas: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
+                    feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                    feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                }, "strip", z.ZodTypeAny, {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                }, {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                }>>;
+                maxPriorityFeePerGas: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
+                    feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                    feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                }, "strip", z.ZodTypeAny, {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                }, {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                }>>;
+            }, "strip", z.ZodTypeAny, {
+                gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
+                teardownGasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
+                maxFeePerGas?: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                } | undefined;
+                maxPriorityFeePerGas?: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                } | undefined;
+            }, {
+                gasLimits?: {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                } | undefined;
+                teardownGasLimits?: {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                } | undefined;
+                maxFeePerGas?: {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                } | undefined;
+                maxPriorityFeePerGas?: {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                } | undefined;
+            }>>;
+        }, "strip", z.ZodTypeAny, {
+            gasSettings?: {
+                gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
+                teardownGasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
+                maxFeePerGas?: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                } | undefined;
+                maxPriorityFeePerGas?: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                } | undefined;
+            } | undefined;
+        }, {
+            gasSettings?: {
+                gasLimits?: {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                } | undefined;
+                teardownGasLimits?: {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                } | undefined;
+                maxFeePerGas?: {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                } | undefined;
+                maxPriorityFeePerGas?: {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                } | undefined;
+            } | undefined;
+        }>>;
+        wait: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodUnion<[z.ZodLiteral<"NO_WAIT">, z.ZodObject<{
+            ignoreDroppedReceiptsFor: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
+            timeout: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
+            interval: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
+            dontThrowOnRevert: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
+        }, "strip", z.ZodTypeAny, {
+            ignoreDroppedReceiptsFor?: number | undefined;
+            timeout?: number | undefined;
+            interval?: number | undefined;
+            dontThrowOnRevert?: boolean | undefined;
+        }, {
+            ignoreDroppedReceiptsFor?: number | undefined;
+            timeout?: number | undefined;
+            interval?: number | undefined;
+            dontThrowOnRevert?: boolean | undefined;
+        }>]>>;
+        additionalScopes: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<import("@aztec/foundation/schemas").ZodFor<AztecAddress>, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        from: AztecAddress;
+        authWitnesses?: import("@aztec/stdlib/auth-witness").AuthWitness[] | undefined;
+        capsules?: import("@aztec/stdlib/tx").Capsule[] | undefined;
+        fee?: {
+            gasSettings?: {
+                gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
+                teardownGasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
+                maxFeePerGas?: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                } | undefined;
+                maxPriorityFeePerGas?: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                } | undefined;
+            } | undefined;
+        } | undefined;
+        wait?: "NO_WAIT" | {
+            ignoreDroppedReceiptsFor?: number | undefined;
+            timeout?: number | undefined;
+            interval?: number | undefined;
+            dontThrowOnRevert?: boolean | undefined;
+        } | undefined;
+        additionalScopes?: AztecAddress[] | undefined;
+    }, {
+        from?: any;
+        authWitnesses?: string[] | undefined;
+        capsules?: string[] | undefined;
+        fee?: {
+            gasSettings?: {
+                gasLimits?: {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                } | undefined;
+                teardownGasLimits?: {
+                    daGas: string | number | bigint;
+                    l2Gas: string | number | bigint;
+                } | undefined;
+                maxFeePerGas?: {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                } | undefined;
+                maxPriorityFeePerGas?: {
+                    feePerDaGas: string | number | bigint;
+                    feePerL2Gas: string | number | bigint;
+                } | undefined;
+            } | undefined;
+        } | undefined;
+        wait?: "NO_WAIT" | {
+            ignoreDroppedReceiptsFor?: number | undefined;
+            timeout?: number | undefined;
+            interval?: number | undefined;
+            dontThrowOnRevert?: boolean | undefined;
+        } | undefined;
+        additionalScopes?: any[] | undefined;
+    }>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<Tx>>;
+    registerAccount: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<AztecAddress>>;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXRDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsaUdBQStGO0FBQy9GLGVBQU8sTUFBTSxrQkFBa0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FJOUIsQ0FBQyJ9

package/dest/test-wallet/worker_wallet_schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI9B,CAAC"}

package/dest/test-wallet/worker_wallet_schema.js

@@ -0,0 +1,10 @@
+import { ExecutionPayloadSchema, SendOptionsSchema, WalletSchema } from '@aztec/aztec.js/wallet';
+import { schemas } from '@aztec/foundation/schemas';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Tx } from '@aztec/stdlib/tx';
+import { z } from 'zod';
+/** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */ export const WorkerWalletSchema = {
+    ...WalletSchema,
+    proveTx: z.function().args(ExecutionPayloadSchema, SendOptionsSchema).returns(Tx.schema),
+    registerAccount: z.function().args(schemas.Fr, schemas.Fr).returns(AztecAddress.schema)
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.1bb068fb5",
+  "version": "0.0.1-commit.217f559981",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -26,45 +26,45 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.1bb068fb5",
-    "@aztec/archiver": "0.0.1-commit.1bb068fb5",
-    "@aztec/aztec": "0.0.1-commit.1bb068fb5",
-    "@aztec/aztec-node": "0.0.1-commit.1bb068fb5",
-    "@aztec/aztec.js": "0.0.1-commit.1bb068fb5",
-    "@aztec/bb-prover": "0.0.1-commit.1bb068fb5",
-    "@aztec/bb.js": "0.0.1-commit.1bb068fb5",
-    "@aztec/blob-client": "0.0.1-commit.1bb068fb5",
-    "@aztec/blob-lib": "0.0.1-commit.1bb068fb5",
-    "@aztec/bot": "0.0.1-commit.1bb068fb5",
-    "@aztec/cli": "0.0.1-commit.1bb068fb5",
-    "@aztec/constants": "0.0.1-commit.1bb068fb5",
-    "@aztec/entrypoints": "0.0.1-commit.1bb068fb5",
-    "@aztec/epoch-cache": "0.0.1-commit.1bb068fb5",
-    "@aztec/ethereum": "0.0.1-commit.1bb068fb5",
-    "@aztec/foundation": "0.0.1-commit.1bb068fb5",
-    "@aztec/kv-store": "0.0.1-commit.1bb068fb5",
-    "@aztec/l1-artifacts": "0.0.1-commit.1bb068fb5",
-    "@aztec/merkle-tree": "0.0.1-commit.1bb068fb5",
-    "@aztec/node-keystore": "0.0.1-commit.1bb068fb5",
-    "@aztec/noir-contracts.js": "0.0.1-commit.1bb068fb5",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.1bb068fb5",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.1bb068fb5",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.1bb068fb5",
-    "@aztec/p2p": "0.0.1-commit.1bb068fb5",
-    "@aztec/protocol-contracts": "0.0.1-commit.1bb068fb5",
-    "@aztec/prover-client": "0.0.1-commit.1bb068fb5",
-    "@aztec/prover-node": "0.0.1-commit.1bb068fb5",
-    "@aztec/pxe": "0.0.1-commit.1bb068fb5",
-    "@aztec/sequencer-client": "0.0.1-commit.1bb068fb5",
-    "@aztec/simulator": "0.0.1-commit.1bb068fb5",
-    "@aztec/slasher": "0.0.1-commit.1bb068fb5",
-    "@aztec/stdlib": "0.0.1-commit.1bb068fb5",
-    "@aztec/telemetry-client": "0.0.1-commit.1bb068fb5",
-    "@aztec/validator-client": "0.0.1-commit.1bb068fb5",
-    "@aztec/validator-ha-signer": "0.0.1-commit.1bb068fb5",
-    "@aztec/wallet-sdk": "0.0.1-commit.1bb068fb5",
-    "@aztec/wallets": "0.0.1-commit.1bb068fb5",
-    "@aztec/world-state": "0.0.1-commit.1bb068fb5",
+    "@aztec/accounts": "0.0.1-commit.217f559981",
+    "@aztec/archiver": "0.0.1-commit.217f559981",
+    "@aztec/aztec": "0.0.1-commit.217f559981",
+    "@aztec/aztec-node": "0.0.1-commit.217f559981",
+    "@aztec/aztec.js": "0.0.1-commit.217f559981",
+    "@aztec/bb-prover": "0.0.1-commit.217f559981",
+    "@aztec/bb.js": "0.0.1-commit.217f559981",
+    "@aztec/blob-client": "0.0.1-commit.217f559981",
+    "@aztec/blob-lib": "0.0.1-commit.217f559981",
+    "@aztec/bot": "0.0.1-commit.217f559981",
+    "@aztec/cli": "0.0.1-commit.217f559981",
+    "@aztec/constants": "0.0.1-commit.217f559981",
+    "@aztec/entrypoints": "0.0.1-commit.217f559981",
+    "@aztec/epoch-cache": "0.0.1-commit.217f559981",
+    "@aztec/ethereum": "0.0.1-commit.217f559981",
+    "@aztec/foundation": "0.0.1-commit.217f559981",
+    "@aztec/kv-store": "0.0.1-commit.217f559981",
+    "@aztec/l1-artifacts": "0.0.1-commit.217f559981",
+    "@aztec/merkle-tree": "0.0.1-commit.217f559981",
+    "@aztec/node-keystore": "0.0.1-commit.217f559981",
+    "@aztec/noir-contracts.js": "0.0.1-commit.217f559981",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.217f559981",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.217f559981",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.217f559981",
+    "@aztec/p2p": "0.0.1-commit.217f559981",
+    "@aztec/protocol-contracts": "0.0.1-commit.217f559981",
+    "@aztec/prover-client": "0.0.1-commit.217f559981",
+    "@aztec/prover-node": "0.0.1-commit.217f559981",
+    "@aztec/pxe": "0.0.1-commit.217f559981",
+    "@aztec/sequencer-client": "0.0.1-commit.217f559981",
+    "@aztec/simulator": "0.0.1-commit.217f559981",
+    "@aztec/slasher": "0.0.1-commit.217f559981",
+    "@aztec/stdlib": "0.0.1-commit.217f559981",
+    "@aztec/telemetry-client": "0.0.1-commit.217f559981",
+    "@aztec/validator-client": "0.0.1-commit.217f559981",
+    "@aztec/validator-ha-signer": "0.0.1-commit.217f559981",
+    "@aztec/wallet-sdk": "0.0.1-commit.217f559981",
+    "@aztec/wallets": "0.0.1-commit.217f559981",
+    "@aztec/world-state": "0.0.1-commit.217f559981",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/e2e_epochs/epochs_test.ts

@@ -1,3 +1,4 @@
+import type { Archiver } from '@aztec/archiver';
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import { getTimestampRangeForEpoch } from '@aztec/aztec.js/block';
 import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
@@ -9,7 +10,8 @@ import { EpochCache } from '@aztec/epoch-cache';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
+import { Delayer, createDelayer, waitUntilL1Timestamp, wrapClientWithDelayer } from '@aztec/ethereum/l1-tx-utils';
+import { ChainMonitor } from '@aztec/ethereum/test';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
@@ -20,16 +22,9 @@ import { sleep } from '@aztec/foundation/sleep';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { TestContract } from '@aztec/noir-test-contracts.js/Test';
 import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
-import { ProverNode, type ProverNodeConfig, ProverNodePublisher } from '@aztec/prover-node';
-import type { TestProverNode } from '@aztec/prover-node/test';
+import type { ProverNodeConfig } from '@aztec/prover-node';
 import type { PXEConfig } from '@aztec/pxe/config';
-import {
-  type SequencerClient,
-  type SequencerEvents,
-  type SequencerPublisher,
-  SequencerState,
-} from '@aztec/sequencer-client';
-import type { TestSequencerClient } from '@aztec/sequencer-client/test';
+import { type SequencerClient, type SequencerEvents, SequencerState } from '@aztec/sequencer-client';
 import { type BlockParameter, EthAddress } from '@aztec/stdlib/block';
 import { type L1RollupConstants, getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
@@ -46,7 +41,7 @@ import {
   setup,
 } from '../fixtures/utils.js';
 
-export const WORLD_STATE_BLOCK_HISTORY = 2;
+export const WORLD_STATE_CHECKPOINT_HISTORY = 2;
 export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
 export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
@@ -81,7 +76,7 @@ export class EpochsTestContext {
   public proverDelayer!: Delayer;
   public sequencerDelayer!: Delayer;
 
-  public proverNodes: ProverNode[] = [];
+  public proverNodes: AztecNodeService[] = [];
   public nodes: AztecNodeService[] = [];
 
   public epochDuration!: number;
@@ -147,7 +142,7 @@ export class EpochsTestContext {
         // using the prover's eth address if the proverId is used for something in the rollup contract
         // Use numeric EthAddress for deterministic prover id
         proverId: EthAddress.fromNumber(1),
-        worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
+        worldStateCheckpointHistory: WORLD_STATE_CHECKPOINT_HISTORY,
         exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
         slasherFlavor: 'none',
         l1PublishingTime,
@@ -169,17 +164,8 @@ export class EpochsTestContext {
     // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
     this.monitor = new ChainMonitor(this.rollup, context.dateProvider, this.logger).start();
 
-    // This is hideous.
-    // We ought to have a definite reference to the l1TxUtils that we're using in both places, provided by the test context.
-    this.proverDelayer = context.proverNode
-      ? (((context.proverNode as TestProverNode).publisher as ProverNodePublisher).l1TxUtils as DelayedTxUtils).delayer!
-      : undefined!;
-    this.sequencerDelayer = context.sequencer
-      ? (
-          ((context.sequencer as TestSequencerClient).sequencer.publisher as SequencerPublisher)
-            .l1TxUtils as DelayedTxUtils
-        ).delayer!
-      : undefined!;
+    this.proverDelayer = context.proverDelayer!;
+    this.sequencerDelayer = context.sequencerDelayer!;
 
     if ((context.proverNode && !this.proverDelayer) || (context.sequencer && !this.sequencerDelayer)) {
       throw new Error(`Could not find prover or sequencer delayer`);
@@ -214,26 +200,29 @@ export class EpochsTestContext {
     const proverNodePrivateKey = this.getNextPrivateKey();
     const proverIndex = this.proverNodes.length + 1;
     const { mockGossipSubNetwork } = this.context;
-    const proverNode = await withLoggerBindings({ actor: `prover-${proverIndex}` }, () =>
+    const { proverNode } = await withLoggerBindings({ actor: `prover-${proverIndex}` }, () =>
       createAndSyncProverNode(
         proverNodePrivateKey,
         {
           ...this.context.config,
           p2pEnabled: this.context.config.p2pEnabled || mockGossipSubNetwork !== undefined,
-        },
-        {
-          dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
           proverId: EthAddress.fromNumber(proverIndex),
           dontStart: opts.dontStart,
           ...opts,
         },
-        this.context.aztecNode,
-        this.context.prefilledPublicData ?? [],
+        {
+          dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
+        },
         {
           dateProvider: this.context.dateProvider,
-          p2pClientDeps: mockGossipSubNetwork
-            ? { p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork) }
-            : undefined,
+          p2pClientDeps: {
+            p2pServiceFactory: mockGossipSubNetwork ? getMockPubSubP2PServiceFactory(mockGossipSubNetwork) : undefined,
+            rpcTxProviders: [this.context.aztecNode],
+          },
+        },
+        {
+          prefilledPublicData: this.context.prefilledPublicData ?? [],
+          dontStart: opts.dontStart,
         },
       ),
     );
@@ -248,15 +237,13 @@ export class EpochsTestContext {
 
   public createValidatorNode(
     privateKeys: `0x${string}`[],
-    opts: Partial<AztecNodeConfig> & { txDelayerMaxInclusionTimeIntoSlot?: number; dontStartSequencer?: boolean } = {},
+    opts: Partial<AztecNodeConfig> & { dontStartSequencer?: boolean } = {},
   ) {
     this.logger.warn('Creating and syncing a validator node...');
     return this.createNode({ ...opts, disableValidator: false, validatorPrivateKeys: new SecretValue(privateKeys) });
   }
 
-  private async createNode(
-    opts: Partial<AztecNodeConfig> & { txDelayerMaxInclusionTimeIntoSlot?: number; dontStartSequencer?: boolean } = {},
-  ) {
+  private async createNode(opts: Partial<AztecNodeConfig> & { dontStartSequencer?: boolean } = {}) {
     const nodeIndex = this.nodes.length + 1;
     const actorPrefix = opts.disableValidator ? 'node' : 'validator';
     const { mockGossipSubNetwork } = this.context;
@@ -285,26 +272,6 @@ export class EpochsTestContext {
       ),
     );
 
-    // REFACTOR: We're getting too much into the internals of the sequencer here.
-    // We should have a single method for constructing an aztec node that returns a TestAztecNodeService
-    // which directly exposes the delayer and sets any test config.
-    if (opts.txDelayerMaxInclusionTimeIntoSlot !== undefined) {
-      this.logger.info(
-        `Setting tx delayer max inclusion time into slot to ${opts.txDelayerMaxInclusionTimeIntoSlot} seconds`,
-      );
-      // Here we reach into the sequencer and hook in a tx delayer. The problem is that the sequencer's l1 utils only uses a public client, not a wallet.
-      // The delayer needs a wallet (a client that can sign), so we have to create one here.
-      const l1Client = createExtendedL1Client(
-        resolvedConfig.l1RpcUrls!,
-        resolvedConfig.publisherPrivateKeys![0]!.getValue(),
-      );
-      const sequencer = node.getSequencer() as TestSequencerClient;
-      const publisher = sequencer.sequencer.publisher;
-      const delayed = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, this.L1_BLOCK_TIME_IN_S, l1Client);
-      delayed.delayer!.setMaxInclusionTimeIntoSlot(opts.txDelayerMaxInclusionTimeIntoSlot);
-      publisher.l1TxUtils = delayed;
-    }
-
     this.nodes.push(node);
     return node;
   }
@@ -356,7 +323,10 @@ export class EpochsTestContext {
     this.logger.info(`Waiting until last slot of submission window for epoch ${epochNumber} at ${date}`, {
       oneSlotBefore,
     });
-    await waitUntilL1Timestamp(this.l1Client, oneSlotBefore);
+    // Use a timeout that accounts for the full proof submission window
+    const proofSubmissionWindowDuration =
+      this.constants.proofSubmissionEpochs * this.epochDuration * this.L2_SLOT_DURATION_IN_S;
+    await waitUntilL1Timestamp(this.l1Client, oneSlotBefore, undefined, proofSubmissionWindowDuration * 2);
   }
 
   /** Waits for the aztec node to sync to the target block number. */
@@ -408,15 +378,13 @@ export class EpochsTestContext {
 
   /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */
   public async createL1Client() {
-    const { client, delayer } = withDelayer(
-      createExtendedL1Client(
-        [...this.l1Client.chain.rpcUrls.default.http],
-        privateKeyToAccount(this.getNextPrivateKey()),
-        this.l1Client.chain,
-      ),
-      this.context.dateProvider,
-      { ethereumSlotDuration: this.L1_BLOCK_TIME_IN_S },
+    const rawClient = createExtendedL1Client(
+      [...this.l1Client.chain.rpcUrls.default.http],
+      privateKeyToAccount(this.getNextPrivateKey()),
+      this.l1Client.chain,
     );
+    const delayer = createDelayer(this.context.dateProvider, { ethereumSlotDuration: this.L1_BLOCK_TIME_IN_S }, {});
+    const client = wrapClientWithDelayer(rawClient, delayer);
     expect(await client.getBalance({ address: client.account.address })).toBeGreaterThan(0n);
     return { client, delayer };
   }
@@ -433,6 +401,38 @@ export class EpochsTestContext {
     expect(result).toBe(expectedSuccess);
   }
 
+  /** Verifies at least one checkpoint has the target number of blocks (for MBPS validation). */
+  public async assertMultipleBlocksPerSlot(targetBlockCount: number) {
+    const archiver = (this.context.aztecNode as AztecNodeService).getBlockSource() as Archiver;
+    const checkpoints = await archiver.getCheckpoints(CheckpointNumber(1), 50);
+
+    this.logger.warn(`Retrieved ${checkpoints.length} checkpoints from archiver`, {
+      checkpoints: checkpoints.map(pc => pc.checkpoint.getStats()),
+    });
+
+    let expectedBlockNumber = checkpoints[0].checkpoint.blocks[0].number;
+    let targetFound = false;
+
+    for (const checkpoint of checkpoints) {
+      const blockCount = checkpoint.checkpoint.blocks.length;
+      targetFound = targetFound || blockCount >= targetBlockCount;
+
+      this.logger.verbose(`Checkpoint ${checkpoint.checkpoint.number} has ${blockCount} blocks`, {
+        checkpoint: checkpoint.checkpoint.getStats(),
+      });
+
+      for (let i = 0; i < blockCount; i++) {
+        const block = checkpoint.checkpoint.blocks[i];
+        expect(block.indexWithinCheckpoint).toBe(i);
+        expect(block.checkpointNumber).toBe(checkpoint.checkpoint.number);
+        expect(block.number).toBe(expectedBlockNumber);
+        expectedBlockNumber++;
+      }
+    }
+
+    expect(targetFound).toBe(true);
+  }
+
   public watchSequencerEvents(
     sequencers: SequencerClient[],
     getMetadata: (i: number) => Record<string, any> = () => ({}),