@aztec/end-to-end 0.86.0-nightly.20250429 → 0.86.0-nightly.20250501

package/dest/e2e_epochs/epochs_test.d.ts

@@ -5,14 +5,15 @@ import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, type Delayer } from '@aztec/ethereum/test';
 import { ProverNode } from '@aztec/prover-node';
 import type { L2BlockNumber } from '@aztec/stdlib/block';
-import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
 export declare const L1_BLOCK_TIME_IN_S: number;
 export declare const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
+export declare const L2_SLOT_DURATION_IN_S: number;
 export declare const WORLD_STATE_BLOCK_HISTORY = 2;
 export declare const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export declare const ARCHIVER_POLL_INTERVAL = 50;
-export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'proverNodeConfig'>>;
+export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'l1PublishRetryIntervalMS' | 'txPropagationMaxQueryAttempts' | 'proverNodeConfig'>>;
 /**
  * Tests building of epochs using fast block times and short epochs.
  * Spawns an aztec node and a prover node with fake proofs.
@@ -41,7 +42,9 @@ export declare class EpochsTestContext {
     /** Waits until the given L2 block number is mined. */
     waitUntilL2BlockNumber(target: number, timeout?: number): Promise<void>;
     /** Waits until the given L2 block number is marked as proven. */
-    waitUntilProvenL2BlockNumber(t: number, timeout?: number): Promise<void>;
+    waitUntilProvenL2BlockNumber(t: number, timeout?: number): Promise<number>;
+    /** Waits until the end of the proof submission window for a given epoch. */
+    waitUntilEndOfProofSubmissionWindow(epochNumber: number | bigint): Promise<void>;
     /** Waits for the aztec node to sync to the target block number. */
     waitForNodeToSync(blockNumber: number, type: 'finalised' | 'historic'): Promise<void>;
     /** Verifies whether the given block number is found on the aztec node. */

package/dest/e2e_epochs/epochs_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAKrE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QAAsE,CAAC;AACtG,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,IAAI,CACF,YAAY,EACZ,iBAAiB,GAAG,4BAA4B,GAAG,oBAAoB,GAAG,mBAAmB,GAAG,kBAAkB,CACnH,CACF,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,UAAU,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAE/B,aAAa,EAAG,MAAM,CAAC;WAEV,KAAK,CAAC,IAAI,GAAE,cAAmB;IAMtC,KAAK,CAAC,IAAI,GAAE,cAAmB;IAoE/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,OAAO,CAAC,iBAAiB;IAKzB,0FAA0F;IAC7E,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAO/C,sDAAsD;IACzC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAK;IAShE,iEAAiE;IACpD,4BAA4B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,SAAK;IASjE,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAUtF"}
+{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,6BAA6B,CAAC;AAK1G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QAAsE,CAAC;AACtG,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,qBAAqB,QAAoD,CAAC;AAEvF,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,IAAI,CACF,YAAY,EACV,iBAAiB,GACjB,4BAA4B,GAC5B,oBAAoB,GACpB,mBAAmB,GACnB,0BAA0B,GAC1B,+BAA+B,GAC/B,kBAAkB,CACrB,CACF,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,UAAU,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAE/B,aAAa,EAAG,MAAM,CAAC;WAEV,KAAK,CAAC,IAAI,GAAE,cAAmB;IAMtC,KAAK,CAAC,IAAI,GAAE,cAAmB;IAoE/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,OAAO,CAAC,iBAAiB;IAKzB,0FAA0F;IAC7E,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAO/C,sDAAsD;IACzC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAK;IAShE,iEAAiE;IACpD,4BAA4B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,SAAK;IAUjE,4EAA4E;IAC/D,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAO7E,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAUtF"}

package/dest/e2e_epochs/epochs_test.js

@@ -4,11 +4,13 @@ import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, waitUntilL1Timestamp } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { withLogNameSuffix } from '@aztec/foundation/log';
+import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { join } from 'path';
 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 L2_SLOT_DURATION_IN_L1_SLOTS = 2;
