@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/e2e_fees/fees_test.d.ts

@@ -1,73 +1,91 @@
-import { type AccountWallet, type AztecAddress, type AztecNode, ChainMonitor, CheatCodes, type Logger, type PXE } from '@aztec/aztec.js';
-import { type DeployL1ContractsArgs } from '@aztec/ethereum';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { CheatCodes } from '@aztec/aztec/testing';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import type { DeployAztecL1ContractsArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { ChainMonitor } from '@aztec/ethereum/test';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
-import { CounterContract } from '@aztec/noir-contracts.js/Counter';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token';
+import { CounterContract } from '@aztec/noir-test-contracts.js/Counter';
 import { GasSettings } from '@aztec/stdlib/gas';
-import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
-import { type BalancesFn, type SetupOptions } from '../fixtures/utils.js';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import { type EndToEndContext, type SetupOptions } from '../fixtures/setup.js';
+import { type BalancesFn } from '../fixtures/utils.js';
 import { type GasBridgingTestHarness } from '../shared/gas_portal_test_harness.js';
+import { TestWallet } from '../test-wallet/test_wallet.js';
 /**
- * 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.
  * FPCSetup: Deploys BananaCoin and FPC contracts, and bridges gas from L1.
+ * SponsoredFPCSetup: Deploys Sponsored FPC contract, and bridges gas from L1.
  * FundAlice: Mints private and public bananas to Alice.
  * SetupSubscription: Deploys a counter contract and a subscription contract, and mints Fee Juice to the subscription contract.
  */
 export declare class FeesTest {
     private numberOfAccounts;
-    private snapshotManager;
-    private wallets;
+    private setupOptions;
+    private accounts;
+    context: EndToEndContext;
     logger: Logger;
-    pxe: PXE;
     aztecNode: AztecNode;
+    aztecNodeAdmin: AztecNodeAdmin;
     cheatCodes: CheatCodes;
-    aliceWallet: AccountWallet;
+    wallet: TestWallet;
     aliceAddress: AztecAddress;
-    bobWallet: AccountWallet;
     bobAddress: AztecAddress;
     sequencerAddress: AztecAddress;
     coinbase: EthAddress;
     fpcAdmin: AztecAddress;
     gasSettings: GasSettings;
+    rollupContract: RollupContract;
     feeJuiceContract: FeeJuiceContract;
     bananaCoin: BananaCoin;
     bananaFPC: FPCContract;
+    sponsoredFPC: SponsoredFPCContract;
     counterContract: CounterContract;
     subscriptionContract: AppSubscriptionContract;
     feeJuiceBridgeTestHarness: GasBridgingTestHarness;
-    context: SubsystemsContext;
     chainMonitor: ChainMonitor;
     getCoinbaseBalance: () => Promise<bigint>;
     getCoinbaseSequencerRewards: () => Promise<bigint>;
     getGasBalanceFn: BalancesFn;
     getBananaPublicBalanceFn: BalancesFn;
     getBananaPrivateBalanceFn: BalancesFn;
-    getProverFee: (blockNumber: number) => Promise<bigint>;
+    getProverFee: (blockNumber: BlockNumber) => Promise<bigint>;
+    getCommittedProverFee: (blockNumber: BlockNumber) => Promise<bigint>;
+    getCommittedBurn: (blockNumber: BlockNumber) => Promise<bigint>;
     readonly ALICE_INITIAL_BANANAS: bigint;
     readonly SUBSCRIPTION_AMOUNT: bigint;
     readonly APP_SPONSORED_TX_GAS_LIMIT: bigint;
-    constructor(testName: string, numberOfAccounts?: number, setupOptions?: Partial<SetupOptions & DeployL1ContractsArgs>);
-    setup(): Promise<this>;
+    constructor(testName: string, numberOfAccounts?: number, setupOptions?: Partial<SetupOptions & DeployAztecL1ContractsArgs>);
+    setup(opts?: Partial<SetupOptions>): Promise<this>;
     teardown(): Promise<void>;
     setIsMarkingAsProven(b: boolean): void;
     catchUpProvenChain(): Promise<void>;
-    mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint): Promise<void>;
+    getBlockRewards(): Promise<{
+        sequencerBlockRewards: bigint;
+        proverBlockRewards: bigint;
+    }>;
+    mintAndBridgeFeeJuice(minter: AztecAddress, recipient: AztecAddress): Promise<void>;
     /** Alice mints bananaCoin tokens privately to the target address and redeems them. */
     mintPrivateBananas(amount: bigint, address: AztecAddress): Promise<void>;
-    applyBaseSnapshots(): Promise<void>;
-    applyInitialAccountsSnapshot(): Promise<void>;
-    applyPublicDeployAccountsSnapshot(): Promise<void>;
-    applySetupFeeJuiceSnapshot(): Promise<void>;
-    applyDeployBananaTokenSnapshot(): Promise<void>;
-    applyFPCSetupSnapshot(): Promise<void>;
+    applyBaseSetup(): Promise<void>;
+    applyEnsureAuthRegistryPublished(): Promise<void>;
+    applyInitialAccounts(): Promise<void>;
+    applyPublicDeployAccounts(): Promise<void>;
+    applySetupFeeJuice(): Promise<void>;
+    applyDeployBananaToken(): Promise<void>;
+    applyFPCSetup(): Promise<void>;
+    applySponsoredFPCSetup(): Promise<void>;
     applyFundAliceWithBananas(): Promise<void>;
     applyFundAliceWithPrivateBananas(): Promise<void>;
-    applySetupSubscription(): Promise<void>;
 }
