@aztec/epoch-cache 0.82.2-alpha-testnet.4 → 0.82.3

package/dest/epoch_cache.d.ts

@@ -1,17 +1,20 @@
-/// <reference types="node" resolution-mode="require"/>
 import { RollupContract } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { DateProvider } from '@aztec/foundation/timer';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import { EventEmitter } from 'node:events';
 import { type EpochCacheConfig } from './config.js';
 type EpochAndSlot = {
     epoch: bigint;
     slot: bigint;
     ts: bigint;
 };
+export type EpochCommitteeInfo = {
+    committee: EthAddress[];
+    seed: bigint;
+    epoch: bigint;
+};
 export interface EpochCacheInterface {
-    getCommittee(nextSlot: boolean): Promise<EthAddress[]>;
+    getCommittee(slot: 'now' | 'next' | bigint | undefined): Promise<EpochCommitteeInfo>;
     getEpochAndSlotNow(): EpochAndSlot;
     getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}`;
     computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint;
@@ -27,37 +30,38 @@ export interface EpochCacheInterface {
  * Epoch cache
  *
  * This class is responsible for managing traffic to the l1 node, by caching the validator set.
+ * Keeps the last N epochs in cache.
  * It also provides a method to get the current or next proposer, and to check who is in the current slot.
  *
- * If the epoch changes, then we update the stored validator set.
- *
  * Note: This class is very dependent on the system clock being in sync.
  */
-export declare class EpochCache extends EventEmitter<{
-    committeeChanged: [EthAddress[], bigint];
-}> implements EpochCacheInterface {
+export declare class EpochCache implements EpochCacheInterface {
     private rollup;
     private readonly l1constants;
     private readonly dateProvider;
-    private committee;
-    private cachedEpoch;
-    private cachedSampleSeed;
+    private readonly config;
+    private cache;
     private readonly log;
-    constructor(rollup: RollupContract, initialValidators?: EthAddress[], initialSampleSeed?: bigint, l1constants?: L1RollupConstants, dateProvider?: DateProvider);
+    constructor(rollup: RollupContract, initialEpoch?: bigint, initialValidators?: EthAddress[], initialSampleSeed?: bigint, l1constants?: L1RollupConstants, dateProvider?: DateProvider, config?: {
+        cacheSize: number;
+    });
     static create(rollupAddress: EthAddress, config?: EpochCacheConfig, deps?: {
         dateProvider?: DateProvider;
     }): Promise<EpochCache>;
-    private nowInSeconds;
+    getL1Constants(): L1RollupConstants;
     getEpochAndSlotNow(): EpochAndSlot;
+    private nowInSeconds;
+    private getEpochAndSlotAtSlot;
     private getEpochAndSlotInNextSlot;
     private getEpochAndSlotAtTimestamp;
     /**
      * Get the current validator set
-     *
      * @param nextSlot - If true, get the validator set for the next slot.
      * @returns The current validator set.
      */
-    getCommittee(nextSlot?: boolean): Promise<EthAddress[]>;
+    getCommittee(slot?: 'now' | 'next' | bigint): Promise<EpochCommitteeInfo>;
+    private getEpochAndTimestamp;
+    private computeCommittee;
     /**
      * Get the ABI encoding of the proposer index - see ValidatorSelectionLib.sol computeProposerIndex
      */
@@ -68,9 +72,6 @@ export declare class EpochCache extends EventEmitter<{
      *
      * We return the next proposer 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.
-     *
-     * If we are at an epoch boundary, then we can update the cache for the next epoch, this is the last check
-     * we do in the validator client, so we can update the cache here.
      */
     getProposerInCurrentOrNextSlot(): Promise<{
         currentProposer: EthAddress;
@@ -78,6 +79,7 @@ export declare class EpochCache extends EventEmitter<{
         currentSlot: bigint;
         nextSlot: bigint;
     }>;
+    private getProposerAt;
     /**
      * Check if a validator is in the current epoch's committee
      */

package/dest/epoch_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"epoch_cache.d.ts","sourceRoot":"","sources":["../src/epoch_cache.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,KAAK,gBAAgB,EAA8B,MAAM,aAAa,CAAC;AAEhF,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACvD,kBAAkB,IAAI,YAAY,CAAC;IACnC,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAAC;IACnF,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtF,8BAA8B,IAAI,OAAO,CAAC;QACxC,eAAe,EAAE,UAAU,CAAC;QAC5B,YAAY,EAAE,UAAU,CAAC;QACzB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;IACH,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxD;AAED;;;;;;;;;GASG;AACH,qBAAa,UACX,SAAQ,YAAY,CAAC;IAAE,gBAAgB,EAAE,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC,CAAA;CAAE,CACjE,YAAW,mBAAmB;IAQ5B,OAAO,CAAC,MAAM;IAGd,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV/B,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAuC;gBAGjD,MAAM,EAAE,cAAc,EAC9B,iBAAiB,GAAE,UAAU,EAAO,EACpC,iBAAiB,GAAE,MAAW,EACb,WAAW,GAAE,iBAA0C,EACvD,YAAY,GAAE,YAAiC;WAWrD,MAAM,CACjB,aAAa,EAAE,UAAU,EACzB,MAAM,CAAC,EAAE,gBAAgB,EACzB,IAAI,GAAE;QAAE,YAAY,CAAC,EAAE,YAAY,CAAA;KAAO;IAoC5C,OAAO,CAAC,YAAY;IAIpB,kBAAkB,IAAI,YAAY;IAIlC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,0BAA0B;IAQlC;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAuBpE;;OAEG;IACH,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE;IAWlF,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAIrF;;;;;;;;OAQG;IACG,8BAA8B,IAAI,OAAO,CAAC;QAC9C,eAAe,EAAE,UAAU,CAAC;QAC5B,YAAY,EAAE,UAAU,CAAC;QACzB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IA+BF;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CAI7D"}
+{"version":3,"file":"epoch_cache.d.ts","sourceRoot":"","sources":["../src/epoch_cache.ts"],"names":[],"mappings":"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"}

package/dest/epoch_cache.js

@@ -2,36 +2,44 @@ import { RollupContract, createEthereumChain } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { EmptyL1RollupConstants, getEpochNumberAtTimestamp, getSlotAtTimestamp } from '@aztec/stdlib/epoch-helpers';
-import { EventEmitter } from 'node:events';
+import { EmptyL1RollupConstants, getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { createPublicClient, encodeAbiParameters, fallback, http, keccak256 } from 'viem';
 import { getEpochCacheConfigEnvVars } from './config.js';
 /**
  * Epoch cache
  *
  * This class is responsible for managing traffic to the l1 node, by caching the validator set.
+ * Keeps the last N epochs in cache.
  * It also provides a method to get the current or next proposer, and to check who is in the current slot.
  *
- * If the epoch changes, then we update the stored validator set.
- *
  * Note: This class is very dependent on the system clock being in sync.
- */ export class EpochCache extends EventEmitter {
+ */ export class EpochCache {
     rollup;
     l1constants;
     dateProvider;
-    committee;
-    cachedEpoch;
-    cachedSampleSeed;
+    config;
+    cache;
     log;
-    constructor(rollup, initialValidators = [], initialSampleSeed = 0n, l1constants = EmptyL1RollupConstants, dateProvider = new DateProvider()){
-        super(), this.rollup = rollup, this.l1constants = l1constants, this.dateProvider = dateProvider, this.log = createLogger('epoch-cache');
-        this.committee = initialValidators;
-        this.cachedSampleSeed = initialSampleSeed;
-        this.log.debug(`Initialized EpochCache with constants and validators`, {
+    constructor(rollup, initialEpoch = 0n, initialValidators = [], initialSampleSeed = 0n, l1constants = EmptyL1RollupConstants, dateProvider = new DateProvider(), config = {
+        cacheSize: 12
+    }){
+        this.rollup = rollup;
+        this.l1constants = l1constants;
+        this.dateProvider = dateProvider;
+        this.config = config;
+        this.cache = new Map();
+        this.log = createLogger('epoch-cache');
+        this.cache.set(initialEpoch, {
+            epoch: initialEpoch,
+            committee: initialValidators,
+            seed: initialSampleSeed
+        });
+        this.log.debug(`Initialized EpochCache with ${initialValidators.length} validators`, {
             l1constants,
-            initialValidators
+            initialValidators,
+            initialSampleSeed,
+            initialEpoch
         });
-        this.cachedEpoch = getEpochNumberAtTimestamp(this.nowInSeconds(), this.l1constants);
     }
     static async create(rollupAddress, config, deps = {}) {
         config = config ?? getEpochCacheConfigEnvVars();
@@ -42,11 +50,12 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             pollingInterval: config.viemPollingIntervalMS
         });
         const rollup = new RollupContract(publicClient, rollupAddress.toString());
-        const [l1StartBlock, l1GenesisTime, initialValidators, sampleSeed] = await Promise.all([
+        const [l1StartBlock, l1GenesisTime, initialValidators, sampleSeed, epochNumber] = await Promise.all([
             rollup.getL1StartBlock(),
             rollup.getL1GenesisTime(),
             rollup.getCurrentEpochCommittee(),
-            rollup.getCurrentSampleSeed()
+            rollup.getCurrentSampleSeed(),
+            rollup.getEpochNumber()
         ]);
         const l1RollupConstants = {
             l1StartBlock,
@@ -55,14 +64,26 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             epochDuration: config.aztecEpochDuration,
             ethereumSlotDuration: config.ethereumSlotDuration
         };
-        return new EpochCache(rollup, initialValidators.map((v)=>EthAddress.fromString(v)), sampleSeed, l1RollupConstants, deps.dateProvider);
+        return new EpochCache(rollup, epochNumber, initialValidators.map((v)=>EthAddress.fromString(v)), sampleSeed, l1RollupConstants, deps.dateProvider);
     }
-    nowInSeconds() {
-        return BigInt(Math.floor(this.dateProvider.now() / 1000));
+    getL1Constants() {
+        return this.l1constants;
     }
     getEpochAndSlotNow() {
         return this.getEpochAndSlotAtTimestamp(this.nowInSeconds());
     }
+    nowInSeconds() {
+        return BigInt(Math.floor(this.dateProvider.now() / 1000));
+    }
+    getEpochAndSlotAtSlot(slot) {
+        const epoch = getEpochAtSlot(slot, this.l1constants);
+        const ts = getTimestampRangeForEpoch(slot, this.l1constants)[0];
+        return {
+            epoch,
+            ts,
+            slot
+        };
+    }
     getEpochAndSlotInNextSlot() {
         const nextSlotTs = this.nowInSeconds() + BigInt(this.l1constants.slotDuration);
         return this.getEpochAndSlotAtTimestamp(nextSlotTs);
@@ -76,30 +97,43 @@ import { getEpochCacheConfigEnvVars } from './config.js';
     }
     /**
    * Get the current validator set
-   *
    * @param nextSlot - If true, get the validator set for the next slot.
    * @returns The current validator set.
-   */ async getCommittee(nextSlot = false) {
-        // If the current epoch has changed, then we need to make a request to update the validator set
-        const { epoch: calculatedEpoch, ts } = nextSlot ? this.getEpochAndSlotInNextSlot() : this.getEpochAndSlotNow();
-        if (calculatedEpoch !== this.cachedEpoch) {
-            this.log.debug(`Updating validator set for new epoch ${calculatedEpoch}`, {
-                epoch: calculatedEpoch,
-                previousEpoch: this.cachedEpoch
-            });
-            const [committeeAtTs, sampleSeedAtTs] = await Promise.all([
-                this.rollup.getCommitteeAt(ts),
-                this.rollup.getSampleSeedAt(ts)
-            ]);
-            this.committee = committeeAtTs.map((v)=>EthAddress.fromString(v));
-            this.cachedEpoch = calculatedEpoch;
-            this.cachedSampleSeed = sampleSeedAtTs;
-            this.log.debug(`Updated validator set for epoch ${calculatedEpoch}`, {
-                commitee: this.committee
-            });
-            this.emit('committeeChanged', this.committee, calculatedEpoch);
+   */ async getCommittee(slot = 'now') {
+        const { epoch, ts } = this.getEpochAndTimestamp(slot);
+        if (this.cache.has(epoch)) {
+            return this.cache.get(epoch);
         }
-        return this.committee;
+        const epochData = await this.computeCommittee({
+            epoch,
+            ts
+        });
+        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') {
+            return this.getEpochAndSlotNow();
+        } else if (slot === 'next') {
+            return this.getEpochAndSlotInNextSlot();
+        } else {
+            return this.getEpochAndSlotAtSlot(slot);
+        }
+    }
+    async computeCommittee(when) {
+        const { ts, epoch } = when;
+        const [committeeHex, seed] = await Promise.all([
+            this.rollup.getCommitteeAt(ts),
+            this.rollup.getSampleSeedAt(ts)
+        ]);
+        const committee = committeeHex.map((v)=>EthAddress.fromString(v));
+        return {
+            committee,
+            seed,
+            epoch
+        };
     }
     /**
    * Get the ABI encoding of the proposer index - see ValidatorSelectionLib.sol computeProposerIndex
@@ -131,34 +165,26 @@ import { getEpochCacheConfigEnvVars } from './config.js';
    *
    * We return the next proposer 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.
-   *
-   * If we are at an epoch boundary, then we can update the cache for the next epoch, this is the last check
-   * we do in the validator client, so we can update the cache here.
    */ async getProposerInCurrentOrNextSlot() {
-        // Validators are sorted by their index in the committee, and getValidatorSet will cache
-        const committee = await this.getCommittee();
-        const { slot: currentSlot, epoch: currentEpoch } = this.getEpochAndSlotNow();
-        const { slot: nextSlot, epoch: nextEpoch } = this.getEpochAndSlotInNextSlot();
-        // Compute the proposer in this and the next slot
-        const proposerIndex = this.computeProposerIndex(currentSlot, this.cachedEpoch, this.cachedSampleSeed, BigInt(committee.length));
-        // Check if the next proposer is in the next epoch
-        if (nextEpoch !== currentEpoch) {
-            await this.getCommittee(/*next slot*/ true);
-        }
-        const nextProposerIndex = this.computeProposerIndex(nextSlot, this.cachedEpoch, this.cachedSampleSeed, BigInt(committee.length));
-        const currentProposer = committee[Number(proposerIndex)];
-        const nextProposer = committee[Number(nextProposerIndex)];
+        const current = this.getEpochAndSlotNow();
+        const next = this.getEpochAndSlotInNextSlot();
         return {
-            currentProposer,
-            nextProposer,
-            currentSlot,
-            nextSlot
+            currentProposer: await this.getProposerAt(current),
+            nextProposer: await this.getProposerAt(next),
+            currentSlot: current.slot,
+            nextSlot: next.slot
         };
     }
+    async getProposerAt(when) {
+        const { epoch, slot } = when;
+        const { seed, committee } = await this.getCommittee(slot);
+        const proposerIndex = this.computeProposerIndex(slot, epoch, seed, BigInt(committee.length));
+        return committee[Number(proposerIndex)];
+    }
     /**
    * Check if a validator is in the current epoch's committee
    */ async isInCommittee(validator) {
-        const committee = await this.getCommittee();
+        const { committee } = await this.getCommittee();
         return committee.some((v)=>v.equals(validator));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/epoch-cache",
-  "version": "0.82.2-alpha-testnet.4",
+  "version": "0.82.3",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,10 +28,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/ethereum": "0.82.2-alpha-testnet.4",
-    "@aztec/foundation": "0.82.2-alpha-testnet.4",
-    "@aztec/l1-artifacts": "0.82.2-alpha-testnet.4",
-    "@aztec/stdlib": "0.82.2-alpha-testnet.4",
+    "@aztec/ethereum": "0.82.3",
+    "@aztec/foundation": "0.82.3",
+    "@aztec/l1-artifacts": "0.82.3",
+    "@aztec/stdlib": "0.82.3",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "get-port": "^7.1.0",

package/src/epoch_cache.ts

@@ -5,11 +5,12 @@ import { DateProvider } from '@aztec/foundation/timer';
 import {
   EmptyL1RollupConstants,
   type L1RollupConstants,
+  getEpochAtSlot,
   getEpochNumberAtTimestamp,
   getSlotAtTimestamp,
+  getTimestampRangeForEpoch,
 } from '@aztec/stdlib/epoch-helpers';
 
-import { EventEmitter } from 'node:events';
 import { createPublicClient, encodeAbiParameters, fallback, http, keccak256 } from 'viem';
 
 import { type EpochCacheConfig, getEpochCacheConfigEnvVars } from './config.js';
@@ -20,8 +21,14 @@ type EpochAndSlot = {
   ts: bigint;
 };
 
+export type EpochCommitteeInfo = {
+  committee: EthAddress[];
+  seed: bigint;
+  epoch: bigint;
+};
+
 export interface EpochCacheInterface {
-  getCommittee(nextSlot: boolean): Promise<EthAddress[]>;
+  getCommittee(slot: 'now' | 'next' | bigint | undefined): Promise<EpochCommitteeInfo>;
   getEpochAndSlotNow(): EpochAndSlot;
   getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}`;
   computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint;
