@aztec/epoch-cache 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/config.d.ts

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

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,EAChC,WAAW,GACX,WAAW,GACX,uBAAuB,GACvB,mBAAmB,GACnB,sBAAsB,GACtB,oBAAoB,CACvB,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}
+{"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"}

package/dest/epoch_cache.d.ts

@@ -1,87 +1,125 @@
-/// <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 = {
+export type EpochAndSlot = {
     epoch: bigint;
     slot: bigint;
     ts: bigint;
 };
+export type EpochCommitteeInfo = {
+    committee: EthAddress[] | undefined;
+    seed: bigint;
+    epoch: bigint;
+};
+export type SlotTag = 'now' | 'next' | bigint;
 export interface EpochCacheInterface {
-    getCommittee(nextSlot: boolean): Promise<EthAddress[]>;
+    getCommittee(slot: SlotTag | undefined): Promise<EpochCommitteeInfo>;
     getEpochAndSlotNow(): EpochAndSlot;
+    getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
+        now: bigint;
+    };
     getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}`;
     computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint;
-    getProposerInCurrentOrNextSlot(): Promise<{
-        currentProposer: EthAddress;
-        nextProposer: EthAddress;
+    getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
+        currentProposer: EthAddress | undefined;
+        nextProposer: EthAddress | undefined;
         currentSlot: bigint;
         nextSlot: bigint;
     }>;
-    isInCommittee(validator: EthAddress): Promise<boolean>;
+    getRegisteredValidators(): Promise<EthAddress[]>;
+    isInCommittee(slot: SlotTag, validator: EthAddress): Promise<boolean>;
+    filterInCommittee(slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
 }
 /**
  * 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;
+    protected readonly config: {
+        cacheSize: number;
+        validatorRefreshIntervalSeconds: number;
+    };
+    protected cache: Map<bigint, EpochCommitteeInfo>;
+    private allValidators;
+    private lastValidatorRefresh;
     private readonly log;
-    constructor(rollup: RollupContract, initialValidators?: EthAddress[], initialSampleSeed?: bigint, l1constants?: L1RollupConstants, dateProvider?: DateProvider);
-    static create(rollupAddress: EthAddress, config?: EpochCacheConfig, deps?: {
+    constructor(rollup: RollupContract, l1constants?: L1RollupConstants, dateProvider?: DateProvider, config?: {
+        cacheSize: number;
+        validatorRefreshIntervalSeconds: number;
+    });
+    static create(rollupOrAddress: EthAddress | RollupContract, config?: EpochCacheConfig, deps?: {
         dateProvider?: DateProvider;
     }): Promise<EpochCache>;
-    private nowInSeconds;
-    getEpochAndSlotNow(): EpochAndSlot;
-    private getEpochAndSlotInNextSlot;
+    getL1Constants(): L1RollupConstants;
+    getEpochAndSlotNow(): EpochAndSlot & {
+        now: bigint;
+    };
+    nowInSeconds(): bigint;
+    private getEpochAndSlotAtSlot;
+    getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
+        now: bigint;
+    };
     private getEpochAndSlotAtTimestamp;
+    getCommitteeForEpoch(epoch: bigint): Promise<EpochCommitteeInfo>;
     /**
      * 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?: SlotTag): Promise<EpochCommitteeInfo>;
+    private getEpochAndTimestamp;
+    private computeCommittee;
     /**
      * 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
+     * Returns the current and next proposer's attester address
      *
-     * 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.
+     * 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.
      */
-    getProposerInCurrentOrNextSlot(): Promise<{
-        currentProposer: EthAddress;
-        nextProposer: EthAddress;
+    getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
         currentSlot: bigint;
         nextSlot: bigint;
+        currentProposer: EthAddress | undefined;
+        nextProposer: EthAddress | undefined;
     }>;
     /**
-     * Check if a validator is in the current epoch's committee
+     * 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>;
+    /**
+     * 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.
      */
-    isInCommittee(validator: EthAddress): Promise<boolean>;
+    private getProposerAttesterAddressAt;
+    getProposerFromEpochCommittee(epochCommitteeInfo: EpochCommitteeInfo, slot: bigint): 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[]>;
 }
-export {};
 //# sourceMappingURL=epoch_cache.d.ts.map

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

@@ -1,105 +1,160 @@
-import { RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { NoCommitteeError, 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, getSlotRangeForEpoch, getTimestampForSlot, 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;
+    allValidators;
+    lastValidatorRefresh;
     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`, {
-            l1constants,
-            initialValidators
+    constructor(rollup, l1constants = EmptyL1RollupConstants, dateProvider = new DateProvider(), config = {
+        cacheSize: 12,
+        validatorRefreshIntervalSeconds: 60
+    }){
+        this.rollup = rollup;
+        this.l1constants = l1constants;
+        this.dateProvider = dateProvider;
+        this.config = config;
+        this.cache = new Map();
+        this.allValidators = new Set();
+        this.lastValidatorRefresh = 0;
+        this.log = createLogger('epoch-cache');
+        this.log.debug(`Initialized EpochCache`, {
+            l1constants
         });
-        this.cachedEpoch = getEpochNumberAtTimestamp(this.nowInSeconds(), this.l1constants);
     }
-    static async create(rollupAddress, config, deps = {}) {
+    static async create(rollupOrAddress, config, deps = {}) {
         config = config ?? getEpochCacheConfigEnvVars();
-        const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
-        const publicClient = createPublicClient({
-            chain: chain.chainInfo,
-            transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
-            pollingInterval: config.viemPollingIntervalMS
-        });
-        const rollup = new RollupContract(publicClient, rollupAddress.toString());
-        const [l1StartBlock, l1GenesisTime, initialValidators, sampleSeed] = await Promise.all([
+        // Load the rollup contract if we were given an address
+        let rollup;
+        if ('address' in rollupOrAddress) {
+            rollup = rollupOrAddress;
+        } else {
+            const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
+            const publicClient = createPublicClient({
+                chain: chain.chainInfo,
+                transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
+                pollingInterval: config.viemPollingIntervalMS
+            });
+            rollup = new RollupContract(publicClient, rollupOrAddress.toString());
+        }
+        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, slotDuration, epochDuration] = await Promise.all([
             rollup.getL1StartBlock(),
             rollup.getL1GenesisTime(),
-            rollup.getCurrentEpochCommittee(),
-            rollup.getCurrentSampleSeed()
+            rollup.getProofSubmissionEpochs(),
+            rollup.getSlotDuration(),
+            rollup.getEpochDuration()
         ]);
         const l1RollupConstants = {
             l1StartBlock,
             l1GenesisTime,
-            slotDuration: config.aztecSlotDuration,
-            epochDuration: config.aztecEpochDuration,
+            proofSubmissionEpochs: Number(proofSubmissionEpochs),
+            slotDuration: Number(slotDuration),
+            epochDuration: Number(epochDuration),
             ethereumSlotDuration: config.ethereumSlotDuration
         };
-        return new EpochCache(rollup, initialValidators.map((v)=>EthAddress.fromString(v)), sampleSeed, l1RollupConstants, deps.dateProvider);
+        return new EpochCache(rollup, l1RollupConstants, deps.dateProvider);
+    }
+    getL1Constants() {
+        return this.l1constants;
+    }
+    getEpochAndSlotNow() {
+        const now = this.nowInSeconds();
+        return {
+            ...this.getEpochAndSlotAtTimestamp(now),
+            now
+        };
     }
     nowInSeconds() {
         return BigInt(Math.floor(this.dateProvider.now() / 1000));
     }
-    getEpochAndSlotNow() {
-        return this.getEpochAndSlotAtTimestamp(this.nowInSeconds());
+    getEpochAndSlotAtSlot(slot) {
+        const epoch = getEpochAtSlot(slot, this.l1constants);
+        const ts = getTimestampRangeForEpoch(epoch, this.l1constants)[0];
+        return {
+            epoch,
+            ts,
+            slot
+        };
     }
-    getEpochAndSlotInNextSlot() {
-        const nextSlotTs = this.nowInSeconds() + BigInt(this.l1constants.slotDuration);
-        return this.getEpochAndSlotAtTimestamp(nextSlotTs);
+    getEpochAndSlotInNextL1Slot() {
+        const now = this.nowInSeconds();
+        const nextSlotTs = now + BigInt(this.l1constants.ethereumSlotDuration);
+        return {
+            ...this.getEpochAndSlotAtTimestamp(nextSlotTs),
+            now
+        };
     }
     getEpochAndSlotAtTimestamp(ts) {
+        const slot = getSlotAtTimestamp(ts, this.l1constants);
         return {
             epoch: getEpochNumberAtTimestamp(ts, this.l1constants),
-            slot: getSlotAtTimestamp(ts, this.l1constants),
-            ts
+            ts: getTimestampForSlot(slot, this.l1constants),
+            slot
         };
     }
+    getCommitteeForEpoch(epoch) {
+        const [startSlot] = getSlotRangeForEpoch(epoch, this.l1constants);
+        return this.getCommittee(startSlot);
+    }
     /**
    * 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);
+        }
+        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;
+        }
+        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.getEpochAndSlotInNextL1Slot();
+        } else {
+            return this.getEpochAndSlotAtSlot(slot);
         }
-        return this.committee;
+    }
+    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
@@ -124,41 +179,89 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         ]);
     }
     computeProposerIndex(slot, epoch, seed, size) {
+        // if committe size is 0, then mod 1 is 0
+        if (size === 0n) {
+            return 0n;
+        }
         return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
     }
     /**
-   * Returns the current and next proposer
-   *
-   * 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.
+   * Returns the current and next proposer's attester address
    *
-   * 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)];
+   * 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() {
+        const current = this.getEpochAndSlotNow();
+        const next = this.getEpochAndSlotInNextL1Slot();
         return {
-            currentProposer,
-            nextProposer,
-            currentSlot,
-            nextSlot
+            currentProposer: await this.getProposerAttesterAddressAt(current),
+            nextProposer: await this.getProposerAttesterAddressAt(next),
+            currentSlot: current.slot,
+            nextSlot: next.slot
         };
     }
     /**
-   * Check if a validator is in the current epoch's committee
-   */ async isInCommittee(validator) {
-        const committee = await this.getCommittee();
+   * 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) {
+        const epochAndSlot = this.getEpochAndSlotAtSlot(slot);
+        return this.getProposerAttesterAddressAt(epochAndSlot);
+    }
+    /**
+   * 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() {
+        const epochAndSlot = this.getEpochAndSlotInNextL1Slot();
+        return this.getProposerAttesterAddressAt(epochAndSlot);
+    }
+    /**
+   * 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.
+   */ async getProposerAttesterAddressAt(when) {
+        const { epoch, slot } = when;
+        const { committee, seed } = await this.getCommittee(slot);
+        if (!committee) {
+            throw new NoCommitteeError();
+        } else if (committee.length === 0) {
+            return undefined;
+        }
+        const proposerIndex = this.computeProposerIndex(slot, epoch, seed, BigInt(committee.length));
+        return committee[Number(proposerIndex)];
+    }
+    getProposerFromEpochCommittee(epochCommitteeInfo, slot) {
+        if (!epochCommitteeInfo.committee || epochCommitteeInfo.committee.length === 0) {
+            return undefined;
+        }
+        const proposerIndex = this.computeProposerIndex(slot, epochCommitteeInfo.epoch, epochCommitteeInfo.seed, BigInt(epochCommitteeInfo.committee.length));
+        return epochCommitteeInfo.committee[Number(proposerIndex)];
+    }
+    /** Check if a validator is in the given slot's committee */ async isInCommittee(slot, validator) {
+        const { committee } = await this.getCommittee(slot);
+        if (!committee) {
+            return false;
+        }
         return committee.some((v)=>v.equals(validator));
     }
+    /** From the set of given addresses, return all that are on the committee for the given slot */ async filterInCommittee(slot, validators) {
+        const { committee } = await this.getCommittee(slot);
+        if (!committee) {
+            return [];
+        }
+        const committeeSet = new Set(committee.map((v)=>v.toString()));
+        return validators.filter((v)=>committeeSet.has(v.toString()));
+    }
+    async getRegisteredValidators() {
+        const validatorRefreshIntervalMs = this.config.validatorRefreshIntervalSeconds * 1000;
+        const validatorRefreshTime = this.lastValidatorRefresh + validatorRefreshIntervalMs;
+        if (validatorRefreshTime < this.dateProvider.now()) {
+            const currentSet = await this.rollup.getAttesters();
+            this.allValidators = new Set(currentSet);
+            this.lastValidatorRefresh = this.dateProvider.now();
+        }
+        return Array.from(this.allValidators.keys().map((v)=>EthAddress.fromString(v)));
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/epoch-cache",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-fake-ceab37513c",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -18,8 +18,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "start:dev": "tsc-watch -p tsconfig.json --onSuccess '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}"
@@ -28,25 +26,25 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/l1-artifacts": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
+    "@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",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "get-port": "^7.1.0",
-    "jest-mock-extended": "^3.0.7",
+    "jest-mock-extended": "^4.0.0",
     "tslib": "^2.4.0",
-    "viem": "2.22.8",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.14.6",
-    "jest": "^29.5.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.15.17",
+    "jest": "^30.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -85,9 +83,13 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/config.ts

@@ -7,12 +7,7 @@ import {
 
 export type EpochCacheConfig = Pick<
   L1ReaderConfig & L1ContractsConfig,
-  | 'l1RpcUrls'
-  | 'l1ChainId'
-  | 'viemPollingIntervalMS'
-  | 'aztecSlotDuration'
-  | 'ethereumSlotDuration'
-  | 'aztecEpochDuration'
+  'l1RpcUrls' | 'l1ChainId' | 'viemPollingIntervalMS' | 'ethereumSlotDuration'
 >;
 
 export function getEpochCacheConfigEnvVars(): EpochCacheConfig {

package/src/epoch_cache.ts

@@ -1,161 +1,201 @@
-import { RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { NoCommitteeError, RollupContract, createEthereumChain } from '@aztec/ethereum';
 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,
   getSlotAtTimestamp,
+  getSlotRangeForEpoch,
+  getTimestampForSlot,
+  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';
 
-type EpochAndSlot = {
+export type EpochAndSlot = {
   epoch: bigint;
   slot: bigint;
   ts: bigint;
 };
 
+export type EpochCommitteeInfo = {
+  committee: EthAddress[] | undefined;
+  seed: bigint;
+  epoch: bigint;
+};
+
+export type SlotTag = 'now' | 'next' | bigint;
+
 export interface EpochCacheInterface {
-  getCommittee(nextSlot: boolean): Promise<EthAddress[]>;
+  getCommittee(slot: SlotTag | undefined): Promise<EpochCommitteeInfo>;
   getEpochAndSlotNow(): EpochAndSlot;
+  getEpochAndSlotInNextL1Slot(): EpochAndSlot & { now: bigint };
   getProposerIndexEncoding(epoch: bigint, slot: bigint, seed: bigint): `0x${string}`;
   computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint;
-  getProposerInCurrentOrNextSlot(): Promise<{
-    currentProposer: EthAddress;
-    nextProposer: EthAddress;
+  getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
+    currentProposer: EthAddress | undefined;
+    nextProposer: EthAddress | undefined;
     currentSlot: bigint;
     nextSlot: bigint;
   }>;
-  isInCommittee(validator: EthAddress): Promise<boolean>;
+  getRegisteredValidators(): Promise<EthAddress[]>;
+  isInCommittee(slot: SlotTag, validator: EthAddress): Promise<boolean>;
+  filterInCommittee(slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
 }
 
 /**
  * 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 {
+  protected cache: Map<bigint, EpochCommitteeInfo> = new Map();
+  private allValidators: Set<string> = new Set();
+  private lastValidatorRefresh = 0;
   private readonly log: Logger = createLogger('epoch-cache');
 
   constructor(
     private rollup: RollupContract,
-    initialValidators: EthAddress[] = [],
-    initialSampleSeed: bigint = 0n,
     private readonly l1constants: L1RollupConstants = EmptyL1RollupConstants,
     private readonly dateProvider: DateProvider = new DateProvider(),
+    protected readonly config = { cacheSize: 12, validatorRefreshIntervalSeconds: 60 },
   ) {
-    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.log.debug(`Initialized EpochCache`, {
+      l1constants,
+    });
   }
 
   static async create(
-    rollupAddress: EthAddress,
+    rollupOrAddress: EthAddress | RollupContract,
     config?: EpochCacheConfig,
     deps: { dateProvider?: DateProvider } = {},
   ) {
     config = config ?? getEpochCacheConfigEnvVars();
 
-    const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
-    const publicClient = createPublicClient({
-      chain: chain.chainInfo,
-      transport: fallback(config.l1RpcUrls.map(url => http(url))),
-      pollingInterval: config.viemPollingIntervalMS,
-    });
+    // Load the rollup contract if we were given an address
+    let rollup: RollupContract;
+    if ('address' in rollupOrAddress) {
+      rollup = rollupOrAddress;
+    } else {
+      const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
+      const publicClient = createPublicClient({
+        chain: chain.chainInfo,
+        transport: fallback(config.l1RpcUrls.map(url => http(url))),
+        pollingInterval: config.viemPollingIntervalMS,
+      });
+      rollup = new RollupContract(publicClient, rollupOrAddress.toString());
+    }
 
-    const rollup = new RollupContract(publicClient, rollupAddress.toString());
-    const [l1StartBlock, l1GenesisTime, initialValidators, sampleSeed] = await Promise.all([
+    const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, slotDuration, epochDuration] = await Promise.all([
       rollup.getL1StartBlock(),
       rollup.getL1GenesisTime(),
-      rollup.getCurrentEpochCommittee(),
-      rollup.getCurrentSampleSeed(),
+      rollup.getProofSubmissionEpochs(),
+      rollup.getSlotDuration(),
+      rollup.getEpochDuration(),
     ] as const);
 
     const l1RollupConstants: L1RollupConstants = {
       l1StartBlock,
       l1GenesisTime,
-      slotDuration: config.aztecSlotDuration,
-      epochDuration: config.aztecEpochDuration,
+      proofSubmissionEpochs: Number(proofSubmissionEpochs),
+      slotDuration: Number(slotDuration),
+      epochDuration: Number(epochDuration),
       ethereumSlotDuration: config.ethereumSlotDuration,
     };
 
-    return new EpochCache(
-      rollup,
-      initialValidators.map(v => EthAddress.fromString(v)),
-      sampleSeed,
-      l1RollupConstants,
-      deps.dateProvider,
-    );
+    return new EpochCache(rollup, l1RollupConstants, deps.dateProvider);
+  }
+
+  public getL1Constants(): L1RollupConstants {
+    return this.l1constants;
+  }
+
+  public getEpochAndSlotNow(): EpochAndSlot & { now: bigint } {
+    const now = this.nowInSeconds();
+    return { ...this.getEpochAndSlotAtTimestamp(now), now };
   }
 
-  private nowInSeconds(): bigint {
+  public 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(epoch, this.l1constants)[0];
+    return { epoch, ts, slot };
   }
 
-  private getEpochAndSlotInNextSlot(): EpochAndSlot {
-    const nextSlotTs = this.nowInSeconds() + BigInt(this.l1constants.slotDuration);
-    return this.getEpochAndSlotAtTimestamp(nextSlotTs);
+  public getEpochAndSlotInNextL1Slot(): EpochAndSlot & { now: bigint } {
+    const now = this.nowInSeconds();
+    const nextSlotTs = now + BigInt(this.l1constants.ethereumSlotDuration);
+    return { ...this.getEpochAndSlotAtTimestamp(nextSlotTs), now };
   }
 
   private getEpochAndSlotAtTimestamp(ts: bigint): EpochAndSlot {
+    const slot = getSlotAtTimestamp(ts, this.l1constants);
     return {
       epoch: getEpochNumberAtTimestamp(ts, this.l1constants),
-      slot: getSlotAtTimestamp(ts, this.l1constants),
-      ts,
+      ts: getTimestampForSlot(slot, this.l1constants),
+      slot,
     };
   }
 
+  public getCommitteeForEpoch(epoch: bigint): Promise<EpochCommitteeInfo> {
+    const [startSlot] = getSlotRangeForEpoch(epoch, this.l1constants);
+    return this.getCommittee(startSlot);
+  }
+
   /**
    * 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: SlotTag = 'now'): Promise<EpochCommitteeInfo> {
+    const { epoch, ts } = this.getEpochAndTimestamp(slot);
+
+    if (this.cache.has(epoch)) {
+      return this.cache.get(epoch)!;
+    }
+
+    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;
     }
+    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 this.committee;
+    return epochData;
+  }
+
+  private getEpochAndTimestamp(slot: SlotTag = 'now') {
+    if (slot === 'now') {
+      return this.getEpochAndSlotNow();
+    } else if (slot === 'next') {
+      return this.getEpochAndSlotInNextL1Slot();
+    } 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 };
   }
 
   /**
@@ -172,60 +212,117 @@ export class EpochCache
     );
   }
 
-  computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint {
+  public computeProposerIndex(slot: bigint, epoch: bigint, seed: bigint, size: bigint): bigint {
+    // if committe size is 0, then mod 1 is 0
+    if (size === 0n) {
+      return 0n;
+    }
     return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
   }
 
   /**
-   * Returns the current and next proposer
-   *
-   * 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.
+   * Returns the current and next proposer's attester address
    *
-   * 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.
+   * 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 getProposerInCurrentOrNextSlot(): Promise<{
-    currentProposer: EthAddress;
-    nextProposer: EthAddress;
+  public async getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
     currentSlot: bigint;
     nextSlot: bigint;
+    currentProposer: EthAddress | undefined;
+    nextProposer: EthAddress | undefined;
   }> {
-    // 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();
+    const current = this.getEpochAndSlotNow();
+    const next = this.getEpochAndSlotInNextL1Slot();
 
-    // 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),
-    );
+    return {
+      currentProposer: await this.getProposerAttesterAddressAt(current),
+      nextProposer: await this.getProposerAttesterAddressAt(next),
+      currentSlot: current.slot,
+      nextSlot: next.slot,
+    };
+  }
 
-    const currentProposer = committee[Number(proposerIndex)];
-    const nextProposer = committee[Number(nextProposerIndex)];
+  /**
+   * 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.
+   */
+  public getProposerAttesterAddressInSlot(slot: bigint): Promise<EthAddress | undefined> {
+    const epochAndSlot = this.getEpochAndSlotAtSlot(slot);
+    return this.getProposerAttesterAddressAt(epochAndSlot);
+  }
 
-    return { currentProposer, nextProposer, currentSlot, nextSlot };
+  /**
+   * 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.
+   */
+  public getProposerAttesterAddressInNextSlot(): Promise<EthAddress | undefined> {
+    const epochAndSlot = this.getEpochAndSlotInNextL1Slot();
+    return this.getProposerAttesterAddressAt(epochAndSlot);
   }
 
   /**
-   * Check if a validator is in the current epoch's committee
+   * 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.
    */
-  async isInCommittee(validator: EthAddress): Promise<boolean> {
-    const committee = await this.getCommittee();
+  private async getProposerAttesterAddressAt(when: EpochAndSlot) {
+    const { epoch, slot } = when;
+    const { committee, seed } = await this.getCommittee(slot);
+    if (!committee) {
+      throw new NoCommitteeError();
+    } else if (committee.length === 0) {
+      return undefined;
+    }
+
+    const proposerIndex = this.computeProposerIndex(slot, epoch, seed, BigInt(committee.length));
+    return committee[Number(proposerIndex)];
+  }
+
+  public getProposerFromEpochCommittee(epochCommitteeInfo: EpochCommitteeInfo, slot: bigint): EthAddress | undefined {
+    if (!epochCommitteeInfo.committee || epochCommitteeInfo.committee.length === 0) {
+      return undefined;
+    }
+    const proposerIndex = this.computeProposerIndex(
+      slot,
+      epochCommitteeInfo.epoch,
+      epochCommitteeInfo.seed,
+      BigInt(epochCommitteeInfo.committee.length),
+    );
+
+    return epochCommitteeInfo.committee[Number(proposerIndex)];
+  }
+
+  /** Check if a validator is in the given slot's committee */
+  async isInCommittee(slot: SlotTag, validator: EthAddress): Promise<boolean> {
+    const { committee } = await this.getCommittee(slot);
+    if (!committee) {
+      return false;
+    }
     return committee.some(v => v.equals(validator));
   }
+
+  /** From the set of given addresses, return all that are on the committee for the given slot */
+  async filterInCommittee(slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]> {
+    const { committee } = await this.getCommittee(slot);
+    if (!committee) {
+      return [];
+    }
+    const committeeSet = new Set(committee.map(v => v.toString()));
+    return validators.filter(v => committeeSet.has(v.toString()));
+  }
+
+  async getRegisteredValidators(): Promise<EthAddress[]> {
+    const validatorRefreshIntervalMs = this.config.validatorRefreshIntervalSeconds * 1000;
+    const validatorRefreshTime = this.lastValidatorRefresh + validatorRefreshIntervalMs;
+    if (validatorRefreshTime < this.dateProvider.now()) {
+      const currentSet = await this.rollup.getAttesters();
+      this.allValidators = new Set(currentSet);
+      this.lastValidatorRefresh = this.dateProvider.now();
+    }
+    return Array.from(this.allValidators.keys().map(v => EthAddress.fromString(v)));
+  }
 }

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":""}