@aztec/end-to-end 0.0.1-commit.1142ef1 → 0.0.1-commit.1bea0213

package/dest/e2e_p2p/shared.js

@@ -1,6 +1,5 @@
-import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { NO_WAIT, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
-import { TxStatus } from '@aztec/aztec.js/tx';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { timesAsync, unique } from '@aztec/foundation/collection';
 import { retryUntil } from '@aztec/foundation/retry';
@@ -16,18 +15,13 @@ export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opt
     const seed = 1234n;
     const spamCount = 15;
     for(let i = 0; i < numTxs; i++){
-        const tx = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic).send({
-            from
+        const method = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic);
+        const txHash = await method.send({
+            from,
+            wait: NO_WAIT
         });
-        const txHash = await tx.getTxHash();
         logger.info(`Tx sent with hash ${txHash.toString()}`);
-        const receipt = await tx.getReceipt();
-        expect(receipt).toEqual(expect.objectContaining({
-            status: TxStatus.PENDING,
-            error: ''
-        }));
-        logger.info(`Receipt received for ${txHash.toString()}`);
-        txs.push(tx);
+        txs.push(txHash);
     }
     return txs;
 };
@@ -63,8 +57,7 @@ export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
         const tx = await proveInteraction(wallet, contract.methods.emit_nullifier(Fr.random()), {
             from: fundedAccountManager.address
         });
-        const txHash = tx.getTxHash();
-        logger.info(`Tx prepared with hash ${txHash}`);
+        logger.info(`Tx prepared with hash ${tx.getTxHash()}`);
         return tx;
     });
 }

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -4,14 +4,15 @@ import type { AztecNode } from '@aztec/aztec.js/node';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import type { TestWallet } from '@aztec/test-wallet/server';
-import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import { type EndToEndContext } from '../fixtures/setup.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 export declare class TokenContractTest {
     static TOKEN_NAME: string;
     static TOKEN_SYMBOL: string;
     static TOKEN_DECIMALS: bigint;
-    private snapshotManager;
+    context: EndToEndContext;
     logger: Logger;
+    metricsPort?: number;
     asset: TokenContract;
     tokenSim: TokenSimulator;
     node: AztecNode;
