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

package/src/e2e_fees/fees_test.ts

@@ -26,25 +26,19 @@ import { getContract } from 'viem';
 
 import { MNEMONIC } from '../fixtures/fixtures.js';
 import {
-  type ISnapshotManager,
-  type SubsystemsContext,
-  createSnapshotManager,
+  type EndToEndContext,
+  type SetupOptions,
   deployAccounts,
-} from '../fixtures/snapshot_manager.js';
+  publicDeployAccounts,
+  setup,
+  teardown,
+} from '../fixtures/setup.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import {
-  type BalancesFn,
-  type SetupOptions,
-  ensureAccountContractsPublished,
-  getBalancesFn,
-  setupSponsoredFPC,
-} from '../fixtures/utils.js';
+import { type BalancesFn, getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
 import { FeeJuicePortalTestingHarnessFactory, type GasBridgingTestHarness } from '../shared/gas_portal_test_harness.js';
 
-const { E2E_DATA_PATH: dataPath } = process.env;
-
 /**
- * Test fixture for testing fees. Provides the following snapshots:
+ * Test fixture for testing fees. Provides the following setup steps:
  * InitialAccounts: Initializes 3 Schnorr account contracts.
  * PublicDeployAccounts: Deploys the accounts publicly.
  * DeployFeeJuice: Deploys the Fee Juice contract.
@@ -54,8 +48,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
  * SetupSubscription: Deploys a counter contract and a subscription contract, and mints Fee Juice to the subscription contract.
  */
 export class FeesTest {
-  private snapshotManager: ISnapshotManager;
   private accounts: AztecAddress[] = [];
+  public context!: EndToEndContext;
 
   public logger: Logger;
   public aztecNode!: AztecNode;
@@ -82,7 +76,6 @@ export class FeesTest {
   public subscriptionContract!: AppSubscriptionContract;
   public feeJuiceBridgeTestHarness!: GasBridgingTestHarness;
 
-  public context!: SubsystemsContext;
   public chainMonitor!: ChainMonitor;
 
   public getCoinbaseBalance!: () => Promise<bigint>;
@@ -99,7 +92,7 @@ export class FeesTest {
   constructor(
     testName: string,
     private numberOfAccounts = 3,
-    setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {},
+    private setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {},
   ) {
     if (!numberOfAccounts) {
       throw new Error('There must be at least 1 initial account.');
@@ -107,30 +100,33 @@ export class FeesTest {
     setupOptions.coinbase ??= EthAddress.random();
     this.coinbase = setupOptions.coinbase!;
     this.logger = createLogger(`e2e:e2e_fees:${testName}`);
-    this.snapshotManager = createSnapshotManager(
-      `e2e_fees/${testName}-${numberOfAccounts}`,
-      dataPath,
-      { startProverNode: true, ...setupOptions },
-      { ...setupOptions },
-    );
   }
 
   async setup() {
-    const context = await this.snapshotManager.setup();
+    this.logger.verbose('Setting up fresh context...');
+    this.context = await setup(0, {
+      startProverNode: true,
+      ...this.setupOptions,
+      fundSponsoredFPC: true,
+      skipAccountDeployment: true,
+      l1ContractsArgs: { ...this.setupOptions },
+    });
 
-    this.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
-    this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
+    this.rollupContract = RollupContract.getFromConfig(this.context.config);
+    this.chainMonitor = new ChainMonitor(this.rollupContract, this.context.dateProvider!, this.logger, 200).start();
+
+    await this.applyBaseSetup();
 
     return this;
   }
 
   async teardown() {
     await this.chainMonitor.stop();
-    await this.snapshotManager.teardown();
+    await teardown(this.context);
   }
 
   setIsMarkingAsProven(b: boolean) {
-    this.context.watcher.setIsMarkingAsProven(b);
+    this.context.watcher!.setIsMarkingAsProven(b);
   }
 
   async catchUpProvenChain() {
@@ -144,9 +140,7 @@ export class FeesTest {
     const blockReward = await this.rollupContract.getCheckpointReward();
     const rewardConfig = await this.rollupContract.getRewardConfig();
 
-    const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
-      EthAddress.fromString(rewardConfig.rewardDistributor),
-    );
+    const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(rewardConfig.rewardDistributor);
 
     const toDistribute = balance > blockReward ? blockReward : balance;
     const sequencerBlockRewards = (toDistribute * BigInt(rewardConfig.sequencerBps)) / 10000n;
@@ -158,10 +152,7 @@ export class FeesTest {
   async mintAndBridgeFeeJuice(minter: AztecAddress, recipient: AztecAddress) {
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(recipient);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await this.feeJuiceContract.methods
-      .claim(recipient, claim.claimAmount, secret, index)
-      .send({ from: minter })
-      .wait();
+    await this.feeJuiceContract.methods.claim(recipient, claim.claimAmount, secret, index).send({ from: minter });
   }
 
   /** Alice mints bananaCoin tokens privately to the target address and redeems them. */
@@ -178,210 +169,171 @@ export class FeesTest {
     expect(balanceAfter).toEqual(balanceBefore + amount);
   }
 
-  public async applyBaseSnapshots() {
-    await this.applyInitialAccountsSnapshot();
-    await this.applyPublicDeployAccountsSnapshot();
-    await this.applySetupFeeJuiceSnapshot();
-    await this.applyDeployBananaTokenSnapshot();
+  public async applyBaseSetup() {
+    await this.applyInitialAccounts();
+    await this.applyPublicDeployAccounts();
+    await this.applySetupFeeJuice();
+    await this.applyDeployBananaToken();
   }
 
-  async applyInitialAccountsSnapshot() {
-    await this.snapshotManager.snapshot(
-      'initial_accounts',
-      deployAccounts(this.numberOfAccounts, this.logger),
-      async ({ deployedAccounts }, { wallet, aztecNode, cheatCodes }) => {
-        this.wallet = wallet;
-        this.aztecNode = aztecNode;
-        this.aztecNodeAdmin = aztecNode;
-        this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2) });
-        this.cheatCodes = cheatCodes;
-        this.accounts = deployedAccounts.map(a => a.address);
-        this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
-        [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
-
-        // We set Alice as the FPC admin to avoid the need for deployment of another account.
-        this.fpcAdmin = this.aliceAddress;
-
-        const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
-      },
-    );
+  async applyInitialAccounts() {
+    this.logger.info('Applying initial accounts setup');
+
+    const { deployedAccounts } = await deployAccounts(
+      this.numberOfAccounts,
+      this.logger,
+    )({
+      wallet: this.context.wallet,
+      initialFundedAccounts: this.context.initialFundedAccounts,
+    });
+
+    this.wallet = this.context.wallet;
+    this.aztecNode = this.context.aztecNodeService!;
+    this.aztecNodeAdmin = this.context.aztecNodeService!;
+    this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentMinFees()).mul(2) });
+    this.cheatCodes = this.context.cheatCodes;
+    this.accounts = deployedAccounts.map(a => a.address);
+    this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
+    [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
+
+    // We set Alice as the FPC admin to avoid the need for deployment of another account.
+    this.fpcAdmin = this.aliceAddress;
+
+    const canonicalFeeJuice = await getCanonicalFeeJuice();
+    this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
   }
 
-  async applyPublicDeployAccountsSnapshot() {
-    await this.snapshotManager.snapshot('public_deploy_accounts', () =>
-      ensureAccountContractsPublished(this.wallet, this.accounts),
-    );
+  async applyPublicDeployAccounts() {
+    this.logger.info('Applying public deploy accounts setup');
+    await publicDeployAccounts(this.wallet, this.accounts);
   }
 
-  async applySetupFeeJuiceSnapshot() {
-    await this.snapshotManager.snapshot(
-      'setup_fee_juice',
-      async () => {},
-      async (_data, context) => {
-        this.context = context;
-
-        this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
-
-        this.getGasBalanceFn = getBalancesFn(
-          '⛽',
-          this.feeJuiceContract.methods.balance_of_public,
-          this.aliceAddress,
-          this.logger,
-        );
-
-        this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
-          aztecNode: context.aztecNode,
-          aztecNodeAdmin: context.aztecNode,
-          l1Client: context.deployL1ContractsValues.l1Client,
-          wallet: this.wallet,
-          logger: this.logger,
-        });
-      },
+  async applySetupFeeJuice() {
+    this.logger.info('Applying fee juice setup');
+
+    this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
+
+    this.getGasBalanceFn = getBalancesFn(
+      '⛽',
+      this.feeJuiceContract.methods.balance_of_public,
+      this.aliceAddress,
+      this.logger,
     );
+
+    this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
+      aztecNode: this.context.aztecNodeService!,
+      aztecNodeAdmin: this.context.aztecNodeService!,
+      l1Client: this.context.deployL1ContractsValues.l1Client,
+      wallet: this.wallet,
+      logger: this.logger,
+    });
   }
 
-  async applyDeployBananaTokenSnapshot() {
-    await this.snapshotManager.snapshot(
-      'deploy_banana_token',
-      async () => {
-        const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n)
-          .send({ from: this.aliceAddress })
-          .deployed();
-        this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
-        return { bananaCoinAddress: bananaCoin.address };
-      },
-      ({ bananaCoinAddress }) => {
-        this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.wallet);
-        const logger = this.logger;
-        this.getBananaPublicBalanceFn = getBalancesFn(
-          '🍌.public',
-          this.bananaCoin.methods.balance_of_public,
-          this.aliceAddress,
-          logger,
-        );
-        this.getBananaPrivateBalanceFn = getBalancesFn(
-          '🍌.private',
-          this.bananaCoin.methods.balance_of_private,
-          this.aliceAddress,
-          logger,
-        );
-        return Promise.resolve();
-      },
+  async applyDeployBananaToken() {
+    this.logger.info('Applying deploy banana token setup');
+
+    const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n).send({
+      from: this.aliceAddress,
+    });
+    this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
+
+    this.bananaCoin = bananaCoin;
+    this.getBananaPublicBalanceFn = getBalancesFn(
+      '🍌.public',
+      this.bananaCoin.methods.balance_of_public,
+      this.aliceAddress,
+      this.logger,
+    );
+    this.getBananaPrivateBalanceFn = getBalancesFn(
+      '🍌.private',
+      this.bananaCoin.methods.balance_of_private,
+      this.aliceAddress,
+      this.logger,
     );
   }
 
-  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);
-
-        const bananaCoin = this.bananaCoin;
-        const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin)
-          .send({ from: this.aliceAddress })
-          .deployed();
-
-        this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
-
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.aliceAddress);
-
-        return {
-          bananaFPCAddress: bananaFPC.address,
-          feeJuiceAddress: feeJuiceContract.address,
-          l1FeeJuiceAddress: this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress,
-          rollupAddress: context.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
-        };
-      },
-      (data, context) => {
-        const bananaFPC = FPCContract.at(data.bananaFPCAddress, this.wallet);
-        this.bananaFPC = bananaFPC;
-
-        this.getCoinbaseBalance = async () => {
-          const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-          const gasL1 = getContract({
-            address: data.l1FeeJuiceAddress.toString(),
-            abi: TestERC20Abi,
-            client: l1Client,
-          });
-          return await gasL1.read.balanceOf([this.coinbase.toString()]);
-        };
-
-        this.getCoinbaseSequencerRewards = async () => {
-          return await this.rollupContract.getSequencerRewards(this.coinbase);
-        };
-
-        this.getProverFee = async (blockNumber: BlockNumber) => {
-          const block = await this.aztecNode.getBlock(blockNumber);
-
-          // @todo @lherskind As we deal with #13601
-          // Right now the value is from `FeeLib.sol`
-          const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
-
-          // We round up
-          const mulDiv = (a: bigint, b: bigint, c: bigint) => (a * b) / c + ((a * b) % c > 0n ? 1n : 0n);
-
-          const { baseFee } = await this.rollupContract.getL1FeesAt(block!.header.globalVariables.timestamp);
-          const proverCost =
-            mulDiv(
-              mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()),
-              1n,
-              await this.rollupContract.getManaTarget(),
-            ) + (await this.rollupContract.getProvingCostPerMana());
-
-          const price = await this.rollupContract.getFeeAssetPerEth();
-
-          const mana = block!.header.totalManaUsed.toBigInt();
-          return mulDiv(mana * proverCost, price, 10n ** 9n);
-        };
-        return Promise.resolve();
-      },
-    );
+  public async applyFPCSetup() {
+    this.logger.info('Applying FPC setup');
+
+    const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
+    expect((await this.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+
+    const bananaCoin = this.bananaCoin;
+    const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin).send({
+      from: this.aliceAddress,
+    });
+
+    this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
+
+    await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.aliceAddress);
+
+    this.bananaFPC = bananaFPC;
+
+    const l1FeeJuiceAddress = this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress;
+
+    this.getCoinbaseBalance = async () => {
+      const l1Client = createExtendedL1Client(this.context.config.l1RpcUrls, MNEMONIC);
+      const gasL1 = getContract({
+        address: l1FeeJuiceAddress.toString(),
+        abi: TestERC20Abi,
+        client: l1Client,
+      });
+      return await gasL1.read.balanceOf([this.coinbase.toString()]);
+    };
+
+    this.getCoinbaseSequencerRewards = async () => {
+      return await this.rollupContract.getSequencerRewards(this.coinbase);
+    };
+
+    this.getProverFee = async (blockNumber: BlockNumber) => {
+      const block = await this.aztecNode.getBlock(blockNumber);
+
+      // @todo @lherskind As we deal with #13601
+      // Right now the value is from `FeeLib.sol`
+      const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
+
+      // We round up
+      const mulDiv = (a: bigint, b: bigint, c: bigint) => (a * b) / c + ((a * b) % c > 0n ? 1n : 0n);
+
+      const { baseFee } = await this.rollupContract.getL1FeesAt(block!.header.globalVariables.timestamp);
+      const proverCost =
+        mulDiv(
+          mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, BigInt(await this.rollupContract.getEpochDuration())),
+          1n,
+          await this.rollupContract.getManaTarget(),
+        ) + (await this.rollupContract.getProvingCostPerMana());
+
+      const price = await this.rollupContract.getEthPerFeeAsset();
+
+      const mana = block!.header.totalManaUsed.toBigInt();
+      return mulDiv(mana * proverCost, 10n ** 12n, price);
+    };
   }
 
