@aztec/epoch-cache 0.0.1-commit.5914bae → 0.0.1-commit.59a0419c6

package/dest/epoch_cache.js

@@ -1,12 +1,15 @@
 import { createEthereumChain } from '@aztec/ethereum/chain';
 import { makeL1HttpTransport } from '@aztec/ethereum/client';
 import { NoCommitteeError, RollupContract } from '@aztec/ethereum/contracts';
+import { getFinalizedL1Block } from '@aztec/ethereum/queries';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { getEpochAtSlot, getEpochNumberAtTimestamp, getNextL1SlotTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampForSlot, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { getEpochAtSlot, getEpochNumberAtTimestamp, getNextL1SlotTimestamp, getSlotAtNextL1Block, getSlotAtTimestamp, getSlotRangeForEpoch, getStartTimestampForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { createPublicClient, encodeAbiParameters, keccak256 } from 'viem';
 import { getEpochCacheConfigEnvVars } from './config.js';
+/** When proposer pipelining is enabled, the proposer builds one slot ahead. */ export const PROPOSER_PIPELINING_SLOT_OFFSET = 1;
 /**
  * Epoch cache
  *
@@ -20,14 +23,19 @@ import { getEpochCacheConfigEnvVars } from './config.js';
     l1constants;
     dateProvider;
     config;
-    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+    /**
+   * Single map holding both resolved entries and in-flight promises.
+   * A `Promise` value means a fetch is in progress; concurrent callers await it.
+   */ // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
     cache;
     allValidators;
     lastValidatorRefresh;
     log;
+    enableProposerPipelining;
     constructor(rollup, l1constants, dateProvider = new DateProvider(), config = {
         cacheSize: 12,
-        validatorRefreshIntervalSeconds: 60
+        validatorRefreshIntervalSeconds: 60,
+        enableProposerPipelining: false
     }){
         this.rollup = rollup;
         this.l1constants = l1constants;
@@ -37,8 +45,10 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         this.allValidators = new Set();
         this.lastValidatorRefresh = 0;
         this.log = createLogger('epoch-cache');
+        this.enableProposerPipelining = this.config.enableProposerPipelining;
         this.log.debug(`Initialized EpochCache`, {
-            l1constants
+            l1constants,
+            enableProposerPipelining: this.enableProposerPipelining
         });
     }
     static async create(rollupOrAddress, config, deps = {}) {
@@ -81,11 +91,35 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             targetCommitteeSize: Number(targetCommitteeSize),
             rollupManaLimit: Number(rollupManaLimit)
         };
-        return new EpochCache(rollup, l1RollupConstants, deps.dateProvider);
+        return new EpochCache(rollup, l1RollupConstants, deps.dateProvider, {
+            cacheSize: 12,
+            validatorRefreshIntervalSeconds: 60,
+            enableProposerPipelining: config.enableProposerPipelining
+        });
     }
     getL1Constants() {
         return this.l1constants;
     }
+    isProposerPipeliningEnabled() {
+        return this.enableProposerPipelining;
+    }
+    pipeliningOffset() {
+        return this.enableProposerPipelining ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
+    }
+    getSlotNow() {
+        return this.getEpochAndSlotNow().slot;
+    }
+    getTargetSlot() {
+        const slotNow = this.getSlotNow();
+        const offset = this.isProposerPipeliningEnabled() ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
+        return SlotNumber(slotNow + offset);
+    }
+    getEpochNow() {
+        return this.getEpochAndSlotNow().epoch;
+    }
+    getTargetEpoch() {
+        return getEpochAtSlot(this.getTargetSlot(), this.l1constants);
+    }
     getEpochAndSlotNow() {
         const nowMs = BigInt(this.dateProvider.now());
         const nowSeconds = nowMs / 1000n;
@@ -95,44 +129,43 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         };
     }
     getEpochAndSlotAtSlot(slot) {
-        const epoch = getEpochAtSlot(slot, this.l1constants);
-        const ts = getTimestampRangeForEpoch(epoch, this.l1constants)[0];
-        return {
-            epoch,
-            ts,
-            slot
-        };
+        return this.getEpochAndSlotAtTimestamp(getTimestampForSlot(slot, this.l1constants));
     }
     getEpochAndSlotInNextL1Slot() {
-        const now = BigInt(this.dateProvider.nowInSeconds());
-        const nextSlotTs = getNextL1SlotTimestamp(Number(now), this.l1constants);
+        const nowSeconds = this.dateProvider.nowInSeconds();
+        const nextSlotTs = getNextL1SlotTimestamp(nowSeconds, this.l1constants);
         return {
             ...this.getEpochAndSlotAtTimestamp(nextSlotTs),
-            now
+            nowSeconds: BigInt(nowSeconds)
+        };
+    }
+    getTargetEpochAndSlotInNextL1Slot() {
+        if (!this.isProposerPipeliningEnabled()) {
+            return this.getEpochAndSlotInNextL1Slot();
+        }
+        const result = this.getEpochAndSlotInNextL1Slot();
+        const offset = PROPOSER_PIPELINING_SLOT_OFFSET;
+        const targetSlot = SlotNumber(result.slot + offset);
+        return {
+            ...result,
+            slot: targetSlot,
+            epoch: getEpochAtSlot(targetSlot, this.l1constants)
         };
     }
     getEpochAndSlotAtTimestamp(ts) {
         const slot = getSlotAtTimestamp(ts, this.l1constants);
+        const epoch = getEpochNumberAtTimestamp(ts, this.l1constants);
         return {
-            epoch: getEpochNumberAtTimestamp(ts, this.l1constants),
-            ts: getTimestampForSlot(slot, this.l1constants),
-            slot
+            slot,
+            epoch,
+            ts: getTimestampForSlot(slot, this.l1constants)
         };
     }
     getCommitteeForEpoch(epoch) {
         const [startSlot] = getSlotRangeForEpoch(epoch, this.l1constants);
         return this.getCommittee(startSlot);
     }
