@aztec/end-to-end 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df

package/dest/{e2e_fees → single-node/fees}/bridging_race.notest.js

@@ -7,7 +7,11 @@ 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', ()=>{
+// Disabled (.notest.ts): this regression was covered by fixes applied at each "wait for two blocks"
+// site in the codebase; keeping the file as reference for the original race scenario. Uses FeesTest
+// with prod sequencer (ethSlot=4s, aztecSlot=8s, inboxLag default, minTxsPerBlock=0) and
+// GasBridgingTestHarness for L1↔L2 fee-juice bridging. Single account, fake in-proc prover node.
+describe('single-node/fees/bridging_race', ()=>{
     const ETHEREUM_SLOT_DURATION = 4;
     const AZTEC_SLOT_DURATION = ETHEREUM_SLOT_DURATION * 2;
     const t = new FeesTest('bridging_race', 1, {
@@ -36,6 +40,17 @@ describe('e2e_fees bridging_race', ()=>{
         });
         bobsAddress = bobsAccountManager.address;
     });
+    // Sleeps until 500ms before the current L2 slot ends, so the subsequent bridge lands right at the slot
+    // boundary (this is what reproduces the "message not in state" race the test guards against).
+    const sleepUntilNearSlotEnd = async ()=>{
+        const sleepTime = (Number(t.monitor.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);
+    };
+    // Reproduces a timing race where an L1→L2 fee-juice bridge message lands just before the end of an
+    // L2 slot, causing the archiver to miss it. The fix was to wait for the archiver to see the message
+    // before waiting for the required two-block confirmation. The sleep injected into approve() simulates
+    // the near-slot-boundary timing.
     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
@@ -43,9 +58,7 @@ describe('e2e_fees bridging_race', ()=>{
         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);
+            await sleepUntilNearSlotEnd();
         };
         // 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

package/dest/single-node/fees/fees_test.d.ts

@@ -0,0 +1,93 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { CheatCodes } from '@aztec/aztec/testing';
+import type { RollupContract } from '@aztec/ethereum/contracts';
+import type { DeployAztecL1ContractsArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
+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 { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import { 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';
+import { SingleNodeTestContext, type SingleNodeTestOpts } from '../single_node_test_context.js';
+/**
+ * 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.
+ *
+ * The fee-domain harness over the single-node topology: extends {@link SingleNodeTestContext} so it
+ * reuses the base node tracking / chain monitor / teardown machinery, but builds its environment with
+ * the bespoke fee opts below (prover node, sponsored-FPC funding, token allowlist) rather than the
+ * base's default node config, and layers the fee-domain setup (FPC, fee juice, banana token) on top.
+ */
+export declare class FeesTest extends SingleNodeTestContext {
+    private numberOfAccounts;
+    private setupOptions;
+    private accounts;
+    aztecNode: AztecNode;
+    aztecNodeAdmin: AztecNodeAdmin;
+    cheatCodes: CheatCodes;
+    wallet: TestWallet;
+    aliceAddress: AztecAddress;
+    bobAddress: AztecAddress;
+    sequencerAddress: AztecAddress;
+    coinbase: EthAddress;
+    fpcAdmin: AztecAddress;
+    gasSettings: GasSettings;
+    /** The base's {@link SingleNodeTestContext.rollup}, exposed under the fee suite's historical name. */
+    rollupContract: RollupContract;
+    feeJuiceContract: FeeJuiceContract;
+    bananaCoin: BananaCoin;
+    bananaFPC: FPCContract;
+    sponsoredFPC: SponsoredFPCContract;
+    counterContract: CounterContract;
+    subscriptionContract: AppSubscriptionContract;
+    feeJuiceBridgeTestHarness: GasBridgingTestHarness;
+    getCoinbaseBalance: () => Promise<bigint>;
+    getCoinbaseSequencerRewards: () => Promise<bigint>;
+    getGasBalanceFn: BalancesFn;
+    getBananaPublicBalanceFn: BalancesFn;
+    getBananaPrivateBalanceFn: BalancesFn;
+    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;
+    private testName;
+    constructor(testName: string, numberOfAccounts?: number, setupOptions?: Partial<SetupOptions & DeployAztecL1ContractsArgs>);
+    setup(opts?: SingleNodeTestOpts): Promise<void>;
+    catchUpProvenChain(): Promise<void>;
+    /** Advances to the next epoch and waits for the proven chain to catch up, so all prior fees are paid out. */
+    waitForEpochProven(): 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>;
+    applyBaseSetup(): Promise<void>;
+    applyEnsureAuthRegistryPublished(): Promise<void>;
+    applyInitialAccounts(): Promise<void>;
+    applySetupFeeJuice(): Promise<void>;
+    applyDeployBananaToken(): Promise<void>;
+    applyFPCSetup(): Promise<void>;
+    applySponsoredFPCSetup(): Promise<void>;
+    applyFundAliceWithBananas(): Promise<void>;
+    applyFundAliceWithPrivateBananas(): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlc190ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2luZ2xlLW5vZGUvZmVlcy9mZWVzX3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBaUMsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQzVGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDbkYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxhQUFhLElBQUksVUFBVSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBR3hFLE9BQU8sRUFBTyxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUt0RSxPQUFPLEVBQUUsS0FBSyxZQUFZLEVBQXNDLE1BQU0seUJBQXlCLENBQUM7QUFHaEcsT0FBTyxFQUFFLEtBQUssVUFBVSxFQUFv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

package/dest/single-node/fees/fees_test.d.ts.map

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

package/dest/{e2e_fees → single-node/fees}/fees_test.js

@@ -1,7 +1,6 @@
 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 { sleep } from '@aztec/foundation/sleep';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
@@ -11,13 +10,15 @@ 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 { GasSettings } from '@aztec/stdlib/gas';
+import { Gas, GasSettings } from '@aztec/stdlib/gas';
 import { getContract } from 'viem';
-import { MNEMONIC } from '../fixtures/fixtures.js';
-import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
-import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import { getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
-import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_harness.js';
+import { L1_DIRECT_WRITE_ACCOUNT_INDEX, MNEMONIC, getPaddedMaxFeesPerGas } from '../../fixtures/fixtures.js';
+import { ensureAuthRegistryPublished, setup } from '../../fixtures/setup.js';
+import { testSpan } from '../../fixtures/timing.js';
+import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
+import { getBalancesFn, setupSponsoredFPC } from '../../fixtures/utils.js';
+import { FeeJuicePortalTestingHarnessFactory } from '../../shared/gas_portal_test_harness.js';
+import { SingleNodeTestContext } from '../single_node_test_context.js';
 /**
  * Test fixture for testing fees. Provides the following setup steps:
  * InitialAccounts: Initializes 3 Schnorr account contracts.
@@ -27,12 +28,15 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
  * 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 {
+ *
+ * The fee-domain harness over the single-node topology: extends {@link SingleNodeTestContext} so it
+ * reuses the base node tracking / chain monitor / teardown machinery, but builds its environment with
+ * the bespoke fee opts below (prover node, sponsored-FPC funding, token allowlist) rather than the
+ * base's default node config, and layers the fee-domain setup (FPC, fee juice, banana token) on top.
+ */ export class FeesTest extends SingleNodeTestContext {
     numberOfAccounts;
     setupOptions;
     accounts;
-    context;
-    logger;
     aztecNode;
     aztecNodeAdmin;
     cheatCodes;
@@ -43,7 +47,7 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
     coinbase;
     fpcAdmin;
     gasSettings;
-    rollupContract;
+    /** The base's {@link SingleNodeTestContext.rollup}, exposed under the fee suite's historical name. */ rollupContract;
     feeJuiceContract;
     bananaCoin;
     bananaFPC;
@@ -51,59 +55,63 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
     counterContract;
     subscriptionContract;
     feeJuiceBridgeTestHarness;
-    chainMonitor;
     getCoinbaseBalance;
     getCoinbaseSequencerRewards;
     getGasBalanceFn;
     getBananaPublicBalanceFn;
     getBananaPrivateBalanceFn;
     getProverFee;
+    getCommittedProverFee;
+    getCommittedBurn;
     ALICE_INITIAL_BANANAS;
     SUBSCRIPTION_AMOUNT;
     APP_SPONSORED_TX_GAS_LIMIT;
+    testName;
     constructor(testName, numberOfAccounts = 3, setupOptions = {}){
-        this.numberOfAccounts = numberOfAccounts;
-        this.setupOptions = setupOptions;
-        this.accounts = [];
-        this.ALICE_INITIAL_BANANAS = BigInt(1e22);
-        this.SUBSCRIPTION_AMOUNT = BigInt(1e19);
-        this.APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9);
+        super(), this.numberOfAccounts = numberOfAccounts, 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.testName = testName;
         this.logger = createLogger(`e2e:e2e_fees:${testName}`);
     }
-    async setup() {
+    async setup(opts = {}) {
         this.logger.verbose('Setting up fresh context...');
-        this.context = await setup(0, {
+        // Token allowlist entries are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
+        const tokenAllowList = await getTokenAllowedSetupFunctions();
+        const context = await setup(this.numberOfAccounts, {
             startProverNode: true,
             ...this.setupOptions,
+            ...opts,
             fundSponsoredFPC: true,
-            skipAccountDeployment: true,
             l1ContractsArgs: {
                 ...this.setupOptions
-            }
+            },
+            txPublicSetupAllowListExtend: [
+                ...this.setupOptions.txPublicSetupAllowListExtend ?? [],
+                ...tokenAllowList
+            ]
         });
-        this.rollupContract = RollupContract.getFromConfig(this.context.config);
-        this.chainMonitor = new ChainMonitor(this.rollupContract, this.context.dateProvider, this.logger, 200).start();
+        // Reuse the base context machinery (rollup, epoch cache, chain monitor, node tracking, teardown)
+        // over the environment built above. Restore the FeesTest-named logger afterwards, since
+        // hydrateFromContext repoints `this.logger` at the context logger.
+        await this.hydrateFromContext(context);
+        this.logger = createLogger(`e2e:e2e_fees:${this.testName}`);
+        this.rollupContract = this.rollup;
         await this.applyBaseSetup();
-        return this;
-    }
-    async 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);
         }
     }
+    /** Advances to the next epoch and waits for the proven chain to catch up, so all prior fees are paid out. */ async waitForEpochProven() {
+        await this.cheatCodes.rollup.advanceToNextEpoch();
+        await this.catchUpProvenChain();
+    }
     async getBlockRewards() {
         const blockReward = await this.rollupContract.getCheckpointReward();
         const rewardConfig = await this.rollupContract.getRewardConfig();
@@ -119,40 +127,41 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
     async mintAndBridgeFeeJuice(minter, recipient) {
         const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(recipient);
         const { claimSecret: secret, messageLeafIndex: index } = claim;
-        await this.feeJuiceContract.methods.claim(recipient, claim.claimAmount, secret, index).send({
-            from: minter
-        });
+        await testSpan('setup:bridge', ()=>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({
+        const { result: balanceBefore } = await this.bananaCoin.methods.balance_of_private(address).simulate({
             from: address
         });
-        await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
-        const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({
+        await testSpan('tx:mint', ()=>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 applyBaseSetup() {
         await this.applyInitialAccounts();
-        await this.applyPublicDeployAccounts();
+        await this.applyEnsureAuthRegistryPublished();
         await this.applySetupFeeJuice();
         await this.applyDeployBananaToken();
     }
+    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.default({
-            maxFeesPerGas: (await this.aztecNode.getCurrentMinFees()).mul(2)
+        this.gasSettings = GasSettings.fallback({
+            gasLimits: Gas.from((await this.aztecNode.getNodeInfo()).txsLimits.gas),
+            maxFeesPerGas: await getPaddedMaxFeesPerGas(this.aztecNode)
         });
         this.cheatCodes = this.context.cheatCodes;
-        this.accounts = deployedAccounts.map((a)=>a.address);
+        this.accounts = this.context.accounts;
         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.
@@ -160,10 +169,6 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
         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);
@@ -171,16 +176,18 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
             aztecNode: this.context.aztecNodeService,
             aztecNodeAdmin: this.context.aztecNodeService,
-            l1Client: this.context.deployL1ContractsValues.l1Client,
+            // Bridge from a dedicated L1 account so its direct writes don't race the sequencer publisher's
+            // txs on the deployer account (see L1_DIRECT_WRITE_ACCOUNT_INDEX).
+            l1Client: createExtendedL1Client(this.context.config.l1RpcUrls, MNEMONIC, undefined, undefined, L1_DIRECT_WRITE_ACCOUNT_INDEX),
             wallet: this.wallet,
             logger: this.logger
         });
     }
     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
-        });
+        const { contract: bananaCoin } = await testSpan('deploy:token', ()=>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);
@@ -191,10 +198,11 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
         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
-        });
+        const { contract: bananaFPC } = await testSpan('deploy:fpc', ()=>FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin).send({
+                from: this.aliceAddress
+            }));
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
+        // bridgeFromL1ToL2 carries its own setup:bridge span.
         await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.aliceAddress);
         this.bananaFPC = bananaFPC;
         const l1FeeJuiceAddress = this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress;
@@ -216,7 +224,7 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
             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;
+            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);
@@ -225,6 +233,24 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
             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');
@@ -237,9 +263,9 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
     async applyFundAliceWithBananas() {
         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
-        });
+        await testSpan('tx:mint', ()=>this.bananaCoin.methods.mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS).send({
+                from: this.aliceAddress
+            }));
     }
     async applyFundAliceWithPrivateBananas() {
         this.logger.info('Applying fund Alice with private bananas setup');

package/dest/single-node/l1-reorgs/setup.d.ts

@@ -0,0 +1,42 @@
+import type { Archiver } from '@aztec/archiver';
+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 type { Delayer } from '@aztec/ethereum/l1-tx-utils';
+import type { ChainMonitor } from '@aztec/ethereum/test';
+import type { TestContract } from '@aztec/noir-test-contracts.js/Test';
+import type { TxHash } from '@aztec/stdlib/tx';
+import { jest } from '@jest/globals';
+import type { EndToEndContext } from '../../fixtures/utils.js';
+import { SingleNodeTestContext } from '../single_node_test_context.js';
+/** Number of txs to send at the start of each reorg test to trigger multi-block checkpoints. */
+export declare const TX_COUNT = 8;
+/**
+ * The single-node + prover-node fixture shared by the L1-reorg suites (`blocks`, `messages`). Stands
+ * up a {@link SingleNodeTestContext} on the {@link FAST_REORG_TIMING} cadence (ethSlot=4s,
+ * aztecSlot=36s, block=8s, epoch=4, 32 slots/epoch) with L1 speed-ups disabled so prover/sequencer txs
+ * can be held back and reorged, registers a {@link TestContract}, and exposes the per-test handles plus
+ * a `sendTransactions` helper that pre-proves and fires `count` lightweight txs to drive multi-block
+ * checkpoints. Reorgs themselves are driven by `EthCheatCodes.reorg`/`reorgWithReplacement` at the call
+ * site. The returned object's fields are populated when `setup()` resolves; create it in `beforeEach`.
+ */
+export declare class L1ReorgsTest {
+    test: SingleNodeTestContext;
+    context: EndToEndContext;
+    logger: Logger;
+    node: AztecNode;
+    archiver: Archiver;
+    monitor: ChainMonitor;
+    proverDelayer: Delayer;
+    sequencerDelayer: Delayer;
+    contract: TestContract;
+    from: AztecAddress;
+    L1_BLOCK_TIME_IN_S: number;
+    L2_SLOT_DURATION_IN_S: number;
+    setup(): Promise<void>;
+    teardown(): Promise<void>;
+    /** Pre-proves and sends `count` txs to generate L2 activity for multi-block checkpoints. */
+    sendTransactions(count: number, offset?: number): Promise<TxHash[]>;
+}
+export { jest };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zaW5nbGUtbm9kZS9sMS1yZW9yZ3Mvc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFaEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDdkUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVyQyxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUcvRCxPQUFPLEVBQXFCLHFCQUFxQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJMUYsZ0dBQWdHO0FBQ2hHLGVBQU8sTUFBTSxRQUFRLElBQUksQ0FBQztBQUUxQjs7Ozs7Ozs7R0FRRztBQUNILHFCQUFhLFlBQVk7SUFDaEIsSUFBSSxFQUFHLHFCQUFxQixDQUFDO0lBQzdCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFHLE1BQU0sQ0FBQztJQUNoQixJQUFJLEVBQUcsU0FBUyxDQUFDO0lBQ2pCLFFBQVEsRUFBRyxRQUFRLENBQUM7SUFDcEIsT0FBTyxFQUFHLFlBQVksQ0FBQztJQUN2QixhQUFhLEVBQUcsT0FBTyxDQUFDO0lBQ3hCLGdCQUFnQixFQUFHLE9BQU8sQ0FBQztJQUMzQixRQUFRLEVBQUcsWUFBWSxDQUFDO0lBQ3hCLElBQUksRUFBRyxZQUFZLENBQUM7SUFFcEIsa0JBQWtCLEVBQUcsTUFBTSxDQUFDO0lBQzVCLHFCQUFxQixFQUFHLE1BQU0sQ0FBQztJQUV6QixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQXlCbEM7SUFFTSxRQUFRLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUvQjtJQUVELDRGQUE0RjtJQUMvRSxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sU0FBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQVUxRTtDQUNGO0FBRUQsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDIn0=

package/dest/single-node/l1-reorgs/setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/single-node/l1-reorgs/setup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAqB,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAI1F,gGAAgG;AAChG,eAAO,MAAM,QAAQ,IAAI,CAAC;AAE1B;;;;;;;;GAQG;AACH,qBAAa,YAAY;IAChB,IAAI,EAAG,qBAAqB,CAAC;IAC7B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAG,MAAM,CAAC;IAChB,IAAI,EAAG,SAAS,CAAC;IACjB,QAAQ,EAAG,QAAQ,CAAC;IACpB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAC3B,QAAQ,EAAG,YAAY,CAAC;IACxB,IAAI,EAAG,YAAY,CAAC;IAEpB,kBAAkB,EAAG,MAAM,CAAC;IAC5B,qBAAqB,EAAG,MAAM,CAAC;IAEzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAyBlC;IAEM,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/B;IAED,4FAA4F;IAC/E,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAU1E;CACF;AAED,OAAO,EAAE,IAAI,EAAE,CAAC"}

package/dest/single-node/l1-reorgs/setup.js

@@ -0,0 +1,57 @@
+import { Fr } from '@aztec/aztec.js/fields';
+import { jest } from '@jest/globals';
+import { proveAndSendTxs } from '../../test-wallet/utils.js';
+import { setupWithProver } from '../setup.js';
+import { FAST_REORG_TIMING } from '../single_node_test_context.js';
+jest.setTimeout(1000 * 60 * 20);
+/** Number of txs to send at the start of each reorg test to trigger multi-block checkpoints. */ export const TX_COUNT = 8;
+/**
+ * The single-node + prover-node fixture shared by the L1-reorg suites (`blocks`, `messages`). Stands
+ * up a {@link SingleNodeTestContext} on the {@link FAST_REORG_TIMING} cadence (ethSlot=4s,
+ * aztecSlot=36s, block=8s, epoch=4, 32 slots/epoch) with L1 speed-ups disabled so prover/sequencer txs
+ * can be held back and reorged, registers a {@link TestContract}, and exposes the per-test handles plus
+ * a `sendTransactions` helper that pre-proves and fires `count` lightweight txs to drive multi-block
+ * checkpoints. Reorgs themselves are driven by `EthCheatCodes.reorg`/`reorgWithReplacement` at the call
+ * site. The returned object's fields are populated when `setup()` resolves; create it in `beforeEach`.
+ */ export class L1ReorgsTest {
+    test;
+    context;
+    logger;
+    node;
+    archiver;
+    monitor;
+    proverDelayer;
+    sequencerDelayer;
+    contract;
+    from;
+    L1_BLOCK_TIME_IN_S;
+    L2_SLOT_DURATION_IN_S;
+    async setup() {
+        this.test = await setupWithProver({
+            ...FAST_REORG_TIMING,
+            numberOfAccounts: 1,
+            maxSpeedUpAttempts: 0,
+            cancelTxOnTimeout: false,
+            minTxsPerBlock: 0,
+            maxTxsPerBlock: 1,
+            aztecProofSubmissionEpochs: 1
+        });
+        ({ proverDelayer: this.proverDelayer, sequencerDelayer: this.sequencerDelayer, context: this.context, logger: this.logger, monitor: this.monitor, L1_BLOCK_TIME_IN_S: this.L1_BLOCK_TIME_IN_S, L2_SLOT_DURATION_IN_S: this.L2_SLOT_DURATION_IN_S } = this.test);
+        this.node = this.context.aztecNode;
+        this.archiver = this.node.getBlockSource();
+        this.from = this.context.accounts[0];
+        this.contract = await this.test.registerTestContract(this.context.wallet);
+    }
+    teardown() {
+        return this.test.teardown();
+    }
+    /** Pre-proves and sends `count` txs to generate L2 activity for multi-block checkpoints. */ async sendTransactions(count, offset = 0) {
+        this.logger.warn(`Pre-proving ${count} transactions`);
+        const txHashes = await proveAndSendTxs(this.context.wallet, count, (i)=>this.contract.methods.emit_nullifier(new Fr(offset + i + 1)), {
+            from: this.from
+        });
+        this.logger.warn(`Sent ${txHashes.length} transactions`);
+        return txHashes;
+    }
+}
+export { jest };

package/dest/single-node/partial-proofs/setup.d.ts

@@ -0,0 +1,5 @@
+import { jest } from '@jest/globals';
+import { NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING, setupWithProver } from '../setup.js';
+import { SingleNodeTestContext } from '../single_node_test_context.js';
+export { jest, setupWithProver, SingleNodeTestContext, NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zaW5nbGUtbm9kZS9wYXJ0aWFsLXByb29mcy9zZXR1cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXJDLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxtQkFBbUIsRUFBRSxlQUFlLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDL0YsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJdkUsT0FBTyxFQUFFLElBQUksRUFBRSxlQUFlLEVBQUUscUJBQXFCLEVBQUUsMEJBQTBCLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQyJ9

package/dest/single-node/partial-proofs/setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/single-node/partial-proofs/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAIvE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,CAAC"}

package/dest/single-node/partial-proofs/setup.js

@@ -0,0 +1,5 @@
+import { jest } from '@jest/globals';
+import { NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING, setupWithProver } from '../setup.js';
+import { SingleNodeTestContext } from '../single_node_test_context.js';
+jest.setTimeout(1000 * 60 * 10);
+export { jest, setupWithProver, SingleNodeTestContext, NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING };

package/dest/single-node/proving/setup.d.ts

@@ -0,0 +1,5 @@
+import { jest } from '@jest/globals';
+import { NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING, setupWithProver } from '../setup.js';
+import { SingleNodeTestContext, WORLD_STATE_CHECKPOINT_HISTORY } from '../single_node_test_context.js';
+export { jest, setupWithProver, SingleNodeTestContext, WORLD_STATE_CHECKPOINT_HISTORY, NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING, };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zaW5nbGUtbm9kZS9wcm92aW5nL3NldHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFckMsT0FBTyxFQUFFLDBCQUEwQixFQUFFLG1CQUFtQixFQUFFLGVBQWUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUMvRixPQUFPLEVBQUUscUJBQXFCLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUl2RyxPQUFPLEVBQ0wsSUFBSSxFQUNKLGVBQWUsRUFDZixxQkFBcUIsRUFDckIsOEJBQThCLEVBQzlCLDBCQUEwQixFQUMxQixtQkFBbUIsR0FDcEIsQ0FBQyJ9

package/dest/single-node/proving/setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/single-node/proving/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAIvG,OAAO,EACL,IAAI,EACJ,eAAe,EACf,qBAAqB,EACrB,8BAA8B,EAC9B,0BAA0B,EAC1B,mBAAmB,GACpB,CAAC"}

package/dest/single-node/proving/setup.js

@@ -0,0 +1,5 @@
+import { jest } from '@jest/globals';
+import { NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING, setupWithProver } from '../setup.js';
+import { SingleNodeTestContext, WORLD_STATE_CHECKPOINT_HISTORY } from '../single_node_test_context.js';
+jest.setTimeout(1000 * 60 * 15);
+export { jest, setupWithProver, SingleNodeTestContext, WORLD_STATE_CHECKPOINT_HISTORY, NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING };

package/dest/single-node/recovery/setup.d.ts

@@ -0,0 +1,5 @@
+import { jest } from '@jest/globals';
+import { NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING, setupWithProver } from '../setup.js';
+import { SingleNodeTestContext } from '../single_node_test_context.js';
+export { jest, setupWithProver, SingleNodeTestContext, NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zaW5nbGUtbm9kZS9yZWNvdmVyeS9zZXR1cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXJDLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxtQkFBbUIsRUFBRSxlQUFlLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDL0YsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJdkUsT0FBTyxFQUFFLElBQUksRUFBRSxlQUFlLEVBQUUscUJBQXFCLEVBQUUsMEJBQTBCLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQyJ9

package/dest/single-node/recovery/setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/single-node/recovery/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAIvE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,CAAC"}

package/dest/single-node/recovery/setup.js

@@ -0,0 +1,5 @@
+import { jest } from '@jest/globals';
+import { NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING, setupWithProver } from '../setup.js';
+import { SingleNodeTestContext } from '../single_node_test_context.js';
+jest.setTimeout(1000 * 60 * 10);
+export { jest, setupWithProver, SingleNodeTestContext, NO_REORG_SUBMISSION_EPOCHS, PROVING_SLOT_TIMING };