@@ -20,16 +21,22 @@ export declare class TokenContractTest {
     adminAddress: AztecAddress;
     account1Address: AztecAddress;
     account2Address: AztecAddress;
+    private shouldApplyBaseSetup;
+    private shouldApplyMint;
     constructor(testName: string);
     /**
-     * Adds two state shifts to snapshot manager.
-     * 1. Add 3 accounts.
-     * 2. Publicly deploy accounts, deploy token contract and a "bad account".
+     * Registers that base setup should be applied during setup().
+     * Call this before setup() to deploy 3 accounts, publicly deploy accounts, token contract and a "bad account".
      */
-    applyBaseSnapshots(): Promise<void>;
+    applyBaseSnapshots(): void;
+    /**
+     * Registers that mint should be applied during setup().
+     * Call this before setup() to mint tokens to the admin account.
+     */
+    applyMintSnapshot(): void;
+    private applyBaseSetup;
     setup(): Promise<void>;
-    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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFFTCxLQUFLLGlCQUFpQixFQUl2QixNQUFNLGlDQUFpQyxDQUFDO0FBRXpDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUlsRSxxQkFBYSxpQkFBaUI7SUFDNUIsTUFBTSxDQUFDLFVBQVUsU0FBVTtJQUMzQixNQUFNLENBQUMsWUFBWSxTQUFTO0lBQzVCLE1BQU0sQ0FBQyxjQUFjLFNBQU87SUFDNUIsT0FBTyxDQUFDLGVBQWUsQ0FBbUI7SUFDMUMsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLEtBQUssRUFBRyxhQUFhLENBQUM7SUFDdEIsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixJQUFJLEVBQUcsU0FBUyxDQUFDO0lBRWpCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsZUFBZSxFQUFHLFlBQVksQ0FBQztJQUMvQixlQUFlLEVBQUcsWUFBWSxDQUFDO0lBRS9CLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFLM0I7SUFFRDs7OztPQUlHO0lBQ0csa0JBQWtCLGtCQWdFdkI7SUFFSyxLQUFLLGtCQUVWO0lBRUQsUUFBUSxHQUFJLENBQUMsOEpBSTJEO0lBRWxFLFFBQVEsa0JBRWI7SUFFSyxpQkFBaUIsa0JBb0N0QjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUVuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFJbEUscUJBQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixLQUFLLEVBQUcsYUFBYSxDQUFDO0lBQ3RCLFFBQVEsRUFBRyxjQUFjLENBQUM7SUFDMUIsSUFBSSxFQUFHLFNBQVMsQ0FBQztJQUVqQixVQUFVLEVBQUcsc0JBQXNCLENBQUM7SUFDcEMsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLGVBQWUsRUFBRyxZQUFZLENBQUM7SUFDL0IsZUFBZSxFQUFHLFlBQVksQ0FBQztJQUUvQixPQUFPLENBQUMsb0JBQW9CLENBQVM7SUFDckMsT0FBTyxDQUFDLGVBQWUsQ0FBUztJQUVoQyxZQUFZLFFBQVEsRUFBRSxNQUFNLEVBRzNCO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtCLFNBRWpCO0lBRUQ7OztPQUdHO0lBQ0gsaUJBQWlCLFNBRWhCO1lBS2EsY0FBYztJQTZDdEIsS0FBSyxrQkFjVjtJQUVLLFFBQVEsa0JBRWI7WUFFYSxTQUFTO0NBMkJ4QiJ9

package/dest/e2e_token_contract/token_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,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,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;IAE/B,YAAY,QAAQ,EAAE,MAAM,EAK3B;IAED;;;;OAIG;IACG,kBAAkB,kBAgEvB;IAEK,KAAK,kBAEV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,iBAAiB,kBAoCtB;CACF"}
+{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,eAAe,CAAS;IAEhC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAED;;;OAGG;IACH,kBAAkB,SAEjB;IAED;;;OAGG;IACH,iBAAiB,SAEhB;YAKa,cAAc;IA6CtB,KAAK,kBAcV;IAEK,QAAQ,kBAEb;YAEa,SAAS;CA2BxB"}

package/dest/e2e_token_contract/token_contract_test.js

@@ -2,16 +2,17 @@ import { createLogger } from '@aztec/aztec.js/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { jest } from '@jest/globals';
-import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
+import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
-const { E2E_DATA_PATH: dataPath, METRICS_PORT: metricsPort } = process.env;
+const { METRICS_PORT: metricsPort } = process.env;
 export class TokenContractTest {
     static TOKEN_NAME = 'USDC';
     static TOKEN_SYMBOL = 'USD';
     static TOKEN_DECIMALS = 18n;
-    snapshotManager;
+    context;
     logger;
+    metricsPort;
     asset;
     tokenSim;
     node;
@@ -20,107 +21,104 @@ export class TokenContractTest {
     adminAddress;
     account1Address;
     account2Address;
+    shouldApplyBaseSetup = false;
+    shouldApplyMint = false;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
-        this.snapshotManager = createSnapshotManager(`e2e_token_contract/${testName}`, dataPath, {
-            metricsPort: metricsPort ? parseInt(metricsPort) : undefined
-        });
+        this.metricsPort = metricsPort ? parseInt(metricsPort) : undefined;
+    }
+    /**
+   * Registers that base setup should be applied during setup().
+   * Call this before setup() to deploy 3 accounts, publicly deploy accounts, token contract and a "bad account".
+   */ applyBaseSnapshots() {
+        this.shouldApplyBaseSetup = true;
+    }
+    /**
+   * Registers that mint should be applied during setup().
+   * Call this before setup() to mint tokens to the admin account.
+   */ applyMintSnapshot() {
+        this.shouldApplyMint = true;
     }
     /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 3 accounts.
-   * 2. Publicly deploy accounts, deploy token contract and a "bad account".
-   */ async applyBaseSnapshots() {
+   * Applies base setup: deploys 3 accounts, publicly deploys accounts, token contract and a "bad account".
+   */ async applyBaseSetup() {
         // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
         jest.setTimeout(120_000);
-        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { wallet, aztecNode })=>{
-            this.node = aztecNode;
-            this.wallet = wallet;
-            [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
-            return Promise.resolve();
+        this.logger.info('Applying base setup - deploying 3 accounts');
+        const { deployedAccounts } = await deployAccounts(3, this.logger)({
+            wallet: this.context.wallet,
+            initialFundedAccounts: this.context.initialFundedAccounts
         });
-        await this.snapshotManager.snapshot('e2e_token_contract', async ()=>{
-            // Create the token contract state.
-            // Move this account thing to addAccounts above?
-            this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallet, [
-                this.adminAddress,
-                this.account1Address
-            ]);
-            this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
-                from: this.adminAddress
-            }).deployed();
-            this.logger.verbose(`Token deployed to ${asset.address}`);
-            this.logger.verbose(`Deploying bad account...`);
-            this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
-                from: this.adminAddress
-            }).deployed();
-            this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
-            return {
-                tokenContractAddress: asset.address,
-                badAccountAddress: this.badAccount.address
-            };
-        }, async ({ tokenContractAddress, badAccountAddress })=>{
-            // Restore the token contract state.
-            this.asset = TokenContract.at(tokenContractAddress, this.wallet);
-            this.logger.verbose(`Token contract address: ${this.asset.address}`);
-            this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
-                this.adminAddress,
-                this.account1Address
-            ]);
-            this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
-            this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
-            expect(await this.asset.methods.get_admin().simulate({
-                from: this.adminAddress
-            })).toBe(this.adminAddress.toBigInt());
+        this.node = this.context.aztecNodeService;
+        this.wallet = this.context.wallet;
+        [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
+        this.logger.info('Applying base setup - deploying token contract');
+        this.logger.verbose(`Public deploy accounts...`);
+        await publicDeployAccounts(this.wallet, [
+            this.adminAddress,
+            this.account1Address
+        ]);
+        this.logger.verbose(`Deploying TokenContract...`);
+        this.asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
+            from: this.adminAddress
         });
