@aztec/end-to-end 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

package/dest/fixtures/setup_p2p_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAI9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AASrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,SAAI,GACd,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoC7B;AAGD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAQ5C;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,EAC/E,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,oDAyB5C;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,4BAqBvB"}
+{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAK3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AASrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAEnD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,GAAG;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,SAAI,EACf,iBAAiB,SAAI,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAyC7B;AAED,4EAA4E;AAC5E,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,GAAG;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,EAC/B,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAY5C;AAED,+EAA+E;AAC/E,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAc5C;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,EAC/E,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,oDAwB5C;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,4BAgBvB;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAM,GAAG,MAAM,EAAM,EACnC,aAAa,CAAC,EAAE,MAAM,4BAmBvB"}

package/dest/fixtures/setup_p2p_test.js

@@ -1,6 +1,7 @@
 /**
  * Test fixtures and utilities to set up and run a test using multiple validators
  */ import { AztecNodeService } from '@aztec/aztec-node';
+import { range } from '@aztec/foundation/array';
 import { SecretValue } from '@aztec/foundation/config';
 import { addLogNameHandler, removeLogNameHandler } from '@aztec/foundation/log';
 import { bufferToHex } from '@aztec/foundation/string';
@@ -21,7 +22,7 @@ export function generatePrivateKeys(startIndex, numberOfKeys) {
     }
     return privateKeys;
 }
-export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, prefilledPublicData, dataDirectory, metricsPort, indexOffset = 0) {
+export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, prefilledPublicData, dataDirectory, metricsPort, indexOffset = 0, validatorsPerNode = 1) {
     const nodePromises = [];
     const loggerIdStorage = new AsyncLocalStorage();
     const logNameHandler = (module)=>loggerIdStorage.getStore() ? `${module}:${loggerIdStorage.getStore()}` : module;
@@ -30,8 +31,11 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
         const index = indexOffset + i;
         // We run on ports from the bootnode upwards
         const port = bootNodePort + 1 + index;
+        // Determine validator indices for this node
+        const validatorIndices = validatorsPerNode === 1 ? index : range(validatorsPerNode, validatorsPerNode * index);
+        // Assign data directory
         const dataDir = dataDirectory ? `${dataDirectory}-${index}` : undefined;
-        const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, index, prefilledPublicData, dataDir, metricsPort, loggerIdStorage);
+        const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, validatorIndices, prefilledPublicData, dataDir, metricsPort, loggerIdStorage);
         nodePromises.push(nodePromise);
     }
     const nodes = await Promise.all(nodePromises);
@@ -43,14 +47,33 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
     removeLogNameHandler(logNameHandler);
     return nodes;
 }
