@aztec/epoch-cache 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/dest/config.d.ts

@@ -1,4 +1,5 @@
-import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
+import { type L1ContractsConfig } from '@aztec/ethereum/config';
+import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
 export type EpochCacheConfig = Pick<L1ReaderConfig & L1ContractsConfig, 'l1RpcUrls' | 'l1ChainId' | 'viemPollingIntervalMS' | 'ethereumSlotDuration'>;
 export declare function getEpochCacheConfigEnvVars(): EpochCacheConfig;
-//# sourceMappingURL=config.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUErQixNQUFNLHdCQUF3QixDQUFDO0FBQzdGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBNEIsTUFBTSwyQkFBMkIsQ0FBQztBQUUxRixNQUFNLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUNqQyxjQUFjLEdBQUcsaUJBQWlCLEVBQ2xDLFdBQVcsR0FBRyxXQUFXLEdBQUcsdUJBQXVCLEdBQUcsc0JBQXNCLENBQzdFLENBQUM7QUFFRix3QkFBZ0IsMEJBQTBCLElBQUksZ0JBQWdCLENBRTdEIn0=

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,cAAc,GAAG,iBAAiB,EAClC,WAAW,GAAG,WAAW,GAAG,uBAAuB,GAAG,sBAAsB,CAC7E,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA+B,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EAAE,KAAK,cAAc,EAA4B,MAAM,2BAA2B,CAAC;AAE1F,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,cAAc,GAAG,iBAAiB,EAClC,WAAW,GAAG,WAAW,GAAG,uBAAuB,GAAG,sBAAsB,CAC7E,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}

package/dest/config.js

@@ -1,4 +1,5 @@
-import { getL1ContractsConfigEnvVars, getL1ReaderConfigFromEnv } from '@aztec/ethereum';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { getL1ReaderConfigFromEnv } from '@aztec/ethereum/l1-reader';
 export function getEpochCacheConfigEnvVars() {
     return {
         ...getL1ReaderConfigFromEnv(),

package/dest/epoch_cache.d.ts

@@ -1,36 +1,41 @@
-import { RollupContract } from '@aztec/ethereum';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { DateProvider } from '@aztec/foundation/timer';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type EpochCacheConfig } from './config.js';
 export type EpochAndSlot = {
-    epoch: bigint;
-    slot: bigint;
+    epoch: EpochNumber;
+    slot: SlotNumber;
     ts: bigint;
 };
 export type EpochCommitteeInfo = {
     committee: EthAddress[] | undefined;
     seed: bigint;
-    epoch: bigint;
+    epoch: EpochNumber;
+    /** True if the epoch is within an open escape hatch window. */
+    isEscapeHatchOpen: boolean;
 };
-export type SlotTag = 'now' | 'next' | bigint;
+export type SlotTag = 'now' | 'next' | SlotNumber;
 export interface EpochCacheInterface {
     getCommittee(slot: SlotTag | undefined): Promise<EpochCommitteeInfo>;
-    getEpochAndSlotNow(): EpochAndSlot;
+    getEpochAndSlotNow(): EpochAndSlot & {
+        nowMs: bigint;
+    };
     getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
         now: bigint;
     };
-    getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}`;
-    computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint;
-    getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
-        currentProposer: EthAddress | undefined;
-        nextProposer: EthAddress | undefined;
-        currentSlot: bigint;
-        nextSlot: bigint;
-    }>;
+    getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
+    computeProposerIndex(slot: SlotNumber, epoch: EpochNumber, seed: bigint, size: bigint): bigint;
+    getCurrentAndNextSlot(): {
+        currentSlot: 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[]>;
+    getL1Constants(): L1RollupConstants;
 }
 /**
  * Epoch cache
@@ -49,11 +54,14 @@ export declare class EpochCache implements EpochCacheInterface {
         cacheSize: number;
         validatorRefreshIntervalSeconds: number;
     };
-    protected cache: Map<bigint, EpochCommitteeInfo>;
+    protected cache: Map<EpochNumber, EpochCommitteeInfo>;
     private allValidators;
     private lastValidatorRefresh;
     private readonly log;
-    constructor(rollup: RollupContract, l1constants?: L1RollupConstants, dateProvider?: DateProvider, config?: {
+    constructor(rollup: RollupContract, l1constants: L1RollupConstants & {
+        lagInEpochsForValidatorSet: number;
+        lagInEpochsForRandao: number;
+    }, dateProvider?: DateProvider, config?: {
         cacheSize: number;
         validatorRefreshIntervalSeconds: number;
     });
@@ -62,7 +70,7 @@ export declare class EpochCache implements EpochCacheInterface {
     }): Promise<EpochCache>;
     getL1Constants(): L1RollupConstants;
     getEpochAndSlotNow(): EpochAndSlot & {
-        now: bigint;
+        nowMs: bigint;
     };
     nowInSeconds(): bigint;
     private getEpochAndSlotAtSlot;
@@ -70,7 +78,21 @@ export declare class EpochCache implements EpochCacheInterface {
         now: bigint;
     };
     private getEpochAndSlotAtTimestamp;
-    getCommitteeForEpoch(epoch: bigint): Promise<EpochCommitteeInfo>;
+    getCommitteeForEpoch(epoch: EpochNumber): Promise<EpochCommitteeInfo>;
+    /**
+     * 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.
+     */
+    isEscapeHatchOpen(epoch: EpochNumber): Promise<boolean>;
+    /**
+     * Returns whether the escape hatch is open for the epoch containing the given slot.
+     *
+     * 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).
+     */
+    isEscapeHatchOpenAtSlot(slot?: SlotTag): Promise<boolean>;
     /**
      * Get the current validator set
      * @param nextSlot - If true, get the validator set for the next slot.
@@ -82,44 +104,31 @@ export declare class EpochCache implements EpochCacheInterface {
     /**
      * Get the ABI encoding of the proposer index - see ValidatorSelectionLib.sol computeProposerIndex
      */
-    getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}`;
-    computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint;
-    /**
-     * Returns the current and next proposer's attester address
-     *
-     * We return the next proposer's attester address as the node will check if it is the proposer at the next ethereum block,
-     * which can be the next slot. If this is the case, then it will send proposals early.
-     */
-    getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
-        currentSlot: bigint;
-        nextSlot: bigint;
-        currentProposer: EthAddress | undefined;
-        nextProposer: EthAddress | undefined;
-    }>;
+    getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
+    computeProposerIndex(slot: SlotNumber, epoch: EpochNumber, seed: bigint, size: bigint): bigint;
+    /** Returns the current and next L2 slot numbers. */
+    getCurrentAndNextSlot(): {
+        currentSlot: SlotNumber;
+        nextSlot: SlotNumber;
+    };
     /**
      * 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.
      * If the committee is empty (i.e. target committee size is 0, and anyone can propose), we return undefined.
      */
