@aztec/end-to-end 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

package/dest/fixtures/authwit_proxy.js

@@ -0,0 +1,34 @@
+/**
+ * Builds a proxy forwarding call from an action, selecting the right forward_private_N method.
+ */ async function buildProxyCall(proxy, action) {
+    const call = await action.getFunctionCall();
+    const argCount = call.args.length;
+    if (argCount === 2) {
+        return proxy.methods.forward_private_2(call.to, call.selector, call.args);
+    } else if (argCount === 3) {
+        return proxy.methods.forward_private_3(call.to, call.selector, call.args);
+    } else if (argCount === 4) {
+        return proxy.methods.forward_private_4(call.to, call.selector, call.args);
+    } else if (argCount === 5) {
+        return proxy.methods.forward_private_5(call.to, call.selector, call.args);
+    } else if (argCount === 6) {
+        return proxy.methods.forward_private_6(call.to, call.selector, call.args);
+    }
+    throw new Error(`No forward_private_${argCount} method on proxy`);
+}
+/**
+ * Sends a contract call through the authwit proxy.
+ * The proxy becomes msg_sender in the target (triggering authwit validation),
+ * while the actual tx sender retains their keys in scope.
+ */ export async function sendThroughAuthwitProxy(proxy, action, options) {
+    const proxyCall = await buildProxyCall(proxy, action);
+    return proxyCall.send(options);
+}
+/**
+ * Simulates a contract call through the authwit proxy.
+ * The proxy becomes msg_sender in the target (triggering authwit validation),
+ * while the actual tx sender retains their keys in scope.
+ */ export async function simulateThroughAuthwitProxy(proxy, action, options) {
+    const proxyCall = await buildProxyCall(proxy, action);
+    return proxyCall.simulate(options);
+}

package/dest/fixtures/e2e_prover_test.d.ts

