@aztec/epoch-cache 0.87.2 → 0.87.3-nightly.20250528

package/dest/epoch_cache.d.ts

@@ -52,8 +52,9 @@ export declare class EpochCache implements EpochCacheInterface {
     getEpochAndSlotNow(): EpochAndSlot;
     private nowInSeconds;
     private getEpochAndSlotAtSlot;
-    private getEpochAndSlotInNextSlot;
+    getEpochAndSlotInNextSlot(): EpochAndSlot;
     private getEpochAndSlotAtTimestamp;
+    getCommitteeForEpoch(epoch: bigint): Promise<EpochCommitteeInfo>;
     /**
      * Get the current validator set
      * @param nextSlot - If true, get the validator set for the next slot.
@@ -74,11 +75,12 @@ export declare class EpochCache implements EpochCacheInterface {
      * can be the next slot. If this is the case, then it will send proposals early.
      */
     getProposerInCurrentOrNextSlot(): Promise<{
-        currentProposer: EthAddress;
-        nextProposer: EthAddress;
         currentSlot: bigint;
         nextSlot: bigint;
+        currentProposer: EthAddress;
+        nextProposer: EthAddress;
     }>;
+    getProposerInNextSlot(): Promise<EthAddress>;
     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":"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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

@@ -2,7 +2,7 @@ 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, getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { EmptyL1RollupConstants, getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { createPublicClient, encodeAbiParameters, fallback, http, keccak256 } from 'viem';
 import { getEpochCacheConfigEnvVars } from './config.js';
 /**
@@ -86,7 +86,7 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         };
     }
     getEpochAndSlotInNextSlot() {
-        const nextSlotTs = this.nowInSeconds() + BigInt(this.l1constants.slotDuration);
+        const nextSlotTs = this.nowInSeconds() + BigInt(this.l1constants.ethereumSlotDuration);
         return this.getEpochAndSlotAtTimestamp(nextSlotTs);
     }
     getEpochAndSlotAtTimestamp(ts) {
@@ -96,6 +96,10 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             ts
         };
     }
+    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.
@@ -109,6 +113,10 @@ import { getEpochCacheConfigEnvVars } from './config.js';
             epoch,
             ts
         });
+        // If the committe size is 0, then do not cache
+        if (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));
@@ -159,6 +167,10 @@ 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;
     }
     /**
@@ -170,12 +182,16 @@ import { getEpochCacheConfigEnvVars } from './config.js';
         const current = this.getEpochAndSlotNow();
         const next = this.getEpochAndSlotInNextSlot();
         return {
-            currentProposer: await this.getProposerAt(current),
-            nextProposer: await this.getProposerAt(next),
             currentSlot: current.slot,
-            nextSlot: next.slot
+            nextSlot: next.slot,
+            currentProposer: await this.getProposerAt(current),
+            nextProposer: await this.getProposerAt(next)
         };
     }
+    getProposerInNextSlot() {
+        const epochAndSlot = this.getEpochAndSlotInNextSlot();
+        return this.getProposerAt(epochAndSlot);
+    }
     async getProposerAt(when) {
         const { epoch, slot } = when;
         const { seed, committee } = await this.getCommittee(slot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/epoch-cache",
-  "version": "0.87.2",
+  "version": "0.87.3-nightly.20250528",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,10 +26,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/ethereum": "0.87.2",
-    "@aztec/foundation": "0.87.2",
-    "@aztec/l1-artifacts": "0.87.2",
-    "@aztec/stdlib": "0.87.2",
+    "@aztec/ethereum": "0.87.3-nightly.20250528",
+    "@aztec/foundation": "0.87.3-nightly.20250528",
+    "@aztec/l1-artifacts": "0.87.3-nightly.20250528",
+    "@aztec/stdlib": "0.87.3-nightly.20250528",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "get-port": "^7.1.0",

package/src/epoch_cache.ts

@@ -8,6 +8,7 @@ import {
   getEpochAtSlot,
   getEpochNumberAtTimestamp,
   getSlotAtTimestamp,
+  getSlotRangeForEpoch,
   getTimestampRangeForEpoch,
 } from '@aztec/stdlib/epoch-helpers';
 
@@ -132,8 +133,8 @@ export class EpochCache implements EpochCacheInterface {
     return { epoch, ts, slot };
   }
 
-  private getEpochAndSlotInNextSlot(): EpochAndSlot {
-    const nextSlotTs = this.nowInSeconds() + BigInt(this.l1constants.slotDuration);
+  public getEpochAndSlotInNextSlot(): EpochAndSlot {
+    const nextSlotTs = this.nowInSeconds() + BigInt(this.l1constants.ethereumSlotDuration);
     return this.getEpochAndSlotAtTimestamp(nextSlotTs);
   }
 
@@ -145,6 +146,11 @@ export class EpochCache implements EpochCacheInterface {
     };
   }
 
+  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.
@@ -158,6 +164,10 @@ export class EpochCache implements EpochCacheInterface {
     }
 
     const epochData = await this.computeCommittee({ epoch, ts });
+    // If the committe size is 0, then do not cache
+    if (epochData.committee.length == 0) {
+      return epochData;
+    }
     this.cache.set(epoch, epochData);
 
     const toPurge = Array.from(this.cache.keys())
@@ -200,6 +210,10 @@ export class EpochCache implements EpochCacheInterface {
   }
 
   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;
   }
 
@@ -210,25 +224,32 @@ export class EpochCache implements EpochCacheInterface {
    * can be the next slot. If this is the case, then it will send proposals early.
    */
   async getProposerInCurrentOrNextSlot(): Promise<{
-    currentProposer: EthAddress;
-    nextProposer: EthAddress;
     currentSlot: bigint;
     nextSlot: bigint;
+    currentProposer: EthAddress;
+    nextProposer: EthAddress;
   }> {
     const current = this.getEpochAndSlotNow();
     const next = this.getEpochAndSlotInNextSlot();
 
     return {
-      currentProposer: await this.getProposerAt(current),
-      nextProposer: await this.getProposerAt(next),
       currentSlot: current.slot,
       nextSlot: next.slot,
+      currentProposer: await this.getProposerAt(current),
+      nextProposer: await this.getProposerAt(next),
     };
   }
 
-  private async getProposerAt(when: EpochAndSlot) {
+  getProposerInNextSlot(): Promise<EthAddress> {
+    const epochAndSlot = this.getEpochAndSlotInNextSlot();
+
+    return this.getProposerAt(epochAndSlot);
+  }
+
+  private async getProposerAt(when: EpochAndSlot): Promise<EthAddress> {
     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)];
   }