-  public async applySponsoredFPCSetupSnapshot() {
-    await this.snapshotManager.snapshot(
-      'sponsored_fpc_setup',
-      async context => {
-        const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
-
-        const sponsoredFPC = await setupSponsoredFPC(this.wallet);
-        this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
-
-        return {
-          sponsoredFPCAddress: sponsoredFPC.address,
-        };
-      },
-      data => {
-        this.sponsoredFPC = SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
-        return Promise.resolve();
-      },
-    );
+  public async applySponsoredFPCSetup() {
+    this.logger.info('Applying sponsored FPC setup');
+
+    const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
+    expect((await this.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+
+    const sponsoredFPCInstance = await setupSponsoredFPC(this.wallet);
+    this.logger.info(`SponsoredFPC at ${sponsoredFPCInstance.address}`);
+
+    this.sponsoredFPC = SponsoredFPCContract.at(sponsoredFPCInstance.address, this.wallet);
   }
 
   public async applyFundAliceWithBananas() {
-    await this.snapshotManager.snapshot(
-      'fund_alice',
-      async () => {
-        await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
-        await this.bananaCoin.methods
-          .mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS)
-          .send({ from: this.aliceAddress })
-          .wait();
-      },
-      () => Promise.resolve(),
-    );
+    this.logger.info('Applying fund Alice with bananas setup');
+
+    await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
+    await this.bananaCoin.methods
+      .mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS)
+      .send({ from: this.aliceAddress });
   }
 
   public async applyFundAliceWithPrivateBananas() {
-    await this.snapshotManager.snapshot(
-      'fund_alice_with_private_bananas',
-      async () => {
-        await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
-      },
-      () => Promise.resolve(),
-    );
+    this.logger.info('Applying fund Alice with private bananas setup');
+
+    await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
   }
 }