-    // TokenContract.artifact.functions.forEach(fn => {
-    //   const sig = decodeFunctionSignature(fn.name, fn.parameters);
-    //   logger.verbose(`Function ${sig} and the selector: ${FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)}`);
-    // });
+        this.logger.verbose(`Token deployed to ${this.asset.address}`);
+        this.logger.verbose(`Deploying bad account...`);
+        this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
+            from: this.adminAddress
+        });
+        this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
+        this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
+            this.adminAddress,
+            this.account1Address
+        ]);
+        expect(await this.asset.methods.get_admin().simulate({
+            from: this.adminAddress
+        })).toBe(this.adminAddress.toBigInt());
     }
     async setup() {
-        await this.snapshotManager.setup();
+        this.context = await setup(0, {
+            metricsPort: this.metricsPort,
+            fundSponsoredFPC: true,
+            skipAccountDeployment: true
+        });
+        if (this.shouldApplyBaseSetup) {
+            await this.applyBaseSetup();
+        }
+        if (this.shouldApplyMint) {
+            await this.applyMint();
+        }
     }
-    snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
     async teardown() {
-        await this.snapshotManager.teardown();
+        await teardown(this.context);
     }
-    async applyMintSnapshot() {
-        await this.snapshotManager.snapshot('mint', async ()=>{
-            const { asset, adminAddress } = this;
-            const amount = 10000n;
-            this.logger.verbose(`Minting ${amount} publicly...`);
-            await asset.methods.mint_to_public(adminAddress, amount).send({
-                from: adminAddress
-            }).wait();
-            this.logger.verbose(`Minting ${amount} privately...`);
-            await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
-            this.logger.verbose(`Minting complete.`);
-            return {
-                amount
-            };
-        }, async ({ amount })=>{
-            const { asset, adminAddress, tokenSim } = this;
-            tokenSim.mintPublic(adminAddress, amount);
-            const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
-                from: adminAddress
-            });
-            this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
-            expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
-            tokenSim.mintPrivate(adminAddress, amount);
-            const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
-                from: adminAddress
-            });
-            this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
-            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
-            const totalSupply = await asset.methods.total_supply().simulate({
-                from: adminAddress
-            });
-            this.logger.verbose(`Total supply: ${totalSupply}`);
-            expect(totalSupply).toEqual(tokenSim.totalSupply);
-            return Promise.resolve();
+    async applyMint() {
+        this.logger.info('Applying mint setup');
+        const { asset, adminAddress, tokenSim } = this;
+        const amount = 10000n;
+        this.logger.verbose(`Minting ${amount} publicly...`);
+        await asset.methods.mint_to_public(adminAddress, amount).send({
+            from: adminAddress
+        });
+        tokenSim.mintPublic(adminAddress, amount);
+        const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
+            from: adminAddress
+        });
+        this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
+        expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
+        this.logger.verbose(`Minting ${amount} privately...`);
+        await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
+        tokenSim.mintPrivate(adminAddress, amount);
+        const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
+            from: adminAddress
+        });
+        this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
+        expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
+        const totalSupply = await asset.methods.total_supply().simulate({
+            from: adminAddress
         });
+        this.logger.verbose(`Total supply: ${totalSupply}`);
+        expect(totalSupply).toEqual(tokenSim.totalSupply);
+        this.logger.verbose(`Minting complete.`);
     }
 }

package/dest/fixtures/e2e_prover_test.d.ts