@@ -38,35 +45,31 @@ export interface EpochCacheInterface {
  * Epoch cache
  *
  * This class is responsible for managing traffic to the l1 node, by caching the validator set.
+ * Keeps the last N epochs in cache.
  * It also provides a method to get the current or next proposer, and to check who is in the current slot.
  *
- * If the epoch changes, then we update the stored validator set.
- *
  * Note: This class is very dependent on the system clock being in sync.
  */
-export class EpochCache
-  extends EventEmitter<{ committeeChanged: [EthAddress[], bigint] }>
-  implements EpochCacheInterface
-{
-  private committee: EthAddress[];
-  private cachedEpoch: bigint;
-  private cachedSampleSeed: bigint;
+export class EpochCache implements EpochCacheInterface {
+  private cache: Map<bigint, EpochCommitteeInfo> = new Map();
   private readonly log: Logger = createLogger('epoch-cache');
 
   constructor(
     private rollup: RollupContract,
+    initialEpoch: bigint = 0n,
     initialValidators: EthAddress[] = [],
     initialSampleSeed: bigint = 0n,
     private readonly l1constants: L1RollupConstants = EmptyL1RollupConstants,
     private readonly dateProvider: DateProvider = new DateProvider(),
+    private readonly config = { cacheSize: 12 },
   ) {
-    super();
-    this.committee = initialValidators;
-    this.cachedSampleSeed = initialSampleSeed;
-
-    this.log.debug(`Initialized EpochCache with constants and validators`, { l1constants, initialValidators });
-
-    this.cachedEpoch = getEpochNumberAtTimestamp(this.nowInSeconds(), this.l1constants);
+    this.cache.set(initialEpoch, { epoch: initialEpoch, committee: initialValidators, seed: initialSampleSeed });
+    this.log.debug(`Initialized EpochCache with ${initialValidators.length} validators`, {
+      l1constants,
+      initialValidators,
+      initialSampleSeed,
+      initialEpoch,
+    });
   }
 
   static async create(
@@ -84,11 +87,12 @@ export class EpochCache
     });
 
     const rollup = new RollupContract(publicClient, rollupAddress.toString());
-    const [l1StartBlock, l1GenesisTime, initialValidators, sampleSeed] = await Promise.all([
+    const [l1StartBlock, l1GenesisTime, initialValidators, sampleSeed, epochNumber] = await Promise.all([
       rollup.getL1StartBlock(),
       rollup.getL1GenesisTime(),
       rollup.getCurrentEpochCommittee(),
       rollup.getCurrentSampleSeed(),
+      rollup.getEpochNumber(),
     ] as const);
 
     const l1RollupConstants: L1RollupConstants = {
@@ -101,6 +105,7 @@ export class EpochCache
 
     return new EpochCache(
       rollup,
+      epochNumber,
       initialValidators.map(v => EthAddress.fromString(v)),
       sampleSeed,
       l1RollupConstants,
@@ -108,12 +113,22 @@ export class EpochCache
     );
   }
 
+  public getL1Constants(): L1RollupConstants {
+    return this.l1constants;
+  }
+
+  public getEpochAndSlotNow(): EpochAndSlot {
+    return this.getEpochAndSlotAtTimestamp(this.nowInSeconds());
+  }
+
   private nowInSeconds(): bigint {
     return BigInt(Math.floor(this.dateProvider.now() / 1000));
   }
 
-  getEpochAndSlotNow(): EpochAndSlot {
-    return this.getEpochAndSlotAtTimestamp(this.nowInSeconds());
+  private getEpochAndSlotAtSlot(slot: bigint): EpochAndSlot {
+    const epoch = getEpochAtSlot(slot, this.l1constants);
+    const ts = getTimestampRangeForEpoch(slot, this.l1constants)[0];
+    return { epoch, ts, slot };
   }
 
   private getEpochAndSlotInNextSlot(): EpochAndSlot {
@@ -131,31 +146,42 @@ export class EpochCache
 
   /**
    * Get the current validator set
-   *
    * @param nextSlot - If true, get the validator set for the next slot.
    * @returns The current validator set.
    */
-  async getCommittee(nextSlot: boolean = false): Promise<EthAddress[]> {
-    // If the current epoch has changed, then we need to make a request to update the validator set
-    const { epoch: calculatedEpoch, ts } = nextSlot ? this.getEpochAndSlotInNextSlot() : this.getEpochAndSlotNow();
-
-    if (calculatedEpoch !== this.cachedEpoch) {
-      this.log.debug(`Updating validator set for new epoch ${calculatedEpoch}`, {
-        epoch: calculatedEpoch,
-        previousEpoch: this.cachedEpoch,
-      });
-      const [committeeAtTs, sampleSeedAtTs] = await Promise.all([
-        this.rollup.getCommitteeAt(ts),
-        this.rollup.getSampleSeedAt(ts),
-      ]);
-      this.committee = committeeAtTs.map((v: `0x${string}`) => EthAddress.fromString(v));
-      this.cachedEpoch = calculatedEpoch;
-      this.cachedSampleSeed = sampleSeedAtTs;
-      this.log.debug(`Updated validator set for epoch ${calculatedEpoch}`, { commitee: this.committee });
-      this.emit('committeeChanged', this.committee, calculatedEpoch);
+  public async getCommittee(slot: 'now' | 'next' | bigint = 'now'): Promise<EpochCommitteeInfo> {
+    const { epoch, ts } = this.getEpochAndTimestamp(slot);
+
+    if (this.cache.has(epoch)) {
+      return this.cache.get(epoch)!;
     }
 
-    return this.committee;
+    const epochData = await this.computeCommittee({ epoch, ts });
+    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;
+  }
+
+  private getEpochAndTimestamp(slot: 'now' | 'next' | bigint = 'now') {
+    if (slot === 'now') {
+      return this.getEpochAndSlotNow();
+    } else if (slot === 'next') {
+      return this.getEpochAndSlotInNextSlot();
+    } else {
+      return this.getEpochAndSlotAtSlot(slot);
+    }
+  }
+
+  private async computeCommittee(when: { epoch: bigint; 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 };
   }
 
   /**
@@ -181,9 +207,6 @@ export class EpochCache
    *
    * We return the next proposer 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.
-   *
-   * If we are at an epoch boundary, then we can update the cache for the next epoch, this is the last check
-   * we do in the validator client, so we can update the cache here.
    */
   async getProposerInCurrentOrNextSlot(): Promise<{
     currentProposer: EthAddress;
@@ -191,41 +214,29 @@ export class EpochCache
     currentSlot: bigint;
     nextSlot: bigint;
   }> {
-    // Validators are sorted by their index in the committee, and getValidatorSet will cache
-    const committee = await this.getCommittee();
-    const { slot: currentSlot, epoch: currentEpoch } = this.getEpochAndSlotNow();
-    const { slot: nextSlot, epoch: nextEpoch } = this.getEpochAndSlotInNextSlot();
-
-    // Compute the proposer in this and the next slot
-    const proposerIndex = this.computeProposerIndex(
-      currentSlot,
-      this.cachedEpoch,
-      this.cachedSampleSeed,
-      BigInt(committee.length),
-    );
-
-    // Check if the next proposer is in the next epoch
-    if (nextEpoch !== currentEpoch) {
-      await this.getCommittee(/*next slot*/ true);
-    }
-    const nextProposerIndex = this.computeProposerIndex(
-      nextSlot,
-      this.cachedEpoch,
-      this.cachedSampleSeed,
-      BigInt(committee.length),
-    );
+    const current = this.getEpochAndSlotNow();
+    const next = this.getEpochAndSlotInNextSlot();
 
-    const currentProposer = committee[Number(proposerIndex)];
-    const nextProposer = committee[Number(nextProposerIndex)];
+    return {
+      currentProposer: await this.getProposerAt(current),
+      nextProposer: await this.getProposerAt(next),
+      currentSlot: current.slot,
+      nextSlot: next.slot,
+    };
+  }
 
-    return { currentProposer, nextProposer, currentSlot, nextSlot };
+  private async getProposerAt(when: EpochAndSlot) {
+    const { epoch, slot } = when;
+    const { seed, committee } = await this.getCommittee(slot);
+    const proposerIndex = this.computeProposerIndex(slot, epoch, seed, BigInt(committee.length));
+    return committee[Number(proposerIndex)];
   }
 
   /**
    * Check if a validator is in the current epoch's committee
    */
   async isInCommittee(validator: EthAddress): Promise<boolean> {
-    const committee = await this.getCommittee();
+    const { committee } = await this.getCommittee();
     return committee.some(v => v.equals(validator));
   }
 }

package/dest/timestamp_provider.d.ts

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

package/dest/timestamp_provider.d.ts.map

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