-// creates a P2P enabled instance of Aztec Node Service
-export async function createNode(config, dateProvider, tcpPort, bootstrapNode, addressIndex, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
+/** Creates a P2P enabled instance of Aztec Node Service with a validator */ export async function createNode(config, dateProvider, tcpPort, bootstrapNode, addressIndex, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
     const createNode = async ()=>{
         const validatorConfig = await createValidatorConfig(config, bootstrapNode, tcpPort, addressIndex, dataDirectory);
-        const telemetry = getEndToEndTestTelemetryClient(metricsPort);
+        const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
         return await AztecNodeService.createAndSync(validatorConfig, {
             telemetry,
             dateProvider
+        }, {
+            prefilledPublicData,
+            dontStartSequencer: config.dontStartSequencer
+        });
+    };
+    return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createNode) : createNode();
+}
+/** Creates a P2P enabled instance of Aztec Node Service without a validator */ export async function createNonValidatorNode(baseConfig, dateProvider, tcpPort, bootstrapNode, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
+    const createNode = async ()=>{
+        const p2pConfig = await createP2PConfig(baseConfig, bootstrapNode, tcpPort, dataDirectory);
+        const config = {
+            ...p2pConfig,
+            disableValidator: true,
+            validatorPrivateKeys: undefined,
+            publisherPrivateKeys: []
+        };
+        const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
+        return await AztecNodeService.createAndSync(config, {
+            telemetry,
+            dateProvider
         }, {
             prefilledPublicData
         });
@@ -60,17 +83,8 @@ export async function createNode(config, dateProvider, tcpPort, bootstrapNode, a
 export async function createProverNode(config, tcpPort, bootstrapNode, addressIndex, proverNodeDeps, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
     const createProverNode = async ()=>{
         const proverNodePrivateKey = getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex);
-        const telemetry = getEndToEndTestTelemetryClient(metricsPort);
-        const proverConfig = {
-            p2pIp: `127.0.0.1`,
-            p2pPort: tcpPort ?? await getPort(),
-            p2pEnabled: true,
-            peerCheckIntervalMS: TEST_PEER_CHECK_INTERVAL_MS,
-            blockCheckIntervalMS: 1000,
-            bootstrapNodes: bootstrapNode ? [
-                bootstrapNode
-            ] : []
-        };
+        const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
+        const proverConfig = await createP2PConfig(config, bootstrapNode, tcpPort, dataDirectory);
         const aztecNodeRpcTxProvider = undefined;
         return await createAndSyncProverNode(bufferToHex(proverNodePrivateKey), config, {
             ...proverConfig,
@@ -82,15 +96,8 @@ export async function createProverNode(config, tcpPort, bootstrapNode, addressIn
     };
     return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createProverNode) : createProverNode();
 }
-export async function createValidatorConfig(config, bootstrapNodeEnr, port, addressIndex = 1, dataDirectory) {
+export async function createP2PConfig(config, bootstrapNodeEnr, port, dataDirectory) {
     port = port ?? await getPort();
-    const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex));
-    config.validatorPrivateKeys = new SecretValue([
-        attesterPrivateKey
-    ]);
-    config.publisherPrivateKeys = [
-        new SecretValue(attesterPrivateKey)
-    ];
     const nodeConfig = {
         ...config,
         p2pIp: `127.0.0.1`,
@@ -105,3 +112,22 @@ export async function createValidatorConfig(config, bootstrapNodeEnr, port, addr
     };
     return nodeConfig;
 }
+export async function createValidatorConfig(config, bootstrapNodeEnr, port, addressIndex = 1, dataDirectory) {
+    const addressIndices = Array.isArray(addressIndex) ? addressIndex : [
+        addressIndex
+    ];
+    if (addressIndices.length === 0) {
+        throw new Error('At least one address index must be provided to create a validator config');
+    }
+    const attesterPrivateKeys = addressIndices.map((index)=>bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + index)));
+    const p2pConfig = await createP2PConfig(config, bootstrapNodeEnr, port, dataDirectory);
+    const nodeConfig = {
+        ...config,
+        ...p2pConfig,
+        validatorPrivateKeys: new SecretValue(attesterPrivateKeys),
+        publisherPrivateKeys: [
+            new SecretValue(attesterPrivateKeys[0])
+        ]
+    };
+    return nodeConfig;
+}

package/dest/fixtures/snapshot_manager.d.ts

@@ -1,13 +1,16 @@
 import { type InitialAccountData } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { type AztecAddress, type AztecNode, type CompleteAddress, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { type BlobSinkServer } from '@aztec/blob-sink/server';
-import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType } from '@aztec/ethereum';
+import type { DeployL1ContractsArgs, DeployL1ContractsReturnType } from '@aztec/ethereum/deploy-l1-contracts';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import type { ProverNode } from '@aztec/prover-node';
-import { type PXEService } from '@aztec/pxe/server';
 import type { SequencerClient } from '@aztec/sequencer-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import type { Anvil } from '@viem/anvil';
 import { type SetupOptions } from './utils.js';
 export type SubsystemsContext = {
@@ -16,7 +19,7 @@ export type SubsystemsContext = {
     bbConfig: any;
     aztecNode: AztecNodeService;
     aztecNodeConfig: AztecNodeConfig;
-    pxe: PXEService;
+    wallet: TestWallet;
     deployL1ContractsValues: DeployL1ContractsReturnType;
     proverNode?: ProverNode;
     watcher: AnvilTestWatcher;
@@ -27,7 +30,7 @@ export type SubsystemsContext = {
     initialFundedAccounts: InitialAccountData[];
     directoryToCleanup?: string;
 };
-export declare function createSnapshotManager(testName: string, dataPath?: string, config?: Partial<SetupOptions>, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>): SnapshotManager | MockSnapshotManager;
+export declare function createSnapshotManager(testName: string, dataPath?: string, config?: Partial<SetupOptions>, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>): MockSnapshotManager | SnapshotManager;
 export interface ISnapshotManager {
     snapshot<T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>): Promise<void>;
     setup(): Promise<SubsystemsContext>;
@@ -73,8 +76,8 @@ declare class SnapshotManager implements ISnapshotManager {
  * Snapshot 'apply' helper function to add accounts.
  * The 'restore' function is not provided, as it must be a closure within the test context to capture the results.
  */
-export declare const deployAccounts: (numberOfAccounts: number, logger: Logger, waitUntilProven?: boolean) => ({ pxe, initialFundedAccounts }: {
-    pxe: PXE;
+export declare const deployAccounts: (numberOfAccounts: number, logger: Logger) => ({ wallet, initialFundedAccounts }: {
+    wallet: TestWallet;
     initialFundedAccounts: InitialAccountData[];
 }) => Promise<{
     deployedAccounts: InitialAccountData[];
@@ -85,8 +88,8 @@ export declare const deployAccounts: (numberOfAccounts: number, logger: Logger,
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  * @param waitUntilProven - Whether to wait for the tx to be proven.
- * @param pxeOrNode - PXE or AztecNode to wait for proven.
+ * @param node - AztecNode used to wait for proven tx.
  */
-export declare function publicDeployAccounts(sender: Wallet, accountsToDeploy: (CompleteAddress | AztecAddress)[], waitUntilProven?: boolean, pxeOrNode?: PXE | AztecNode): Promise<void>;
+export declare function publicDeployAccounts(wallet: Wallet, accountsToDeploy: AztecAddress[], waitUntilProven?: boolean, node?: AztecNode): Promise<void>;
 export {};
-//# sourceMappingURL=snapshot_manager.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3RfbWFuYWdlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpeHR1cmVzL3NuYXBzaG90X21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQTJCLE1BQU0seUJBQXlCLENBQUM7QUFDM0YsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLGdCQUFnQixFQUFvQixNQUFNLG1CQUFtQixDQUFDO0FBQzdGLE9BQU8sRUFBRSxZQUFZLEVBQWMsTUFBTSwyQkFBMkIsQ0FBQztBQUlyRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDcEUsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUF3QixNQUFNLHlCQUF5QixDQUFDO0FBSXBGLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLDJCQUEyQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFROUcsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHL0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3ZELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQWV6QyxPQUFPLEVBQ0wsS0FBSyxZQUFZLEVBS2xCLE1BQU0sWUFBWSxDQUFDO0FBR3BCLE1BQU0sTUFBTSxpQkFBaUIs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

package/dest/fixtures/snapshot_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAAwD,MAAM,yBAAyB,CAAC;AACxH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,eAAe,EAIpB,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AACpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAIjC,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,UAAU,EAAyC,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAezC,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,gBAAgB,CAAC;IAC5B,eAAe,EAAE,eAAe,CAAC;IACjC,GAAG,EAAE,UAAU,CAAC;IAChB,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,EAAE,cAAc,CAAC;IACzB,qBAAqB,EAAE,kBAAkB,EAAE,CAAC;IAC5C,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AASF,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,GAAE,OAAO,CAAC,YAAY,CAAM,EAClC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAEnD,yCAKF;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,CAAC,EACR,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,GACvE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,KAAK,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEpC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,qIAAqI;AACrI,cAAM,mBAAoB,YAAW,gBAAgB;IAMjD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,qBAAqB;IAN/B,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,MAAM,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EACR,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAMvD,QAAQ,CAAC,CAAC,EACrB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,GAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B;IAYtF,KAAK;IAOL,QAAQ;CAItB;AAED;;;GAGG;AACH,cAAM,eAAgB,YAAW,gBAAgB;IAQ7C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,qBAAqB;IAT/B,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,MAAM,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EACR,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,OAAO,CAAC,YAAY,CAAM,EAClC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAMvD,QAAQ,CAAC,CAAC,EACrB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,GAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B;IA4CnG;;;;OAIG;IACU,KAAK;IA0BlB;;OAEG;IACU,QAAQ;CAKtB;AA4UD;;;GAGG;AACH,eAAO,MAAM,cAAc,GACxB,kBAAkB,MAAM,EAAE,QAAQ,MAAM,EAAE,yBAAuB,MAC3D,gCAAgC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,qBAAqB,EAAE,kBAAkB,EAAE,CAAA;CAAE;;EAe/F,CAAC;AAEJ;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,CAAC,eAAe,GAAG,YAAY,CAAC,EAAE,EACpD,eAAe,UAAQ,EACvB,SAAS,CAAC,EAAE,GAAG,GAAG,SAAS,iBAyB5B"}
+{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"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"}

package/dest/fixtures/snapshot_manager.js

@@ -1,22 +1,27 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
-import { deployFundedSchnorrAccounts, generateSchnorrAccounts } from '@aztec/accounts/testing';
+import { generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { BatchCall, DefaultWaitForProvenOpts, EthAddress, getContractClassFromArtifact, waitForProven } from '@aztec/aztec.js';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { getContractClassFromArtifact } from '@aztec/aztec.js/contracts';
+import { BatchCall, waitForProven } from '@aztec/aztec.js/contracts';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
-import { createExtendedL1Client, deployMulticall3, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { deployMulticall3 } from '@aztec/ethereum/contracts';
 import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { asyncMap } from '@aztec/foundation/async-map';
 import { SecretValue } from '@aztec/foundation/config';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { randomBytes } from '@aztec/foundation/crypto/random';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
 import { resolver, reviver } from '@aztec/foundation/serialize';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
+import { getPXEConfig } from '@aztec/pxe/server';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { copySync, removeSync } from 'fs-extra/esm';
@@ -118,7 +123,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         // Execute the restoration function.
         await restore(snapshotData, context);
         // Save the snapshot data.
-        const ethCheatCodes = new EthCheatCodesWithState(context.aztecNodeConfig.l1RpcUrls);
+        const ethCheatCodes = new EthCheatCodesWithState(context.aztecNodeConfig.l1RpcUrls, context.dateProvider);
         const anvilStateFile = `${this.livePath}/anvil.dat`;
         await ethCheatCodes.dumpChainState(anvilStateFile);
         writeFileSync(`${this.livePath}/${name}.json`, JSON.stringify(snapshotData || {}, resolver));
@@ -234,17 +239,6 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig.dataDirectory = statePath;
     }
     aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
-    // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
-    logger.verbose('Starting anvil...');
-    const res = await startAnvil({
-        l1BlockTime: opts.ethereumSlotDuration
-    });
-    const anvil = res.anvil;
-    aztecNodeConfig.l1RpcUrls = [
-        res.rpcUrl
-    ];
-    // Deploy our L1 contracts.
-    logger.verbose('Deploying L1 contracts...');
     const hdAccount = mnemonicToAccount(MNEMONIC, {
         addressIndex: 0
     });
@@ -262,7 +256,20 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         `0x${validatorPrivKey.toString('hex')}`
     ]);
     aztecNodeConfig.coinbase = opts.coinbase ?? EthAddress.fromString(`${hdAccount.address}`);
-    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
+    logger.info(`Setting up environment with config`, aztecNodeConfig);
+    // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
+    logger.verbose('Starting anvil...');
+    const res = await startAnvil({
+        l1BlockTime: opts.ethereumSlotDuration
+    });
+    const anvil = res.anvil;
+    aztecNodeConfig.l1RpcUrls = [
+        res.rpcUrl
+    ];
+    const dateProvider = new TestDateProvider();
+    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls, dateProvider);
+    // Deploy our L1 contracts.
+    logger.verbose('Deploying L1 contracts...');
     if (opts.l1StartTime) {
         await ethCheatCodes.warp(opts.l1StartTime, {
             resetBlockInterval: true
@@ -282,9 +289,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     });
     aztecNodeConfig.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
     aztecNodeConfig.rollupVersion = deployL1ContractsValues.rollupVersion;
-    aztecNodeConfig.l1PublishRetryIntervalMS = 100;
-    const dateProvider = new TestDateProvider();
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
+    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls, dateProvider), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
     await watcher.start();
     const acvmConfig = await getACVMConfig(logger);
     if (acvmConfig) {
@@ -296,7 +301,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig.bbBinaryPath = bbConfig.bbBinaryPath;
         aztecNodeConfig.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
     }
-    const telemetry = getEndToEndTestTelemetryClient(opts.metricsPort);
+    const telemetry = await getEndToEndTestTelemetryClient(opts.metricsPort);
     // Setup blob sink service
     const blobSink = await createBlobSinkServer({
         l1ChainId: aztecNodeConfig.l1ChainId,
@@ -304,7 +309,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         l1Contracts: aztecNodeConfig.l1Contracts,
         port: blobSinkPort,
         dataDirectory: aztecNodeConfig.dataDirectory,
-        dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB
+        dataStoreMapSizeKb: aztecNodeConfig.dataStoreMapSizeKb
     }, telemetry);
     await blobSink.start();
     logger.info('Creating and synching an aztec node...');
@@ -318,17 +323,18 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     if (opts.startProverNode) {
         logger.verbose('Creating and syncing a simulated prover node with p2p disabled...');
         proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig, {
+            ...aztecNodeConfig.proverNodeConfig,
             dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')),
             p2pEnabled: false
         }, aztecNode, prefilledPublicData);
     }
     logger.verbose('Creating pxe...');
-    const pxeConfig = getPXEServiceConfig();
+    const pxeConfig = getPXEConfig();
     pxeConfig.dataDirectory = statePath ?? path.join(directoryToCleanup, randomBytes(8).toString('hex'));
     // Only enable proving if specifically requested.
     pxeConfig.proverEnabled = !!opts.realProofs;
-    const pxe = await createPXEService(aztecNode, pxeConfig);
-    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+    const wallet = await TestWallet.create(aztecNode, pxeConfig);
+    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, aztecNode, dateProvider);
     if (statePath) {
         writeFileSync(`${statePath}/aztec_node_config.json`, JSON.stringify(aztecNodeConfig, resolver));
         writeFileSync(`${statePath}/accounts.json`, JSON.stringify(initialFundedAccounts, resolver));
@@ -337,7 +343,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig,
         anvil,
         aztecNode,
-        pxe,
+        wallet,
         sequencer: aztecNode.getSequencer(),
         acvmConfig,
         bbConfig,
@@ -375,7 +381,8 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     ];
     // Load anvil state.
     const anvilStateFile = `${statePath}/anvil.dat`;
-    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
+    const dateProvider = new TestDateProvider();
+    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls, dateProvider);
     await ethCheatCodes.loadChainState(anvilStateFile);
     // TODO: Encapsulate this in a NativeAcvm impl.
     const acvmConfig = await getACVMConfig(logger);
@@ -390,17 +397,16 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     }
     logger.verbose('Creating ETH clients...');
     const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
-    const dateProvider = new TestDateProvider();
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), aztecNodeConfig.l1Contracts.rollupAddress, l1Client, dateProvider);
+    const watcher = new AnvilTestWatcher(ethCheatCodes, aztecNodeConfig.l1Contracts.rollupAddress, l1Client, dateProvider);
     await watcher.start();
-    const telemetry = initTelemetryClient(getTelemetryConfig());
+    const telemetry = await initTelemetryClient(getTelemetryConfig());
     const blobSink = await createBlobSinkServer({
         l1ChainId: aztecNodeConfig.l1ChainId,
         l1RpcUrls: aztecNodeConfig.l1RpcUrls,
         l1Contracts: aztecNodeConfig.l1Contracts,
         port: blobSinkPort,
         dataDirectory: statePath,
-        dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB
+        dataStoreMapSizeKb: aztecNodeConfig.dataStoreMapSizeKb
     }, telemetry);
     await blobSink.start();
     logger.verbose('Creating aztec node...');
@@ -416,19 +422,21 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         const proverNodePrivateKey = getPrivateKeyFromIndex(2);
         const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
         proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig, {
-            dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex'))
+            ...aztecNodeConfig.proverNodeConfig,
+            dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')),
+            p2pEnabled: false
         }, aztecNode, prefilledPublicData);
     }
     logger.verbose('Creating pxe...');
