@aztec/end-to-end 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.17

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

@@ -0,0 +1 @@
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/fixtures/logging.ts"],"names":[],"mappings":"AAKA,wGAAwG;AACxG,wBAAgB,yBAAyB,YAExC;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,QAOlD"}

package/dest/fixtures/setup_l1_contracts.d.ts

@@ -0,0 +1,6 @@
+import { type Logger } from '@aztec/aztec.js';
+import type { DeployL1ContractsArgs, L1ContractsConfig } from '@aztec/ethereum';
+import type { HDAccount, PrivateKeyAccount } from 'viem';
+export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
+export declare const setupL1Contracts: (l1RpcUrl: string, account: HDAccount | PrivateKeyAccount, logger: Logger, args: Pick<DeployL1ContractsArgs, 'genesisArchiveRoot' | 'genesisBlockHash' | 'initialValidators'> & L1ContractsConfig) => Promise<import("@aztec/aztec.js").DeployL1ContractsReturnType>;
+//# sourceMappingURL=setup_l1_contracts.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setup_l1_contracts.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIhF,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGzD,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AAEnG,eAAO,MAAM,gBAAgB,aACjB,MAAM,WACP,SAAS,GAAG,iBAAiB,UAC9B,MAAM,QACR,KAAK,qBAAqB,EAAE,oBAAoB,GAAG,kBAAkB,GAAG,mBAAmB,CAAC,GAChG,iBAAiB,mEAWpB,CAAC"}

package/dest/fixtures/setup_l1_contracts.js

@@ -1,12 +1,14 @@
 import { deployL1Contracts } from '@aztec/aztec.js';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { foundry } from 'viem/chains';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 export const setupL1Contracts = async (l1RpcUrl, account, logger, args)=>{
-    const l1Data = await deployL1Contracts(l1RpcUrl, account, foundry, logger, {
-        l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice,
-        vkTreeRoot: await getVKTreeRoot(),
+    const l1Data = await deployL1Contracts([
+        l1RpcUrl
+    ], account, foundry, logger, {
+        l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
+        vkTreeRoot: getVKTreeRoot(),
         protocolContractTreeRoot,
         salt: undefined,
         ...args

package/dest/fixtures/setup_p2p_test.d.ts

@@ -0,0 +1,22 @@
+/// <reference types="node" resolution-mode="require"/>
+/**
+ * Test fixtures and utilities to set up and run a test using multiple validators
+ */
+import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+import type { SentTx } from '@aztec/aztec.js';
+import type { DateProvider } from '@aztec/foundation/timer';
+import type { PXEService } from '@aztec/pxe';
+import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { AsyncLocalStorage } from 'node:async_hooks';
+export declare const PROPOSER_PRIVATE_KEYS_START_INDEX = 1;
+export declare const ATTESTER_PRIVATE_KEYS_START_INDEX = 1001;
+export interface NodeContext {
+    node: AztecNodeService;
+    pxeService: PXEService;
+    txs: SentTx[];
+}
+export declare function generatePrivateKeys(startIndex: number, numberOfKeys: number): `0x${string}`[];
+export declare function createNodes(config: AztecNodeConfig, dateProvider: DateProvider, bootstrapNodeEnr: string, numNodes: number, bootNodePort: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number): Promise<AztecNodeService[]>;
+export declare function createNode(config: AztecNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, accountIndex: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, loggerIdStorage?: AsyncLocalStorage<string>): Promise<AztecNodeService>;
+export declare function createValidatorConfig(config: AztecNodeConfig, bootstrapNodeEnr?: string, port?: number, accountIndex?: number, dataDirectory?: string): Promise<AztecNodeConfig>;
+//# sourceMappingURL=setup_p2p_test.d.ts.map

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

@@ -0,0 +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;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAEtD,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,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA4B7B;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,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,4BA6BvB"}

package/dest/fixtures/setup_p2p_test.js

@@ -19,7 +19,7 @@ export function generatePrivateKeys(startIndex, numberOfKeys) {
     }
     return privateKeys;
 }
-export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, dataDirectory, metricsPort) {
+export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, prefilledPublicData, dataDirectory, metricsPort) {
     const nodePromises = [];
     const loggerIdStorage = new AsyncLocalStorage();
     const logNameHandler = (module)=>loggerIdStorage.getStore() ? `${module}:${loggerIdStorage.getStore()}` : module;
@@ -28,7 +28,7 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
         // We run on ports from the bootnode upwards
         const port = bootNodePort + i + 1;
         const dataDir = dataDirectory ? `${dataDirectory}-${i}` : undefined;
-        const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, i, dataDir, metricsPort, loggerIdStorage);
+        const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, i, prefilledPublicData, dataDir, metricsPort, loggerIdStorage);
         nodePromises.push(nodePromise);
     }
     const nodes = await Promise.all(nodePromises);
@@ -36,13 +36,15 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
     return nodes;
 }
 // creates a P2P enabled instance of Aztec Node Service
