@aztec/end-to-end 4.0.0-nightly.20260112 → 4.0.0-nightly.20260114

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -29,12 +29,7 @@ import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { TestWallet } from '@aztec/test-wallet/server';
 
 import { MNEMONIC } from '../../fixtures/fixtures.js';
-import {
-  type ISnapshotManager,
-  type SubsystemsContext,
-  createSnapshotManager,
-  deployAccounts,
-} from '../../fixtures/snapshot_manager.js';
+import { type SubsystemsContext, deployAccounts, setupFromFresh, teardown } from '../../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
 import { type SetupOptions, setupSponsoredFPC } from '../../fixtures/utils.js';
 import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js';
@@ -45,15 +40,13 @@ import {
 import { ProxyLogger } from './benchmark.js';
 import { type ClientFlowsConfig, FULL_FLOWS_CONFIG, KEY_FLOWS_CONFIG } from './config.js';
 
-const { E2E_DATA_PATH: dataPath, BENCHMARK_CONFIG } = process.env;
+const { BENCHMARK_CONFIG } = process.env;
 
 export type AccountType = 'ecdsar1' | 'schnorr';
 export type FeePaymentMethodGetter = (wallet: Wallet, sender: AztecAddress) => Promise<FeePaymentMethod | undefined>;
 export type BenchmarkingFeePaymentMethod = 'bridged_fee_juice' | 'private_fpc' | 'sponsored_fpc' | 'fee_juice';
 
 export class ClientFlowsBenchmark {
-  private snapshotManager: ISnapshotManager;
-
   public logger: Logger;
   public aztecNode!: AztecNode;
   public cheatCodes!: CheatCodes;
@@ -125,33 +118,32 @@ export class ClientFlowsBenchmark {
   public config: ClientFlowsConfig;
 
   private proxyLogger: ProxyLogger;
+  private setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs>;
 
   constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {}) {
     this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
-    this.snapshotManager = createSnapshotManager(
-      `bench_client_flows${testName ? `/${testName}` : ''}`,
-      dataPath,
-      { startProverNode: true, ...setupOptions },
-      { ...setupOptions },
-    );
+    this.setupOptions = { startProverNode: true, ...setupOptions };
     this.config = BENCHMARK_CONFIG === 'key_flows' ? KEY_FLOWS_CONFIG : FULL_FLOWS_CONFIG;
     ProxyLogger.create();
     this.proxyLogger = ProxyLogger.getInstance();
   }
 
   async setup() {
-    const context = await this.snapshotManager.setup();
-    await context.aztecNode.setConfig({ feeRecipient: this.sequencerAddress, coinbase: this.coinbase });
+    this.logger.info('Setting up subsystems from fresh');
+    this.context = await setupFromFresh(this.logger, this.setupOptions, this.setupOptions);
+    await this.applyBaseSetup();
 
-    const rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
-    this.chainMonitor = new ChainMonitor(rollupContract, context.dateProvider, this.logger, 200).start();
+    await this.context.aztecNode.setConfig({ feeRecipient: this.sequencerAddress, coinbase: this.coinbase });
+
+    const rollupContract = RollupContract.getFromConfig(this.context.aztecNodeConfig);
+    this.chainMonitor = new ChainMonitor(rollupContract, this.context.dateProvider, this.logger, 200).start();
 
     return this;
   }
 
   async teardown() {
     await this.chainMonitor.stop();
-    await this.snapshotManager.teardown();
+    await teardown(this.context);
   }
 
   async mintAndBridgeFeeJuice(address: AztecAddress) {
@@ -193,157 +185,120 @@ export class ClientFlowsBenchmark {
     }
   }
 
-  public async applyBaseSnapshots() {
-    await this.applyInitialAccountsSnapshot();
-    await this.applySetupFeeJuiceSnapshot();
+  public async applyBaseSetup() {
+    await this.applyInitialAccounts();
+    await this.applySetupFeeJuice();
   }
 
-  async applyInitialAccountsSnapshot() {
-    await this.snapshotManager.snapshot(
-      'initial_accounts',
-      deployAccounts(2, this.logger),
-      async (
-        { deployedAccounts: [{ address: adminAddress }, { address: sequencerAddress }] },
-        { wallet, aztecNode, cheatCodes },
-      ) => {
-        this.adminWallet = wallet;
-        this.aztecNode = aztecNode;
-        this.cheatCodes = cheatCodes;
-
-        this.adminAddress = adminAddress;
-        this.sequencerAddress = sequencerAddress;
-
-        const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
-        this.coinbase = EthAddress.random();
-
-        const userPXEConfig = getPXEConfig();
-        const userPXEConfigWithContracts = {
-          ...userPXEConfig,
-          proverEnabled: this.realProofs,
-        } as PXEConfig;
-
-        this.userWallet = await TestWallet.create(this.aztecNode, userPXEConfigWithContracts, {
-          loggers: {
-            prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied'),
-          },
-        });
+  async applyInitialAccounts() {
+    this.logger.info('Applying initial accounts setup');
+    const { deployedAccounts } = await deployAccounts(
+      2,
+      this.logger,
+    )({
+      wallet: this.context.wallet,
+      initialFundedAccounts: this.context.initialFundedAccounts,
+    });
+
+    const [{ address: adminAddress }, { address: sequencerAddress }] = deployedAccounts;
+
+    this.adminWallet = this.context.wallet;
+    this.aztecNode = this.context.aztecNode;
+    this.cheatCodes = this.context.cheatCodes;
+
+    this.adminAddress = adminAddress;
+    this.sequencerAddress = sequencerAddress;
+
+    const canonicalFeeJuice = await getCanonicalFeeJuice();
+    this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
+    this.coinbase = EthAddress.random();
+
+    const userPXEConfig = getPXEConfig();
+    const userPXEConfigWithContracts = {
+      ...userPXEConfig,
+      proverEnabled: this.realProofs,
+    } as PXEConfig;
+
+    this.userWallet = await TestWallet.create(this.aztecNode, userPXEConfigWithContracts, {
+      loggers: {
+        prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied'),
       },
-    );
+    });
   }
 
-  async applySetupFeeJuiceSnapshot() {
-    await this.snapshotManager.snapshot(
-      'setup_fee_juice',
-      async () => {},
-      async (_data, context) => {
-        this.context = context;
-
-        this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
-
-        this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
-          aztecNode: context.aztecNode,
-          aztecNodeAdmin: context.aztecNode,
-          l1Client: context.deployL1ContractsValues.l1Client,
-          wallet: this.adminWallet,
-          logger: this.logger,
-        });
-      },
-    );
+  async applySetupFeeJuice() {
+    this.logger.info('Applying fee juice setup');
+    this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
+
+    this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
+      aztecNode: this.context.aztecNode,
+      aztecNodeAdmin: this.context.aztecNode,
+      l1Client: this.context.deployL1ContractsValues.l1Client,
+      wallet: this.adminWallet,
+      logger: this.logger,
+    });
   }
 
-  async applyDeployBananaTokenSnapshot() {
-    await this.snapshotManager.snapshot(
-      'deploy_banana_token',
-      async () => {
-        const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(
-          this.adminWallet,
-          this.adminAddress,
-          'BC',
-          'BC',
-          18n,
-        )
-          .send({ from: this.adminAddress })
-          .wait();
-        this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
-        return { bananaCoinAddress: bananaCoin.address, bananaCoinInstance };
-      },
-      ({ bananaCoinAddress, bananaCoinInstance }) => {
-        this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.adminWallet);
-        this.bananaCoinInstance = bananaCoinInstance;
-        return Promise.resolve();
-      },
-    );
+  async applyDeployBananaToken() {
+    this.logger.info('Applying banana token deployment');
+    const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(
+      this.adminWallet,
+      this.adminAddress,
+      'BC',
+      'BC',
+      18n,
+    )
+      .send({ from: this.adminAddress })
+      .wait();
+    this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
+    this.bananaCoin = bananaCoin;
+    this.bananaCoinInstance = bananaCoinInstance;
   }
 
-  async applyDeployCandyBarTokenSnapshot() {
-    await this.snapshotManager.snapshot(
-      'deploy_candy_bar_token',
-      async () => {
-        const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TokenContract.deploy(
-          this.adminWallet,
-          this.adminAddress,
-          'CBC',
-          'CBC',
-          18n,
-        )
-          .send({ from: this.adminAddress })
-          .wait();
-        this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
-        return { candyBarCoinAddress: candyBarCoin.address, candyBarCoinInstance };
-      },
-      ({ candyBarCoinAddress, candyBarCoinInstance }) => {
-        this.candyBarCoin = TokenContract.at(candyBarCoinAddress, this.adminWallet);
-        this.candyBarCoinInstance = candyBarCoinInstance;
-        return Promise.resolve();
-      },
-    );
+  async applyDeployCandyBarToken() {
+    this.logger.info('Applying candy bar token deployment');
+    const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TokenContract.deploy(
+      this.adminWallet,
+      this.adminAddress,
+      'CBC',
+      'CBC',
+      18n,
+    )
+      .send({ from: this.adminAddress })
+      .wait();
+    this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
+    this.candyBarCoin = candyBarCoin;
+    this.candyBarCoinInstance = candyBarCoinInstance;
   }
 
-  public async applyFPCSetupSnapshot() {
-    await this.snapshotManager.snapshot(
-      'fpc_setup',
-      async context => {
-        const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+  public async applyFPCSetup() {
+    this.logger.info('Applying FPC setup');
+    const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
+    expect((await this.context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
-        const bananaCoin = this.bananaCoin;
-        const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(
-          this.adminWallet,
-          bananaCoin.address,
-          this.adminAddress,
-        )
-          .send({ from: this.adminAddress })
-          .wait();
+    const bananaCoin = this.bananaCoin;
+    const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(
+      this.adminWallet,
+      bananaCoin.address,
+      this.adminAddress,
+    )
+      .send({ from: this.adminAddress })
+      .wait();
 
-        this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
+    this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
+    await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
 
-        return { bananaFPCAddress: bananaFPC.address, bananaFPCInstance };
-      },
-      data => {
-        this.bananaFPC = FPCContract.at(data.bananaFPCAddress, this.adminWallet);
-        this.bananaFPCInstance = data.bananaFPCInstance;
-        return Promise.resolve();
-      },
-    );
+    this.bananaFPC = bananaFPC;
+    this.bananaFPCInstance = bananaFPCInstance;
   }
 
-  async applyDeploySponsoredFPCSnapshot() {
-    await this.snapshotManager.snapshot(
-      'deploy_sponsored_fpc',
-      async () => {
-        const sponsoredFPCInstance = await setupSponsoredFPC(this.adminWallet);
-        this.logger.info(`SponsoredFPC at ${sponsoredFPCInstance.address}`);
-        return { sponsoredFPCAddress: sponsoredFPCInstance.address, sponsoredFPCInstance };
-      },
-      ({ sponsoredFPCAddress, sponsoredFPCInstance }) => {
-        this.sponsoredFPC = SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
-        this.sponsoredFPCInstance = sponsoredFPCInstance;
-        return Promise.resolve();
-      },
-    );
+  async applyDeploySponsoredFPC() {
+    this.logger.info('Applying sponsored FPC deployment');
+    const sponsoredFPCInstance = await setupSponsoredFPC(this.adminWallet);
+    this.logger.info(`SponsoredFPC at ${sponsoredFPCInstance.address}`);
+    this.sponsoredFPC = SponsoredFPCContract.at(sponsoredFPCInstance.address, this.adminWallet);
+    this.sponsoredFPCInstance = sponsoredFPCInstance;
   }
 
   public async createCrossChainTestHarness(owner: AztecAddress) {
@@ -391,44 +346,31 @@ export class ClientFlowsBenchmark {
     return accountManager.address;
   }
 
-  public async applyDeployAmmSnapshot() {
-    await this.snapshotManager.snapshot(
-      'deploy_amm',
-      async () => {
-        const { contract: liquidityToken, instance: liquidityTokenInstance } = await TokenContract.deploy(
-          this.adminWallet,
-          this.adminAddress,
-          'LPT',
-          'LPT',
-          18n,
-        )
-          .send({ from: this.adminAddress })
-          .wait();
-        const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
-          this.adminWallet,
-          this.bananaCoin.address,
-          this.candyBarCoin.address,
-          liquidityToken.address,
-        )
-          .send({ from: this.adminAddress })
-          .wait();
-        this.logger.info(`AMM deployed at ${amm.address}`);
-        await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
-        return {
-          ammAddress: amm.address,
-          ammInstance,
-          liquidityTokenAddress: liquidityToken.address,
-          liquidityTokenInstance,
-        };
-      },
-      ({ ammAddress, ammInstance, liquidityTokenAddress, liquidityTokenInstance }) => {
-        this.liquidityToken = TokenContract.at(liquidityTokenAddress, this.adminWallet);
-        this.liquidityTokenInstance = liquidityTokenInstance;
-        this.amm = AMMContract.at(ammAddress, this.adminWallet);
-        this.ammInstance = ammInstance;
-        return Promise.resolve();
-      },
-    );
+  public async applyDeployAmm() {
+    this.logger.info('Applying AMM deployment');
+    const { contract: liquidityToken, instance: liquidityTokenInstance } = await TokenContract.deploy(
+      this.adminWallet,
+      this.adminAddress,
+      'LPT',
+      'LPT',
+      18n,
+    )
+      .send({ from: this.adminAddress })
+      .wait();
+    const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
+      this.adminWallet,
+      this.bananaCoin.address,
+      this.candyBarCoin.address,
+      liquidityToken.address,
+    )
+      .send({ from: this.adminAddress })
+      .wait();
+    this.logger.info(`AMM deployed at ${amm.address}`);
+    await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
+    this.liquidityToken = liquidityToken;
+    this.liquidityTokenInstance = liquidityTokenInstance;
+    this.amm = amm;
+    this.ammInstance = ammInstance;
   }
 
   public async getBridgedFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress) {