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

package/dest/e2e_fees/fees_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}

package/dest/e2e_fees/fees_test.js

@@ -1,5 +1,6 @@
 import { createLogger } from '@aztec/aztec.js/log';
-import { RollupContract, createExtendedL1Client } from '@aztec/ethereum';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { sleep } from '@aztec/foundation/sleep';
@@ -13,13 +14,12 @@ import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { getContract } from 'viem';
 import { MNEMONIC } from '../fixtures/fixtures.js';
-import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
+import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import { ensureAccountContractsPublished, getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
+import { getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
 import { FeeJuicePortalTestingHarnessFactory } 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.
@@ -29,10 +29,12 @@ 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 {
     numberOfAccounts;
-    snapshotManager;
+    setupOptions;
     accounts;
+    context;
     logger;
     aztecNode;
+    aztecNodeAdmin;
     cheatCodes;
     wallet;
     aliceAddress;
@@ -49,7 +51,6 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     counterContract;
     subscriptionContract;
     feeJuiceBridgeTestHarness;
-    context;
     chainMonitor;
     getCoinbaseBalance;
     getCoinbaseSequencerRewards;
@@ -62,6 +63,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     APP_SPONSORED_TX_GAS_LIMIT;
     constructor(testName, numberOfAccounts = 3, setupOptions = {}){
         this.numberOfAccounts = numberOfAccounts;
+        this.setupOptions = setupOptions;
         this.accounts = [];
         this.ALICE_INITIAL_BANANAS = BigInt(1e22);
         this.SUBSCRIPTION_AMOUNT = BigInt(1e19);
@@ -72,22 +74,26 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         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.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
-        this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
+        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(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) {
         this.context.watcher.setIsMarkingAsProven(b);
@@ -99,9 +105,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }
     }
     async getBlockRewards() {
-        const blockReward = await this.rollupContract.getBlockReward();
+        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;
         const proverBlockRewards = toDistribute - sequencerBlockRewards;
@@ -115,7 +121,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         const { claimSecret: secret, messageLeafIndex: index } = claim;
         await this.feeJuiceContract.methods.claim(recipient, claim.claimAmount, secret, index).send({
             from: minter
-        }).wait();
+        });
     }
     /** Alice mints bananaCoin tokens privately to the target address and redeems them. */ async mintPrivateBananas(amount, address) {
         const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({
@@ -127,134 +133,116 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         });
         expect(balanceAfter).toEqual(balanceBefore + amount);
     }
-    async applyBaseSnapshots() {
-        await this.applyInitialAccountsSnapshot();
-        await this.applyPublicDeployAccountsSnapshot();
-        await this.applySetupFeeJuiceSnapshot();
-        await this.applyDeployBananaTokenSnapshot();
-    }
-    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.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 = await FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
+    async applyBaseSetup() {
+        await this.applyInitialAccounts();
+        await this.applyPublicDeployAccounts();
+        await this.applySetupFeeJuice();
+        await this.applyDeployBananaToken();
+    }
+    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
         });
-    }
-    async applyPublicDeployAccountsSnapshot() {
-        await this.snapshotManager.snapshot('public_deploy_accounts', ()=>ensureAccountContractsPublished(this.wallet, this.accounts));
-    }
-    async applySetupFeeJuiceSnapshot() {
-        await this.snapshotManager.snapshot('setup_fee_juice', async ()=>{}, async (_data, context)=>{
-            this.context = context;
-            this.feeJuiceContract = await 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
-            });
+        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)
         });
-    }
-    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
-            };
-        }, async ({ bananaCoinAddress })=>{
-            this.bananaCoin = await 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);
+        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 applyPublicDeployAccounts() {
+        this.logger.info('Applying public deploy accounts setup');
+        await publicDeployAccounts(this.wallet, this.accounts);
+    }
+    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 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
-            };
-        }, async (data, context)=>{
-            const bananaFPC = await 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)=>{
-                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, b, c)=>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);
-            };
+    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
         });
-    }
-    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
-            };
-        }, async (data)=>{
-            this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
+        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);
+    }
+    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)=>{
+            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, b, c)=>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);
+        };
+    }
+    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);
     }
     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
+        });
     }
     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/dest/e2e_l1_publisher/write_json.d.ts

@@ -1,10 +1,10 @@
 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 } from '@aztec/blob-lib';
+import { L2Block } from '@aztec/stdlib/block';
 /**
  * Creates a json object that can be used to test the solidity contract.
  * The json object must be put into
  */
 export declare function writeJson(fileName: string, block: L2Block, l1ToL2Content: Fr[], blobs: Blob[], batchedBlob: BatchedBlob, recipientAddress: AztecAddress, deployerAddress: `0x${string}`): Promise<void>;