-export async function createNode(config, dateProvider, tcpPort, bootstrapNode, accountIndex, dataDirectory, metricsPort, loggerIdStorage) {
+export async function createNode(config, dateProvider, tcpPort, bootstrapNode, accountIndex, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
     const createNode = async ()=>{
         const validatorConfig = await createValidatorConfig(config, bootstrapNode, tcpPort, accountIndex, dataDirectory);
         const telemetry = getEndToEndTestTelemetryClient(metricsPort);
         return await AztecNodeService.createAndSync(validatorConfig, {
             telemetry,
             dateProvider
+        }, {
+            prefilledPublicData
         });
     };
     return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createNode) : createNode();

package/dest/fixtures/snapshot_manager.d.ts

@@ -0,0 +1,87 @@
+import { type InitialAccountData } from '@aztec/accounts/testing';
+import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+import { AnvilTestWatcher, type AztecAddress, CheatCodes, type CompleteAddress, type DeployL1ContractsReturnType, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
+import { type BlobSinkServer } from '@aztec/blob-sink/server';
+import { type DeployL1ContractsArgs } from '@aztec/ethereum';
+import { TestDateProvider } from '@aztec/foundation/timer';
+import type { ProverNode } from '@aztec/prover-node';
+import { type PXEService } from '@aztec/pxe';
+import type { Anvil } from '@viem/anvil';
+import { type SetupOptions } from './utils.js';
+export type SubsystemsContext = {
+    anvil: Anvil;
+    acvmConfig: any;
+    bbConfig: any;
+    aztecNode: AztecNodeService;
+    aztecNodeConfig: AztecNodeConfig;
+    pxe: PXEService;
+    deployL1ContractsValues: DeployL1ContractsReturnType;
+    proverNode?: ProverNode;
+    watcher: AnvilTestWatcher;
+    cheatCodes: CheatCodes;
+    dateProvider: TestDateProvider;
+    blobSink: BlobSinkServer;
+    initialFundedAccounts: InitialAccountData[];
+    directoryToCleanup?: string;
+};
+export declare function createSnapshotManager(testName: string, dataPath?: string, config?: Partial<SetupOptions>, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>): SnapshotManager | MockSnapshotManager;
+export interface ISnapshotManager {
+    snapshot<T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>): Promise<void>;
+    setup(): Promise<SubsystemsContext>;
+    teardown(): Promise<void>;
+}
+/** Snapshot manager that does not perform snapshotting, it just applies transition and restoration functions as it receives them. */
+declare class MockSnapshotManager implements ISnapshotManager {
+    private config;
+    private deployL1ContractsArgs;
+    private context?;
+    private logger;
+    constructor(testName: string, config?: Partial<AztecNodeConfig>, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>);
+    snapshot<T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>): Promise<void>;
+    setup(): Promise<SubsystemsContext>;
+    teardown(): Promise<void>;
+}
+/**
+ * Snapshot engine for local e2e tests. Read more:
+ * https://github.com/AztecProtocol/aztec-packages/pull/5526
+ */
+declare class SnapshotManager implements ISnapshotManager {
+    private dataPath;
+    private config;
+    private deployL1ContractsArgs;
+    private snapshotStack;
+    private context?;
+    private livePath;
+    private logger;
+    constructor(testName: string, dataPath: string, config?: Partial<SetupOptions>, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>);
+    snapshot<T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>): Promise<void>;
+    /**
+     * Creates and returns the subsystem context based on the current snapshot stack.
+     * If the subsystem context already exists, just return it.
+     * If you want to be sure to get a clean snapshot, be sure to call teardown() before calling setup().
+     */
+    setup(): Promise<SubsystemsContext>;
+    /**
+     * Destroys the current subsystem context.
+     */
+    teardown(): Promise<void>;
+}
+/**
+ * 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;
+    initialFundedAccounts: InitialAccountData[];
+}) => Promise<{
+    deployedAccounts: InitialAccountData[];
+}>;
+/**
+ * Registers the contract class used for test accounts and publicly deploys the instances requested.
+ * Use this when you need to make a public call to an account contract, such as for requesting a public authwit.
+ * @param sender - Wallet to send the deployment tx.
+ * @param accountsToDeploy - Which accounts to publicly deploy.
+ */
+export declare function publicDeployAccounts(sender: Wallet, accountsToDeploy: (CompleteAddress | AztecAddress)[], waitUntilProven?: boolean): Promise<void>;
+export {};
+//# sourceMappingURL=snapshot_manager.d.ts.map

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