package/src/e2e_l1_publisher/write_json.ts

@@ -1,8 +1,9 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import type { L2Block } from '@aztec/aztec.js/block';
 import { Fr } from '@aztec/aztec.js/fields';
 import { BatchedBlob, Blob, getEthBlobEvaluationInputs, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { L2Block } from '@aztec/stdlib/block';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 
 import { writeFile } from 'fs/promises';
 
@@ -32,6 +33,12 @@ export async function writeJson(
     return `0x${buffer.toString('hex').padStart(size, '0')}`;
   };
 
+  // Create a checkpoint header for this block
+  const checkpointHeader = CheckpointHeader.random({
+    slotNumber: block.slot,
+    timestamp: block.timestamp,
+  });
+
   const jsonObject = {
     populate: {
       l1ToL2Content: l1ToL2Content.map(value => asHex(value)),
@@ -50,24 +57,22 @@ export async function writeJson(
       checkpointNumber: block.number,
       body: `0x${block.body.toBuffer().toString('hex')}`,
       header: {
-        lastArchiveRoot: asHex(block.header.lastArchive.root),
-        blockHeadersHash: asHex(block.header.blockHeadersHash),
-        contentCommitment: {
-          blobsHash: asHex(block.header.contentCommitment.blobsHash),
-          inHash: asHex(block.header.contentCommitment.inHash),
-          outHash: asHex(block.header.contentCommitment.outHash),
-        },
-        slotNumber: Number(block.header.globalVariables.slotNumber),
-        timestamp: Number(block.header.globalVariables.timestamp),
-        coinbase: asHex(block.header.globalVariables.coinbase, 40),
-        feeRecipient: asHex(block.header.globalVariables.feeRecipient),
+        lastArchiveRoot: asHex(checkpointHeader.lastArchiveRoot),
+        blockHeadersHash: asHex(checkpointHeader.blockHeadersHash),
+        blobsHash: asHex(checkpointHeader.blobsHash),
+        inHash: asHex(checkpointHeader.inHash),
+        outHash: asHex(checkpointHeader.epochOutHash),
+        slotNumber: Number(checkpointHeader.slotNumber),
+        timestamp: Number(checkpointHeader.timestamp),
+        coinbase: asHex(checkpointHeader.coinbase, 40),
+        feeRecipient: asHex(checkpointHeader.feeRecipient),
         gasFees: {
-          feePerDaGas: Number(block.header.globalVariables.gasFees.feePerDaGas),
-          feePerL2Gas: Number(block.header.globalVariables.gasFees.feePerL2Gas),
+          feePerDaGas: Number(checkpointHeader.gasFees.feePerDaGas),
+          feePerL2Gas: Number(checkpointHeader.gasFees.feePerL2Gas),
         },
-        totalManaUsed: block.header.totalManaUsed.toNumber(),
+        totalManaUsed: checkpointHeader.totalManaUsed.toNumber(),
       },
-      headerHash: asHex(block.getCheckpointHeader().hash()),
+      headerHash: asHex(checkpointHeader.hash()),
       numTxs: block.body.txEffects.length,
     },
   };