@@ -3,14 +3,14 @@ import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
 import { type Logger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
-import { type ClientProtocolCircuitVerifier } from '@aztec/bb-prover';
-import type { BlobSinkServer } from '@aztec/blob-sink/server';
-import type { DeployL1ContractsReturnType } from '@aztec/ethereum';
+import type { ClientProtocolCircuitVerifier } from '@aztec/bb-prover';
+import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import { TestWallet } from '@aztec/test-wallet/server';
 import { TokenSimulator } from '../simulators/token_simulator.js';
-import { type SubsystemsContext } from './snapshot_manager.js';
+import { TestWallet } from '../test-wallet/test_wallet.js';
+import { type EndToEndContext, type SetupOptions } from './setup.js';
 /**
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
  * However, we then setup a second PXE with a full prover instance.
@@ -18,44 +18,39 @@ import { type SubsystemsContext } from './snapshot_manager.js';
  * We then prove and verify transactions created via this full prover PXE.
  */
 export declare class FullProverTest {
-    private minNumberOfTxsPerBlock;
-    private realProofs;
     static TOKEN_NAME: string;
     static TOKEN_SYMBOL: string;
     static TOKEN_DECIMALS: bigint;
-    private snapshotManager;
     logger: Logger;
     wallet: TestWallet;
     provenWallet: TestWallet;
     accounts: AztecAddress[];
     deployedAccounts: InitialAccountData[];
     fakeProofsAsset: TokenContract;
+    fakeProofsAssetInstance: ContractInstanceWithAddress;
     tokenSim: TokenSimulator;
     aztecNode: AztecNode;
     aztecNodeAdmin: AztecNodeAdmin;
     cheatCodes: CheatCodes;
-    blobSink: BlobSinkServer;
     private provenComponents;
     private bbConfigCleanup?;
     private acvmConfigCleanup?;
-    circuitProofVerifier?: ClientProtocolCircuitVerifier;
+    /** Returns the proof verifier from the prover node (for test assertions). */
+    get circuitProofVerifier(): ClientProtocolCircuitVerifier | undefined;
     provenAsset: TokenContract;
-    private context;
-    private proverNode;
-    private simulatedProverNode;
-    l1Contracts: DeployL1ContractsReturnType;
+    context: EndToEndContext;
+    private proverAztecNode;
+    private simulatedProverAztecNode;
+    l1Contracts: DeployAztecL1ContractsReturnType;
     proverAddress: EthAddress;
+    private minNumberOfTxsPerBlock;
+    private coinbase;
+    private realProofs;
     constructor(testName: string, minNumberOfTxsPerBlock: number, coinbase: EthAddress, realProofs?: boolean);
-    /**
-     * Adds two state shifts to snapshot manager.
-     * 1. Add 2 accounts.
-     * 2. Publicly deploy accounts, deploy token contract
-     */
-    applyBaseSnapshots(): Promise<void>;
-    setup(): Promise<this>;
+    private applyBaseSetup;
+    setup(opts?: Partial<SetupOptions>): Promise<this>;
     private mintFeeJuice;
-    snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
     teardown(): Promise<void>;
-    applyMintSnapshot(): Promise<void>;
+    private applyMint;
 }
-//# sourceMappingURL=e2e_prover_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdEUsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUlsRyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQU10RSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDbEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxZQUFZLEVBUWxCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELDZFQUE2RTtJQUM3RSxJQUFJLG9CQUFvQixJQUFJLDZCQUE2QixHQUFHLFNBQVMsQ0FFcEU7SUFDRCxXQUFXLEVBQUcsYUFBYSxDQUFDO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsT0FBTyxDQUFDLGVBQWUsQ0FBb0I7SUFDM0MsT0FBTyxDQUFDLHdCQUF3QixDQUFvQjtJQUM3QyxXQUFXLEVBQUcsZ0NBQWdDLENBQUM7SUFDL0MsYUFBYSxFQUFHLFVBQVUsQ0FBQztJQUNsQyxPQUFPLENBQUMsc0JBQXNCLENBQVM7SUFDdkMsT0FBTyxDQUFDLFFBQVEsQ0FBYTtJQUM3QixPQUFPLENBQUMsVUFBVSxDQUFVO0lBRTVCLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxVQUFVLFVBQU8sRUFLcEc7WUFLYSxjQUFjO0lBcUN0QixLQUFLLENBQUMsSUFBSSxHQUFFLE9BQU8sQ0FBQyxZQUFZLENBQU0saUJBd0kzQztZQUVhLFlBQVk7SUFTcEIsUUFBUSxrQkFjYjtZQUVhLFNBQVM7Q0FzQ3hCIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAInE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAMvD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,uBAAuB,CAAC;AAU/B;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,gBAAgB,EAAG,kBAAkB,EAAE,CAAC;IACxC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAa3B;;;;OAIG;IACG,kBAAkB;IAsDlB,KAAK;YA6IG,YAAY;IAS1B,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAeR,iBAAiB;CA8CxB"}
+{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAQlB,MAAM,YAAY,CAAC;AAOpB;;;;;GAKG;AAEH,qBAAa,cAAc;IACzB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,gBAAgB,EAAG,kBAAkB,EAAE,CAAC;IACxC,eAAe,EAAG,aAAa,CAAC;IAChC,uBAAuB,EAAG,2BAA2B,CAAC;IACtD,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,6EAA6E;IAC7E,IAAI,oBAAoB,IAAI,6BAA6B,GAAG,SAAS,CAEpE;IACD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,OAAO,CAAC,eAAe,CAAoB;IAC3C,OAAO,CAAC,wBAAwB,CAAoB;IAC7C,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAClC,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,UAAU,CAAU;IAE5B,YAAY,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,UAAO,EAKpG;YAKa,cAAc;IAqCtB,KAAK,CAAC,IAAI,GAAE,OAAO,CAAC,YAAY,CAAM,iBAwI3C;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAsCxB"}

package/dest/fixtures/e2e_prover_test.js

@@ -1,114 +1,108 @@
-import { createArchiver } from '@aztec/archiver';
+import { AztecNodeService } from '@aztec/aztec-node';
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { createLogger } from '@aztec/aztec.js/log';
-import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
+import { BackendType, Barretenberg } from '@aztec/bb.js';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { SecretValue } from '@aztec/foundation/config';
 import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { createProverNode } from '@aztec/prover-node';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { getContract } from 'viem';
 import { privateKeyToAddress } from 'viem/accounts';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
-import { createSnapshotManager, deployAccounts, publicDeployAccounts } from './snapshot_manager.js';
-import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEAndGetWallet } from './utils.js';
-const { E2E_DATA_PATH: dataPath } = process.env;
+import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicDeployAccounts, setup, setupPXEAndGetWallet, teardown } from './setup.js';
 /**
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
  * However, we then setup a second PXE with a full prover instance.
  * We configure this instance with all of the accounts and contracts.
  * We then prove and verify transactions created via this full prover PXE.
  */ export class FullProverTest {
-    minNumberOfTxsPerBlock;
-    realProofs;
     static TOKEN_NAME = 'USDC';
     static TOKEN_SYMBOL = 'USD';
     static TOKEN_DECIMALS = 18n;
-    snapshotManager;
     logger;
     wallet;
     provenWallet;
-    accounts;
+    accounts = [];
     deployedAccounts;
     fakeProofsAsset;
+    fakeProofsAssetInstance;
     tokenSim;
     aztecNode;
     aztecNodeAdmin;
     cheatCodes;
-    blobSink;
-    provenComponents;
+    provenComponents = [];
     bbConfigCleanup;
     acvmConfigCleanup;
-    circuitProofVerifier;
+    /** Returns the proof verifier from the prover node (for test assertions). */ get circuitProofVerifier() {
+        return this.proverAztecNode?.getProofVerifier();
+    }
     provenAsset;
     context;
-    proverNode;
-    simulatedProverNode;
+    proverAztecNode;
+    simulatedProverAztecNode;
     l1Contracts;
     proverAddress;
+    minNumberOfTxsPerBlock;
+    coinbase;
+    realProofs;
     constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
+        this.logger = createLogger(`e2e:full_prover_test:${testName}`);
         this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
+        this.coinbase = coinbase;
         this.realProofs = realProofs;
-        this.accounts = [];
-        this.provenComponents = [];
-        this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
-        this.logger = createLogger(`e2e:full_prover_test:${testName}`);
-        this.snapshotManager = createSnapshotManager(`full_prover_integration/${testName}`, dataPath, {
-            startProverNode: true,
-            fundRewardDistributor: true,
-            coinbase
-        }, {
-            realVerifier: realProofs
-        });
     }
     /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 2 accounts.