-    /**
-   * Returns whether the escape hatch is open for the given epoch.
-   *
-   * Uses the already-cached EpochCommitteeInfo when available. If not cached, it will fetch
-   * the epoch committee info (which includes the escape hatch flag) and return it.
-   */ async isEscapeHatchOpen(epoch) {
-        const cached = this.cache.get(epoch);
-        if (cached) {
-            return cached.isEscapeHatchOpen;
-        }
+    /** Returns whether the escape hatch is open for the given epoch. */ async isEscapeHatchOpen(epoch) {
         const info = await this.getCommitteeForEpoch(epoch);
         return info.isEscapeHatchOpen;
     }
@@ -142,30 +175,47 @@ import { getEpochCacheConfigEnvVars } from './config.js';
    * This is a lightweight helper intended for callers that already have a slot number and only
    * need the escape hatch flag (without pulling full committee info).
    */ async isEscapeHatchOpenAtSlot(slot = 'now') {
-        const epoch = slot === 'now' ? this.getEpochAndSlotNow().epoch : slot === 'next' ? this.getEpochAndSlotInNextL1Slot().epoch : getEpochAtSlot(slot, this.l1constants);
+        const epoch = slot === 'now' ? this.getEpochNow() : slot === 'next' ? this.getEpochAndSlotInNextL1Slot().epoch : getEpochAtSlot(slot, this.l1constants);
         return await this.isEscapeHatchOpen(epoch);
     }
     /**
-   * Get the current validator set
-   * @param nextSlot - If true, get the validator set for the next slot.
-   * @returns The current validator set.
+   * Get the current validator set.
+   *
+   * Returns cached data if the entry is finalized or still fresh (queried less than one
+   * Ethereum slot ago). Stale non-finalized entries are re-queried, and concurrent callers
+   * coalesce on the same in-flight promise so the L1 query happens only once.
    */ async getCommittee(slot = 'now') {
         const { epoch, ts } = this.getEpochAndTimestamp(slot);
-        if (this.cache.has(epoch)) {
-            return this.cache.get(epoch);
+        const cached = this.cache.get(epoch);
+        // In-flight promise: another caller is already fetching this epoch — just await it.
+        if (cached instanceof Promise) {
+            return (await cached).data;
         }
-        const epochData = await this.computeCommittee({
-            epoch,
-            ts
-        });
-        // If the committee size is 0 or undefined, then do not cache
-        if (!epochData.committee || epochData.committee.length === 0) {
-            return epochData;
+        // Resolved entry: return it if finalized or still fresh.
+        if (cached && (cached.finalized || !this.isStale(cached))) {
+            return cached.data;
+        }
+        // Stale non-finalized entry: do a lightweight refresh first (check block hash + finalized ts).
+        // Only fall back to a full re-fetch if the L1 block was reorged.
+        if (cached) {
+            const promise = this.refreshStaleEntry(cached, epoch, ts);
+            this.cache.set(epoch, promise);
+            try {
+                return (await promise).data;
+            } catch (err) {
+                this.cache.set(epoch, cached);
+                throw err;
+            }
+        }
+        // No entry at all: full fetch.
+        const promise = this.fetchAndCache(epoch, ts);
+        this.cache.set(epoch, promise);
+        try {
+            return (await promise).data;
+        } catch (err) {
+            this.cache.delete(epoch);
+            throw err;
         }
-        this.cache.set(epoch, epochData);
-        const toPurge = Array.from(this.cache.keys()).sort((a, b)=>Number(b - a)).slice(this.config.cacheSize);
-        toPurge.forEach((key)=>this.cache.delete(key));
-        return epochData;
     }
     getEpochAndTimestamp(slot = 'now') {
         if (slot === 'now') {
@@ -176,27 +226,121 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             return this.getEpochAndSlotAtSlot(slot);
         }
     }
-    async computeCommittee(when) {
-        const { ts, epoch } = when;
-        const [committee, seedBuffer, l1Timestamp, isEscapeHatchOpen] = await Promise.all([
+    /** Evicts oldest cache entries (resolved or in-flight) beyond cacheSize. */ purgeCache() {
+        if (this.cache.size <= this.config.cacheSize) {
+            return;
+        }
+        const toPurge = Array.from(this.cache.keys()).sort((a, b)=>Number(b - a)).slice(this.config.cacheSize);
+        toPurge.forEach((key)=>this.cache.delete(key));
+    }
+    /** Returns true if a non-finalized cache entry is older than one Ethereum slot. */ isStale(entry) {
+        const nowSeconds = BigInt(this.dateProvider.nowInSeconds());
+        return nowSeconds - entry.lastRefreshL1Timestamp >= BigInt(this.l1constants.ethereumSlotDuration);
+    }
+    /** Whether a cached epoch entry has been marked as finalized. Returns undefined if not cached or still in-flight. */ isFinalized(epoch) {
+        const entry = this.cache.get(epoch);
+        if (!entry || entry instanceof Promise) {
+            return undefined;
+        }
+        return entry.finalized;
+    }
+    /** Returns the latest L1 timestamp stored in the cached entry. Undefined if not cached or in-flight. */ getCachedLastRefreshL1Timestamp(epoch) {
+        const entry = this.cache.get(epoch);
+        if (!entry || entry instanceof Promise) {
+            return undefined;
+        }
+        return entry.lastRefreshL1Timestamp;
+    }
+    /** Computes the sampling timestamp for an epoch's committee data. */ getSamplingTimestamp(epoch) {
+        const { lagInEpochsForRandao, epochDuration, slotDuration } = this.l1constants;
+        const epochStartTs = getStartTimestampForEpoch(epoch, this.l1constants);
+        return epochStartTs - BigInt(lagInEpochsForRandao) * BigInt(epochDuration) * BigInt(slotDuration);
+    }
+    /**
+   * Lightweight refresh for a stale non-finalized entry. Queries only the block hash at
+   * the original block number and the finalized block timestamp — avoids the expensive
+   * getCommitteeAt and getSampleSeedAt calls on the rollup contract.
+   *
+   * If the block hash still matches (no L1 reorg), we keep the existing data and just
+   * update the provenance timestamp. If the finalized block has caught up, we promote the
+   * entry to finalized. If there was a reorg (hash mismatch), we fall back to a full fetch.
+   */ async refreshStaleEntry(stale, epoch, ts) {
+        const [blockAtOriginal, l1FinalizedBlock, latestBlock] = await Promise.all([
+            this.rollup.client.getBlock({
+                blockNumber: stale.lastQueryL1BlockNumber,
+                includeTransactions: false
+            }),
+            getFinalizedL1Block(this.rollup.client),
+            this.rollup.client.getBlock({
+                includeTransactions: false
+            })
+        ]);
+        if (blockAtOriginal.hash === stale.lastQueryL1BlockHash) {
+            // No reorg: the data is still valid. Check if we can now mark it as finalized.
+            const samplingTs = this.getSamplingTimestamp(epoch);
+            const finalized = !!(stale.data.committee && stale.data.committee.length > 0) && l1FinalizedBlock !== undefined && samplingTs <= l1FinalizedBlock.timestamp;
+            const refreshed = {
+                ...stale,
+                lastRefreshL1Timestamp: latestBlock.timestamp,
+                finalized
+            };
+            this.cache.set(epoch, refreshed);
+            return refreshed;
+        }
+        // Reorg detected: block hash mismatch. Do a full re-fetch.
+        // Pass the already-fetched block timestamps to avoid redundant queries.
+        this.log.warn(`L1 reorg detected for epoch ${epoch}: block ${stale.lastQueryL1BlockNumber} hash changed`, {
+            epoch,
+            expectedHash: stale.lastQueryL1BlockHash,
+            actualHash: blockAtOriginal.hash
+        });
+        return this.fetchAndCache(epoch, ts, {
+            latestBlock,
+            finalizedBlock: l1FinalizedBlock
+        });
+    }
+    /**
+   * Fetches committee data from L1, determines finalization status, and stores in the cache.
+   *
+   * Uses `lagInEpochsForRandao` (the binding constraint, always <= lagInEpochsForValidatorSet)
+   * and computes the sampling timestamp from the epoch start to match the L1 contract's logic.
+   *
+   * When called from refreshStaleEntry after a reorg, the latest and finalized blocks are
+   * passed in to avoid redundant L1 queries.
+   */ async fetchAndCache(epoch, ts, prefetched) {
+        const [committee, seedBuffer, latestBlock, finalizedBlock, isEscapeHatchOpen] = await Promise.all([
             this.rollup.getCommitteeAt(ts),
             this.rollup.getSampleSeedAt(ts),
-            this.rollup.client.getBlock({
+            prefetched?.latestBlock ?? this.rollup.client.getBlock({
                 includeTransactions: false
-            }).then((b)=>b.timestamp),
+            }),
+            prefetched !== undefined ? prefetched.finalizedBlock : getFinalizedL1Block(this.rollup.client),
             this.rollup.isEscapeHatchOpen(epoch)
         ]);
-        const { lagInEpochsForValidatorSet, epochDuration, slotDuration } = this.l1constants;
-        const sub = BigInt(lagInEpochsForValidatorSet) * BigInt(epochDuration) * BigInt(slotDuration);
-        if (ts - sub > l1Timestamp) {
-            throw new Error(`Cannot query committee for future epoch ${epoch} with timestamp ${ts} (current L1 time is ${l1Timestamp}). Check your Ethereum node is synced.`);
+        const samplingTs = this.getSamplingTimestamp(epoch);
+        if (samplingTs > latestBlock.timestamp) {
+            throw new Error(`Cannot query committee for future epoch ${epoch}: ` + `sampling timestamp ${samplingTs} is beyond latest L1 block at ${latestBlock.timestamp}. ` + `Check your Ethereum node is synced.`);
         }
-        return {
+        // Empty committees are never marked finalized so they always get re-queried after TTL.
+        // If L1 has no finalized block yet (devnet startup), entries stay unfinalized.
+        const hasCommittee = !!(committee && committee.length > 0);
+        const finalized = hasCommittee && finalizedBlock !== undefined && samplingTs <= finalizedBlock.timestamp;
+        const data = {
             committee,
             seed: seedBuffer.toBigInt(),
             epoch,
             isEscapeHatchOpen
         };
+        const entry = {
+            data,
+            lastQueryL1BlockNumber: latestBlock.number,
+            lastQueryL1BlockHash: latestBlock.hash,
+            lastRefreshL1Timestamp: latestBlock.timestamp,
+            finalized
+        };
+        this.cache.set(epoch, entry);
+        this.purgeCache();
+        return entry;
     }
     /**
    * Get the ABI encoding of the proposer index - see ValidatorSelectionLib.sol computeProposerIndex
@@ -227,14 +371,26 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         }
         return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
     }
-    /** Returns the current and next L2 slot numbers. */ getCurrentAndNextSlot() {
-        const current = this.getEpochAndSlotNow();
+    /** Returns the current and next L2 slot in next eth L1 Slot. */ getCurrentAndNextSlot() {
+        const currentSlot = this.getSlotNow();
         const next = this.getEpochAndSlotInNextL1Slot();
         return {
-            currentSlot: current.slot,
+            currentSlot,
             nextSlot: next.slot
         };
     }
+    /** Returns the target and next L2 slot in the next L1 slot. */ getTargetAndNextSlot() {
+        const nowSeconds = BigInt(this.dateProvider.nowInSeconds());
+        const offset = this.isProposerPipeliningEnabled() ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
+        const currentSlot = getSlotAtTimestamp(nowSeconds, this.l1constants);
+        const targetSlot = SlotNumber(currentSlot + offset);
+        const nextL2SlotOnL1 = getSlotAtNextL1Block(nowSeconds, this.l1constants);
+        const nextSlot = SlotNumber(nextL2SlotOnL1 + offset);
+        return {
+            targetSlot,
+            nextSlot
+        };
+    }
     /**
    * Get the proposer attester address in the given L2 slot
    * @returns The proposer attester address. If the committee does not exist, we throw a NoCommitteeError.

package/dest/test/test_epoch_cache.d.ts

@@ -1,7 +1,7 @@
 import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import type { EpochAndSlot, EpochCacheInterface, EpochCommitteeInfo, SlotTag } from '../epoch_cache.js';
+import { type EpochAndSlot, type EpochCacheInterface, type EpochCommitteeInfo, type SlotTag } from '../epoch_cache.js';
 /**
  * A test implementation of EpochCacheInterface that allows manual configuration
  * of committee, proposer, slot, and escape hatch state for use in tests.
@@ -17,6 +17,7 @@ export declare class TestEpochCache implements EpochCacheInterface {
     private seed;
     private registeredValidators;
     private l1Constants;
+    private proposerPipeliningEnabled;
     constructor(l1Constants?: Partial<L1RollupConstants>);
     /**
      * Sets the committee members. Used in validation and attestation flows.
@@ -54,12 +55,22 @@ export declare class TestEpochCache implements EpochCacheInterface {
      */
     setL1Constants(constants: Partial<L1RollupConstants>): this;
     getL1Constants(): L1RollupConstants;
+    setProposerPipeliningEnabled(enabled: boolean): void;
     getCommittee(_slot?: SlotTag): Promise<EpochCommitteeInfo>;
+    getSlotNow(): SlotNumber;
+    getTargetSlot(): SlotNumber;
+    getEpochNow(): EpochNumber;
+    getTargetEpoch(): EpochNumber;
+    isProposerPipeliningEnabled(): boolean;
+    pipeliningOffset(): number;
     getEpochAndSlotNow(): EpochAndSlot & {
         nowMs: bigint;
     };
     getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
-        now: bigint;
+        nowSeconds: bigint;
+    };
+    getTargetEpochAndSlotInNextL1Slot(): EpochAndSlot & {
+        nowSeconds: bigint;
     };
     getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
     computeProposerIndex(slot: SlotNumber, _epoch: EpochNumber, _seed: bigint, size: bigint): bigint;
@@ -67,10 +78,15 @@ export declare class TestEpochCache implements EpochCacheInterface {
         currentSlot: SlotNumber;
         nextSlot: SlotNumber;
     };
+    getTargetAndNextSlot(): {
+        targetSlot: SlotNumber;
+        nextSlot: SlotNumber;
+    };
     getProposerAttesterAddressInSlot(_slot: SlotNumber): Promise<EthAddress | undefined>;
     getRegisteredValidators(): Promise<EthAddress[]>;
     isInCommittee(_slot: SlotTag, validator: EthAddress): Promise<boolean>;
     filterInCommittee(_slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
+    isEscapeHatchOpen(_epoch: EpochNumber): Promise<boolean>;
     isEscapeHatchOpenAtSlot(_slot?: SlotTag): Promise<boolean>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9lcG9jaF9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdGVzdF9lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR3JFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWN4Rzs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxjQUFlLFlBQVcsbUJBQW1CO0lBQ3hELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlCO0lBQ2hELE9BQU8sQ0FBQyxXQUFXLENBQTZCO0lBQ2hELE9BQU8sQ0FBQyxlQUFlLENBQWtCO0lBQ3pDLE9BQU8sQ0FBQyxJQUFJLENBQWM7SUFDMUIsT0FBTyxDQUFDLG9CQUFvQixDQUFvQjtJQUNoRCxPQUFPLENBQUMsV0FBVyxDQUFvQjtJQUV2QyxZQUFZLFdBQVcsR0FBRSxPQUFPLENBQUMsaUJBQWlCLENBQU0sRUFFdkQ7SUFFRDs7O09BR0c7SUFDSCxZQUFZLENBQUMsU0FBUyxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FHMUM7SUFFRDs7O09BR0c7SUFDSCxXQUFXLENBQUMsUUFBUSxFQUFFLFVBQVUsR0FBRyxTQUFTLEdBQUcsSUFBSSxDQUdsRDtJQUVEOzs7T0FHRztJQUNILGNBQWMsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FHckM7SUFFRDs7O09BR0c7SUFDSCxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsT0FBTyxHQUFHLElBQUksQ0FHdEM7SUFFRDs7O09BR0c7SUFDSCxPQUFPLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBRzFCO0lBRUQ7OztPQUdHO0lBQ0gsdUJBQXVCLENBQUMsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FHdEQ7SUFFRDs7O09BR0c7SUFDSCxjQUFjLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLElBQUksQ0FHMUQ7SUFFRCxjQUFjLElBQUksaUJBQWlCLENBRWxDO0lBRUQsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FRekQ7SUFFRCxrQkFBa0IsSUFBSSxZQUFZLEdBQUc7UUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FJckQ7SUFFRCwyQkFBMkIsSUFBSSxZQUFZLEdBQUc7UUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FPNUQ7SUFFRCx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxLQUFLLE1BQU0sRUFBRSxDQUcxRjtJQUVELG9CQUFvQixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUsvRjtJQUVELHFCQUFxQixJQUFJO1FBQUUsV0FBVyxFQUFFLFVBQVUsQ0FBQztRQUFDLFFBQVEsRUFBRSxVQUFVLENBQUE7S0FBRSxDQUt6RTtJQUVELGdDQUFnQyxDQUFDLEtBQUssRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUMsQ0FFbkY7SUFFRCx1QkFBdUIsSUFBSSxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FFL0M7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FFckU7SUFFRCxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FHakY7SUFFRCx1QkFBdUIsQ0FBQyxLQUFLLENBQUMsRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUV6RDtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9lcG9jaF9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdGVzdF9lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR3JFLE9BQU8sRUFDTCxLQUFLLFlBQVksRUFDakIsS0FBSyxtQkFBbUIsRUFDeEIsS0FBSyxrQkFBa0IsRUFFdkIsS0FBSyxPQUFPLEVBQ2IsTUFBTSxtQkFBbUIsQ0FBQztBQWMzQjs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxjQUFlLFlBQVcsbUJBQW1CO0lBQ3hELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlCO0lBQ2hELE9BQU8sQ0FBQyxXQUFXLENBQTZCO0lBQ2hELE9BQU8sQ0FBQyxlQUFlLENBQWtCO0lBQ3pDLE9BQU8sQ0FBQyxJQUFJLENBQWM7SUFDMUIsT0FBTyxDQUFDLG9CQUFvQixDQUFvQjtJQUNoRCxPQUFPLENBQUMsV0FBVyxDQUFvQjtJQUN2QyxPQUFPLENBQUMseUJBQXlCLENBQVM7SUFFMUMsWUFBWSxXQUFXLEdBQUUsT0FBTyxDQUFDLGlCQUFpQixDQUFNLEVBRXZEO0lBRUQ7OztPQUdHO0lBQ0gsWUFBWSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBRzFDO0lBRUQ7OztPQUdHO0lBQ0gsV0FBVyxDQUFDLFFBQVEsRUFBRSxVQUFVLEdBQUcsU0FBUyxHQUFHLElBQUksQ0FHbEQ7SUFFRDs7O09BR0c7SUFDSCxjQUFjLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBR3JDO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtC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

package/dest/test/test_epoch_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_epoch_cache.d.ts","sourceRoot":"","sources":["../../src/test/test_epoch_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAcxG;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,mBAAmB;IACxD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,eAAe,CAAyB;IAChD,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,oBAAoB,CAAoB;IAChD,OAAO,CAAC,WAAW,CAAoB;IAEvC,YAAY,WAAW,GAAE,OAAO,CAAC,iBAAiB,CAAM,EAEvD;IAED;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAG1C;IAED;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAGlD;IAED;;;OAGG;IACH,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAGrC;IAED;;;OAGG;IACH,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAGtC;IAED;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAG1B;IAED;;;OAGG;IACH,uBAAuB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAGtD;IAED;;;OAGG;IACH,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAG1D;IAED,cAAc,IAAI,iBAAiB,CAElC;IAED,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQzD;IAED,kBAAkB,IAAI,YAAY,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAIrD;IAED,2BAA2B,IAAI,YAAY,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAO5D;IAED,wBAAwB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAG1F;IAED,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/F;IAED,qBAAqB,IAAI;QAAE,WAAW,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,CAKzE;IAED,gCAAgC,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEnF;IAED,uBAAuB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAE/C;IAED,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAErE;IAED,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAGjF;IAED,uBAAuB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAEzD;CACF"}
+{"version":3,"file":"test_epoch_cache.d.ts","sourceRoot":"","sources":["../../src/test/test_epoch_cache.ts"],"names":[],"mappings":"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"}

package/dest/test/test_epoch_cache.js

@@ -1,5 +1,6 @@
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { PROPOSER_PIPELINING_SLOT_OFFSET } from '../epoch_cache.js';
 /** Default L1 constants for testing. */ const DEFAULT_L1_CONSTANTS = {
     l1StartBlock: 0n,
     l1GenesisTime: 0n,
@@ -24,6 +25,7 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
     seed = 0n;
     registeredValidators = [];
     l1Constants;
+    proposerPipeliningEnabled = false;
     constructor(l1Constants = {}){
         this.l1Constants = {
             ...DEFAULT_L1_CONSTANTS,
@@ -85,6 +87,9 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
     getL1Constants() {
         return this.l1Constants;
     }
+    setProposerPipeliningEnabled(enabled) {
+        this.proposerPipeliningEnabled = enabled;
+    }
     getCommittee(_slot) {
         const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
         return Promise.resolve({
@@ -94,27 +99,55 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
             isEscapeHatchOpen: this.escapeHatchOpen
         });
     }
+    getSlotNow() {
+        return this.currentSlot;
+    }
+    getTargetSlot() {
+        return this.proposerPipeliningEnabled ? SlotNumber(this.currentSlot + PROPOSER_PIPELINING_SLOT_OFFSET) : this.currentSlot;
+    }
+    getEpochNow() {
+        return getEpochAtSlot(this.currentSlot, this.l1Constants);
+    }
+    getTargetEpoch() {
+        return getEpochAtSlot(this.getTargetSlot(), this.l1Constants);
+    }
+    isProposerPipeliningEnabled() {
+        return this.proposerPipeliningEnabled;
+    }
+    pipeliningOffset() {
+        return this.proposerPipeliningEnabled ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
+    }
     getEpochAndSlotNow() {
-        const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
-        const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
+        const epochNow = getEpochAtSlot(this.currentSlot, this.l1Constants);
+        const ts = getTimestampRangeForEpoch(epochNow, this.l1Constants)[0];
         return {
-            epoch,
+            epoch: epochNow,
             slot: this.currentSlot,
             ts,
             nowMs: ts * 1000n
         };
     }
     getEpochAndSlotInNextL1Slot() {
-        const now = getTimestampRangeForEpoch(getEpochAtSlot(this.currentSlot, this.l1Constants), this.l1Constants)[0];
-        const nextSlotTs = now + BigInt(this.l1Constants.ethereumSlotDuration);
+        const nowTs = getTimestampRangeForEpoch(getEpochAtSlot(this.currentSlot, this.l1Constants), this.l1Constants)[0];
+        const nextSlotTs = nowTs + BigInt(this.l1Constants.ethereumSlotDuration);
         const nextSlot = getSlotAtTimestamp(nextSlotTs, this.l1Constants);
-        const epoch = getEpochAtSlot(nextSlot, this.l1Constants);
-        const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
+        const epochNow = getEpochAtSlot(nextSlot, this.l1Constants);
+        const ts = getTimestampRangeForEpoch(epochNow, this.l1Constants)[0];
         return {
-            epoch,
+            epoch: epochNow,
             slot: nextSlot,
             ts,
-            now
+            nowSeconds: nowTs
+        };
+    }
+    getTargetEpochAndSlotInNextL1Slot() {
+        const result = this.getEpochAndSlotInNextL1Slot();
+        const offset = this.isProposerPipeliningEnabled() ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
+        const targetSlot = SlotNumber(result.slot + offset);
+        return {
+            ...result,
+            slot: targetSlot,
+            epoch: getEpochAtSlot(targetSlot, this.l1Constants)
         };
     }
     getProposerIndexEncoding(epoch, slot, seed) {
@@ -128,9 +161,19 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
         return BigInt(slot) % size;
     }
     getCurrentAndNextSlot() {
+        const currentSlot = this.getSlotNow();
+        const next = this.getEpochAndSlotInNextL1Slot();
         return {
-            currentSlot: this.currentSlot,
-            nextSlot: SlotNumber(this.currentSlot + 1)
+            currentSlot,
+            nextSlot: next.slot
+        };
+    }
+    getTargetAndNextSlot() {
+        const targetSlot = this.getTargetSlot();
+        const next = this.getTargetEpochAndSlotInNextL1Slot();
+        return {
+            targetSlot,
+            nextSlot: next.slot
         };
     }
     getProposerAttesterAddressInSlot(_slot) {
@@ -146,6 +189,9 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
         const committeeSet = new Set(this.committee.map((v)=>v.toString()));
         return Promise.resolve(validators.filter((v)=>committeeSet.has(v.toString())));
     }
+    isEscapeHatchOpen(_epoch) {
+        return Promise.resolve(this.escapeHatchOpen);
+    }
     isEscapeHatchOpenAtSlot(_slot) {
         return Promise.resolve(this.escapeHatchOpen);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/epoch-cache",
-  "version": "0.0.1-commit.5914bae",
+  "version": "0.0.1-commit.59a0419c6",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,11 +26,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/ethereum": "0.0.1-commit.5914bae",
-    "@aztec/foundation": "0.0.1-commit.5914bae",
-    "@aztec/l1-artifacts": "0.0.1-commit.5914bae",
-    "@aztec/stdlib": "0.0.1-commit.5914bae",
-    "@viem/anvil": "^0.0.10",
+    "@aztec/ethereum": "0.0.1-commit.59a0419c6",
+    "@aztec/foundation": "0.0.1-commit.59a0419c6",
+    "@aztec/l1-artifacts": "0.0.1-commit.59a0419c6",
+    "@aztec/stdlib": "0.0.1-commit.59a0419c6",
     "dotenv": "^16.0.3",
     "get-port": "^7.1.0",
     "jest-mock-extended": "^4.0.0",

package/src/config.ts

@@ -1,11 +1,17 @@
 import { type L1ContractsConfig, getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { type L1ReaderConfig, getL1ReaderConfigFromEnv } from '@aztec/ethereum/l1-reader';
+import { type PipelineConfig, getPipelineConfigEnvVars } from '@aztec/stdlib/config';
 
 export type EpochCacheConfig = Pick<
-  L1ReaderConfig & L1ContractsConfig,
-  'l1RpcUrls' | 'l1ChainId' | 'viemPollingIntervalMS' | 'l1HttpTimeoutMS' | 'ethereumSlotDuration'
+  L1ReaderConfig & L1ContractsConfig & PipelineConfig,
+  | 'l1RpcUrls'
+  | 'l1ChainId'
+  | 'viemPollingIntervalMS'
+  | 'ethereumSlotDuration'
+  | 'l1HttpTimeoutMS'
+  | 'enableProposerPipelining'
 >;
 
 export function getEpochCacheConfigEnvVars(): EpochCacheConfig {
-  return { ...getL1ReaderConfigFromEnv(), ...getL1ContractsConfigEnvVars() };
+  return { ...getL1ReaderConfigFromEnv(), ...getL1ContractsConfigEnvVars(), ...getPipelineConfigEnvVars() };
 }