-    getProposerAttesterAddressInSlot(slot: bigint): Promise<EthAddress | undefined>;
+    getProposerAttesterAddressInSlot(slot: SlotNumber): Promise<EthAddress | undefined>;
     /**
      * Get the proposer attester address in the next slot
      * @returns The proposer attester address. If the committee does not exist, we throw a NoCommitteeError.
      * If the committee is empty (i.e. target committee size is 0, and anyone can propose), we return undefined.
      */
     getProposerAttesterAddressInNextSlot(): Promise<EthAddress | undefined>;
-    /**
-     * Get the proposer attester address at a given epoch and slot
-     * @param when - The epoch and slot to get the proposer attester address at
-     * @returns The proposer attester address. If the committee does not exist, we throw a NoCommitteeError.
-     * If the committee is empty (i.e. target committee size is 0, and anyone can propose), we return undefined.
-     */
     private getProposerAttesterAddressAt;
-    getProposerFromEpochCommittee(epochCommitteeInfo: EpochCommitteeInfo, slot: bigint): EthAddress | undefined;
+    getProposerFromEpochCommittee(epochCommitteeInfo: EpochCommitteeInfo, slot: SlotNumber): EthAddress | undefined;
     /** Check if a validator is in the given slot's committee */
     isInCommittee(slot: SlotTag, validator: EthAddress): Promise<boolean>;
     /** From the set of given addresses, return all that are on the committee for the given slot */
     filterInCommittee(slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
     getRegisteredValidators(): Promise<EthAddress[]>;
 }
-//# sourceMappingURL=epoch_cache.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfY2FjaGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQW9CLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDMUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQ0wsS0FBSyxpQkFBaUIsRUFPdkIsTUFBTSw2QkFBNkIsQ0FBQztBQUlyQyxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBOEIsTUFBTSxhQUFhLENBQUM7QUFFaEYsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixLQUFLLEVBQUUsV0FBVyxDQUFDO0lBQ25CLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakIsRUFBRSxFQUFFLE1BQU0sQ0FBQztDQUNaLENBQUM7QUFFRixNQUFNLE1BQU0sa0JBQWtCLEdBQUc7SUFDL0IsU0FBUyxFQUFFLFVBQVUsRUFBRSxHQUFHLFNBQVMsQ0FBQztJQUNwQyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsS0FBSyxFQUFFLFdBQVcsQ0FBQztJQUNuQiwrREFBK0Q7SUFDL0QsaUJBQWlCLEVBQUUsT0FBTyxDQUFDO0NBQzVCLENBQUM7QUFFRixNQUFNLE1BQU0sT0FBTyxHQUFHLEtBQUssR0FBRyxNQUFNLEdBQUcsVUFBVSxDQUFDO0FBRWxELE1BQU0sV0FBVyxtQkFBbUI7SUFDbEMsWUFBWSxDQUFDLElBQUksRUFBRSxPQUFPLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3JFLGtCQUFrQixJQUFJLFlBQVksR0FBRztRQUFFLEtBQUssRUFBRSxNQUFNLENBQUE7S0FBRSxDQUFDO0lBQ3ZE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

package/dest/epoch_cache.d.ts.map

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

package/dest/epoch_cache.js