-   * 2. Publicly deploy accounts, deploy token contract
-   */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('2_accounts', deployAccounts(2, this.logger), ({ deployedAccounts }, { wallet })=>{
-            this.deployedAccounts = deployedAccounts;
-            this.accounts = deployedAccounts.map((a)=>a.address);
-            this.wallet = wallet;
-            return Promise.resolve();
+   * Applies base setup: deploys 2 accounts and token contract.
+   */ async applyBaseSetup() {
+        this.logger.info('Applying base setup: deploying accounts');
+        const { deployedAccounts } = await deployAccounts(2, this.logger)({
+            wallet: this.context.wallet,
+            initialFundedAccounts: this.context.initialFundedAccounts
         });
-        await this.snapshotManager.snapshot('client_prover_integration', async ()=>{
-            // Create the token contract state.
-            // Move this account thing to addAccounts above?
-            this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
-            this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
-                from: this.accounts[0]
-            }).deployed();
-            this.logger.verbose(`Token deployed to ${asset.address}`);
-            return {
-                tokenContractAddress: asset.address
-            };
-        }, async ({ tokenContractAddress })=>{
-            // Restore the token contract state.
-            this.fakeProofsAsset = await TokenContract.at(tokenContractAddress, this.wallet);
-            this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
-            this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
-            expect(await this.fakeProofsAsset.methods.get_admin().simulate({
-                from: this.accounts[0]
-            })).toBe(this.accounts[0].toBigInt());
+        this.deployedAccounts = deployedAccounts;
+        this.accounts = deployedAccounts.map((a)=>a.address);
+        this.wallet = this.context.wallet;
+        this.logger.info('Applying base setup: publicly deploying accounts');
+        await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
+        this.logger.info('Applying base setup: deploying token contract');
+        const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
+            from: this.accounts[0]
         });
+        this.logger.verbose(`Token deployed to ${asset.address}`);
+        this.fakeProofsAsset = asset;
+        this.fakeProofsAssetInstance = instance;
+        this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
+        this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
+        expect((await this.fakeProofsAsset.methods.get_admin().simulate({
+            from: this.accounts[0]
+        })).result).toBe(this.accounts[0].toBigInt());
     }