-//# sourceMappingURL=fees_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlc190ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX2ZlZXMvZmVlc190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFpQyxNQUFNLHNCQUFzQixDQUFDO0FBRWpGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQzVGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBQ25GLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxJQUFJLFVBQVUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUd4RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFL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

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,56 +1,57 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { ChainMonitor, CheatCodes, createLogger, sleep } from '@aztec/aztec.js';
-import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
-import { RollupContract, createL1Clients } from '@aztec/ethereum';
+import { createLogger } from '@aztec/aztec.js/log';
+import { getTokenAllowedSetupFunctions } from '@aztec/aztec/testing';
+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 { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
-import { CounterContract } from '@aztec/noir-contracts.js/Counter';
+import { sleep } from '@aztec/foundation/sleep';
+import { TestERC20Abi } from '@aztec/l1-artifacts';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
-import { computePartialAddress } from '@aztec/stdlib/contract';
 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 { MNEMONIC, getPaddedMaxFeesPerGas } from '../fixtures/fixtures.js';
+import { deployAccounts, ensureAuthRegistryPublished, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import { ensureAccountsPubliclyDeployed, getBalancesFn, setupCanonicalFeeJuice } 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.
  * FPCSetup: Deploys BananaCoin and FPC contracts, and bridges gas from L1.
+ * SponsoredFPCSetup: Deploys Sponsored FPC contract, and bridges gas from L1.
  * FundAlice: Mints private and public bananas to Alice.
  * SetupSubscription: Deploys a counter contract and a subscription contract, and mints Fee Juice to the subscription contract.
  */ export class FeesTest {
     numberOfAccounts;
-    snapshotManager;
-    wallets;
+    setupOptions;
+    accounts;
+    context;
     logger;
-    pxe;
     aztecNode;
+    aztecNodeAdmin;
     cheatCodes;
-    aliceWallet;
+    wallet;
     aliceAddress;
-    bobWallet;
     bobAddress;
     sequencerAddress;
     coinbase;
     fpcAdmin;
     gasSettings;
+    rollupContract;
     feeJuiceContract;
     bananaCoin;
     bananaFPC;
+    sponsoredFPC;
     counterContract;
     subscriptionContract;
     feeJuiceBridgeTestHarness;
-    context;
     chainMonitor;
     getCoinbaseBalance;
     getCoinbaseSequencerRewards;
@@ -58,212 +59,223 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     getBananaPublicBalanceFn;
     getBananaPrivateBalanceFn;
     getProverFee;
+    getCommittedProverFee;
+    getCommittedBurn;
     ALICE_INITIAL_BANANAS;
     SUBSCRIPTION_AMOUNT;
     APP_SPONSORED_TX_GAS_LIMIT;
     constructor(testName, numberOfAccounts = 3, setupOptions = {}){
         this.numberOfAccounts = numberOfAccounts;
-        this.wallets = [];
+        this.setupOptions = setupOptions;
+        this.accounts = [];
         this.ALICE_INITIAL_BANANAS = BigInt(1e22);
         this.SUBSCRIPTION_AMOUNT = BigInt(1e19);
         this.APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9);
         if (!numberOfAccounts) {
             throw new Error('There must be at least 1 initial account.');
         }
+        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();
-        await context.aztecNode.setConfig({
-            feeRecipient: this.sequencerAddress,
-            coinbase: this.coinbase
+    async setup(opts = {}) {
+        this.logger.verbose('Setting up fresh context...');
+        // Token allowlist entries are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
+        const tokenAllowList = await getTokenAllowedSetupFunctions();
+        this.context = await setup(0, {
+            startProverNode: true,
+            ...this.setupOptions,
+            ...opts,
+            fundSponsoredFPC: true,
+            skipAccountDeployment: true,
+            l1ContractsArgs: {
+                ...this.setupOptions
+            },
+            txPublicSetupAllowListExtend: [
+                ...this.setupOptions.txPublicSetupAllowListExtend ?? [],
+                ...tokenAllowList
+            ]
         });
-        const rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
-        this.chainMonitor = new ChainMonitor(rollupContract, 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() {
-        this.chainMonitor.stop();
-        await this.snapshotManager.teardown();
+        await this.chainMonitor.stop();
+        await teardown(this.context);
     }
     setIsMarkingAsProven(b) {
         this.context.watcher.setIsMarkingAsProven(b);
     }
     async catchUpProvenChain() {
         const bn = await this.aztecNode.getBlockNumber();
-        while(await this.aztecNode.getProvenBlockNumber() < bn){
+        while(await this.aztecNode.getBlockNumber('proven') < bn){
             await sleep(1000);
         }
     }
-    async mintAndBridgeFeeJuice(address, amount) {
-        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, address);
+    async getBlockRewards() {
+        const blockReward = await this.rollupContract.getCheckpointReward();
+        const rewardConfig = await this.rollupContract.getRewardConfig();
+        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;
+        return {
+            sequencerBlockRewards,
+            proverBlockRewards
+        };
+    }
+    async mintAndBridgeFeeJuice(minter, recipient) {
+        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(recipient);
         const { claimSecret: secret, messageLeafIndex: index } = claim;
-        await this.feeJuiceContract.methods.claim(address, amount, secret, index).send().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. */ async mintPrivateBananas(amount, address) {
-        const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate();
-        await mintTokensToPrivate(this.bananaCoin, this.aliceWallet, address, amount);
-        const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate();
+        const { result: balanceBefore } = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: address
+        });
+        await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
+        const { result: balanceAfter } = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: address
+        });
         expect(balanceAfter).toEqual(balanceBefore + amount);
     }
-    async applyBaseSnapshots() {
-        await this.applyInitialAccountsSnapshot();
-        await this.applyPublicDeployAccountsSnapshot();
-        await this.applySetupFeeJuiceSnapshot();
-        await this.applyDeployBananaTokenSnapshot();
+    async applyBaseSetup() {
+        await this.applyInitialAccounts();
+        await this.applyEnsureAuthRegistryPublished();
+        await this.applyPublicDeployAccounts();
+        await this.applySetupFeeJuice();
+        await this.applyDeployBananaToken();
     }
-    async applyInitialAccountsSnapshot() {
-        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig })=>{
-            this.pxe = pxe;
-            this.aztecNode = aztecNode;
-            this.gasSettings = GasSettings.default({
-                maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2)
-            });
-            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            [this.aliceWallet, this.bobWallet] = this.wallets.slice(0, 2);
-            [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.wallets.map((w)=>w.getAddress());
-            // 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.aliceWallet);
-            if (this.numberOfAccounts > 1) {
-                const bobInstance = (await this.bobWallet.getContractMetadata(this.bobAddress)).contractInstance;
-                await this.aliceWallet.registerAccount(deployedAccounts[1].secret, await computePartialAddress(bobInstance));
-            }
-            this.coinbase = EthAddress.random();
-            const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, MNEMONIC);
-            this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
-                aztecNode: aztecNode,
-                pxeService: pxe,
-                publicClient: publicClient,
-                walletClient: walletClient,
-                wallet: this.aliceWallet,
-                logger: this.logger
-            });
+    async applyEnsureAuthRegistryPublished() {
+        this.logger.info('Ensuring AuthRegistry published');
+        await ensureAuthRegistryPublished(this.wallet, this.aliceAddress);
+    }
+    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.fallback({
+            maxFeesPerGas: await getPaddedMaxFeesPerGas(this.aztecNode)
         });
+        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', ()=>ensureAccountsPubliclyDeployed(this.aliceWallet, this.wallets));
+    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 (context)=>{
-            await setupCanonicalFeeJuice(context.pxe);
-        }, async (_data, context)=>{
-            this.context = context;
-            this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.aliceWallet);
-            this.getGasBalanceFn = getBalancesFn('⛽', this.feeJuiceContract.methods.balance_of_public, this.logger);
-            const { publicClient, walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-            this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
-                aztecNode: context.aztecNode,
-                pxeService: context.pxe,
-                publicClient: publicClient,
-                walletClient: walletClient,
-                wallet: this.aliceWallet,
-                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.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.aliceWallet, this.aliceAddress, 'BC', 'BC', 18n).send().deployed();
-            this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
-            return {
-                bananaCoinAddress: bananaCoin.address
-            };
-        }, async ({ bananaCoinAddress })=>{
-            this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.aliceWallet);
+    async applyDeployBananaToken() {
+        this.logger.info('Applying deploy banana token setup');
+        const { contract: 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.logger);
+        this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, this.logger);
     }
-    async applyFPCSetupSnapshot() {
-        await this.snapshotManager.snapshot('fpc_setup', async (context)=>{
-            const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPubliclyDeployed).toBe(true);
-            const bananaCoin = this.bananaCoin;
-            const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin).send().deployed();
-            this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
-            await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(FEE_FUNDING_FOR_TESTER_ACCOUNT, bananaFPC.address);
-            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.aliceWallet);
-            this.bananaFPC = bananaFPC;
-            const logger = this.logger;
-            this.getBananaPublicBalanceFn = getBalancesFn('🍌.public', this.bananaCoin.methods.balance_of_public, logger);
-            this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, logger);
-            this.getCoinbaseBalance = async ()=>{
-                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-                const gasL1 = getContract({
-                    address: data.l1FeeJuiceAddress.toString(),
-                    abi: TestERC20Abi,
-                    client: walletClient
-                });
-                return await gasL1.read.balanceOf([
-                    this.coinbase.toString()
-                ]);
-            };
-            this.getCoinbaseSequencerRewards = async ()=>{
-                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-                const rollup = getContract({
-                    address: data.rollupAddress.toString(),
-                    abi: RollupAbi,
-                    client: walletClient
-                });
-                return await rollup.read.getSequencerRewards([
-                    this.coinbase.toString()
-                ]);
-            };
-            this.getProverFee = async (blockNumber)=>{
-                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-                const rollup = getContract({
-                    address: data.rollupAddress.toString(),
-                    abi: RollupAbi,
-                    client: walletClient
-                });
-                const provingCostPerMana = await rollup.read.getProvingCostPerManaInFeeAsset();
-                const block = await this.pxe.getBlock(blockNumber);
-                const mana = block.header.totalManaUsed.toBigInt();
-                return mana * provingCostPerMana;
-            };
+    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 { contract: 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 = 3600000n;
+            // 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);
+        };
+        /**
+     * Reads the prover fee that the rollup actually committed for the block's checkpoint, which is what
+     * RewardLib uses to pay prover rewards. Unlike `getProverFee`, this does not re-derive the value
+     * from current L1 fees or current eth-per-fee-asset price, so it is robust to pipelined fee-asset-price
+     * drift between propose-time and reward-payout-time.
+     */ this.getCommittedProverFee = async (blockNumber)=>{
+            const block = await this.aztecNode.getBlock(blockNumber);
+            const feeHeader = await this.rollupContract.getFeeHeader(BigInt(block.checkpointNumber));
+            return feeHeader.manaUsed * feeHeader.proverCost;
+        };
+        // RewardLib computes sequencerFee = checkpointFee - burn - proverFee where burn = manaUsed * congestionCost.
+        // The fixture's typical case keeps congestionCost at zero, but reading it explicitly avoids latent bugs
+        // when test load changes excess mana.
+        this.getCommittedBurn = async (blockNumber)=>{
+            const block = await this.aztecNode.getBlock(blockNumber);
+            const feeHeader = await this.rollupContract.getFeeHeader(BigInt(block.checkpointNumber));
+            return feeHeader.manaUsed * feeHeader.congestionCost;
+        };
+    }
+    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().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());
-    }
-    async applySetupSubscription() {
-        await this.snapshotManager.snapshot('setup_subscription', async ()=>{
-            const counterContract = await CounterContract.deploy(this.bobWallet, 0, this.bobAddress).send().deployed();
-            // Deploy subscription contract, that allows subscriptions for SUBSCRIPTION_AMOUNT of bananas
-            const subscriptionContract = await AppSubscriptionContract.deploy(this.bobWallet, counterContract.address, this.bobAddress, this.bananaCoin.address, this.SUBSCRIPTION_AMOUNT, this.APP_SPONSORED_TX_GAS_LIMIT).send().deployed();
-            // Mint some Fee Juice to the subscription contract
-            // Could also use bridgeFromL1ToL2 from the harness, but this is more direct
-            await this.mintAndBridgeFeeJuice(subscriptionContract.address, FEE_FUNDING_FOR_TESTER_ACCOUNT);
-            return {
-                counterContractAddress: counterContract.address,
-                subscriptionContractAddress: subscriptionContract.address
-            };
-        }, async ({ counterContractAddress, subscriptionContractAddress })=>{
-            this.counterContract = await CounterContract.at(counterContractAddress, this.bobWallet);
-            this.subscriptionContract = await AppSubscriptionContract.at(subscriptionContractAddress, this.bobWallet);
-        });
+        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

@@ -0,0 +1,11 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { BatchedBlob, Blob } from '@aztec/blob-lib';
+import { L2Block } from '@aztec/stdlib/block';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
+/**
+ * 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, checkpointHeader: CheckpointHeader, block: L2Block, l1ToL2Content: Fr[], blobs: Blob[], batchedBlob: BatchedBlob, recipientAddress: AztecAddress, deployerAddress: `0x${string}`): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVfanNvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV9sMV9wdWJsaXNoZXIvd3JpdGVfanNvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUE2RCxNQUFNLGlCQUFpQixDQUFDO0FBRS9HLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQU14RDs7O0dBR0c7QUFDSCx3QkFBc0IsU0FBUyxDQUM3QixRQUFRLEVBQUUsTUFBTSxFQUNoQixnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsS0FBSyxFQUFFLE9BQU8sRUFDZCxhQUFhLEVBQUUsRUFBRSxFQUFFLEVBQ25CLEtBQUssRUFBRSxJQUFJLEVBQUUsRUFDYixXQUFXLEVBQUUsV0FBVyxFQUN4QixnQkFBZ0IsRUFBRSxZQUFZLEVBQzlCLGVBQWUsRUFBRSxLQUFLLE1BQU0sRUFBRSxHQUM3QixPQUFPLENBQUMsSUFBSSxDQUFDLENBb0RmIn0=

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

@@ -0,0 +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,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;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAMxD;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,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,CAoDf"}