@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.0b941701

package/dest/e2e_epochs/epochs_test.js

@@ -1,20 +1,32 @@
 import { AztecNodeService } from '@aztec/aztec-node';
-import { Fr, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
-import { ChainMonitor } from '@aztec/aztec.js/ethereum';
+import { getTimestampRangeForEpoch } from '@aztec/aztec.js/block';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { MerkleTreeId } from '@aztec/aztec.js/trees';
+import { EpochCache } from '@aztec/epoch-cache';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { waitUntilL1Timestamp } from '@aztec/ethereum/test';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { ChainMonitor, DelayedTxUtils, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
+import { EpochNumber } from '@aztec/foundation/branded-types';
+import { SecretValue } from '@aztec/foundation/config';
+import { randomBytes } from '@aztec/foundation/crypto/random';
 import { withLogNameSuffix } from '@aztec/foundation/log';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { retryUntil } from '@aztec/foundation/retry';
+import { sleep } from '@aztec/foundation/sleep';
+import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
+import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
+import { SequencerState } from '@aztec/sequencer-client';
+import { EthAddress } from '@aztec/stdlib/block';
+import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { join } from 'path';
+import { privateKeyToAccount } from 'viem/accounts';
 import { createAndSyncProverNode, getPrivateKeyFromIndex, setup } from '../fixtures/utils.js';
-// This can be lowered to as much as 2s in non-CI
-export const L1_BLOCK_TIME_IN_S = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
-export const EPOCH_DURATION_IN_L2_SLOTS = 4;
-export const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
 export const WORLD_STATE_BLOCK_HISTORY = 2;
 export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
+export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
 /**
  * Tests building of epochs using fast block times and short epochs.
  * Spawns an aztec node and a prover node with fake proofs.
@@ -26,39 +38,66 @@ export const ARCHIVER_POLL_INTERVAL = 50;
     constants;
     logger;
     monitor;
+    epochCache;
     proverDelayer;
     sequencerDelayer;
     proverNodes = [];
     nodes = [];
+    epochDuration;
+    L1_BLOCK_TIME_IN_S;
+    L2_SLOT_DURATION_IN_S;
     static async setup(opts = {}) {
         const test = new EpochsTestContext();
         await test.setup(opts);
         return test;
     }
+    static getSlotDurations(opts = {}) {
+        const envEthereumSlotDuration = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : DEFAULT_L1_BLOCK_TIME;
+        const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
+        const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
+        const aztecEpochDuration = opts.aztecEpochDuration ?? 6;
+        const aztecProofSubmissionEpochs = opts.aztecProofSubmissionEpochs ?? 1;
+        const l1PublishingTime = opts.l1PublishingTime ?? 1;
+        return {
+            l1PublishingTime,
+            ethereumSlotDuration,
+            aztecSlotDuration,
+            aztecEpochDuration,
+            aztecProofSubmissionEpochs
+        };
+    }
     async setup(opts = {}) {
+        const { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionEpochs, l1PublishingTime } = EpochsTestContext.getSlotDurations(opts);
+        this.L1_BLOCK_TIME_IN_S = ethereumSlotDuration;
+        this.L2_SLOT_DURATION_IN_S = aztecSlotDuration;
         // Set up system without any account nor protocol contracts
         // and with faster block times and shorter epochs.
-        const context = await setup(0, {
+        const context = await setup(opts.numberOfAccounts ?? 0, {
+            automineL1Setup: true,
             checkIntervalMs: 50,
             archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
             worldStateBlockCheckIntervalMS: WORLD_STATE_BLOCK_CHECK_INTERVAL,
-            skipProtocolContracts: true,
-            salt: 1,
-            aztecEpochDuration: EPOCH_DURATION_IN_L2_SLOTS,
-            aztecSlotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
-            ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
-            aztecProofSubmissionWindow: EPOCH_DURATION_IN_L2_SLOTS * 2 - 1,
+            aztecEpochDuration,
+            aztecSlotDuration,
+            ethereumSlotDuration,
+            aztecProofSubmissionEpochs,
+            aztecTargetCommitteeSize: opts.initialValidators?.length ?? 0,
             minTxsPerBlock: 0,
             realProofs: false,
             startProverNode: true,
+            proverTestDelayMs: opts.proverTestDelayMs ?? 0,
             // We use numeric incremental prover ids for simplicity, but we can switch to
             // using the prover's eth address if the proverId is used for something in the rollup contract
-            proverId: Fr.fromString('1'),
-            // This must be enough so that the tx from the prover is delayed properly,
-            // but not so much to hang the sequencer and timeout the teardown
-            txPropagationMaxQueryAttempts: 12,
+            // Use numeric EthAddress for deterministic prover id
+            proverId: EthAddress.fromNumber(1),
             worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
+            exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+            slasherFlavor: 'none',
+            l1PublishingTime,
             ...opts
+        }, // Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
+        {
+            syncChainTip: 'checkpointed'
         });
         this.context = context;
         this.proverNodes = context.proverNode ? [
@@ -68,52 +107,108 @@ export const ARCHIVER_POLL_INTERVAL = 50;
             context.aztecNode
         ] : [];
         this.logger = context.logger;
-        this.l1Client = context.deployL1ContractsValues.publicClient;
+        this.l1Client = context.deployL1ContractsValues.l1Client;
         this.rollup = RollupContract.getFromConfig(context.config);
+        this.epochCache = await EpochCache.create(this.rollup, context.config, {
+            dateProvider: context.dateProvider
+        });
         // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
-        this.monitor = new ChainMonitor(this.rollup, this.logger).start();
+        this.monitor = new ChainMonitor(this.rollup, context.dateProvider, this.logger).start();
         // This is hideous.
         // We ought to have a definite reference to the l1TxUtils that we're using in both places, provided by the test context.
         this.proverDelayer = context.proverNode ? context.proverNode.publisher.l1TxUtils.delayer : undefined;
-        this.sequencerDelayer = context.sequencer.sequencer.publisher.l1TxUtils.delayer;
-        if (context.proverNode && !this.proverDelayer || !this.sequencerDelayer) {
+        this.sequencerDelayer = context.sequencer ? context.sequencer.sequencer.publisher.l1TxUtils.delayer : undefined;
+        if (context.proverNode && !this.proverDelayer || context.sequencer && !this.sequencerDelayer) {
             throw new Error(`Could not find prover or sequencer delayer`);
         }
         // Constants used for time calculation
+        this.epochDuration = aztecEpochDuration;
         this.constants = {
-            epochDuration: EPOCH_DURATION_IN_L2_SLOTS,
-            slotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
+            epochDuration: aztecEpochDuration,
+            slotDuration: aztecSlotDuration,
             l1StartBlock: await this.rollup.getL1StartBlock(),
             l1GenesisTime: await this.rollup.getL1GenesisTime(),
-            ethereumSlotDuration: L1_BLOCK_TIME_IN_S
+            ethereumSlotDuration,
+            proofSubmissionEpochs: Number(await this.rollup.getProofSubmissionEpochs())
         };
         this.logger.info(`L2 genesis at L1 block ${this.constants.l1StartBlock} (timestamp ${this.constants.l1GenesisTime})`);
     }
     async teardown() {
-        this.monitor.stop();
-        await Promise.all(this.proverNodes.map((node)=>node.stop()));
-        await Promise.all(this.nodes.map((node)=>node.stop()));
+        await this.monitor.stop();
+        await Promise.all(this.proverNodes.map((node)=>tryStop(node, this.logger)));
+        await Promise.all(this.nodes.map((node)=>tryStop(node, this.logger)));
         await this.context.teardown();
     }
-    async createProverNode() {
+    async createProverNode(opts = {}) {
         this.logger.warn('Creating and syncing a simulated prover node...');
         const proverNodePrivateKey = this.getNextPrivateKey();
         const suffix = (this.proverNodes.length + 1).toString();
         const proverNode = await withLogNameSuffix(suffix, ()=>createAndSyncProverNode(proverNodePrivateKey, {
-                ...this.context.config,
-                proverId: Fr.fromString(suffix)
-            }, this.context.aztecNode, join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))));
+                ...this.context.config
+            }, {
+                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex')),
+                proverId: EthAddress.fromNumber(parseInt(suffix, 10)),
+                dontStart: opts.dontStart,
+                ...opts
+            }, this.context.aztecNode, this.context.prefilledPublicData ?? [], {
+                dateProvider: this.context.dateProvider
+            }));
         this.proverNodes.push(proverNode);
         return proverNode;
     }
-    async createNonValidatorNode() {
+    createNonValidatorNode(opts = {}) {
         this.logger.warn('Creating and syncing a node without a validator...');
+        return this.createNode({
+            ...opts,
+            disableValidator: true
+        });
+    }
+    createValidatorNode(privateKeys, opts = {}) {
+        this.logger.warn('Creating and syncing a validator node...');
+        return this.createNode({
+            ...opts,
+            disableValidator: false,
+            validatorPrivateKeys: new SecretValue(privateKeys)
+        });
+    }
+    async createNode(opts = {}) {
         const suffix = (this.nodes.length + 1).toString();
+        const { mockGossipSubNetwork } = this.context;
+        const resolvedConfig = {
+            ...this.context.config,
+            ...opts
+        };
+        const p2pEnabled = resolvedConfig.p2pEnabled || mockGossipSubNetwork !== undefined;
+        const p2pIp = resolvedConfig.p2pIp ?? (p2pEnabled ? '127.0.0.1' : undefined);
         const node = await withLogNameSuffix(suffix, ()=>AztecNodeService.createAndSync({
-                ...this.context.config,
-                disableValidator: true,
-                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))
+                ...resolvedConfig,
+                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex')),
+                validatorPrivateKeys: opts.validatorPrivateKeys ?? new SecretValue([]),
+                p2pEnabled,
+                p2pIp
+            }, {
+                dateProvider: this.context.dateProvider,
+                p2pClientDeps: {
+                    p2pServiceFactory: mockGossipSubNetwork ? getMockPubSubP2PServiceFactory(mockGossipSubNetwork) : undefined
+                }
+            }, {
+                prefilledPublicData: this.context.prefilledPublicData,
+                ...opts
             }));
+        // REFACTOR: We're getting too much into the internals of the sequencer here.
+        // We should have a single method for constructing an aztec node that returns a TestAztecNodeService
+        // which directly exposes the delayer and sets any test config.
+        if (opts.txDelayerMaxInclusionTimeIntoSlot !== undefined) {
+            this.logger.info(`Setting tx delayer max inclusion time into slot to ${opts.txDelayerMaxInclusionTimeIntoSlot} seconds`);
+            // Here we reach into the sequencer and hook in a tx delayer. The problem is that the sequencer's l1 utils only uses a public client, not a wallet.
+            // The delayer needs a wallet (a client that can sign), so we have to create one here.
+            const l1Client = createExtendedL1Client(resolvedConfig.l1RpcUrls, resolvedConfig.publisherPrivateKeys[0].getValue());
+            const sequencer = node.getSequencer();
+            const publisher = sequencer.sequencer.publisher;
+            const delayed = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, this.L1_BLOCK_TIME_IN_S, l1Client);
+            delayed.delayer.setMaxInclusionTimeIntoSlot(opts.txDelayerMaxInclusionTimeIntoSlot);
+            publisher.l1TxUtils = delayed;
+        }
         this.nodes.push(node);
         return node;
     }
@@ -122,34 +217,126 @@ export const ARCHIVER_POLL_INTERVAL = 50;
         return `0x${key.toString('hex')}`;
     }
     /** Waits until the epoch begins (ie until the immediately previous L1 block is mined). */ async waitUntilEpochStarts(epoch) {
-        const [start] = getTimestampRangeForEpoch(BigInt(epoch), this.constants);
+        const [start] = getTimestampRangeForEpoch(EpochNumber(epoch), this.constants);
         this.logger.info(`Waiting until L1 timestamp ${start} is reached as the start of epoch ${epoch}`);
-        await waitUntilL1Timestamp(this.l1Client, start - BigInt(L1_BLOCK_TIME_IN_S));
+        await waitUntilL1Timestamp(this.l1Client, start - BigInt(this.L1_BLOCK_TIME_IN_S), undefined, 30 * this.epochDuration);
         return start;
     }
-    /** Waits until the given L2 block number is mined. */ async waitUntilL2BlockNumber(target, timeout = 60) {
-        await retryUntil(()=>Promise.resolve(target === this.monitor.l2BlockNumber), `Wait until L2 block ${target}`, timeout, 0.1);
+    /** Waits until the given checkpoint number is mined. */ async waitUntilCheckpointNumber(target, timeout = 120) {
+        await retryUntil(()=>Promise.resolve(target <= this.monitor.checkpointNumber), `Wait until checkpoint ${target}`, timeout, 0.1);
     }
-    /** Waits until the given L2 block number is marked as proven. */ async waitUntilProvenL2BlockNumber(t, timeout = 60) {
-        await retryUntil(()=>Promise.resolve(t === this.monitor.l2ProvenBlockNumber), `Wait proven L2 block ${t}`, timeout, 0.1);
+    /** Waits until the given checkpoint number is marked as proven. */ async waitUntilProvenCheckpointNumber(target, timeout = 120) {
+        await retryUntil(()=>Promise.resolve(target <= this.monitor.provenCheckpointNumber), `Wait proven checkpoint ${target}`, timeout, 0.1);
+        return this.monitor.provenCheckpointNumber;
+    }
+    /** Waits until the last slot of the proof submission window for a given epoch. */ async waitUntilLastSlotOfProofSubmissionWindow(epochNumber) {
+        const deadline = getProofSubmissionDeadlineTimestamp(EpochNumber.fromBigInt(BigInt(epochNumber)), this.constants);
+        const oneSlotBefore = deadline - BigInt(this.constants.slotDuration);
+        const date = new Date(Number(oneSlotBefore) * 1000);
+        this.logger.info(`Waiting until last slot of submission window for epoch ${epochNumber} at ${date}`, {
+            oneSlotBefore
+        });
+        await waitUntilL1Timestamp(this.l1Client, oneSlotBefore);
     }
     /** Waits for the aztec node to sync to the target block number. */ async waitForNodeToSync(blockNumber, type) {
         const waitTime = ARCHIVER_POLL_INTERVAL + WORLD_STATE_BLOCK_CHECK_INTERVAL;
         let synched = false;
         while(!synched){
             await sleep(waitTime);
-            const syncState = await this.context.aztecNode.getWorldStateSyncStatus();
-            if (type === 'finalised') {
-                synched = syncState.finalisedBlockNumber >= blockNumber;
+            const [syncState, tips] = await Promise.all([
+                this.context.aztecNode.getWorldStateSyncStatus(),
+                await this.context.aztecNode.getL2Tips()
+            ]);
+            this.logger.info(`Wait for node synch ${blockNumber} ${type}`, {
+                blockNumber,
+                type,
+                syncState,
+                tips
+            });
+            if (type === 'proven') {
+                synched = tips.proven.block.number >= blockNumber && syncState.latestBlockNumber >= blockNumber;
+            } else if (type === 'finalized') {
+                synched = syncState.finalizedBlockNumber >= blockNumber;
             } else {
                 synched = syncState.oldestHistoricBlockNumber >= blockNumber;
             }
         }
     }
+    /** Registers the SpamContract on the given wallet. */ async registerSpamContract(wallet, salt = Fr.ZERO) {
+        const instance = await getContractInstanceFromInstantiationParams(SpamContract.artifact, {
+            constructorArgs: [],
+            constructorArtifact: undefined,
+            salt,
+            publicKeys: undefined,
+            deployer: undefined
+        });
+        await wallet.registerContract(instance, SpamContract.artifact);
+        return SpamContract.at(instance.address, wallet);
+    }
+    /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */ async createL1Client() {
+        const { client, delayer } = withDelayer(createExtendedL1Client([
+            ...this.l1Client.chain.rpcUrls.default.http
+        ], privateKeyToAccount(this.getNextPrivateKey()), this.l1Client.chain), this.context.dateProvider, {
+            ethereumSlotDuration: this.L1_BLOCK_TIME_IN_S
+        });
+        expect(await client.getBalance({
+            address: client.account.address
+        })).toBeGreaterThan(0n);
+        return {
+            client,
+            delayer
+        };
+    }
     /** Verifies whether the given block number is found on the aztec node. */ async verifyHistoricBlock(blockNumber, expectedSuccess) {
-        const result = await this.context.aztecNode.findBlockNumbersForIndexes(blockNumber, MerkleTreeId.NULLIFIER_TREE, [
-            0n
+        // We use `findLeavesIndexes` here, but could use any function that queries the world-state
+        // at a particular block, so we know whether that historic block is available or has been
+        // pruned. Note that `getBlock` would not work here, since it only hits the archiver.
+        const result = await this.context.aztecNode.findLeavesIndexes(blockNumber, MerkleTreeId.NULLIFIER_TREE, [
+            Fr.ZERO
         ]).then((_)=>true).catch((_)=>false);
         expect(result).toBe(expectedSuccess);
     }
+    watchSequencerEvents(sequencers, getMetadata = ()=>({})) {
+        const stateChanges = [];
+        const failEvents = [];
+        // Note we do not include the 'block-tx-count-check-failed' event here, since it is fine if we dont build
+        // due to lack of txs available.
+        const failEventsKeys = [
+            'block-build-failed',
+            'checkpoint-publish-failed',
+            'proposer-rollup-check-failed'
+        ];
+        const makeEvent = (i, eventName, args)=>({
+                ...args,
+                type: eventName,
+                sequencerIndex: i + 2,
+                ...getMetadata(i)
+            });
+        sequencers.forEach((sequencer, i)=>{
+            const sequencerIndex = i + 2;
+            sequencer.getSequencer().on('state-changed', (args)=>{
+                const noisyStates = [
+                    SequencerState.IDLE,
+                    SequencerState.PROPOSER_CHECK,
+                    SequencerState.SYNCHRONIZING
+                ];
+                if (!noisyStates.includes(args.newState)) {
+                    const evt = makeEvent(i, 'state-changed', args);
+                    stateChanges.push(evt);
+                    this.logger.verbose(`Sequencer ${sequencerIndex} transitioned from state ${args.oldState} to state ${args.newState}`, evt);
+                }
+            });
+            failEventsKeys.forEach((eventName)=>{
+                sequencer.getSequencer().on(eventName, (args)=>{
+                    const evt = makeEvent(i, eventName, args);
+                    failEvents.push(evt);
+                    this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, undefined, evt);
+                });
+            });
+        });
+        return {
+            failEvents,
+            stateChanges
+        };
+    }
 }

package/dest/e2e_fees/bridging_race.notest.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJpZGdpbmdfcmFjZS5ub3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfZmVlcy9icmlkZ2luZ19yYWNlLm5vdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/dest/e2e_fees/bridging_race.notest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bridging_race.notest.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/bridging_race.notest.ts"],"names":[],"mappings":""}

package/dest/e2e_fees/bridging_race.notest.js

@@ -0,0 +1,61 @@
+import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
+import { Fr } from '@aztec/aztec.js/fields';
+import { Fq } from '@aztec/foundation/curves/bn254';
+import { sleep } from '@aztec/foundation/sleep';
+import { jest } from '@jest/globals';
+import { FeesTest } from './fees_test.js';
+jest.setTimeout(300_000);
+// Regression for https://github.com/AztecProtocol/aztec-packages/issues/12366
+// Similar to e2e_fees/account_init but with no automine
+describe('e2e_fees bridging_race', ()=>{
+    const ETHEREUM_SLOT_DURATION = 4;
+    const AZTEC_SLOT_DURATION = ETHEREUM_SLOT_DURATION * 2;
+    const t = new FeesTest('bridging_race', 1, {
+        ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
+        aztecSlotDuration: AZTEC_SLOT_DURATION,
+        minTxsPerBlock: 0
+    });
+    beforeAll(async ()=>{
+        await t.setup();
+        ({ wallet, logger } = t);
+    });
+    afterAll(async ()=>{
+        await t.teardown();
+    });
+    let logger;
+    let bobsAddress;
+    let wallet;
+    beforeEach(async ()=>{
+        const bobsSecretKey = Fr.random();
+        const bobsPrivateSigningKey = Fq.random();
+        const bobsSalt = Fr.random();
+        const bobsAccountManager = await wallet.createAccount({
+            secret: bobsSecretKey,
+            salt: bobsSalt,
+            contract: new SchnorrAccountContract(bobsPrivateSigningKey)
+        });
+        bobsAddress = bobsAccountManager.address;
+    });
+    it('Alice bridges funds to Bob', async ()=>{
+        // Tweak the token manager so the bridging happens immediately before the end of the current L2 slot
+        // This caused the message to be "not in state" when tried to be used
+        const l1TokenManager = t.feeJuiceBridgeTestHarness.l1TokenManager;
+        const origApprove = l1TokenManager.approve.bind(l1TokenManager);
+        l1TokenManager.approve = async (amount, address, addressName = '')=>{
+            await origApprove(amount, address, addressName);
+            const sleepTime = (Number(t.chainMonitor.checkpointTimestamp) + AZTEC_SLOT_DURATION) * 1000 - Date.now() - 500;
+            logger.info(`Sleeping for ${sleepTime}ms until near end of L2 slot before sending L1 fee juice to L2 inbox`);
+            await sleep(sleepTime);
+        };
+        // Waiting for the archiver to sync the message _before_ waiting for the mandatory 2 L2 blocks to pass fixed it
+        // This was added everywhere we wait for two blocks, which is spread across three different places in the codebase
+        // Yes, we need to REFACTOR it at some point
+        const claim = await t.feeJuiceBridgeTestHarness.prepareTokensOnL1(bobsAddress);
+        const { claimSecret: secret, messageLeafIndex: index } = claim;
+        await t.feeJuiceContract.methods.claim(bobsAddress, claim.claimAmount, secret, index).send({
+            from: bobsAddress
+        });
+        const [balance] = await t.getGasBalanceFn(bobsAddress);
+        expect(balance).toEqual(claim.claimAmount);
+    });
+});

package/dest/e2e_fees/fees_test.d.ts

@@ -1,73 +1,88 @@
-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 { TestWallet } from '@aztec/test-wallet/server';
+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';
 /**
- * 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>;
     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>);
+    constructor(testName: string, numberOfAccounts?: number, setupOptions?: Partial<SetupOptions & DeployAztecL1ContractsArgs>);
     setup(): 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>;
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlc190ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX2ZlZXMvZmVlc190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDNUYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDbkYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxhQUFhLElBQUksVUFBVSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBR3hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0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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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"}