-    async setup() {
-        this.context = await this.snapshotManager.setup();
+    async setup(opts = {}) {
+        this.logger.info('Setting up subsystems from fresh');
+        this.context = await setup(0, {
+            ...opts,
+            startProverNode: true,
+            coinbase: this.coinbase,
+            fundSponsoredFPC: true,
+            skipAccountDeployment: true,
+            l1ContractsArgs: {
+                realVerifier: this.realProofs
+            }
+        });
+        await this.applyBaseSetup();
+        await this.applyMint();
+        this.logger.info(`Enabling proving`, {
+            realProofs: this.realProofs
+        });
         // We don't wish to mark as proven automatically, so we set the flag to false
         this.context.watcher.setIsMarkingAsProven(false);
-        this.simulatedProverNode = this.context.proverNode;
-        ({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes, blobSink: this.blobSink } = this.context);
-        this.aztecNodeAdmin = this.context.aztecNode;
-        const blobSinkClient = createBlobSinkClient({
-            blobSinkUrl: `http://localhost:${this.blobSink.port}`
-        });
+        this.simulatedProverAztecNode = this.context.proverNode;
+        ({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
+        this.aztecNodeAdmin = this.context.aztecNodeService;
+        const config = this.context.aztecNodeConfig;
         // Configure a full prover PXE
         let acvmConfig;
         let bbConfig;
@@ -122,11 +116,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             }
             this.acvmConfigCleanup = acvmConfig.cleanup;
             this.bbConfigCleanup = bbConfig.cleanup;
-            if (!bbConfig?.bbWorkingDirectory || !bbConfig?.bbBinaryPath) {
-                throw new Error(`Test must be run with BB native configuration`);
-            }
-            const verifier = await BBCircuitVerifier.new(bbConfig);
-            this.circuitProofVerifier = new QueuedIVCVerifier(bbConfig, verifier);
+            await Barretenberg.initSingleton({
+                backend: BackendType.NativeUnixSocket
+            });
             this.logger.debug(`Configuring the node for real proofs...`);
             await this.aztecNodeAdmin.setConfig({
                 realProofs: true,
@@ -134,7 +126,6 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             });
         } else {
             this.logger.debug(`Configuring the node min txs per block ${this.minNumberOfTxsPerBlock}...`);
-            this.circuitProofVerifier = new TestCircuitVerifier();
             await this.aztecNodeAdmin.setConfig({
                 minTxsPerBlock: this.minNumberOfTxsPerBlock
             });
@@ -145,17 +136,15 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         await this.context.cheatCodes.rollup.markAsProven();
         this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
         const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
-            proverEnabled: this.realProofs,
-            bbBinaryPath: bbConfig?.bbBinaryPath,
-            bbWorkingDirectory: bbConfig?.bbWorkingDirectory
-        }, undefined, true);
+            proverEnabled: this.realProofs
+        }, undefined, 'pxe-proven');
         this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
-        await provenWallet.registerContract(this.fakeProofsAsset);
+        await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
         for(let i = 0; i < 2; i++){
             await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
             await this.wallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
         }