@@ -1,8 +1,9 @@
-import { NoCommitteeError, RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { NoCommitteeError, RollupContract } from '@aztec/ethereum/contracts';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { EmptyL1RollupConstants, getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampForSlot, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampForSlot, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { createPublicClient, encodeAbiParameters, fallback, http, keccak256 } from 'viem';
 import { getEpochCacheConfigEnvVars } from './config.js';
 /**
@@ -18,11 +19,12 @@ import { getEpochCacheConfigEnvVars } from './config.js';
     l1constants;
     dateProvider;
     config;
+    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
     cache;
     allValidators;
     lastValidatorRefresh;
     log;
-    constructor(rollup, l1constants = EmptyL1RollupConstants, dateProvider = new DateProvider(), config = {
+    constructor(rollup, l1constants, dateProvider = new DateProvider(), config = {
         cacheSize: 12,
         validatorRefreshIntervalSeconds: 60
     }){
@@ -48,17 +50,22 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
             const publicClient = createPublicClient({
                 chain: chain.chainInfo,
-                transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
+                transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
+                        batch: false
+                    }))),
                 pollingInterval: config.viemPollingIntervalMS
             });
             rollup = new RollupContract(publicClient, rollupOrAddress.toString());
         }
-        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, slotDuration, epochDuration] = await Promise.all([
+        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, slotDuration, epochDuration, lagInEpochsForValidatorSet, lagInEpochsForRandao, targetCommitteeSize] = await Promise.all([
             rollup.getL1StartBlock(),
             rollup.getL1GenesisTime(),
             rollup.getProofSubmissionEpochs(),
             rollup.getSlotDuration(),
-            rollup.getEpochDuration()
+            rollup.getEpochDuration(),
+            rollup.getLagInEpochsForValidatorSet(),
+            rollup.getLagInEpochsForRandao(),
+            rollup.getTargetCommitteeSize()
         ]);
         const l1RollupConstants = {
             l1StartBlock,
@@ -66,7 +73,10 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             proofSubmissionEpochs: Number(proofSubmissionEpochs),
             slotDuration: Number(slotDuration),
             epochDuration: Number(epochDuration),
-            ethereumSlotDuration: config.ethereumSlotDuration
+            ethereumSlotDuration: config.ethereumSlotDuration,
+            lagInEpochsForValidatorSet: Number(lagInEpochsForValidatorSet),
+            lagInEpochsForRandao: Number(lagInEpochsForRandao),
+            targetCommitteeSize: Number(targetCommitteeSize)
         };
         return new EpochCache(rollup, l1RollupConstants, deps.dateProvider);
     }
@@ -74,10 +84,11 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         return this.l1constants;
     }
     getEpochAndSlotNow() {
-        const now = this.nowInSeconds();
+        const nowMs = BigInt(this.dateProvider.now());
+        const nowSeconds = nowMs / 1000n;
         return {
-            ...this.getEpochAndSlotAtTimestamp(now),
-            now
+            ...this.getEpochAndSlotAtTimestamp(nowSeconds),
+            nowMs
         };
     }
     nowInSeconds() {
@@ -113,6 +124,28 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         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;
+        }
+        const info = await this.getCommitteeForEpoch(epoch);
+        return info.isEscapeHatchOpen;
+    }
+    /**
+   * Returns whether the escape hatch is open for the epoch containing the given slot.
+   *
+   * 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);
+        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.
@@ -145,15 +178,24 @@ import { getEpochCacheConfigEnvVars } from './config.js';
     }
     async computeCommittee(when) {
         const { ts, epoch } = when;
-        const [committeeHex, seed] = await Promise.all([
+        const [committee, seedBuffer, l1Timestamp, isEscapeHatchOpen] = await Promise.all([
             this.rollup.getCommitteeAt(ts),
-            this.rollup.getSampleSeedAt(ts)
+            this.rollup.getSampleSeedAt(ts),
+            this.rollup.client.getBlock({
+                includeTransactions: false
+            }).then((b)=>b.timestamp),
+            this.rollup.isEscapeHatchOpen(epoch)
         ]);
-        const committee = committeeHex?.map((v)=>EthAddress.fromString(v));
+        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.`);
+        }
         return {
             committee,
-            seed,
-            epoch
+            seed: seedBuffer.toBigInt(),
+            epoch,
+            isEscapeHatchOpen
         };
     }
     /**
@@ -173,8 +215,8 @@ import { getEpochCacheConfigEnvVars } from './config.js';
                 name: 'seed'
             }
         ], [
-            epoch,
-            slot,
+            BigInt(epoch),
+            BigInt(slot),
             seed
         ]);
     }
@@ -185,17 +227,10 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         }
         return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
     }
-    /**
-   * Returns the current and next proposer's attester address
-   *
-   * We return the next proposer's attester address as the node will check if it is the proposer at the next ethereum block,
-   * which can be the next slot. If this is the case, then it will send proposals early.
-   */ async getProposerAttesterAddressInCurrentOrNextSlot() {
+    /** Returns the current and next L2 slot numbers. */ getCurrentAndNextSlot() {
         const current = this.getEpochAndSlotNow();
         const next = this.getEpochAndSlotInNextL1Slot();
         return {
-            currentProposer: await this.getProposerAttesterAddressAt(current),
-            nextProposer: await this.getProposerAttesterAddressAt(next),
             currentSlot: current.slot,
             nextSlot: next.slot
         };
@@ -259,9 +294,9 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         const validatorRefreshTime = this.lastValidatorRefresh + validatorRefreshIntervalMs;
         if (validatorRefreshTime < this.dateProvider.now()) {
             const currentSet = await this.rollup.getAttesters();
-            this.allValidators = new Set(currentSet);
+            this.allValidators = new Set(currentSet.map((v)=>v.toString()));
             this.lastValidatorRefresh = this.dateProvider.now();
         }
-        return Array.from(this.allValidators.keys().map((v)=>EthAddress.fromString(v)));
+        return Array.from(this.allValidators.keys()).map((v)=>EthAddress.fromString(v));
     }
 }

package/dest/index.d.ts

@@ -1,3 +1,3 @@
 export * from './epoch_cache.js';
 export * from './config.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsYUFBYSxDQUFDIn0=

package/dest/test/index.d.ts

@@ -0,0 +1,2 @@
+export * from './test_epoch_cache.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsdUJBQXVCLENBQUMifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}

package/dest/test/index.js

@@ -0,0 +1 @@
+export * from './test_epoch_cache.js';

package/dest/test/test_epoch_cache.d.ts

@@ -0,0 +1,76 @@
+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';
+/**
+ * A test implementation of EpochCacheInterface that allows manual configuration
+ * of committee, proposer, slot, and escape hatch state for use in tests.
+ *
+ * Unlike the real EpochCache, this class doesn't require any RPC connections
+ * or mock setup. Simply use the setter methods to configure the test state.
+ */
+export declare class TestEpochCache implements EpochCacheInterface {
+    private committee;
+    private proposerAddress;
+    private currentSlot;
+    private escapeHatchOpen;
+    private seed;
+    private registeredValidators;
+    private l1Constants;
+    constructor(l1Constants?: Partial<L1RollupConstants>);
+    /**
+     * Sets the committee members. Used in validation and attestation flows.
+     * @param committee - Array of committee member addresses.
+     */
+    setCommittee(committee: EthAddress[]): this;
+    /**
+     * Sets the proposer address returned by getProposerAttesterAddressInSlot.
+     * @param proposer - The address of the current proposer.
+     */
+    setProposer(proposer: EthAddress | undefined): this;
+    /**
+     * Sets the current slot number.
+     * @param slot - The slot number to set.
+     */
+    setCurrentSlot(slot: SlotNumber): this;
+    /**
+     * Sets whether the escape hatch is open.
+     * @param open - True if escape hatch should be open.
+     */
+    setEscapeHatchOpen(open: boolean): this;
+    /**
+     * Sets the randomness seed used for proposer selection.
+     * @param seed - The seed value.
+     */
+    setSeed(seed: bigint): this;
+    /**
+     * Sets the list of registered validators (all validators, not just committee).
+     * @param validators - Array of validator addresses.
+     */
+    setRegisteredValidators(validators: EthAddress[]): this;
+    /**
+     * Sets the L1 constants used for epoch/slot calculations.
+     * @param constants - Partial constants to override defaults.
+     */
+    setL1Constants(constants: Partial<L1RollupConstants>): this;
+    getL1Constants(): L1RollupConstants;
+    getCommittee(_slot?: SlotTag): Promise<EpochCommitteeInfo>;
+    getEpochAndSlotNow(): EpochAndSlot & {
+        nowMs: bigint;
+    };
+    getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
+        now: bigint;
+    };
+    getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
+    computeProposerIndex(slot: SlotNumber, _epoch: EpochNumber, _seed: bigint, size: bigint): bigint;
+    getCurrentAndNextSlot(): {
+        currentSlot: 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[]>;
+    isEscapeHatchOpenAtSlot(_slot?: SlotTag): Promise<boolean>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9lcG9jaF9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdGVzdF9lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR3JFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWF4Rzs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxjQUFlLFlBQVcsbUJBQW1CO0lBQ3hELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlCO0lBQ2hELE9BQU8sQ0FBQyxXQUFXLENBQTZCO0lBQ2hELE9BQU8sQ0FBQyxlQUFlLENBQWtCO0lBQ3pDLE9BQU8sQ0FBQyxJQUFJLENBQWM7SUFDMUIsT0FBTyxDQUFDLG9CQUFvQixDQUFvQjtJQUNoRCxPQUFPLENBQUMsV0FBVyxDQUFvQjtJQUV2QyxZQUFZLFdBQVcsR0FBRSxPQUFPLENBQUMsaUJBQWlCLENBQU0sRUFFdkQ7SUFFRDs7O09BR0c7SUFDSCxZQUFZLENBQUMsU0FBUyxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FHMUM7SUFFRDs7O09BR0c7SUFDSCxXQUFXLENBQUMsUUFBUSxFQUFFLFVBQVUsR0FBRyxTQUFTLEdBQUcsSUFBSSxDQUdsRDtJQUVEOzs7T0FHRztJQUNILGNBQWMsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FHckM7SUFFRDs7O09BR0c7SUFDSCxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsT0FBTyxHQUFHLElBQUksQ0FHdEM7SUFFRDs7O09BR0c7SUFDSCxPQUFPLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBRzFCO0lBRUQ7OztPQUdHO0lBQ0gsdUJBQXVCLENBQUMsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FHdEQ7SUFFRDs7O09BR0c7SUFDSCxjQUFjLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLElBQUksQ0FHMUQ7SUFFRCxjQUFjLElBQUksaUJBQWlCLENBRWxDO0lBRUQsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FRekQ7SUFFRCxrQkFBa0IsSUFBSSxZQUFZLEdBQUc7UUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FJckQ7SUFFRCwyQkFBMkIsSUFBSSxZQUFZLEdBQUc7UUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FPNUQ7SUFFRCx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxLQUFLLE1BQU0sRUFBRSxDQUcxRjtJQUVELG9CQUFvQixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUsvRjtJQUVELHFCQUFxQixJQUFJO1FBQUUsV0FBVyxFQUFFLFVBQVUsQ0FBQztRQUFDLFFBQVEsRUFBRSxVQUFVLENBQUE7S0FBRSxDQUt6RTtJQUVELGdDQUFnQyxDQUFDLEtBQUssRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUMsQ0FFbkY7SUFFRCx1QkFBdUIsSUFBSSxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FFL0M7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FFckU7SUFFRCxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FHakY7SUFFRCx1QkFBdUIsQ0FBQyxLQUFLLENBQUMsRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUV6RDtDQUNGIn0=

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

@@ -0,0 +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;AAaxG;;;;;;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"}

package/dest/test/test_epoch_cache.js

@@ -0,0 +1,151 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+/** Default L1 constants for testing. */ const DEFAULT_L1_CONSTANTS = {
+    l1StartBlock: 0n,
+    l1GenesisTime: 0n,
+    slotDuration: 24,
+    epochDuration: 16,
+    ethereumSlotDuration: 12,
+    proofSubmissionEpochs: 2,
+    targetCommitteeSize: 48
+};
+/**
+ * A test implementation of EpochCacheInterface that allows manual configuration
+ * of committee, proposer, slot, and escape hatch state for use in tests.
+ *
+ * Unlike the real EpochCache, this class doesn't require any RPC connections
+ * or mock setup. Simply use the setter methods to configure the test state.
+ */ export class TestEpochCache {
+    committee = [];
+    proposerAddress;
+    currentSlot = SlotNumber(0);
+    escapeHatchOpen = false;
+    seed = 0n;
+    registeredValidators = [];
+    l1Constants;
+    constructor(l1Constants = {}){
+        this.l1Constants = {
+            ...DEFAULT_L1_CONSTANTS,
+            ...l1Constants
+        };
+    }
+    /**
+   * Sets the committee members. Used in validation and attestation flows.
+   * @param committee - Array of committee member addresses.
+   */ setCommittee(committee) {
+        this.committee = committee;
+        return this;
+    }
+    /**
+   * Sets the proposer address returned by getProposerAttesterAddressInSlot.
+   * @param proposer - The address of the current proposer.
+   */ setProposer(proposer) {
+        this.proposerAddress = proposer;
+        return this;
+    }
+    /**
+   * Sets the current slot number.
+   * @param slot - The slot number to set.
+   */ setCurrentSlot(slot) {
+        this.currentSlot = slot;
+        return this;
+    }
+    /**
+   * Sets whether the escape hatch is open.
+   * @param open - True if escape hatch should be open.
+   */ setEscapeHatchOpen(open) {
+        this.escapeHatchOpen = open;
+        return this;
+    }
+    /**
+   * Sets the randomness seed used for proposer selection.
+   * @param seed - The seed value.
+   */ setSeed(seed) {
+        this.seed = seed;
+        return this;
+    }
+    /**
+   * Sets the list of registered validators (all validators, not just committee).
+   * @param validators - Array of validator addresses.
+   */ setRegisteredValidators(validators) {
+        this.registeredValidators = validators;
+        return this;
+    }
+    /**
+   * Sets the L1 constants used for epoch/slot calculations.
+   * @param constants - Partial constants to override defaults.
+   */ setL1Constants(constants) {
+        this.l1Constants = {
+            ...this.l1Constants,
+            ...constants
+        };
+        return this;
+    }
+    getL1Constants() {
+        return this.l1Constants;
+    }
+    getCommittee(_slot) {
+        const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
+        return Promise.resolve({
+            committee: this.committee,
+            epoch,
+            seed: this.seed,
+            isEscapeHatchOpen: this.escapeHatchOpen
+        });
+    }
+    getEpochAndSlotNow() {
+        const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
+        const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
+        return {
+            epoch,
+            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 nextSlot = getSlotAtTimestamp(nextSlotTs, this.l1Constants);
+        const epoch = getEpochAtSlot(nextSlot, this.l1Constants);
+        const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
+        return {
+            epoch,
+            slot: nextSlot,
+            ts,
+            now
+        };
+    }
+    getProposerIndexEncoding(epoch, slot, seed) {
+        // Simple encoding for testing purposes
+        return `0x${epoch.toString(16).padStart(64, '0')}${slot.toString(16).padStart(64, '0')}${seed.toString(16).padStart(64, '0')}`;
+    }
+    computeProposerIndex(slot, _epoch, _seed, size) {
+        if (size === 0n) {
+            return 0n;
+        }
+        return BigInt(slot) % size;
+    }
+    getCurrentAndNextSlot() {
+        return {
+            currentSlot: this.currentSlot,
+            nextSlot: SlotNumber(this.currentSlot + 1)
+        };
+    }
+    getProposerAttesterAddressInSlot(_slot) {
+        return Promise.resolve(this.proposerAddress);
+    }
+    getRegisteredValidators() {
+        return Promise.resolve(this.registeredValidators);
+    }
+    isInCommittee(_slot, validator) {
+        return Promise.resolve(this.committee.some((v)=>v.equals(validator)));
+    }
+    filterInCommittee(_slot, validators) {
+        const committeeSet = new Set(this.committee.map((v)=>v.toString()));
+        return Promise.resolve(validators.filter((v)=>committeeSet.has(v.toString())));
+    }
+    isEscapeHatchOpenAtSlot(_slot) {
+        return Promise.resolve(this.escapeHatchOpen);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/epoch-cache",
-  "version": "0.0.1-fake-ceab37513c",
+  "version": "0.0.6-commit.a2d1860fe9",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -15,10 +15,10 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
+    "start:dev": "concurrently -k \"../scripts/tsc.sh --watch\" \"nodemon --watch dest --exec yarn start\"",
     "start": "node ./dest/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -26,22 +26,23 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/ethereum": "0.0.1-fake-ceab37513c",
-    "@aztec/foundation": "0.0.1-fake-ceab37513c",
-    "@aztec/l1-artifacts": "0.0.1-fake-ceab37513c",
-    "@aztec/stdlib": "0.0.1-fake-ceab37513c",
+    "@aztec/ethereum": "0.0.6-commit.a2d1860fe9",
+    "@aztec/foundation": "0.0.6-commit.a2d1860fe9",
+    "@aztec/l1-artifacts": "0.0.6-commit.a2d1860fe9",
+    "@aztec/stdlib": "0.0.6-commit.a2d1860fe9",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "get-port": "^7.1.0",
     "jest-mock-extended": "^4.0.0",
     "tslib": "^2.4.0",
-    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
+    "viem": "npm:@aztec/viem@2.38.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"

package/src/config.ts

@@ -1,9 +1,5 @@
-import {
-  type L1ContractsConfig,
-  type L1ReaderConfig,
-  getL1ContractsConfigEnvVars,
-  getL1ReaderConfigFromEnv,
-} from '@aztec/ethereum';
+import { type L1ContractsConfig, getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { type L1ReaderConfig, getL1ReaderConfigFromEnv } from '@aztec/ethereum/l1-reader';
 
 export type EpochCacheConfig = Pick<
   L1ReaderConfig & L1ContractsConfig,

package/src/epoch_cache.ts

@@ -1,9 +1,10 @@
-import { NoCommitteeError, RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { NoCommitteeError, RollupContract } from '@aztec/ethereum/contracts';
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import {
-  EmptyL1RollupConstants,
   type L1RollupConstants,
   getEpochAtSlot,
   getEpochNumberAtTimestamp,
@@ -18,34 +19,33 @@ import { createPublicClient, encodeAbiParameters, fallback, http, keccak256 } fr
 import { type EpochCacheConfig, getEpochCacheConfigEnvVars } from './config.js';
 
 export type EpochAndSlot = {
-  epoch: bigint;
-  slot: bigint;
+  epoch: EpochNumber;
+  slot: SlotNumber;
   ts: bigint;
 };
 
 export type EpochCommitteeInfo = {
   committee: EthAddress[] | undefined;
   seed: bigint;
-  epoch: bigint;
+  epoch: EpochNumber;
+  /** True if the epoch is within an open escape hatch window. */
+  isEscapeHatchOpen: boolean;
 };
 
-export type SlotTag = 'now' | 'next' | bigint;
+export type SlotTag = 'now' | 'next' | SlotNumber;
 
 export interface EpochCacheInterface {
   getCommittee(slot: SlotTag | undefined): Promise<EpochCommitteeInfo>;
-  getEpochAndSlotNow(): EpochAndSlot;
+  getEpochAndSlotNow(): EpochAndSlot & { nowMs: bigint };
   getEpochAndSlotInNextL1Slot(): EpochAndSlot & { now: bigint };
-  getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}`;
-  computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint;
-  getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
-    currentProposer: EthAddress | undefined;
-    nextProposer: EthAddress | undefined;
-    currentSlot: bigint;
-    nextSlot: bigint;
-  }>;
+  getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
+  computeProposerIndex(slot: SlotNumber, epoch: EpochNumber, seed: bigint, size: bigint): bigint;
+  getCurrentAndNextSlot(): { currentSlot: 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[]>;
+  getL1Constants(): L1RollupConstants;
 }
 
 /**
@@ -58,14 +58,18 @@ export interface EpochCacheInterface {
  * Note: This class is very dependent on the system clock being in sync.
  */
 export class EpochCache implements EpochCacheInterface {
-  protected cache: Map<bigint, EpochCommitteeInfo> = new Map();
+  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+  protected cache: Map<EpochNumber, EpochCommitteeInfo> = new Map();
   private allValidators: Set<string> = new Set();
   private lastValidatorRefresh = 0;
   private readonly log: Logger = createLogger('epoch-cache');
 
   constructor(
     private rollup: RollupContract,
-    private readonly l1constants: L1RollupConstants = EmptyL1RollupConstants,
+    private readonly l1constants: L1RollupConstants & {
+      lagInEpochsForValidatorSet: number;
+      lagInEpochsForRandao: number;
+    },
     private readonly dateProvider: DateProvider = new DateProvider(),
     protected readonly config = { cacheSize: 12, validatorRefreshIntervalSeconds: 60 },
   ) {
@@ -89,27 +93,42 @@ export class EpochCache implements EpochCacheInterface {
       const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
       const publicClient = createPublicClient({
         chain: chain.chainInfo,
-        transport: fallback(config.l1RpcUrls.map(url => http(url))),
+        transport: fallback(config.l1RpcUrls.map(url => http(url, { batch: false }))),
         pollingInterval: config.viemPollingIntervalMS,
       });
       rollup = new RollupContract(publicClient, rollupOrAddress.toString());
     }
 
-    const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, slotDuration, epochDuration] = await Promise.all([
+    const [
+      l1StartBlock,
+      l1GenesisTime,
+      proofSubmissionEpochs,
+      slotDuration,
+      epochDuration,
+      lagInEpochsForValidatorSet,
+      lagInEpochsForRandao,
+      targetCommitteeSize,
+    ] = await Promise.all([
       rollup.getL1StartBlock(),
       rollup.getL1GenesisTime(),
       rollup.getProofSubmissionEpochs(),
       rollup.getSlotDuration(),
       rollup.getEpochDuration(),
+      rollup.getLagInEpochsForValidatorSet(),
+      rollup.getLagInEpochsForRandao(),
+      rollup.getTargetCommitteeSize(),
     ] as const);
 
-    const l1RollupConstants: L1RollupConstants = {
+    const l1RollupConstants = {
       l1StartBlock,
       l1GenesisTime,
       proofSubmissionEpochs: Number(proofSubmissionEpochs),
       slotDuration: Number(slotDuration),
       epochDuration: Number(epochDuration),
       ethereumSlotDuration: config.ethereumSlotDuration,
+      lagInEpochsForValidatorSet: Number(lagInEpochsForValidatorSet),
+      lagInEpochsForRandao: Number(lagInEpochsForRandao),
+      targetCommitteeSize: Number(targetCommitteeSize),
     };
 
     return new EpochCache(rollup, l1RollupConstants, deps.dateProvider);
@@ -119,16 +138,17 @@ export class EpochCache implements EpochCacheInterface {
     return this.l1constants;
   }
 
-  public getEpochAndSlotNow(): EpochAndSlot & { now: bigint } {
-    const now = this.nowInSeconds();
-    return { ...this.getEpochAndSlotAtTimestamp(now), now };
+  public getEpochAndSlotNow(): EpochAndSlot & { nowMs: bigint } {
+    const nowMs = BigInt(this.dateProvider.now());
+    const nowSeconds = nowMs / 1000n;
+    return { ...this.getEpochAndSlotAtTimestamp(nowSeconds), nowMs };
   }
 
   public nowInSeconds(): bigint {
     return BigInt(Math.floor(this.dateProvider.now() / 1000));
   }
 
-  private getEpochAndSlotAtSlot(slot: bigint): EpochAndSlot {
+  private getEpochAndSlotAtSlot(slot: SlotNumber): EpochAndSlot {
     const epoch = getEpochAtSlot(slot, this.l1constants);
     const ts = getTimestampRangeForEpoch(epoch, this.l1constants)[0];
     return { epoch, ts, slot };
@@ -149,11 +169,43 @@ export class EpochCache implements EpochCacheInterface {
     };
   }
 
-  public getCommitteeForEpoch(epoch: bigint): Promise<EpochCommitteeInfo> {
+  public getCommitteeForEpoch(epoch: EpochNumber): Promise<EpochCommitteeInfo> {
     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.
+   */
+  public async isEscapeHatchOpen(epoch: EpochNumber): Promise<boolean> {
+    const cached = this.cache.get(epoch);
+    if (cached) {
+      return cached.isEscapeHatchOpen;
+    }
+    const info = await this.getCommitteeForEpoch(epoch);
+    return info.isEscapeHatchOpen;
+  }
+
+  /**
+   * Returns whether the escape hatch is open for the epoch containing the given slot.
+   *
+   * 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).
+   */
+  public async isEscapeHatchOpenAtSlot(slot: SlotTag = 'now'): Promise<boolean> {
+    const epoch =
+      slot === 'now'
+        ? this.getEpochAndSlotNow().epoch
+        : 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.
@@ -191,28 +243,39 @@ export class EpochCache implements EpochCacheInterface {
     }
   }
 
-  private async computeCommittee(when: { epoch: bigint; ts: bigint }): Promise<EpochCommitteeInfo> {
+  private async computeCommittee(when: { epoch: EpochNumber; ts: bigint }): Promise<EpochCommitteeInfo> {
     const { ts, epoch } = when;
-    const [committeeHex, seed] = await Promise.all([this.rollup.getCommitteeAt(ts), this.rollup.getSampleSeedAt(ts)]);
-    const committee = committeeHex?.map((v: `0x${string}`) => EthAddress.fromString(v));
-    return { committee, seed, epoch };
+    const [committee, seedBuffer, l1Timestamp, isEscapeHatchOpen] = await Promise.all([
+      this.rollup.getCommitteeAt(ts),
+      this.rollup.getSampleSeedAt(ts),
+      this.rollup.client.getBlock({ includeTransactions: false }).then(b => b.timestamp),
+      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.`,
+      );
+    }
+    return { committee, seed: seedBuffer.toBigInt(), epoch, isEscapeHatchOpen };
   }
 
   /**
    * Get the ABI encoding of the proposer index - see ValidatorSelectionLib.sol computeProposerIndex
    */
-  getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}` {
+  getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}` {
     return encodeAbiParameters(
       [
         { type: 'uint256', name: 'epoch' },
         { type: 'uint256', name: 'slot' },
         { type: 'uint256', name: 'seed' },
       ],
-      [epoch, slot, seed],
+      [BigInt(epoch), BigInt(slot), seed],
     );
   }
 
-  public computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint {
+  public computeProposerIndex(slot: SlotNumber, epoch: EpochNumber, seed: bigint, size: bigint): bigint {
     // if committe size is 0, then mod 1 is 0
     if (size === 0n) {
       return 0n;
@@ -220,24 +283,12 @@ export class EpochCache implements EpochCacheInterface {
     return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
   }
 
-  /**
-   * Returns the current and next proposer's attester address
-   *
-   * We return the next proposer's attester address as the node will check if it is the proposer at the next ethereum block,
-   * which can be the next slot. If this is the case, then it will send proposals early.
-   */
-  public async getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
-    currentSlot: bigint;
-    nextSlot: bigint;
-    currentProposer: EthAddress | undefined;
-    nextProposer: EthAddress | undefined;
-  }> {
+  /** Returns the current and next L2 slot numbers. */
+  public getCurrentAndNextSlot(): { currentSlot: SlotNumber; nextSlot: SlotNumber } {
     const current = this.getEpochAndSlotNow();
     const next = this.getEpochAndSlotInNextL1Slot();
 
     return {
-      currentProposer: await this.getProposerAttesterAddressAt(current),
-      nextProposer: await this.getProposerAttesterAddressAt(next),
       currentSlot: current.slot,
       nextSlot: next.slot,
     };
@@ -248,7 +299,7 @@ export class EpochCache implements EpochCacheInterface {
    * @returns The proposer attester address. If the committee does not exist, we throw a NoCommitteeError.
    * If the committee is empty (i.e. target committee size is 0, and anyone can propose), we return undefined.
    */
-  public getProposerAttesterAddressInSlot(slot: bigint): Promise<EthAddress | undefined> {
+  public getProposerAttesterAddressInSlot(slot: SlotNumber): Promise<EthAddress | undefined> {
     const epochAndSlot = this.getEpochAndSlotAtSlot(slot);
     return this.getProposerAttesterAddressAt(epochAndSlot);
   }
@@ -282,7 +333,10 @@ export class EpochCache implements EpochCacheInterface {
     return committee[Number(proposerIndex)];
   }
 
-  public getProposerFromEpochCommittee(epochCommitteeInfo: EpochCommitteeInfo, slot: bigint): EthAddress | undefined {
+  public getProposerFromEpochCommittee(
+    epochCommitteeInfo: EpochCommitteeInfo,
+    slot: SlotNumber,
+  ): EthAddress | undefined {
     if (!epochCommitteeInfo.committee || epochCommitteeInfo.committee.length === 0) {
       return undefined;
     }
@@ -320,9 +374,9 @@ export class EpochCache implements EpochCacheInterface {
     const validatorRefreshTime = this.lastValidatorRefresh + validatorRefreshIntervalMs;
     if (validatorRefreshTime < this.dateProvider.now()) {
       const currentSet = await this.rollup.getAttesters();
-      this.allValidators = new Set(currentSet);
+      this.allValidators = new Set(currentSet.map(v => v.toString()));
       this.lastValidatorRefresh = this.dateProvider.now();
     }
-    return Array.from(this.allValidators.keys().map(v => EthAddress.fromString(v)));
+    return Array.from(this.allValidators.keys()).map(v => EthAddress.fromString(v));
   }
 }

package/src/test/index.ts

@@ -0,0 +1 @@
+export * from './test_epoch_cache.js';

package/src/test/test_epoch_cache.ts

@@ -0,0 +1,170 @@
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+
+import type { EpochAndSlot, EpochCacheInterface, EpochCommitteeInfo, SlotTag } from '../epoch_cache.js';
+
+/** Default L1 constants for testing. */
+const DEFAULT_L1_CONSTANTS: L1RollupConstants = {
+  l1StartBlock: 0n,
+  l1GenesisTime: 0n,
+  slotDuration: 24,
+  epochDuration: 16,
+  ethereumSlotDuration: 12,
+  proofSubmissionEpochs: 2,
+  targetCommitteeSize: 48,
+};
+
+/**
+ * A test implementation of EpochCacheInterface that allows manual configuration
+ * of committee, proposer, slot, and escape hatch state for use in tests.
+ *
+ * Unlike the real EpochCache, this class doesn't require any RPC connections
+ * or mock setup. Simply use the setter methods to configure the test state.
+ */
+export class TestEpochCache implements EpochCacheInterface {
+  private committee: EthAddress[] = [];
+  private proposerAddress: EthAddress | undefined;
+  private currentSlot: SlotNumber = SlotNumber(0);
+  private escapeHatchOpen: boolean = false;
+  private seed: bigint = 0n;
+  private registeredValidators: EthAddress[] = [];
+  private l1Constants: L1RollupConstants;
+
+  constructor(l1Constants: Partial<L1RollupConstants> = {}) {
+    this.l1Constants = { ...DEFAULT_L1_CONSTANTS, ...l1Constants };
+  }
+
+  /**
+   * Sets the committee members. Used in validation and attestation flows.
+   * @param committee - Array of committee member addresses.
+   */
+  setCommittee(committee: EthAddress[]): this {
+    this.committee = committee;
+    return this;
+  }
+
+  /**
+   * Sets the proposer address returned by getProposerAttesterAddressInSlot.
+   * @param proposer - The address of the current proposer.
+   */
+  setProposer(proposer: EthAddress | undefined): this {
+    this.proposerAddress = proposer;
+    return this;
+  }
+
+  /**
+   * Sets the current slot number.
+   * @param slot - The slot number to set.
+   */
+  setCurrentSlot(slot: SlotNumber): this {
+    this.currentSlot = slot;
+    return this;
+  }
+
+  /**
+   * Sets whether the escape hatch is open.
+   * @param open - True if escape hatch should be open.
+   */
+  setEscapeHatchOpen(open: boolean): this {
+    this.escapeHatchOpen = open;
+    return this;
+  }
+
+  /**
+   * Sets the randomness seed used for proposer selection.
+   * @param seed - The seed value.
+   */
+  setSeed(seed: bigint): this {
+    this.seed = seed;
+    return this;
+  }
+
+  /**
+   * Sets the list of registered validators (all validators, not just committee).
+   * @param validators - Array of validator addresses.
+   */
+  setRegisteredValidators(validators: EthAddress[]): this {
+    this.registeredValidators = validators;
+    return this;
+  }
+
+  /**
+   * Sets the L1 constants used for epoch/slot calculations.
+   * @param constants - Partial constants to override defaults.
+   */
+  setL1Constants(constants: Partial<L1RollupConstants>): this {
+    this.l1Constants = { ...this.l1Constants, ...constants };
+    return this;
+  }
+
+  getL1Constants(): L1RollupConstants {
+    return this.l1Constants;
+  }
+
+  getCommittee(_slot?: SlotTag): Promise<EpochCommitteeInfo> {
+    const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
+    return Promise.resolve({
+      committee: this.committee,
+      epoch,
+      seed: this.seed,
+      isEscapeHatchOpen: this.escapeHatchOpen,
+    });
+  }
+
+  getEpochAndSlotNow(): EpochAndSlot & { nowMs: bigint } {
+    const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
+    const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
+    return { epoch, slot: this.currentSlot, ts, nowMs: ts * 1000n };
+  }
+
+  getEpochAndSlotInNextL1Slot(): EpochAndSlot & { now: bigint } {
+    const now = getTimestampRangeForEpoch(getEpochAtSlot(this.currentSlot, this.l1Constants), this.l1Constants)[0];
+    const nextSlotTs = now + BigInt(this.l1Constants.ethereumSlotDuration);
+    const nextSlot = getSlotAtTimestamp(nextSlotTs, this.l1Constants);
+    const epoch = getEpochAtSlot(nextSlot, this.l1Constants);
+    const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
+    return { epoch, slot: nextSlot, ts, now };
+  }
+
+  getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}` {
+    // Simple encoding for testing purposes
+    return `0x${epoch.toString(16).padStart(64, '0')}${slot.toString(16).padStart(64, '0')}${seed.toString(16).padStart(64, '0')}`;
+  }
+
+  computeProposerIndex(slot: SlotNumber, _epoch: EpochNumber, _seed: bigint, size: bigint): bigint {
+    if (size === 0n) {
+      return 0n;
+    }
+    return BigInt(slot) % size;
+  }
+
+  getCurrentAndNextSlot(): { currentSlot: SlotNumber; nextSlot: SlotNumber } {
+    return {
+      currentSlot: this.currentSlot,
+      nextSlot: SlotNumber(this.currentSlot + 1),
+    };
+  }
+
+  getProposerAttesterAddressInSlot(_slot: SlotNumber): Promise<EthAddress | undefined> {
+    return Promise.resolve(this.proposerAddress);
+  }
+
+  getRegisteredValidators(): Promise<EthAddress[]> {
+    return Promise.resolve(this.registeredValidators);
+  }
+
+  isInCommittee(_slot: SlotTag, validator: EthAddress): Promise<boolean> {
+    return Promise.resolve(this.committee.some(v => v.equals(validator)));
+  }
+
+  filterInCommittee(_slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]> {
+    const committeeSet = new Set(this.committee.map(v => v.toString()));
+    return Promise.resolve(validators.filter(v => committeeSet.has(v.toString())));
+  }
+
+  isEscapeHatchOpenAtSlot(_slot?: SlotTag): Promise<boolean> {
+    return Promise.resolve(this.escapeHatchOpen);
+  }
+}