-    const pxeConfig = getPXEServiceConfig();
+    const pxeConfig = getPXEConfig();
     pxeConfig.dataDirectory = statePath;
-    const pxe = await createPXEService(aztecNode, pxeConfig);
-    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+    const wallet = await TestWallet.create(aztecNode, pxeConfig);
+    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, aztecNode, dateProvider);
     return {
         aztecNodeConfig,
         anvil,
         aztecNode,
-        pxe,
+        wallet,
         sequencer: aztecNode.getSequencer(),
         acvmConfig,
         bbConfig,
@@ -449,13 +457,21 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
 /**
  * Snapshot 'apply' helper function to add accounts.
  * The 'restore' function is not provided, as it must be a closure within the test context to capture the results.
- */ export const deployAccounts = (numberOfAccounts, logger, waitUntilProven = false)=>async ({ pxe, initialFundedAccounts })=>{
+ */ export const deployAccounts = (numberOfAccounts, logger)=>async ({ wallet, initialFundedAccounts })=>{
         if (initialFundedAccounts.length < numberOfAccounts) {
             throw new Error(`Cannot deploy more than ${initialFundedAccounts.length} initial accounts.`);
         }
         logger.verbose('Deploying accounts funded with fee juice...');
         const deployedAccounts = initialFundedAccounts.slice(0, numberOfAccounts);
-        await deployFundedSchnorrAccounts(pxe, deployedAccounts, undefined, waitUntilProven ? DefaultWaitForProvenOpts : undefined);
+        // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
+        for(let i = 0; i < deployedAccounts.length; i++){
+            const accountManager = await wallet.createSchnorrAccount(deployedAccounts[i].secret, deployedAccounts[i].salt, deployedAccounts[i].signingKey);
+            const deployMethod = await accountManager.getDeployMethod();
+            await deployMethod.send({
+                from: AztecAddress.ZERO,
+                skipClassPublication: i !== 0
+            }).wait();
+        }
         return {
             deployedAccounts
         };
@@ -466,27 +482,26 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  * @param waitUntilProven - Whether to wait for the tx to be proven.
- * @param pxeOrNode - PXE or AztecNode to wait for proven.
- */ export async function publicDeployAccounts(sender, accountsToDeploy, waitUntilProven = false, pxeOrNode) {
-    const accountAddressesToDeploy = accountsToDeploy.map((a)=>'address' in a ? a.address : a);
-    const instances = (await Promise.all(accountAddressesToDeploy.map((account)=>sender.getContractMetadata(account)))).map((metadata)=>metadata.contractInstance);
+ * @param node - AztecNode used to wait for proven tx.
+ */ export async function publicDeployAccounts(wallet, accountsToDeploy, waitUntilProven = false, node) {
+    const instances = (await Promise.all(accountsToDeploy.map((account)=>wallet.getContractMetadata(account)))).map((metadata)=>metadata.contractInstance);
     const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
-    const alreadyRegistered = (await sender.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered;
+    const alreadyRegistered = (await wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered;
     const calls = await Promise.all([
         ...!alreadyRegistered ? [
-            publishContractClass(sender, SchnorrAccountContractArtifact)
+            publishContractClass(wallet, SchnorrAccountContractArtifact)
         ] : [],
-        ...instances.map((instance)=>publishInstance(sender, instance))
+        ...instances.map((instance)=>publishInstance(wallet, instance))
     ]);
-    const batch = new BatchCall(sender, calls);
+    const batch = new BatchCall(wallet, calls);
     const txReceipt = await batch.send({
-        from: accountAddressesToDeploy[0]
+        from: accountsToDeploy[0]
     }).wait();
     if (waitUntilProven) {
-        if (!pxeOrNode) {
-            throw new Error('Need to provide a PXE or AztecNode to wait for proven.');
+        if (!node) {
+            throw new Error('Need to provide an AztecNode to wait for proven.');
         } else {
-            await waitForProven(pxeOrNode, txReceipt);
+            await waitForProven(node, txReceipt);
         }
     }
 }

package/dest/fixtures/token_utils.d.ts

@@ -1,7 +1,12 @@
-import { type AztecAddress, type Logger, type Wallet } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-export declare function deployToken(adminWallet: Wallet, deployerAddress: AztecAddress, initialAdminBalance: bigint, logger: Logger): Promise<TokenContract>;
-export declare function mintTokensToPrivate(token: TokenContract, minter: AztecAddress, minterWallet: Wallet, recipient: AztecAddress, amount: bigint): Promise<void>;
+export declare function deployToken(wallet: Wallet, admin: AztecAddress, initialAdminBalance: bigint, logger: Logger): Promise<{
+    contract: TokenContract;
+    instance: import("@aztec/aztec.js/contracts").ContractInstanceWithAddress;
+}>;
+export declare function mintTokensToPrivate(token: TokenContract, minter: AztecAddress, recipient: AztecAddress, amount: bigint): Promise<void>;
 export declare function expectTokenBalance(wallet: Wallet, token: TokenContract, owner: AztecAddress, expectedBalance: bigint, logger: Logger): Promise<void>;
-export declare function mintNotes(sender: Wallet, minter: AztecAddress, recipient: AztecAddress, asset: TokenContract, noteAmounts: bigint[]): Promise<bigint>;
-//# sourceMappingURL=token_utils.d.ts.map
+export declare function mintNotes(wallet: Wallet, minter: AztecAddress, recipient: AztecAddress, asset: TokenContract, noteAmounts: bigint[]): Promise<bigint>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy90b2tlbl91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFL0Qsd0JBQXNCLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxZQUFZLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNOzs7R0Fhakg7QUFFRCx3QkFBc0IsbUJBQW1CLENBQ3ZDLEtBQUssRUFBRSxhQUFhLEVBQ3BCLE1BQU0sRUFBRSxZQUFZLEVBQ3BCLFNBQVMsRUFBRSxZQUFZLEVBQ3ZCLE1BQU0sRUFBRSxNQUFNLGlCQUdmO0FBRUQsd0JBQXNCLGtCQUFrQixDQUN0QyxNQUFNLEVBQUUsTUFBTSxFQUNkLEtBQUssRUFBRSxhQUFhLEVBQ3BCLEtBQUssRUFBRSxZQUFZLEVBQ25CLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLE1BQU0sRUFBRSxNQUFNLGlCQU9mO0FBRUQsd0JBQXNCLFNBQVMsQ0FDN0IsTUFBTSxFQUFFLE1BQU0sRUFDZCxNQUFNLEVBQUUsWUFBWSxFQUNwQixTQUFTLEVBQUUsWUFBWSxFQUN2QixLQUFLLEVBQUUsYUFBYSxFQUNwQixXQUFXLEVBQUUsTUFBTSxFQUFFLEdBQ3BCLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FXakIifQ==

package/dest/fixtures/token_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token_utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/token_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAa,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,YAAY,EAC7B,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM,0BAef;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,iBAIf;AAGD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,iBAOf;AAED,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,aAAa,EACpB,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,MAAM,CAAC,CAWjB"}
+{"version":3,"file":"token_utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/token_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;GAajH;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,iBAGf;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,iBAOf;AAED,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,aAAa,EACpB,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,MAAM,CAAC,CAWjB"}

package/dest/fixtures/token_utils.js

@@ -1,42 +1,41 @@
-import { BatchCall } from '@aztec/aztec.js';
+import { BatchCall } from '@aztec/aztec.js/contracts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-// docs:start:token_utils
-export async function deployToken(adminWallet, deployerAddress, initialAdminBalance, logger) {
+export async function deployToken(wallet, admin, initialAdminBalance, logger) {
     logger.info(`Deploying Token contract...`);
-    const contract = await TokenContract.deploy(adminWallet, deployerAddress, 'TokenName', 'TokenSymbol', 18).send({
-        from: deployerAddress
-    }).deployed();
+    const { contract, instance } = await TokenContract.deploy(wallet, admin, 'TokenName', 'TokenSymbol', 18).send({
+        from: admin
+    }).wait();
     if (initialAdminBalance > 0n) {
-        // Minter is minting to herself so contract as minter is the same as contract as recipient
-        await mintTokensToPrivate(contract, deployerAddress, adminWallet, deployerAddress, initialAdminBalance);
+        await mintTokensToPrivate(contract, admin, admin, initialAdminBalance);
     }
     logger.info('L2 contract deployed');
-    return contract;
+    return {
+        contract,
+        instance
+    };
 }
-export async function mintTokensToPrivate(token, minter, minterWallet, recipient, amount) {
-    const tokenAsMinter = await TokenContract.at(token.address, minterWallet);
-    await tokenAsMinter.methods.mint_to_private(recipient, amount).send({
+export async function mintTokensToPrivate(token, minter, recipient, amount) {
+    await token.methods.mint_to_private(recipient, amount).send({
         from: minter
     }).wait();
 }
-// docs:end:token_utils
 export async function expectTokenBalance(wallet, token, owner, expectedBalance, logger) {
     // Then check the balance
-    const contractWithWallet = await TokenContract.at(token.address, wallet);
+    const contractWithWallet = TokenContract.at(token.address, wallet);
     const balance = await contractWithWallet.methods.balance_of_private(owner).simulate({
         from: owner
     });
     logger.info(`Account ${owner} balance: ${balance}`);
     expect(balance).toBe(expectedBalance);
 }
-export async function mintNotes(sender, minter, recipient, asset, noteAmounts) {
-    // We can only mint 4 notes at a time, since that's the maximum number of calls our entrypoints allow
+export async function mintNotes(wallet, minter, recipient, asset, noteAmounts) {
+    // We can only mint 5 notes at a time, since that's the maximum number of calls our entrypoints allow
     // TODO(#13024): mint as many notes as possible in a single tx
-    const notesPerIteration = 4;
+    const notesPerIteration = 5;
     for(let mintedNotes = 0; mintedNotes < noteAmounts.length; mintedNotes += notesPerIteration){
         const toMint = noteAmounts.slice(mintedNotes, mintedNotes + notesPerIteration);
         const actions = toMint.map((amt)=>asset.methods.mint_to_private(recipient, amt));
-        await new BatchCall(sender, actions).send({
+        await new BatchCall(wallet, actions).send({
             from: minter
         }).wait();
     }