-        const asset = await TokenContract.at(this.fakeProofsAsset.address, provenWallet);
+        const asset = TokenContract.at(this.fakeProofsAsset.address, provenWallet);
         this.provenComponents.push({
             wallet: provenWallet,
             teardown: provenTeardown
@@ -163,35 +152,30 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         this.provenAsset = asset;
         this.provenWallet = provenWallet;
         this.logger.info(`Full prover PXE started`);
-        // Shutdown the current, simulated prover node
+        // Shutdown the current, simulated prover node (by stopping its hosting aztec node)
         this.logger.verbose('Shutting down simulated prover node');
-        await this.simulatedProverNode.stop();
-        // Creating temp store and archiver for fully proven prover node
-        this.logger.verbose('Starting archiver for new prover node');
-        const archiver = await createArchiver({
-            ...this.context.aztecNodeConfig,
-            dataDirectory: undefined
-        }, {
-            blobSinkClient
-        }, {
-            blockUntilSync: true
-        });
+        await this.simulatedProverAztecNode.stop();
         // The simulated prover node (now shutdown) used private key index 2
         const proverNodePrivateKey = getPrivateKeyFromIndex(2);
+        const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
         const proverNodeSenderAddress = privateKeyToAddress(new Buffer32(proverNodePrivateKey).toString());
         this.proverAddress = EthAddress.fromString(proverNodeSenderAddress);
         this.logger.verbose(`Funding prover node at ${proverNodeSenderAddress}`);
         await this.mintFeeJuice(proverNodeSenderAddress);
         this.logger.verbose('Starting prover node');
-        const proverConfig = {
-            ...this.context.aztecNodeConfig,
-            txCollectionNodeRpcUrls: [],
+        const sponsoredFPCAddress = await getSponsoredFPCAddress();
+        const { genesis } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), undefined, undefined, this.context.genesis.genesisTimestamp);
+        const proverNodeConfig = {
+            ...config,
+            enableProverNode: true,
+            disableValidator: true,
             dataDirectory: undefined,
+            txCollectionNodeRpcUrls: [],
             proverId: this.proverAddress,
             realProofs: this.realProofs,
             proverAgentCount: 2,
-            publisherPrivateKeys: [
-                new SecretValue(`0x${proverNodePrivateKey.toString('hex')}`)
+            proverPublisherPrivateKeys: [
+                new SecretValue(proverNodePrivateKeyHex)
             ],
             proverNodeMaxPendingJobs: 100,
             proverNodeMaxParallelBlocksPerEpoch: 32,
@@ -201,19 +185,22 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             txGatheringMaxParallelRequestsPerNode: 100,
             txGatheringTimeoutMs: 24_000,
             proverNodeFailedEpochStore: undefined,
-            proverNodeEpochProvingDelayMs: undefined
+            proverNodeEpochProvingDelayMs: undefined,
+            validatorPrivateKeys: new SecretValue([])
         };
-        const sponsoredFPCAddress = await getSponsoredFPCAddress();
-        const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
-        this.proverNode = await createProverNode(proverConfig, {
-            aztecNodeTxProvider: this.aztecNode,
-            archiver: archiver,
-            blobSinkClient
+        this.proverAztecNode = await AztecNodeService.createAndSync(proverNodeConfig, {
+            dateProvider: this.context.dateProvider,
+            p2pClientDeps: {
+                rpcTxProviders: [
+                    this.aztecNode
+                ]
+            }
         }, {
-            prefilledPublicData
+            genesis
+        });
+        this.logger.warn(`Proofs are now enabled`, {
+            realProofs: this.realProofs
         });
-        await this.proverNode.start();
-        this.logger.warn(`Proofs are now enabled`);
         return this;
     }
     async mintFeeJuice(recipient) {
@@ -232,55 +219,49 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             hash
         });
     }
-    snapshot;
     async teardown() {
-        await this.snapshotManager.teardown();
         // Cleanup related to the full prover PXEs
         for(let i = 0; i < this.provenComponents.length; i++){
             await this.provenComponents[i].teardown();
         }
-        // clean up the full prover node
-        await this.proverNode.stop();
+        // clean up the full prover node (by stopping its hosting aztec node)
+        await this.proverAztecNode.stop();
+        await Barretenberg.destroySingleton();
         await this.bbConfigCleanup?.();
         await this.acvmConfigCleanup?.();
+        await teardown(this.context);
     }
-    async applyMintSnapshot() {
-        await this.snapshotManager.snapshot('mint', async ()=>{
-            const { fakeProofsAsset: asset, accounts } = this;
-            const privateAmount = 10000n;
-            const publicAmount = 10000n;
-            this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
-            await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
-                from: accounts[0]
-            }).wait();
-            this.logger.verbose(`Transferring ${privateAmount} to private...`);
-            await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
-                from: accounts[0]
-            }).wait();
-            this.logger.verbose(`Minting complete.`);
-            return {
-                amount: publicAmount
-            };
-        }, async ({ amount })=>{
-            const { fakeProofsAsset: asset, accounts: [address], tokenSim } = this;
-            tokenSim.mintPublic(address, amount);
-            const publicBalance = await asset.methods.balance_of_public(address).simulate({
-                from: address
-            });
-            this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
-            expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
-            tokenSim.mintPrivate(address, amount);
-            const privateBalance = await asset.methods.balance_of_private(address).simulate({
-                from: address
-            });
-            this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
-            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
-            const totalSupply = await asset.methods.total_supply().simulate({
-                from: address
-            });
-            this.logger.verbose(`Total supply: ${totalSupply}`);
-            expect(totalSupply).toEqual(tokenSim.totalSupply);
-            return Promise.resolve();
+    async applyMint() {
+        this.logger.info('Applying mint setup');
+        const { fakeProofsAsset: asset, accounts } = this;
+        const privateAmount = 10000n;
+        const publicAmount = 10000n;
+        this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
+        await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
+            from: accounts[0]
+        });
+        this.logger.verbose(`Transferring ${privateAmount} to private...`);
+        await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
+            from: accounts[0]
+        });
+        this.logger.info(`Minting complete`);
+        const { fakeProofsAsset, accounts: [address], tokenSim } = this;
+        tokenSim.mintPublic(address, publicAmount);
+        const { result: publicBalance } = await fakeProofsAsset.methods.balance_of_public(address).simulate({
+            from: address
+        });
+        this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
+        expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
+        tokenSim.mintPrivate(address, publicAmount);
+        const { result: privateBalance } = await fakeProofsAsset.methods.balance_of_private(address).simulate({
+            from: address
+        });
+        this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
+        expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
+        const { result: totalSupply } = await fakeProofsAsset.methods.total_supply().simulate({
+            from: address
         });