@@ -10,7 +10,7 @@ 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 { type EndToEndContext } 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,12 +18,9 @@ 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;
@@ -40,22 +37,19 @@ export declare class FullProverTest {
     private acvmConfigCleanup?;
     circuitProofVerifier?: ClientProtocolCircuitVerifier;
     provenAsset: TokenContract;
-    private context;
+    context: EndToEndContext;
     private proverNode;
     private simulatedProverNode;
     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>;
+    private applyBaseSetup;
     setup(): 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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBTXZELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUdsRSxPQUFPLEVBRUwsS0FBSyxpQkFBaUIsRUFJdkIsTUFBTSx1QkFBdUIsQ0FBQztBQVUvQjs7Ozs7R0FLRztBQUVILHFCQUFhLGNBQWM7SUE2QnZCLE9BQU8sQ0FBQyxzQkFBc0I7SUFFOUIsT0FBTyxDQUFDLFVBQVU7SUE5QnBCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxVQUFVLENBQUM7SUFDMUIsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFNO0lBQzlCLGdCQUFnQixFQUFHLGtCQUFrQixFQUFFLENBQUM7SUFDeEMsZUFBZSxFQUFHLGFBQWEsQ0FBQztJQUNoQyx1QkFBdUIsRUFBRywyQkFBMkIsQ0FBQztJQUN0RCxRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBcUI7SUFDN0MsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFzQjtJQUM5QyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBc0I7SUFDaEQsb0JBQW9CLENBQUMsRUFBRSw2QkFBNkIsQ0FBQztJQUNyRCxXQUFXLEVBQUcsYUFBYSxDQUFDO0lBQzVCLE9BQU8sQ0FBQyxPQUFPLENBQXFCO0lBQ3BDLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBRWxDLFlBQ0UsUUFBUSxFQUFFLE1BQU0sRUFDUixzQkFBc0IsRUFBRSxNQUFNLEVBQ3RDLFFBQVEsRUFBRSxVQUFVLEVBQ1osVUFBVSxVQUFPLEVBVzFCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkFxRHZCO0lBRUssS0FBSyxrQkFvSVY7WUFFYSxZQUFZO0lBUzFCLFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQWNiO0lBRUssaUJBQWlCLGtCQTZDdEI7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBTXZELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUdsRSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBUXJCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELG9CQUFvQixDQUFDLEVBQUUsNkJBQTZCLENBQUM7SUFDckQsV0FBVyxFQUFHLGFBQWEsQ0FBQztJQUM1QixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBUztJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUFhO0lBQzdCLE9BQU8sQ0FBQyxVQUFVLENBQVU7SUFFNUIsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFVBQVUsVUFBTyxFQUtwRztZQUthLGNBQWM7SUFxQ3RCLEtBQUssa0JBZ0pWO1lBRWEsWUFBWTtJQVNwQixRQUFRLGtCQWNiO1lBRWEsU0FBUztDQWtDeEIifQ==

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;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,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,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,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,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAElC,YACE,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO,EAW1B;IAED;;;;OAIG;IACG,kBAAkB,kBAqDvB;IAEK,KAAK,kBAoIV;YAEa,YAAY;IAS1B,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAcb;IAEK,iBAAiB,kBA6CtB;CACF"}
+{"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;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,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,EACL,KAAK,eAAe,EAQrB,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,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,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,kBAgJV;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAkCxB"}

package/dest/fixtures/e2e_prover_test.js

@@ -15,25 +15,20 @@ 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;
@@ -41,7 +36,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     aztecNode;
     aztecNodeAdmin;
     cheatCodes;
-    provenComponents;
+    provenComponents = [];
     bbConfigCleanup;
     acvmConfigCleanup;
     circuitProofVerifier;
@@ -51,63 +46,65 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     simulatedProverNode;
     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,
-            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 { 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]
-            }).wait();
-            this.logger.verbose(`Token deployed to ${asset.address}`);
-            return {
-                tokenContractAddress: asset.address,
-                tokenContractInstance: instance
-            };
-        }, async ({ tokenContractAddress, tokenContractInstance })=>{
-            // Restore the token contract state.
-            this.fakeProofsAsset = TokenContract.at(tokenContractAddress, this.wallet);
-            this.fakeProofsAssetInstance = tokenContractInstance;
-            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],
+            wait: {
+                returnReceipt: true
+            }
         });
+        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]
+        })).toBe(this.accounts[0].toBigInt());
     }
     async setup() {
-        this.context = await this.snapshotManager.setup();
+        this.logger.info('Setting up subsystems from fresh');
+        this.context = await setup(0, {
+            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 } = this.context);
-        this.aztecNodeAdmin = this.context.aztecNode;
+        this.aztecNodeAdmin = this.context.aztecNodeService;
         const config = this.context.aztecNodeConfig;
         const blobClient = await createBlobClientWithFileStores(config, this.logger);
         // Configure a full prover PXE
@@ -212,7 +209,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             prefilledPublicData
         });
         await this.proverNode.start();
-        this.logger.warn(`Proofs are now enabled`);
+        this.logger.warn(`Proofs are now enabled`, {
+            realProofs: this.realProofs
+        });
         return this;
     }
     async mintFeeJuice(recipient) {
@@ -231,9 +230,7 @@ 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();
@@ -243,44 +240,39 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         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 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 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 totalSupply = await fakeProofsAsset.methods.total_supply().simulate({
+            from: address
         });
+        this.logger.verbose(`Total supply: ${totalSupply}`);
+        expect(totalSupply).toEqual(tokenSim.totalSupply);
     }
 }