-//# sourceMappingURL=write_json.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVfanNvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV9sMV9wdWJsaXNoZXIvd3JpdGVfanNvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUE2RCxNQUFNLGlCQUFpQixDQUFDO0FBRS9HLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQU85Qzs7O0dBR0c7QUFDSCx3QkFBc0IsU0FBUyxDQUM3QixRQUFRLEVBQUUsTUFBTSxFQUNoQixLQUFLLEVBQUUsT0FBTyxFQUNkLGFBQWEsRUFBRSxFQUFFLEVBQUUsRUFDbkIsS0FBSyxFQUFFLElBQUksRUFBRSxFQUNiLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLGdCQUFnQixFQUFFLFlBQVksRUFDOUIsZUFBZSxFQUFFLEtBQUssTUFBTSxFQUFFLEdBQzdCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EwRGYifQ==

package/dest/e2e_l1_publisher/write_json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write_json.d.ts","sourceRoot":"","sources":["../../src/e2e_l1_publisher/write_json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAiC,MAAM,iBAAiB,CAAC;AAOnF;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,EAAE,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,YAAY,EAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CAqDf"}
+{"version":3,"file":"write_json.d.ts","sourceRoot":"","sources":["../../src/e2e_l1_publisher/write_json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,IAAI,EAA6D,MAAM,iBAAiB,CAAC;AAE/G,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,EAAE,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,YAAY,EAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CA0Df"}

package/dest/e2e_l1_publisher/write_json.js

@@ -1,4 +1,5 @@
-import { getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
+import { getEthBlobEvaluationInputs, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { writeFile } from 'fs/promises';
 const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
 /**
@@ -14,6 +15,11 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
         const buffer = Buffer.isBuffer(value) ? value : value.toBuffer();
         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)),
@@ -23,32 +29,31 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
         messages: {
             l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map((value)=>asHex(value))
         },
-        block: {
+        checkpoint: {
             // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
             // This should not be a problem for testing as long as the values are not larger than u32.
             archive: asHex(block.archive.root),
             blobCommitments: getPrefixedEthBlobCommitments(blobs),
-            batchedBlobInputs: batchedBlob.getEthBlobEvaluationInputs(),
-            blockNumber: block.number,
+            batchedBlobInputs: getEthBlobEvaluationInputs(batchedBlob),
+            checkpointNumber: block.number,
             body: `0x${block.body.toBuffer().toString('hex')}`,
             header: {
-                lastArchiveRoot: asHex(block.header.lastArchive.root),
-                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
         }
     };

package/dest/e2e_multi_validator/utils.d.ts

@@ -9,4 +9,4 @@ export declare function createKeyFile4(fileName: string, validator1Address: EthA
 export declare function createKeyFile5(fileName: string, proverAddress: EthAddress, remoteSignerUrl: string): Promise<void>;
 export declare function createKeyFile6(fileName: string, mnemonic: string, validator1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
 export declare function addressForPrivateKey(privateKey: EthPrivateKey): EthAddress;
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbXVsdGlfdmFsaWRhdG9yL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFXMUQsd0JBQWdCLG1CQUFtQixDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxzR0EwRXBHO0FBR0Qsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFlBQVksRUFBRSxhQUFhLEVBQzNCLGlCQUFpQixFQUFFLE1BQU0sRUFDekIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsWUFBWSxFQUFFLFlBQVksaUJBaUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGlCQUFpQixFQUFFLFVBQVUsRUFDN0IsaUJBQWlCLEVBQUUsVUFBVSxFQUM3QixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsYUFBYSxFQUM1QixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsVUFBVSxFQUNyQixTQUFTLEVBQUUsVUFBVSxFQUNyQixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsWUFBWSxFQUMzQixhQUFhLEVBQUUsWUFBWSxpQkE0QjVCO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBY3hHO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBa0IzQjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsYUFBYSxHQUFHLFVBQVUsQ0FFMUUifQ==

package/dest/e2e_multi_validator/utils.js

@@ -1,4 +1,4 @@
-import { getAddressFromPrivateKey } from '@aztec/ethereum';
+import { getAddressFromPrivateKey } from '@aztec/ethereum/account';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { writeFile } from 'fs/promises';
 import { createServer } from 'http';

package/dest/e2e_nested_contract/nested_contract_test.d.ts

@@ -4,10 +4,10 @@ import type { AztecNode } from '@aztec/aztec.js/node';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
-import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import { type EndToEndContext } from '../fixtures/setup.js';
 export declare class NestedContractTest {
     private numberOfAccounts;
-    private snapshotManager;
+    context: EndToEndContext;
     logger: Logger;
     wallet: Wallet;
     defaultAccountAddress: AztecAddress;
@@ -16,14 +16,11 @@ export declare class NestedContractTest {
     childContract: ChildContract;
     constructor(testName: string, numberOfAccounts?: number);
     /**
-     * Adds two state shifts to snapshot manager.
-     * 1. Add 3 accounts.
-     * 2. Publicly deploy accounts
+     * Applies base setup by deploying accounts and publicly deploying them.
      */
-    applyBaseSnapshots(): Promise<void>;
+    applyBaseSetup(): Promise<void>;
     setup(): Promise<void>;
     teardown(): Promise<void>;
-    snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
-    applyManualSnapshots(): Promise<void>;
+    applyManual(): Promise<void>;
 }
-//# sourceMappingURL=nested_contract_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVzdGVkX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbmVzdGVkX2NvbnRyYWN0L25lc3RlZF9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUV0RSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBS3JCLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIscUJBQWEsa0JBQWtCO0lBWTNCLE9BQU8sQ0FBQyxnQkFBZ0I7SUFYMUIsT0FBTyxFQUFHLGVBQWUsQ0FBQztJQUMxQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLE1BQU0sQ0FBQztJQUNoQixxQkFBcUIsRUFBRyxZQUFZLENBQUM7SUFDckMsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixjQUFjLEVBQUcsY0FBYyxDQUFDO0lBQ2hDLGFBQWEsRUFBRyxhQUFhLENBQUM7SUFFOUIsWUFDRSxRQUFRLEVBQUUsTUFBTSxFQUNSLGdCQUFnQixTQUFJLEVBRzdCO0lBRUQ7O09BRUc7SUFDRyxjQUFjLGtCQWVuQjtJQUVLLEtBQUssa0JBT1Y7SUFFSyxRQUFRLGtCQUViO0lBRUssV0FBVyxrQkFNaEI7Q0FDRiJ9

package/dest/e2e_nested_contract/nested_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_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,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,MAAM,CAAC;IAChB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IAEtB,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAG5B,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI;IAM9B;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,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,oBAAoB;CAkB3B"}
+{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_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,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EACL,KAAK,eAAe,EAKrB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,MAAM,CAAC;IAChB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IAEtB,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;IAE9B,YACE,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI,EAG7B;IAED;;OAEG;IACG,cAAc,kBAenB;IAEK,KAAK,kBAOV;IAEK,QAAQ,kBAEb;IAEK,WAAW,kBAMhB;CACF"}

package/dest/e2e_nested_contract/nested_contract_test.js

@@ -1,11 +1,10 @@
 import { createLogger } from '@aztec/aztec.js/log';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
-import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
-const { E2E_DATA_PATH: dataPath } = process.env;
+import { deployAccounts, publicDeployAccounts, setup, teardown as teardownSubsystems } from '../fixtures/setup.js';
 export class NestedContractTest {
     numberOfAccounts;
-    snapshotManager;
+    context;
     logger;
     wallet;
     defaultAccountAddress;
@@ -14,50 +13,44 @@ export class NestedContractTest {
     childContract;
     constructor(testName, numberOfAccounts = 1){
         this.numberOfAccounts = numberOfAccounts;
-        this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
         this.logger = createLogger(`e2e:e2e_nested_contract:${testName}`);
-        this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}-${numberOfAccounts}`, dataPath);
     }
     /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 3 accounts.
-   * 2. Publicly deploy accounts
-   */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), ({ deployedAccounts }, { wallet, aztecNode })=>{
-            this.wallet = wallet;
-            [{ address: this.defaultAccountAddress }] = deployedAccounts;
-            this.aztecNode = aztecNode;
-            return Promise.resolve();
-        });
-        await this.snapshotManager.snapshot('public_deploy', async ()=>{}, async ()=>{
-            this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallet, [
-                this.defaultAccountAddress
-            ]);
+   * Applies base setup by deploying accounts and publicly deploying them.
+   */ async applyBaseSetup() {
+        this.logger.info('Deploying accounts');
+        const { deployedAccounts } = await deployAccounts(this.numberOfAccounts, this.logger)({
+            wallet: this.context.wallet,
+            initialFundedAccounts: this.context.initialFundedAccounts
         });
+        this.wallet = this.context.wallet;
+        [{ address: this.defaultAccountAddress }] = deployedAccounts;
+        this.aztecNode = this.context.aztecNodeService;
+        this.logger.info('Public deploy accounts');
+        await publicDeployAccounts(this.wallet, [
+            this.defaultAccountAddress
+        ]);
     }
     async setup() {
-        await this.snapshotManager.setup();
+        this.logger.info('Setting up fresh subsystems');
+        this.context = await setup(0, {
+            fundSponsoredFPC: true,
+            skipAccountDeployment: true
+        });
+        await this.applyBaseSetup();
     }
     async teardown() {
-        await this.snapshotManager.teardown();
+        await teardownSubsystems(this.context);
     }
-    snapshot;
-    async applyManualSnapshots() {
-        await this.snapshotManager.snapshot('manual', async ()=>{
-            const parentContract = await ParentContract.deploy(this.wallet).send({
-                from: this.defaultAccountAddress
-            }).deployed();
-            const childContract = await ChildContract.deploy(this.wallet).send({
-                from: this.defaultAccountAddress
-            }).deployed();
-            return {
-                parentContractAddress: parentContract.address,
-                childContractAddress: childContract.address
-            };
-        }, async ({ parentContractAddress, childContractAddress })=>{
-            this.parentContract = await ParentContract.at(parentContractAddress, this.wallet);
-            this.childContract = await ChildContract.at(childContractAddress, this.wallet);
+    async applyManual() {
+        this.logger.info('Deploying parent and child contracts');
+        const parentContract = await ParentContract.deploy(this.wallet).send({
+            from: this.defaultAccountAddress
+        });
+        const childContract = await ChildContract.deploy(this.wallet).send({
+            from: this.defaultAccountAddress
         });
+        this.parentContract = parentContract;
+        this.childContract = childContract;
     }
 }