@aztec/end-to-end 5.0.0-rc.1 → 5.0.0

package/dest/single-node/cross-chain/message_test_helpers.d.ts

@@ -0,0 +1,38 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Fr } from '@aztec/aztec.js/fields';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import type { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { sendL1ToL2Message } from '../../fixtures/l1_to_l2_messaging.js';
+import type { CrossChainMessagingTest } from './cross_chain_messaging_test.js';
+/** Scope from which an L1→L2 message is consumed on L2. */
+export type L1ToL2MessageScope = 'private' | 'public';
+/** Dependencies the L1→L2 message helpers close over. */
+export interface L1ToL2MessageHelperDeps {
+    t: CrossChainMessagingTest;
+    aztecNode: AztecNode;
+    wallet: Wallet;
+    user1Address: AztecAddress;
+    log: Logger;
+    /** Marks the current pending tip proven on L1, subject to the caller's proving policy. */
+    markAsProven: () => Promise<void>;
+}
+/** Helpers for driving L1→L2 messages through the inbox, shared across the L1→L2 messaging suites. */
+export interface L1ToL2MessageHelpers {
+    sendMessageToL2(message: {
+        recipient: AztecAddress;
+        content: Fr;
+        secretHash: Fr;
+    }): ReturnType<typeof sendL1ToL2Message>;
+    advanceBlock(): Promise<BlockNumber>;
+    waitForMessageFetched(msgHash: Fr): Promise<CheckpointNumber>;
+    waitForMessageReady(msgHash: Fr, scope: L1ToL2MessageScope, onNotReady?: (blockNumber: BlockNumber) => Promise<void>): Promise<void>;
+}
+/**
+ * Builds the L1→L2 message helpers over a running {@link CrossChainMessagingTest}. The `markAsProven`
+ * dependency lets each suite plug in its own proving policy: suites that never pause proving pass an
+ * unconditional mark, while the inbox-drift suite gates it behind a flag it toggles mid-test.
+ */
+export declare function createL1ToL2MessageHelpers(deps: L1ToL2MessageHelperDeps): L1ToL2MessageHelpers;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV90ZXN0X2hlbHBlcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zaW5nbGUtbm9kZS9jcm9zcy1jaGFpbi9tZXNzYWdlX3Rlc3RfaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUlyRixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUN6RSxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRS9FLDZEQUEyRDtBQUMzRCxNQUFNLE1BQU0sa0JBQWtCLEdBQUcsU0FBUyxHQUFHLFFBQVEsQ0FBQztBQUV0RCwyREFBeUQ7QUFDekQsTUFBTSxXQUFXLHVCQUF1QjtJQUN0QyxDQUFDLEVBQUUsdUJBQXVCLENBQUM7SUFDM0IsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLEVBQUUsTUFBTSxDQUFDO0lBQ1osMEZBQTBGO0lBQzFGLFlBQVksRUFBRSxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUNuQztBQUVELDBHQUFzRztBQUN0RyxNQUFNLFdBQVcsb0JBQW9CO0lBQ25DLGVBQWUsQ0FBQyxPQUFPLEVBQUU7UUFDdkIsU0FBUyxFQUFFLFlBQVksQ0FBQztRQUN4QixPQUFPLEVBQUUsRUFBRSxDQUFDO1FBQ1osVUFBVSxFQUFFLEVBQUUsQ0FBQztLQUNoQixHQUFHLFVBQVUsQ0FBQyxPQUFPLGlCQUFpQixDQUFDLENBQUM7SUFDekMsWUFBWSxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNyQyxxQkFBcUIsQ0FBQyxPQUFPLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzlELG1CQUFtQixDQUNqQixPQUFPLEVBQUUsRUFBRSxFQUNYLEtBQUssRUFBRSxrQkFBa0IsRUFDekIsVUFBVSxDQUFDLEVBQUUsQ0FBQyxXQUFXLEVBQUUsV0FBVyxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FDdkQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ2xCO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQiwwQkFBMEIsQ0FBQyxJQUFJLEVBQUUsdUJBQXVCLEdBQUcsb0JBQW9CLENBNEU5RiJ9

package/dest/single-node/cross-chain/message_test_helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message_test_helpers.d.ts","sourceRoot":"","sources":["../../../src/single-node/cross-chain/message_test_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAIrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,6DAA2D;AAC3D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEtD,2DAAyD;AACzD,MAAM,WAAW,uBAAuB;IACtC,CAAC,EAAE,uBAAuB,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,0FAA0F;IAC1F,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACnC;AAED,0GAAsG;AACtG,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,OAAO,EAAE;QACvB,SAAS,EAAE,YAAY,CAAC;QACxB,OAAO,EAAE,EAAE,CAAC;QACZ,UAAU,EAAE,EAAE,CAAC;KAChB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IACzC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IACrC,qBAAqB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC9D,mBAAmB,CACjB,OAAO,EAAE,EAAE,EACX,KAAK,EAAE,kBAAkB,EACzB,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GACvD,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,uBAAuB,GAAG,oBAAoB,CA4E9F"}

package/dest/single-node/cross-chain/message_test_helpers.js

@@ -0,0 +1,70 @@
+import { isL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
+import { retryUntil } from '@aztec/foundation/retry';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
+import { sendL1ToL2Message } from '../../fixtures/l1_to_l2_messaging.js';
+/**
+ * Builds the L1→L2 message helpers over a running {@link CrossChainMessagingTest}. The `markAsProven`
+ * dependency lets each suite plug in its own proving policy: suites that never pause proving pass an
+ * unconditional mark, while the inbox-drift suite gates it behind a flag it toggles mid-test.
+ */ export function createL1ToL2MessageHelpers(deps) {
+    const { t, aztecNode, wallet, user1Address, log, markAsProven } = deps;
+    // Sends an L1→L2 message from the harness L1 account. This suite skips the token bridge, so the
+    // message context is built from the test's L1 handles rather than a CrossChainTestHarness.
+    const sendMessageToL2 = (message)=>sendL1ToL2Message(message, {
+            l1Client: t.harnessL1Client,
+            l1ContractAddresses: t.deployL1ContractsValues.l1ContractAddresses
+        });
+    // Sends a tx to L2 to advance the block number by 1
+    const advanceBlock = async ()=>{
+        const block = await aztecNode.getBlockNumber();
+        log.warn(`Sending noop tx at block ${block}`);
+        await wallet.sendTx(ExecutionPayload.empty(), {
+            from: user1Address
+        });
+        const newBlock = await aztecNode.getBlockNumber();
+        log.warn(`Advanced to block ${newBlock}`);
+        if (newBlock === block) {
+            throw new Error(`Failed to advance block ${block}`);
+        }
+        // Keep the proof window from expiring mid-test. No-op once a drift scenario disables proving.
+        await markAsProven();
+        return newBlock;
+    };
+    // Waits until the message is fetched by the archiver of the node and returns the msg target checkpoint.
+    // Advances a block on each retry because an L1->L2 message is only indexed once further L2 blocks build.
+    const waitForMessageFetched = async (msgHash)=>{
+        log.warn(`Waiting until the message is fetched by the node`);
+        return await retryUntil(async ()=>{
+            const checkpoint = await aztecNode.getL1ToL2MessageCheckpoint(msgHash);
+            if (checkpoint !== undefined) {
+                return checkpoint;
+            }
+            await advanceBlock();
+            return undefined;
+        }, 'get msg checkpoint', 60);
+    };
+    // Waits until the message is ready to be consumed on L2 as it's been added to the world state
+    const waitForMessageReady = async (msgHash, scope, onNotReady)=>{
+        const msgCheckpoint = await waitForMessageFetched(msgHash);
+        log.warn(`Waiting until L2 reaches the first block of msg checkpoint ${msgCheckpoint} (current is ${await aztecNode.getCheckpointNumber()})`);
+        await retryUntil(async ()=>{
+            const [blockNumber, checkpointNumber] = await Promise.all([
+                aztecNode.getBlockNumber(),
+                aztecNode.getCheckpointNumber()
+            ]);
+            const witness = await aztecNode.getL1ToL2MessageMembershipWitness('latest', msgHash);
+            const isReady = await isL1ToL2MessageReady(aztecNode, msgHash);
+            log.info(`Block is ${blockNumber}, checkpoint is ${checkpointNumber}. Message checkpoint is ${msgCheckpoint}. Witness ${!!witness}. Ready ${isReady}.`);
+            if (!isReady) {
+                await (onNotReady ? onNotReady(blockNumber) : advanceBlock());
+            }
+            return isReady;
+        }, `wait for rollup to reach msg checkpoint ${msgCheckpoint}`, 240);
+    };
+    return {
+        sendMessageToL2,
+        advanceBlock,
+        waitForMessageFetched,
+        waitForMessageReady
+    };
+}

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

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

package/dest/single-node/fees/bridging_race.notest.d.ts.map

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

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,95 @@
+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; the FPC's fee juice is seeded at genesis.
+ * SponsoredFPCSetup: Registers the Sponsored FPC contract, whose fee juice is seeded at genesis.
+ * 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>;
+    /** Warps L1 to the next epoch boundary so the current epoch closes and can be proven. */
+    advanceToNextEpoch(): 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlc190ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2luZ2xlLW5vZGUvZmVlcy9mZWVzX3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJOUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBaUMsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQzVGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDbkYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxhQUFhLElBQUksVUFBVSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBSXhFLE9BQU8sRUFBTyxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUt0RSxPQUFPLEVBQUUsS0FBSyxZQUFZLEVBQXNDLE1BQU0seUJBQXlCLENBQUM7QUFHaEcsT0FBTyxFQUFFLEtBQUssVUFBVSxFQUFv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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,8 +1,8 @@
+import { BatchCall } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
 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';
@@ -12,28 +12,71 @@ 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 { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { Gas, GasSettings } from '@aztec/stdlib/gas';
 import { getContract } from 'viem';
-import { MNEMONIC, getPaddedMaxFeesPerGas } from '../fixtures/fixtures.js';
-import { ensureAuthRegistryPublished, 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';
+// Fixed deploy salts so BananaCoin and its BananaFPC land at deterministic addresses given the FPC
+// admin. This lets the BananaFPC's fee-juice balance be seeded at genesis (see `FeesTest.setup`)
+// instead of bridged from L1 during setup — the address must be known before genesis is computed.
+const BANANA_COIN_SALT = new Fr(0xba4a4a);
+const BANANA_FPC_SALT = new Fr(0xfacade);
+const BANANA_COIN_CONSTRUCTOR_ARGS = [
+    'BC',
+    'BC',
+    18n
+];
+/**
+ * Computes the deterministic BananaCoin and BananaFPC instances for the given admin/deployer, matching
+ * what {@link FeesTest.applyDeployBananaToken} and {@link FeesTest.applyFPCSetup} deploy with the fixed
+ * salts above. Used both to seed the BananaFPC's fee juice at genesis and to assert the deployed
+ * addresses match the seeded one.
+ */ async function computeBananaContractAddresses(admin) {
+    const bananaCoin = await getContractInstanceFromInstantiationParams(BananaCoin.artifact, {
+        salt: BANANA_COIN_SALT,
+        constructorArgs: [
+            admin,
+            ...BANANA_COIN_CONSTRUCTOR_ARGS
+        ],
+        deployer: admin
+    });
+    const bananaFPC = await getContractInstanceFromInstantiationParams(FPCContract.artifact, {
+        salt: BANANA_FPC_SALT,
+        constructorArgs: [
+            bananaCoin.address,
+            admin
+        ],
+        deployer: admin
+    });
+    return {
+        bananaCoinAddress: bananaCoin.address,
+        bananaFPCAddress: bananaFPC.address
+    };
+}
 /**
  * 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.
+ * FPCSetup: Deploys BananaCoin and FPC contracts; the FPC's fee juice is seeded at genesis.
+ * SponsoredFPCSetup: Registers the Sponsored FPC contract, whose fee juice is seeded at genesis.
  * 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;
@@ -44,7 +87,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;
@@ -52,7 +95,6 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
     counterContract;
     subscriptionContract;
     feeJuiceBridgeTestHarness;
-    chainMonitor;
     getCoinbaseBalance;
     getCoinbaseSequencerRewards;
     getGasBalanceFn;
@@ -64,29 +106,31 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
     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(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(this.numberOfAccounts, {
+        const context = await setup(this.numberOfAccounts, {
             startProverNode: true,
             ...this.setupOptions,
             ...opts,
             fundSponsoredFPC: true,
+            // Seed the BananaFPC's fee juice at genesis instead of bridging it from L1 in applyFPCSetup. The
+            // FPC admin is the first account, so its address is deterministic once the accounts are generated.
+            computeExtraGenesisFundedAddresses: async (defaultAccounts)=>[
+                    (await computeBananaContractAddresses(defaultAccounts[0].address)).bananaFPCAddress
+                ],
             l1ContractsArgs: {
                 ...this.setupOptions
             },
@@ -95,20 +139,28 @@ import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_h
                 ...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);
     }
     async catchUpProvenChain() {
-        const bn = await this.aztecNode.getBlockNumber();
-        while(await this.aztecNode.getBlockNumber('proven') < bn){
-            await sleep(1000);
-        }
+        await testSpan('wait:proven-checkpoint', async ()=>{
+            const bn = await this.aztecNode.getBlockNumber();
+            while(await this.aztecNode.getBlockNumber('proven') < bn){
+                await sleep(1000);
+            }
+        });
+    }
+    /** Warps L1 to the next epoch boundary so the current epoch closes and can be proven. */ async advanceToNextEpoch() {
+        await testSpan('warp:proven-checkpoint-epoch', ()=>this.cheatCodes.rollup.advanceToNextEpoch());
+    }
+    /** 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.advanceToNextEpoch();
+        await this.catchUpProvenChain();
     }
     async getBlockRewards() {
         const blockReward = await this.rollupContract.getCheckpointReward();
@@ -125,15 +177,15 @@ 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 { result: balanceBefore } = await this.bananaCoin.methods.balance_of_private(address).simulate({
             from: address
         });
-        await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
+        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
         });
@@ -174,16 +226,21 @@ 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 { contract: 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, ...BANANA_COIN_CONSTRUCTOR_ARGS, {
+                salt: BANANA_COIN_SALT,
+                deployer: this.aliceAddress
+            }).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);
@@ -194,11 +251,20 @@ 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 { contract: 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, {
+                salt: BANANA_FPC_SALT,
+                deployer: this.aliceAddress
+            }).send({
+                from: this.aliceAddress
+            }));
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.aliceAddress);
+        // The BananaFPC's fee juice is seeded at genesis (see FeesTest.setup) rather than bridged here.
+        // Assert the deploy landed at the seeded address so a params drift surfaces as a clear error rather
+        // than a downstream "insufficient fee payer balance".
+        const { bananaFPCAddress } = await computeBananaContractAddresses(this.aliceAddress);
+        if (!bananaFPC.address.equals(bananaFPCAddress)) {
+            throw new Error(`Deployed BananaFPC address ${bananaFPC.address} does not match the genesis-funded address ` + `${bananaFPCAddress}; the deterministic deploy params drifted from the genesis funding computation.`);
+        }
         this.bananaFPC = bananaFPC;
         const l1FeeJuiceAddress = this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress;
         this.getCoinbaseBalance = async ()=>{
@@ -257,10 +323,22 @@ 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({
+        // Both mints are alice sends on BananaCoin touching disjoint balances, so they ride a single
+        // BatchCall tx (one proof, one slot) rather than two concurrent txs. The PXE serializes proving,
+        // so two concurrent sends would still be proven back-to-back and land in consecutive slots.
+        const { result: privateBalanceBefore } = await this.bananaCoin.methods.balance_of_private(this.aliceAddress).simulate({
+            from: this.aliceAddress
+        });
+        await testSpan('tx:mint', ()=>new BatchCall(this.wallet, [
+                this.bananaCoin.methods.mint_to_private(this.aliceAddress, this.ALICE_INITIAL_BANANAS),
+                this.bananaCoin.methods.mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS)
+            ]).send({
+                from: this.aliceAddress
+            }));
+        const { result: privateBalanceAfter } = await this.bananaCoin.methods.balance_of_private(this.aliceAddress).simulate({
             from: this.aliceAddress
         });
+        expect(privateBalanceAfter).toEqual(privateBalanceBefore + this.ALICE_INITIAL_BANANAS);
     }
     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=24s, block=5s, 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"}