+        this.logger.verbose(`Total supply: ${totalSupply}`);
+        expect(totalSupply).toEqual(tokenSim.totalSupply);
     }
 }

package/dest/fixtures/elu_monitor.d.ts

@@ -0,0 +1,21 @@
+/** Samples event-loop utilization, delay histogram, and heap usage per test, writing columnar text to a file. */
+export declare class EluMonitor {
+    private filePath;
+    private intervalMs;
+    private timer;
+    private lastELU;
+    private histogram;
+    private testName;
+    private testStart;
+    private eluSamples;
+    constructor(filePath: string, intervalMs?: number);
+    /** Begin sampling for a test. Writes a header line and starts the periodic sampler. */
+    startTest(testName: string): void;
+    /** Stop sampling and write a summary line. */
+    stopTest(): void;
+    /** Alias for stopTest — call on process exit to flush any remaining data. */
+    stop(): void;
+    private sample;
+    private writeSummary;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWx1X21vbml0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9lbHVfbW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxpSEFBaUg7QUFDakgscUJBQWEsVUFBVTtJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFTO0lBQ3pCLE9BQU8sQ0FBQyxVQUFVLENBQVM7SUFDM0IsT0FBTyxDQUFDLEtBQUssQ0FBNkM7SUFDMUQsT0FBTyxDQUFDLE9BQU8sQ0FBbUM7SUFDbEQsT0FBTyxDQUFDLFNBQVMsQ0FBb0I7SUFDckMsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFDckMsT0FBTyxDQUFDLFNBQVMsQ0FBcUI7SUFDdEMsT0FBTyxDQUFDLFVBQVUsQ0FBZ0I7SUFFbEMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sRUFJaEQ7SUFFRCx1RkFBdUY7SUFDdkYsU0FBUyxDQUFDLFFBQVEsRUFBRSxNQUFNLEdBQUcsSUFBSSxDQW1CaEM7SUFFRCw4Q0FBOEM7SUFDOUMsUUFBUSxJQUFJLElBQUksQ0FtQmY7SUFFRCwrRUFBNkU7SUFDN0UsSUFBSSxJQUFJLElBQUksQ0FFWDtJQUVELE9BQU8sQ0FBQyxNQUFNO0lBOEJkLE9BQU8sQ0FBQyxZQUFZO0NBbUJyQiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"elu_monitor.d.ts","sourceRoot":"","sources":["../../src/fixtures/elu_monitor.ts"],"names":[],"mappings":"AAKA,iHAAiH;AACjH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAA6C;IAC1D,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,UAAU,CAAgB;IAElC,YAAY,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAIhD;IAED,uFAAuF;IACvF,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAmBhC;IAED,8CAA8C;IAC9C,QAAQ,IAAI,IAAI,CAmBf;IAED,+EAA6E;IAC7E,IAAI,IAAI,IAAI,CAEX;IAED,OAAO,CAAC,MAAM;IA8Bd,OAAO,CAAC,YAAY;CAmBrB"}

package/dest/fixtures/elu_monitor.js

