@aztec/end-to-end 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

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 = await 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 = await 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

@@ -4,13 +4,13 @@ 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 { 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 { 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,44 +18,38 @@ 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;
     provenAsset: TokenContract;
-    private context;
+    context: EndToEndContext;
     private proverNode;
     private simulatedProverNode;
-    l1Contracts: DeployL1ContractsReturnType;
+    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=e2e_prover_test.d.ts.map
+//# 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;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,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

@@ -2,7 +2,8 @@ import { createArchiver } from '@aztec/archiver';
 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 { createBlobClientWithFileStores } from '@aztec/blob-client/client';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { SecretValue } from '@aztec/foundation/config';
 import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
@@ -14,33 +15,28 @@ 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;
@@ -50,65 +46,67 @@ 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,
-            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],
+            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, blobSink: this.blobSink } = this.context);
-        this.aztecNodeAdmin = this.context.aztecNode;
-        const blobSinkClient = createBlobSinkClient({
-            blobSinkUrl: `http://localhost:${this.blobSink.port}`
-        });
+        ({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
+        this.aztecNodeAdmin = this.context.aztecNodeService;
+        const config = this.context.aztecNodeConfig;
+        const blobClient = await createBlobClientWithFileStores(config, this.logger);
         // Configure a full prover PXE
         let acvmConfig;
         let bbConfig;
@@ -122,9 +120,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`);
-            }
+            await Barretenberg.initSingleton({
+                backend: BackendType.NativeUnixSocket
+            });
             const verifier = await BBCircuitVerifier.new(bbConfig);
             this.circuitProofVerifier = new QueuedIVCVerifier(bbConfig, verifier);
             this.logger.debug(`Configuring the node for real proofs...`);
@@ -145,17 +143,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
+            proverEnabled: this.realProofs
         }, undefined, true);
         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
@@ -172,7 +168,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             ...this.context.aztecNodeConfig,
             dataDirectory: undefined
         }, {
-            blobSinkClient
+            blobClient,
+            dateProvider: this.context.dateProvider
         }, {
             blockUntilSync: true
         });
@@ -207,13 +204,14 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
         this.proverNode = await createProverNode(proverConfig, {
             aztecNodeTxProvider: this.aztecNode,
-            archiver: archiver,
-            blobSinkClient
+            archiver: archiver
         }, {
             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) {
@@ -232,55 +230,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();
+        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);
     }
 }

package/dest/fixtures/fixtures.d.ts

@@ -1,7 +1,7 @@
 export declare const METRICS_PORT = 4318;
 export declare const shouldCollectMetrics: () => 4318 | undefined;
 export declare const TEST_PEER_CHECK_INTERVAL_MS = 1000;
-export declare const TEST_MAX_TX_POOL_SIZE: number;
+export declare const TEST_MAX_PENDING_TX_POOL_COUNT = 10000;
 export declare const MNEMONIC = "test test test test test test test test test test test junk";
 export declare const privateKey: Buffer<ArrayBuffer>;
 export declare const privateKey2: Buffer<ArrayBuffer>;
@@ -12,5 +12,4 @@ export declare const DUPLICATE_NULLIFIER_ERROR: RegExp;
 export declare const NO_L1_TO_L2_MSG_ERROR: RegExp;
 export declare const STATIC_CALL_STATE_MODIFICATION_ERROR: RegExp;
 export declare const STATIC_CONTEXT_ASSERTION_ERROR: RegExp;
-export declare const DEFAULT_BLOB_SINK_PORT = "5052";
-//# sourceMappingURL=fixtures.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFPLE1BQU0sWUFBWSxPQUFPLENBQUM7QUFFakMsZUFBTyxNQUFNLG9CQUFvQix3QkFLaEMsQ0FBQztBQUVGLGVBQU8sTUFBTSwyQkFBMkIsT0FBTyxDQUFDO0FBQ2hELGVBQU8sTUFBTSw4QkFBOEIsUUFBUyxDQUFDO0FBRXJELGVBQU8sTUFBTSxRQUFRLGdFQUFnRSxDQUFDO0FBQ3RGLGVBQU8sTUFBTSxVQUFVLHFCQUF5RixDQUFDO0FBQ2pILGVBQU8sTUFBTSxXQUFXLHFCQUF5RixDQUFDO0FBR2xILGVBQU8sTUFBTSxvQkFBb0Isd0RBQXdELENBQUM7QUFDMUYsZUFBTyxNQUFNLG1CQUFtQixtREFBbUQsQ0FBQztBQUNwRixlQUFPLE1BQU0scUJBQXFCLCtFQUErRSxDQUFDO0FBRWxILGVBQU8sTUFBTSx5QkFBeUIsUUFBZ0MsQ0FBQztBQUN2RSxlQUFPLE1BQU0scUJBQXFCLFFBQ3dFLENBQUM7QUFDM0csZUFBTyxNQUFNLG9DQUFvQyxRQUEwQyxDQUFDO0FBQzVGLGVBQU8sTUFBTSw4QkFBOEIsUUFBa0UsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,qBAAqB,QAAyB,CAAC;AAE5D,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,qBAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,qBAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,wDAAwD,CAAC;AAC1F,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AACpF,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAC+B,CAAC;AACjF,eAAO,MAAM,8BAA8B,QAAkE,CAAC;AAE9G,eAAO,MAAM,sBAAsB,SAAS,CAAC"}
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,8BAA8B,QAAS,CAAC;AAErD,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,qBAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,qBAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,wDAAwD,CAAC;AAC1F,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AACpF,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAA0C,CAAC;AAC5F,eAAO,MAAM,8BAA8B,QAAkE,CAAC"}