@@ -0,0 +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,gBAAgB,EAChB,KAAK,YAAY,EAGjB,UAAU,EACV,KAAK,eAAe,EAEpB,KAAK,2BAA2B,EAEhC,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,KAAK,qBAAqB,EAA6D,MAAM,iBAAiB,CAAC;AAMxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,UAAU,EAAyC,MAAM,YAAY,CAAC;AAIpF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAczC,OAAO,EAAE,KAAK,YAAY,EAA8D,MAAM,YAAY,CAAC;AAG3G,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,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;AAmUD;;;GAGG;AACH,eAAO,MAAM,cAAc,qBACN,MAAM,UAAU,MAAM,iEACF;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,qBAAqB,EAAE,kBAAkB,EAAE,CAAA;CAAE;;EAU/F,CAAC;AAEJ;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,CAAC,eAAe,GAAG,YAAY,CAAC,EAAE,EACpD,eAAe,UAAQ,iBAoBxB"}

package/dest/fixtures/snapshot_manager.js

@@ -1,6 +1,7 @@
-import { SchnorrAccountContractArtifact, getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
+import { deployFundedSchnorrAccounts, generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { AnvilTestWatcher, BatchCall, CheatCodes, Fr, GrumpkinScalar, getContractClassFromArtifact } from '@aztec/aztec.js';
+import { AnvilTestWatcher, BatchCall, CheatCodes, getContractClassFromArtifact } from '@aztec/aztec.js';
 import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
 import { createL1Clients, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
@@ -12,6 +13,7 @@ import { resolver, reviver } from '@aztec/foundation/serialize';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import { getGenesisValues } from '@aztec/world-state/testing';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { copySync, removeSync } from 'fs-extra/esm';
 import fs from 'fs/promises';
@@ -27,7 +29,6 @@ import { setupL1Contracts } from './setup_l1_contracts.js';
 import { createAndSyncProverNode, getLogger, getPrivateKeyFromIndex } from './utils.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 export function createSnapshotManager(testName, dataPath, config = {}, deployL1ContractsArgs = {
-    assumeProvenThrough: Number.MAX_SAFE_INTEGER,
     initialValidators: []
 }) {
     return dataPath ? new SnapshotManager(testName, dataPath, config, deployL1ContractsArgs) : new MockSnapshotManager(testName, config, deployL1ContractsArgs);
@@ -37,9 +38,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     deployL1ContractsArgs;
     context;
     logger;
-    constructor(testName, config = {}, deployL1ContractsArgs = {
-        assumeProvenThrough: Number.MAX_SAFE_INTEGER
-    }){
+    constructor(testName, config = {}, deployL1ContractsArgs = {}){
         this.config = config;
         this.deployL1ContractsArgs = deployL1ContractsArgs;
         this.logger = createLogger(`e2e:snapshot_manager:${testName}`);
@@ -77,9 +76,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     context;
     livePath;
     logger;
-    constructor(testName, dataPath, config = {}, deployL1ContractsArgs = {
-        assumeProvenThrough: Number.MAX_SAFE_INTEGER
-    }){
+    constructor(testName, dataPath, config = {}, deployL1ContractsArgs = {}){
         this.dataPath = dataPath;
         this.config = config;
         this.deployL1ContractsArgs = deployL1ContractsArgs;
@@ -117,7 +114,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.l1RpcUrl);
+        const ethCheatCodes = new EthCheatCodesWithState(context.aztecNodeConfig.l1RpcUrls);
         const anvilStateFile = `${this.livePath}/anvil.dat`;
         await ethCheatCodes.dumpChainState(anvilStateFile);
         writeFileSync(`${this.livePath}/${name}.json`, JSON.stringify(snapshotData || {}, resolver));
@@ -189,10 +186,15 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         await context.watcher.stop();
         await context.blobSink.stop();
         if (context.directoryToCleanup) {
-            await fs.rm(context.directoryToCleanup, {
-                recursive: true,
-                force: true
-            });
+            try {
+                await fs.rm(context.directoryToCleanup, {
+                    recursive: true,
+                    force: true,
+                    maxRetries: 3
+                });
+            } catch (err) {
+                getLogger().warn(`Failed to delete tmp directory ${context.directoryToCleanup}: ${err}`);
+            }
         }
     } catch (err) {
         getLogger().error('Error during teardown', err);
@@ -202,8 +204,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
  * Initializes a fresh set of subsystems.
  * If given a statePath, the state will be written to the path.
  * If there is no statePath, in-memory and temporary state locations will be used.
- */ async function setupFromFresh(statePath, logger, opts = {}, deployL1ContractsArgs = {
-    assumeProvenThrough: Number.MAX_SAFE_INTEGER,
+ */ async function setupFromFresh(statePath, logger, { numberOfInitialFundedAccounts = 10, ...opts } = {}, deployL1ContractsArgs = {
     initialValidators: []
 }) {
     logger.verbose(`Initializing state...`);
@@ -237,9 +238,13 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     await blobSink.start();
     // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
     logger.verbose('Starting anvil...');
-    const res = await startAnvil(opts.ethereumSlotDuration);
+    const res = await startAnvil({
+        l1BlockTime: opts.ethereumSlotDuration
+    });
     const anvil = res.anvil;
-    aztecNodeConfig.l1RpcUrl = res.rpcUrl;
+    aztecNodeConfig.l1RpcUrls = [
+        res.rpcUrl
+    ];
     // Deploy our L1 contracts.
     logger.verbose('Deploying L1 contracts...');
     const hdAccount = mnemonicToAccount(MNEMONIC, {
@@ -251,12 +256,16 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const proverNodePrivateKey = getPrivateKeyFromIndex(0);
     aztecNodeConfig.publisherPrivateKey = `0x${publisherPrivKey.toString('hex')}`;
     aztecNodeConfig.validatorPrivateKey = `0x${validatorPrivKey.toString('hex')}`;
-    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrl);
+    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
     if (opts.l1StartTime) {
         await ethCheatCodes.warp(opts.l1StartTime);
     }
-    const deployL1ContractsValues = await setupL1Contracts(aztecNodeConfig.l1RpcUrl, hdAccount, logger, {
+    const initialFundedAccounts = await generateSchnorrAccounts(numberOfInitialFundedAccounts);
+    const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice);
+    const deployL1ContractsValues = await setupL1Contracts(aztecNodeConfig.l1RpcUrls[0], hdAccount, logger, {
         ...getL1ContractsConfigEnvVars(),
+        genesisArchiveRoot,
+        genesisBlockHash,
         salt: opts.salt,
         ...deployL1ContractsArgs,
         initialValidators: opts.initialValidators
@@ -286,7 +295,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         });
         logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
     }
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrl), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient);
+    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient);
     await watcher.start();
     const acvmConfig = await getACVMConfig(logger);
     if (acvmConfig) {
@@ -304,19 +313,22 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const aztecNode = await AztecNodeService.createAndSync(aztecNodeConfig, {
         telemetry,
         dateProvider
+    }, {
+        prefilledPublicData
     });
     let proverNode = undefined;
     if (opts.startProverNode) {
         logger.verbose('Creating and syncing a simulated prover node...');
-        proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')));
+        proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')), prefilledPublicData);
     }
     logger.verbose('Creating pxe...');
     const pxeConfig = getPXEServiceConfig();
     pxeConfig.dataDirectory = statePath ?? path.join(directoryToCleanup, randomBytes(8).toString('hex'));
     const pxe = await createPXEService(aztecNode, pxeConfig);
-    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrl, pxe);
+    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
     if (statePath) {
         writeFileSync(`${statePath}/aztec_node_config.json`, JSON.stringify(aztecNodeConfig, resolver));
+        writeFileSync(`${statePath}/accounts.json`, JSON.stringify(initialFundedAccounts, resolver));
     }
     return {
         aztecNodeConfig,
@@ -331,6 +343,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         cheatCodes,
         dateProvider,
         blobSink,
+        initialFundedAccounts,
         directoryToCleanup
     };
 }
@@ -348,6 +361,8 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const aztecNodeConfig = JSON.parse(readFileSync(`${statePath}/aztec_node_config.json`, 'utf-8'), reviver);
     aztecNodeConfig.dataDirectory = statePath;
     aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
+    const initialFundedAccounts = JSON.parse(readFileSync(`${statePath}/accounts.json`, 'utf-8'), reviver) || [];
+    const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
     const blobSink = await createBlobSinkServer({
         port: blobSinkPort,
         dataStoreConfig: {
@@ -358,10 +373,12 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     await blobSink.start();
     // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
     const { anvil, rpcUrl } = await startAnvil();
-    aztecNodeConfig.l1RpcUrl = rpcUrl;
+    aztecNodeConfig.l1RpcUrls = [
+        rpcUrl
+    ];
     // Load anvil state.
     const anvilStateFile = `${statePath}/anvil.dat`;
-    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrl);
+    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
     await ethCheatCodes.loadChainState(anvilStateFile);
     // TODO: Encapsulate this in a NativeAcvm impl.
     const acvmConfig = await getACVMConfig(logger);
@@ -375,8 +392,8 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
     }
     logger.verbose('Creating ETH clients...');
-    const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrl, mnemonicToAccount(MNEMONIC));
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrl), aztecNodeConfig.l1Contracts.rollupAddress, publicClient);
+    const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
+    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), aztecNodeConfig.l1Contracts.rollupAddress, publicClient);
     await watcher.start();
     logger.verbose('Creating aztec node...');
     const telemetry = initTelemetryClient(getTelemetryConfig());
@@ -384,19 +401,21 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const aztecNode = await AztecNodeService.createAndSync(aztecNodeConfig, {
         telemetry,
         dateProvider
+    }, {
+        prefilledPublicData
     });
     let proverNode = undefined;
     if (aztecNodeConfig.startProverNode) {
         logger.verbose('Creating and syncing a simulated prover node...');
         const proverNodePrivateKey = getPrivateKeyFromIndex(2);
         const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
-        proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')));
+        proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')), prefilledPublicData);
     }
     logger.verbose('Creating pxe...');
     const pxeConfig = getPXEServiceConfig();
     pxeConfig.dataDirectory = statePath;
     const pxe = await createPXEService(aztecNode, pxeConfig);
-    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrl, pxe);
+    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
     return {
         aztecNodeConfig,
         anvil,
@@ -414,52 +433,24 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         cheatCodes,
         dateProvider,
         blobSink,
+        initialFundedAccounts,
         directoryToCleanup
     };
 }
 /**
  * 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 addAccounts = (numberOfAccounts, logger, waitUntilProven = false)=>async ({ pxe })=>{
-        // Generate account keys.
-        const accountKeys = Array.from({
-            length: numberOfAccounts
-        }).map((_)=>[
-                Fr.random(),
-                GrumpkinScalar.random()
-            ]);
-        logger.verbose('Simulating account deployment...');
-        const provenTxs = await Promise.all(accountKeys.map(async ([secretKey, signPk], index)=>{
-            const account = await getSchnorrAccount(pxe, secretKey, signPk, 1);
-            // only register the contract class once
-            let skipClassRegistration = true;
-            if (index === 0) {
-                // for the first account, check if the contract class is already registered, otherwise we should register now
-                if (!(await pxe.getContractClassMetadata(account.getInstance().contractClassId)).isContractClassPubliclyRegistered) {
-                    skipClassRegistration = false;
-                }
-            }
-            const deployMethod = await account.getDeployMethod();
-            const provenTx = await deployMethod.prove({
-                contractAddressSalt: new Fr(account.salt),
-                skipClassRegistration,
-                skipPublicDeployment: true,
-                universalDeploy: true
-            });
-            return provenTx;
-        }));
-        logger.verbose('Account deployment tx hashes:');
-        for (const provenTx of provenTxs){
-            logger.verbose((await provenTx.getTxHash()).toString());
+ */ export const deployAccounts = (numberOfAccounts, logger, waitUntilProven = false)=>async ({ pxe, initialFundedAccounts })=>{
+        if (initialFundedAccounts.length < numberOfAccounts) {
+            throw new Error(`Cannot deploy more than ${initialFundedAccounts.length} initial accounts.`);
         }
-        logger.verbose('Deploying accounts...');
-        const txs = await Promise.all(provenTxs.map((provenTx)=>provenTx.send()));
-        await Promise.all(txs.map((tx)=>tx.wait({
-                interval: 0.1,
-                proven: waitUntilProven
-            })));
+        logger.verbose('Deploying accounts funded with fee juice...');
+        const deployedAccounts = initialFundedAccounts.slice(0, numberOfAccounts);
+        await deployFundedSchnorrAccounts(pxe, deployedAccounts, {
+            proven: waitUntilProven
+        });
         return {
-            accountKeys
+            deployedAccounts
         };
     };
 /**
@@ -472,14 +463,16 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const instances = (await Promise.all(accountAddressesToDeploy.map((account)=>sender.getContractMetadata(account)))).map((metadata)=>metadata.contractInstance);
     const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
     const alreadyRegistered = (await sender.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered;
-    const calls = [];
-    if (!alreadyRegistered) {
-        const registerContractCall = await registerContractClass(sender, SchnorrAccountContractArtifact);
-        calls.push(await registerContractCall.request());
-    }
-    const requests = await Promise.all(instances.map(async (instance)=>(await deployInstance(sender, instance)).request()));
-    calls.push(...requests);
+    const fns = await Promise.all([
+        ...!alreadyRegistered ? [
+            registerContractClass(sender, SchnorrAccountContractArtifact)
+        ] : [],
+        ...instances.map((instance)=>deployInstance(sender, instance))
+    ]);
+    const calls = await Promise.all(fns.map((fn)=>fn.request()));
+    const capsules = fns.map((fn)=>fn.getCapsules()).flat();
     const batch = new BatchCall(sender, calls);
+    batch.addCapsules(capsules);
     await batch.send().wait({
         proven: waitUntilProven
     });

package/dest/fixtures/token_utils.d.ts

@@ -0,0 +1,6 @@
+import type { AztecAddress, Logger, Wallet } from '@aztec/aztec.js';
+import { TokenContract } from '@aztec/noir-contracts.js/Token';
+export declare function deployToken(adminWallet: Wallet, initialAdminBalance: bigint, logger: Logger): Promise<TokenContract>;
+export declare function mintTokensToPrivate(token: TokenContract, minterWallet: Wallet, recipient: AztecAddress, amount: bigint): Promise<void>;
+export declare function expectTokenBalance(wallet: Wallet, token: TokenContract, owner: AztecAddress, expectedBalance: bigint, logger: Logger): Promise<void>;
+//# sourceMappingURL=token_utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"token_utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/token_utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,0BAcjG;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,iBAKf;AAGD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,iBAOf"}

package/dest/fixtures/token_utils.js

@@ -12,7 +12,7 @@ export async function deployToken(adminWallet, initialAdminBalance, logger) {
 }
 export async function mintTokensToPrivate(token, minterWallet, recipient, amount) {
     const tokenAsMinter = await TokenContract.at(token.address, minterWallet);
-    const from = minterWallet.getAddress(); // we are setting from to minter here because of TODO(#9887)
+    const from = minterWallet.getAddress(); // we are setting from to minter here because we need a sender to calculate the tag
     await tokenAsMinter.methods.mint_to_private(from, recipient, amount).send().wait();
 }
 // docs:end:token_utils