@@ -0,0 +1,102 @@
+import { appendFileSync } from 'node:fs';
+import { monitorEventLoopDelay, performance } from 'node:perf_hooks';
+const NANOS_PER_MS = 1_000_000;
+/** Samples event-loop utilization, delay histogram, and heap usage per test, writing columnar text to a file. */ export class EluMonitor {
+    filePath;
+    intervalMs;
+    timer;
+    lastELU;
+    histogram;
+    testName;
+    testStart;
+    eluSamples = [];
+    constructor(filePath, intervalMs){
+        this.filePath = filePath;
+        this.intervalMs = intervalMs ?? 2000;
+        this.histogram = monitorEventLoopDelay({
+            resolution: 20
+        });
+    }
+    /** Begin sampling for a test. Writes a header line and starts the periodic sampler. */ startTest(testName) {
+        this.stopTest();
+        this.testName = testName;
+        this.testStart = performance.now();
+        this.eluSamples = [];
+        appendFileSync(this.filePath, `\n=== Test: ${testName} ===\n`);
+        appendFileSync(this.filePath, padColumns('TIME', 'ELU', 'EL_DLY_P50', 'EL_DLY_P99', 'EL_DLY_MAX', 'HEAP_MB') + '\n');
+        this.lastELU = performance.eventLoopUtilization();
+        this.histogram.enable();
+        this.timer = setInterval(()=>this.sample(), this.intervalMs);
+        // Allow the process to exit even if the timer is still running.
+        this.timer.unref();
+    }
+    /** Stop sampling and write a summary line. */ stopTest() {
+        if (!this.timer) {
+            return;
+        }
+        // Take a final sample before stopping.
+        this.sample();
+        clearInterval(this.timer);
+        this.timer = undefined;
+        this.histogram.disable();
+        this.histogram.reset();
+        this.writeSummary();
+        this.lastELU = undefined;
+        this.testName = undefined;
+        this.testStart = undefined;
+        this.eluSamples = [];
+    }
+    /** Alias for stopTest — call on process exit to flush any remaining data. */ stop() {
+        this.stopTest();
+    }
+    sample() {
+        const newELU = performance.eventLoopUtilization();
+        const delta = performance.eventLoopUtilization(newELU, this.lastELU);
+        this.lastELU = newELU;
+        const elu = delta.utilization;
+        this.eluSamples.push(elu);
+        const p50 = this.histogram.percentile(50) / NANOS_PER_MS;
+        const p99 = this.histogram.percentile(99) / NANOS_PER_MS;
+        const max = this.histogram.max / NANOS_PER_MS;
+        const heapMb = Math.round(process.memoryUsage().heapUsed / (1024 * 1024));
+        const now = new Date();
+        const time = [
+            now.getHours(),
+            now.getMinutes(),
+            now.getSeconds()
+        ].map((n)=>String(n).padStart(2, '0')).join(':');
+        const line = padColumns(time, elu.toFixed(2), `${p50.toFixed(1)}ms`, `${p99.toFixed(1)}ms`, `${max.toFixed(1)}ms`, String(heapMb));
+        appendFileSync(this.filePath, line + '\n');
+        // Reset histogram so next sample only reflects the new interval.
+        this.histogram.reset();
+    }
+    writeSummary() {
+        if (this.eluSamples.length === 0 || this.testStart === undefined) {
+            return;
+        }
+        const mean = this.eluSamples.reduce((a, b)=>a + b, 0) / this.eluSamples.length;
+        const maxElu = Math.max(...this.eluSamples);
+        const sorted = [
+            ...this.eluSamples
+        ].sort((a, b)=>a - b);
+        const p90Elu = sorted[Math.floor(sorted.length * 0.9)] ?? maxElu;
+        const durationS = ((performance.now() - this.testStart) / 1000).toFixed(1);
+        let summary = `--- Summary: mean_elu=${mean.toFixed(2)} max_elu=${maxElu.toFixed(2)} p90_elu=${p90Elu.toFixed(2)} duration=${durationS}s`;
+        if (maxElu > 0.85) {
+            summary += ' WARNING:ELU>0.85';
+        }
+        summary += ' ---\n';
+        appendFileSync(this.filePath, summary);
+    }
+}
+function padColumns(...cols) {
+    const widths = [
+        11,
+        7,
+        12,
+        12,
+        12,
+        8
+    ];
+    return cols.map((col, i)=>col.padEnd(widths[i] ?? 10)).join('');
+}