+export const L2_SLOT_DURATION_IN_S = L2_SLOT_DURATION_IN_L1_SLOTS * L1_BLOCK_TIME_IN_S;
 export const WORLD_STATE_BLOCK_HISTORY = 2;
 export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
@@ -133,10 +135,19 @@ export const ARCHIVER_POLL_INTERVAL = 50;
         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);
+        await retryUntil(()=>Promise.resolve(target <= this.monitor.l2BlockNumber), `Wait until L2 block ${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);
+        await retryUntil(()=>Promise.resolve(t <= this.monitor.l2ProvenBlockNumber), `Wait proven L2 block ${t}`, timeout, 0.1);
+        return this.monitor.l2ProvenBlockNumber;
+    }
+    /** Waits until the end of the proof submission window for a given epoch. */ async waitUntilEndOfProofSubmissionWindow(epochNumber) {
+        const deadline = getProofSubmissionDeadlineTimestamp(BigInt(epochNumber), this.constants);
+        const date = new Date(Number(deadline) * 1000);
+        this.logger.info(`Waiting until end of submission window for epoch ${epochNumber} at ${date}`, {
+            deadline
+        });
+        await waitUntilL1Timestamp(this.l1Client, deadline);
     }
     /** 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;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=bridging_race.notest.d.ts.map

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,60 @@
+import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { Fr, sleep } from '@aztec/aztec.js';
+import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
+import { Fq } from '@aztec/foundation/fields';
+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.applyInitialAccountsSnapshot();
+        await t.applyPublicDeployAccountsSnapshot();
+        await t.applySetupFeeJuiceSnapshot();
+        ({ pxe, logger } = await t.setup());
+    });
+    afterAll(async ()=>{
+        await t.teardown();
+    });
+    let logger;
+    let pxe;
+    let bobsAddress;
+    beforeEach(async ()=>{
+        const bobsSecretKey = Fr.random();
+        const bobsPrivateSigningKey = Fq.random();
+        const bobsAccountManager = await getSchnorrAccount(pxe, bobsSecretKey, bobsPrivateSigningKey, Fr.random());
+        const bobsCompleteAddress = await bobsAccountManager.getCompleteAddress();
+        bobsAddress = bobsCompleteAddress.address;
+        await bobsAccountManager.getWallet();
+        await bobsAccountManager.register();
+    });
+    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.l2BlockTimestamp) + 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 amount = FEE_FUNDING_FOR_TESTER_ACCOUNT;
+        const claim = await t.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, bobsAddress);
+        const { claimSecret: secret, messageLeafIndex: index } = claim;
+        await t.feeJuiceContract.methods.claim(bobsAddress, amount, secret, index).send().wait();
+        const [balance] = await t.getGasBalanceFn(bobsAddress);
+        expect(balance).toEqual(amount);
+    });
+});

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

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

package/dest/e2e_fees/fees_test.js

@@ -223,15 +223,22 @@ const { E2E_DATA_PATH: dataPath } = process.env;
                 return await rollup.getSequencerRewards(this.coinbase);
             };
             this.getProverFee = async (blockNumber)=>{
+                const block = await this.pxe.getBlock(blockNumber);
                 const publicClient = getPublicClient({
                     l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
                     l1ChainId: context.aztecNodeConfig.l1ChainId
                 });
                 const rollup = new RollupContract(publicClient, data.rollupAddress);
-                const provingCostPerMana = await rollup.getProvingCostPerManaInFeeAsset();
-                const block = await this.pxe.getBlock(blockNumber);
+                // @todo @lherskind As we deal with #13601
+                // Right now the value is from `FeeLib.sol`
+                const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
+                // We round up
+                const mulDiv = (a, b, c)=>a * b / c + (a * b % c > 0n ? 1n : 0n);
+                const { baseFee } = await rollup.getL1FeesAt(block.header.globalVariables.timestamp.toBigInt());
+                const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await rollup.getEpochDuration()), 1n, await rollup.getManaTarget()) + await rollup.getProvingCostPerMana();
+                const price = await rollup.getFeeAssetPerEth();
                 const mana = block.header.totalManaUsed.toBigInt();
-                return mana * provingCostPerMana;
+                return mulDiv(mana * proverCost, price, 10n ** 9n);
             };
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.86.0-nightly.20250429",
+  "version": "0.86.0-nightly.20250501",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,39 +25,39 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.86.0-nightly.20250429",
-    "@aztec/archiver": "0.86.0-nightly.20250429",
-    "@aztec/aztec": "0.86.0-nightly.20250429",
-    "@aztec/aztec-node": "0.86.0-nightly.20250429",
-    "@aztec/aztec.js": "0.86.0-nightly.20250429",
-    "@aztec/bb-prover": "0.86.0-nightly.20250429",
-    "@aztec/blob-lib": "0.86.0-nightly.20250429",
-    "@aztec/blob-sink": "0.86.0-nightly.20250429",
-    "@aztec/bot": "0.86.0-nightly.20250429",
-    "@aztec/cli": "0.86.0-nightly.20250429",
-    "@aztec/constants": "0.86.0-nightly.20250429",
-    "@aztec/entrypoints": "0.86.0-nightly.20250429",
-    "@aztec/epoch-cache": "0.86.0-nightly.20250429",
-    "@aztec/ethereum": "0.86.0-nightly.20250429",
-    "@aztec/foundation": "0.86.0-nightly.20250429",
-    "@aztec/kv-store": "0.86.0-nightly.20250429",
-    "@aztec/l1-artifacts": "0.86.0-nightly.20250429",
-    "@aztec/merkle-tree": "0.86.0-nightly.20250429",
-    "@aztec/noir-contracts.js": "0.86.0-nightly.20250429",
-    "@aztec/noir-noirc_abi": "0.86.0-nightly.20250429",
-    "@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250429",
-    "@aztec/noir-test-contracts.js": "0.86.0-nightly.20250429",
-    "@aztec/p2p": "0.86.0-nightly.20250429",
-    "@aztec/protocol-contracts": "0.86.0-nightly.20250429",
-    "@aztec/prover-client": "0.86.0-nightly.20250429",
-    "@aztec/prover-node": "0.86.0-nightly.20250429",
-    "@aztec/pxe": "0.86.0-nightly.20250429",
-    "@aztec/sequencer-client": "0.86.0-nightly.20250429",
-    "@aztec/simulator": "0.86.0-nightly.20250429",
-    "@aztec/stdlib": "0.86.0-nightly.20250429",
-    "@aztec/telemetry-client": "0.86.0-nightly.20250429",
-    "@aztec/validator-client": "0.86.0-nightly.20250429",
-    "@aztec/world-state": "0.86.0-nightly.20250429",
+    "@aztec/accounts": "0.86.0-nightly.20250501",
+    "@aztec/archiver": "0.86.0-nightly.20250501",
+    "@aztec/aztec": "0.86.0-nightly.20250501",
+    "@aztec/aztec-node": "0.86.0-nightly.20250501",
+    "@aztec/aztec.js": "0.86.0-nightly.20250501",
+    "@aztec/bb-prover": "0.86.0-nightly.20250501",
+    "@aztec/blob-lib": "0.86.0-nightly.20250501",
+    "@aztec/blob-sink": "0.86.0-nightly.20250501",
+    "@aztec/bot": "0.86.0-nightly.20250501",
+    "@aztec/cli": "0.86.0-nightly.20250501",
+    "@aztec/constants": "0.86.0-nightly.20250501",
+    "@aztec/entrypoints": "0.86.0-nightly.20250501",
+    "@aztec/epoch-cache": "0.86.0-nightly.20250501",
+    "@aztec/ethereum": "0.86.0-nightly.20250501",
+    "@aztec/foundation": "0.86.0-nightly.20250501",
+    "@aztec/kv-store": "0.86.0-nightly.20250501",
+    "@aztec/l1-artifacts": "0.86.0-nightly.20250501",
+    "@aztec/merkle-tree": "0.86.0-nightly.20250501",
+    "@aztec/noir-contracts.js": "0.86.0-nightly.20250501",
+    "@aztec/noir-noirc_abi": "0.86.0-nightly.20250501",
+    "@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250501",
+    "@aztec/noir-test-contracts.js": "0.86.0-nightly.20250501",
+    "@aztec/p2p": "0.86.0-nightly.20250501",
+    "@aztec/protocol-contracts": "0.86.0-nightly.20250501",
+    "@aztec/prover-client": "0.86.0-nightly.20250501",
+    "@aztec/prover-node": "0.86.0-nightly.20250501",
+    "@aztec/pxe": "0.86.0-nightly.20250501",
+    "@aztec/sequencer-client": "0.86.0-nightly.20250501",
+    "@aztec/simulator": "0.86.0-nightly.20250501",
+    "@aztec/stdlib": "0.86.0-nightly.20250501",
+    "@aztec/telemetry-client": "0.86.0-nightly.20250501",
+    "@aztec/validator-client": "0.86.0-nightly.20250501",
+    "@aztec/world-state": "0.86.0-nightly.20250501",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.5.0",
     "@noble/curves": "^1.0.0",

package/src/e2e_epochs/epochs_test.ts

@@ -10,7 +10,7 @@ import type { TestProverNode } from '@aztec/prover-node/test';
 import type { SequencerPublisher } from '@aztec/sequencer-client';
 import type { TestSequencerClient } from '@aztec/sequencer-client/test';
 import type { L2BlockNumber } from '@aztec/stdlib/block';
-import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { type L1RollupConstants, getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 
 import { join } from 'path';
 import type { Hex } from 'viem';
@@ -26,6 +26,8 @@ import {
 // 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 L2_SLOT_DURATION_IN_L1_SLOTS = 2;
+export const L2_SLOT_DURATION_IN_S = L2_SLOT_DURATION_IN_L1_SLOTS * L1_BLOCK_TIME_IN_S;
+
 export const WORLD_STATE_BLOCK_HISTORY = 2;
 export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
@@ -33,7 +35,13 @@ export const ARCHIVER_POLL_INTERVAL = 50;
 export type EpochsTestOpts = Partial<
   Pick<
     SetupOptions,
-    'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'proverNodeConfig'
+    | 'startProverNode'
+    | 'aztecProofSubmissionWindow'
+    | 'aztecEpochDuration'
+    | 'proverTestDelayMs'
+    | 'l1PublishRetryIntervalMS'
+    | 'txPropagationMaxQueryAttempts'
+    | 'proverNodeConfig'
   >
 >;
 
@@ -184,7 +192,7 @@ export class EpochsTestContext {
   /** Waits until the given L2 block number is mined. */
   public async waitUntilL2BlockNumber(target: number, timeout = 60) {
     await retryUntil(
-      () => Promise.resolve(target === this.monitor.l2BlockNumber),
+      () => Promise.resolve(target <= this.monitor.l2BlockNumber),
       `Wait until L2 block ${target}`,
       timeout,
       0.1,
@@ -194,11 +202,20 @@ export class EpochsTestContext {
   /** Waits until the given L2 block number is marked as proven. */
   public async waitUntilProvenL2BlockNumber(t: number, timeout = 60) {
     await retryUntil(
-      () => Promise.resolve(t === this.monitor.l2ProvenBlockNumber),
+      () => Promise.resolve(t <= this.monitor.l2ProvenBlockNumber),
       `Wait proven L2 block ${t}`,
       timeout,
       0.1,
     );
+    return this.monitor.l2ProvenBlockNumber;
+  }
+
+  /** Waits until the end of the proof submission window for a given epoch. */
+  public async waitUntilEndOfProofSubmissionWindow(epochNumber: number | bigint) {
+    const deadline = getProofSubmissionDeadlineTimestamp(BigInt(epochNumber), this.constants);
+    const date = new Date(Number(deadline) * 1000);
+    this.logger.info(`Waiting until end of submission window for epoch ${epochNumber} at ${date}`, { deadline });
+    await waitUntilL1Timestamp(this.l1Client, deadline);
   }
 
   /** Waits for the aztec node to sync to the target block number. */

package/src/e2e_fees/bridging_race.notest.ts

@@ -0,0 +1,74 @@
+import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { Fr, type Logger, type PXE, sleep } from '@aztec/aztec.js';
+import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
+import { Fq } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+import { jest } from '@jest/globals';
+import type { Hex } from 'viem';
+
+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.applyInitialAccountsSnapshot();
+    await t.applyPublicDeployAccountsSnapshot();
+    await t.applySetupFeeJuiceSnapshot();
+
+    ({ pxe, logger } = await t.setup());
+  });
+
+  afterAll(async () => {
+    await t.teardown();
+  });
+
+  let logger: Logger;
+  let pxe: PXE;
+  let bobsAddress: AztecAddress;
+
+  beforeEach(async () => {
+    const bobsSecretKey = Fr.random();
+    const bobsPrivateSigningKey = Fq.random();
+    const bobsAccountManager = await getSchnorrAccount(pxe, bobsSecretKey, bobsPrivateSigningKey, Fr.random());
+    const bobsCompleteAddress = await bobsAccountManager.getCompleteAddress();
+    bobsAddress = bobsCompleteAddress.address;
+    await bobsAccountManager.getWallet();
+    await bobsAccountManager.register();
+  });
+
+  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: bigint, address: Hex, addressName = '') => {
+      await origApprove(amount, address, addressName);
+      const sleepTime = (Number(t.chainMonitor.l2BlockTimestamp) + 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 amount = FEE_FUNDING_FOR_TESTER_ACCOUNT;
+    const claim = await t.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, bobsAddress);
+    const { claimSecret: secret, messageLeafIndex: index } = claim;
+    await t.feeJuiceContract.methods.claim(bobsAddress, amount, secret, index).send().wait();
+    const [balance] = await t.getGasBalanceFn(bobsAddress);
+    expect(balance).toEqual(amount);
+  });
+});

package/src/e2e_fees/fees_test.ts

@@ -310,17 +310,33 @@ export class FeesTest {
         };
 
         this.getProverFee = async (blockNumber: number) => {
+          const block = await this.pxe.getBlock(blockNumber);
+
           const publicClient = getPublicClient({
             l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
             l1ChainId: context.aztecNodeConfig.l1ChainId,
           });
           const rollup = new RollupContract(publicClient, data.rollupAddress);
 
-          const provingCostPerMana = await rollup.getProvingCostPerManaInFeeAsset();
+          // @todo @lherskind As we deal with #13601
+          // Right now the value is from `FeeLib.sol`
+          const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
+
+          // We round up
+          const mulDiv = (a: bigint, b: bigint, c: bigint) => (a * b) / c + ((a * b) % c > 0n ? 1n : 0n);
+
+          const { baseFee } = await rollup.getL1FeesAt(block!.header.globalVariables.timestamp.toBigInt());
+          const proverCost =
+            mulDiv(
+              mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await rollup.getEpochDuration()),
+              1n,
+              await rollup.getManaTarget(),
+            ) + (await rollup.getProvingCostPerMana());
+
+          const price = await rollup.getFeeAssetPerEth();
 
-          const block = await this.pxe.getBlock(blockNumber);
           const mana = block!.header.totalManaUsed.toBigInt();
-          return mana * provingCostPerMana;
+          return mulDiv(mana * proverCost, price, 10n ** 9n);
         };
       },
     );