feat: epoch cache, do not attest if not in committee or from current proposer

l1-contracts/src/core/Leonidas.sol

@@ -121,6 +121,42 @@ contract Leonidas is Ownable, TimeFns, ILeonidas {
     return store.validatorSet.values();
   }
 
+  /**
+   * @notice  Get the committee for a given timestamp
+   *
+   * @param _ts - The timestamp to get the committee for
+   *
+   * @return The committee for the given timestamp
+   */
+  function getCommitteeAt(Timestamp _ts)
+    external
+    view
+    override(ILeonidas)
+    returns (address[] memory)
+  {
+    return store.getCommitteeAt(getEpochAt(_ts), TARGET_COMMITTEE_SIZE);
+  }
+
+  /**
+   * @notice  Get the sample seed for a given timestamp
+   *
+   * @param _ts - The timestamp to get the sample seed for
+   *
+   * @return The sample seed for the given timestamp
+   */
+  function getSampleSeedAt(Timestamp _ts) external view override(ILeonidas) returns (uint256) {
+    return store.getSampleSeed(getEpochAt(_ts));
+  }
+
+  /**
+   * @notice  Get the sample seed for the current epoch
+   *
+   * @return The sample seed for the current epoch
+   */
+  function getCurrentSampleSeed() external view override(ILeonidas) returns (uint256) {
+    return store.getSampleSeed(getCurrentEpoch());
+  }
+
   /**
    * @notice  Performs a setup of an epoch if needed. The setup will
    *          - Sample the validator set for the epoch

l1-contracts/src/core/interfaces/ILeonidas.sol

@@ -48,9 +48,13 @@ interface ILeonidas {
   // Likely removal of these to replace with a size and indiviual getter
   // Get the current epoch committee
   function getCurrentEpochCommittee() external view returns (address[] memory);
+  function getCommitteeAt(Timestamp _ts) external view returns (address[] memory);
   function getEpochCommittee(Epoch _epoch) external view returns (address[] memory);
   function getValidators() external view returns (address[] memory);
 
+  function getSampleSeedAt(Timestamp _ts) external view returns (uint256);
+  function getCurrentSampleSeed() external view returns (uint256);
+
   function getEpochAt(Timestamp _ts) external view returns (Epoch);
   function getSlotAt(Timestamp _ts) external view returns (Slot);
   function getEpochAtSlot(Slot _slotNumber) external view returns (Epoch);

yarn-project/archiver/src/archiver/archiver.ts

@@ -1,7 +1,9 @@
 import {
+  EmptyL1RollupConstants,
   type GetUnencryptedLogsResponse,
   type InBlock,
   type InboxLeaf,
+  type L1RollupConstants,
   type L1ToL2MessageSource,
   type L2Block,
   type L2BlockId,
@@ -15,6 +17,10 @@ import {
   type TxReceipt,
   type TxScopedL2Log,
   type UnencryptedL2Log,
+  getEpochNumberAtTimestamp,
+  getSlotAtTimestamp,
+  getSlotRangeForEpoch,
+  getTimestampRangeForEpoch,
 } from '@aztec/circuit-types';
 import {
   type ContractClassPublic,
@@ -62,12 +68,6 @@ import {
 import { type ArchiverDataStore, type ArchiverL1SynchPoint } from './archiver_store.js';
 import { type ArchiverConfig } from './config.js';
 import { retrieveBlockFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js';
-import {
-  getEpochNumberAtTimestamp,
-  getSlotAtTimestamp,
-  getSlotRangeForEpoch,
-  getTimestampRangeForEpoch,
-} from './epoch_helpers.js';
 import { ArchiverInstrumentation } from './instrumentation.js';
 import { type DataRetrieval } from './structs/data_retrieval.js';
 import { type L1Published } from './structs/published.js';
@@ -1068,19 +1068,3 @@ class ArchiverStoreHelper
     return this.store.estimateSize();
   }
 }
-
-type L1RollupConstants = {
-  l1StartBlock: bigint;
-  l1GenesisTime: bigint;
-  slotDuration: number;
-  epochDuration: number;
-  ethereumSlotDuration: number;
-};
-
-const EmptyL1RollupConstants: L1RollupConstants = {
-  l1StartBlock: 0n,
-  l1GenesisTime: 0n,
-  epochDuration: 0,
-  slotDuration: 0,
-  ethereumSlotDuration: 0,
-};

yarn-project/archiver/src/test/mock_l2_block_source.ts

@@ -7,12 +7,11 @@ import {
   TxReceipt,
   TxStatus,
 } from '@aztec/circuit-types';
+import { getSlotRangeForEpoch } from '@aztec/circuit-types';
 import { EthAddress, type Header } from '@aztec/circuits.js';
 import { DefaultL1ContractsConfig } from '@aztec/ethereum';
 import { createDebugLogger } from '@aztec/foundation/log';
 
-import { getSlotRangeForEpoch } from '../archiver/epoch_helpers.js';
-
 /**
  * A mocked implementation of L2BlockSource to be used in tests.
  */

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -171,7 +171,7 @@ export class AztecNodeService implements AztecNode {
     // start both and wait for them to sync from the block source
     await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
 
-    const validatorClient = createValidatorClient(config, p2pClient, telemetry);
+    const validatorClient = await createValidatorClient(config, config.l1Contracts.rollupAddress, p2pClient, telemetry);
 
     // now create the sequencer
     const sequencer = config.disableValidator

yarn-project/aztec.js/src/index.ts

@@ -32,9 +32,9 @@ export {
   type ContractNotes,
   type ContractStorageLayout,
   type DeployOptions,
+  type ProfileResult,
   type SendMethodOptions,
   type WaitOpts,
-  type ProfileResult,
 } from './contract/index.js';
 
 export { ContractDeployer } from './deployment/index.js';
@@ -59,8 +59,8 @@ export {
   type FieldLike,
   type FunctionSelectorLike,
   type L2AmountClaim,
-  type L2Claim,
   type L2AmountClaimWithRecipient,
+  type L2Claim,
   type WrappedFieldLike,
 } from './utils/index.js';
 
@@ -138,10 +138,12 @@ export {
   UnencryptedL2Log,
   UniqueNote,
   createAztecNodeClient,
+  getTimestampRangeForEpoch,
   merkleTreeIds,
   mockEpochProofQuote,
   mockTx,
   type AztecNode,
+  type EpochConstants,
   type LogFilter,
   type PXE,
   type PartialAddress,
@@ -164,7 +166,7 @@ export { elapsed } from '@aztec/foundation/timer';
 export { type FieldsOf } from '@aztec/foundation/types';
 export { fileURLToPath } from '@aztec/foundation/url';
 
-export { type DeployL1Contracts, EthCheatCodes, deployL1Contract, deployL1Contracts } from '@aztec/ethereum';
+export { EthCheatCodes, deployL1Contract, deployL1Contracts, type DeployL1Contracts } from '@aztec/ethereum';
 
 // Start of section that exports public api via granular api.
 // Here you *can* do `export *` as the granular api defacto exports things explicitly.

yarn-project/archiver/src/archiver/epoch_helpers.ts → yarn-project/circuit-types/src/epoch-helpers/index.ts

@@ -1,4 +1,18 @@
-// REFACTOR: This file should go in a package lower in the dependency graph.
+export type L1RollupConstants = {
+  l1StartBlock: bigint;
+  l1GenesisTime: bigint;
+  slotDuration: number;
+  epochDuration: number;
+  ethereumSlotDuration: number;
+};
+
+export const EmptyL1RollupConstants: L1RollupConstants = {
+  l1StartBlock: 0n,
+  l1GenesisTime: 0n,
+  epochDuration: 1, // Not 0 to pervent division by zero
+  slotDuration: 1,
+  ethereumSlotDuration: 1,
+};
 
 export type EpochConstants = {
   l1GenesisBlock: bigint;

yarn-project/circuit-types/src/index.ts

@@ -25,3 +25,4 @@ export * from './tx_execution_request.js';
 export * from './in_block.js';
 export * from './nullifier_with_block_source.js';
 export * from './proving_error.js';
+export * from './epoch-helpers/index.js';

yarn-project/end-to-end/package.json

@@ -99,6 +99,7 @@
   "devDependencies": {
     "0x": "^5.7.0",
     "@jest/globals": "^29.5.0",
+    "@sinonjs/fake-timers": "^13.0.5",
     "@types/jest": "^29.5.0",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash.chunk": "^4.2.9",

yarn-project/end-to-end/src/e2e_epochs.test.ts

@@ -1,5 +1,5 @@
-import { type EpochConstants, getTimestampRangeForEpoch } from '@aztec/archiver/epoch';
-import { type DebugLogger, retryUntil } from '@aztec/aztec.js';
+// eslint-disable-next-line no-restricted-imports
+import { type DebugLogger, type EpochConstants, getTimestampRangeForEpoch, retryUntil } from '@aztec/aztec.js';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test';
 

yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts

@@ -37,9 +37,9 @@ describe('e2e_p2p_network', () => {
       testName: 'e2e_p2p_network',
       numberOfNodes: NUM_NODES,
       basePort: BOOT_NODE_UDP_PORT,
-      // To collect metrics - run in aztec-packages `docker compose --profile metrics up` and set COLLECT_METRICS=true
       metricsPort: shouldCollectMetrics(),
     });
+
     await t.applyBaseSnapshots();
     await t.setup();
   });