fix: Fix epoch monitoring and related e2e tests (#12096)

Fixes the prover-node's epoch monitor so it accounts for the previous
epoch to be proven. The updated logic is that an epoch is ready to prove
only if it is completed and it contains the first unproven block (which
gets updated over a reorg).

Also fixes #11840 

Builds on top of @PhilWindle's #12014

---------

Co-authored-by: PhilWindle <philip.windle@gmail.com>

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

@@ -30,6 +30,7 @@ import {
   type ProverConfig,
   type SequencerConfig,
   type Service,
+  type WorldStateSyncStatus,
   type WorldStateSynchronizer,
   tryStop,
 } from '@aztec/circuit-types/interfaces/server';
@@ -127,6 +128,11 @@ export class AztecNodeService implements AztecNode, Traceable {
     this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
   }
 
+  public async getWorldStateSyncStatus(): Promise<WorldStateSyncStatus> {
+    const status = await this.worldStateSynchronizer.status();
+    return status.syncSummary;
+  }
+
   public getL2Tips() {
     return this.blockSource.getL2Tips();
   }

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

@@ -36,7 +36,12 @@ export function getEpochNumberAtTimestamp(
   ts: bigint,
   constants: Pick<L1RollupConstants, 'epochDuration' | 'slotDuration' | 'l1GenesisTime'>,
 ) {
-  return getSlotAtTimestamp(ts, constants) / BigInt(constants.epochDuration);
+  return getEpochAtSlot(getSlotAtTimestamp(ts, constants), constants);
+}
+
+/** Returns the epoch number for a given slot. */
+export function getEpochAtSlot(slot: bigint, constants: Pick<L1RollupConstants, 'epochDuration'>) {
+  return slot / BigInt(constants.epochDuration);
 }
 
 /** Returns the range of L2 slots (inclusive) for a given epoch number. */

yarn-project/circuit-types/src/interfaces/aztec-node.test.ts

@@ -55,6 +55,7 @@ import { type AztecNode, AztecNodeApiSchema } from './aztec-node.js';
 import { type SequencerConfig } from './configs.js';
 import { NullifierMembershipWitness } from './nullifier_membership_witness.js';
 import { type ProverConfig } from './prover-client.js';
+import type { WorldStateSyncStatus } from './world_state.js';
 
 describe('AztecNodeApiSchema', () => {
   let handler: MockAztecNode;
@@ -353,11 +354,26 @@ describe('AztecNodeApiSchema', () => {
     const contractClass = await getContractClassFromArtifact(artifact);
     await context.client.addContractClass({ ...contractClass, unconstrainedFunctions: [], privateFunctions: [] });
   });
+
+  it('getWorldStateSyncStatus', async () => {
+    const response = await context.client.getWorldStateSyncStatus();
+    expect(response).toEqual(await handler.getWorldStateSyncStatus());
+  });
 });
 
 class MockAztecNode implements AztecNode {
   constructor(private artifact: ContractArtifact) {}
 
+  getWorldStateSyncStatus(): Promise<WorldStateSyncStatus> {
+    return Promise.resolve({
+      finalisedBlockNumber: 1,
+      latestBlockHash: '0x',
+      latestBlockNumber: 1,
+      oldestHistoricBlockNumber: 1,
+      treesAreSynched: true,
+    });
+  }
+
   getL2Tips(): Promise<L2Tips> {
     return Promise.resolve({
       latest: { number: 1, hash: `0x01` },

yarn-project/circuit-types/src/interfaces/aztec-node.ts

@@ -56,6 +56,7 @@ import { type L2BlockNumber, L2BlockNumberSchema } from './l2_block_number.js';
 import { NullifierMembershipWitness } from './nullifier_membership_witness.js';
 import { type ProverConfig, ProverConfigSchema } from './prover-client.js';
 import { type ProverCoordination } from './prover-coordination.js';
+import { type WorldStateSyncStatus, WorldStateSyncStatusSchema } from './world_state.js';
 
 /**
  * The aztec node.
@@ -69,6 +70,11 @@ export interface AztecNode
    */
   getL2Tips(): Promise<L2Tips>;
 
+  /**
+   * Returns the sync status of the node's world state
+   */
+  getWorldStateSyncStatus(): Promise<WorldStateSyncStatus>;
+
   /**
    * Find the indexes of the given leaves in the given tree.
    * @param blockNumber - The block number at which to get the data or 'latest' for latest data
@@ -453,6 +459,8 @@ export interface AztecNode
 export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
   getL2Tips: z.function().args().returns(L2TipsSchema),
 
+  getWorldStateSyncStatus: z.function().args().returns(WorldStateSyncStatusSchema),
+
   findLeavesIndexes: z
     .function()
     .args(L2BlockNumberSchema, z.nativeEnum(MerkleTreeId), z.array(schemas.Fr))

yarn-project/circuit-types/src/interfaces/prover-client.ts

@@ -102,6 +102,8 @@ export interface EpochProverManager {
 
   getProvingJobSource(): ProvingJobConsumer;
 
+  getProverId(): Fr;
+
   updateProverConfig(config: Partial<ProverConfig>): Promise<void>;
 }
 

yarn-project/circuit-types/src/interfaces/world_state.ts

@@ -1,4 +1,5 @@
-import { type L2BlockId } from '../l2_block_source.js';
+import { z } from 'zod';
+
 import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from './merkle_tree_operations.js';
 
 /**
@@ -11,6 +12,14 @@ export enum WorldStateRunningState {
   STOPPED,
 }
 
+export interface WorldStateSyncStatus {
+  latestBlockNumber: number;
+  latestBlockHash: string;
+  finalisedBlockNumber: number;
+  oldestHistoricBlockNumber: number;
+  treesAreSynched: boolean;
+}
+
 /**
  * Defines the status of the world state synchronizer.
  */
@@ -20,9 +29,9 @@ export interface WorldStateSynchronizerStatus {
    */
   state: WorldStateRunningState;
   /**
-   * The block number that the world state synchronizer is synced to.
+   * The block numbers that the world state synchronizer is synced to.
    */
-  syncedToL2Block: L2BlockId;
+  syncSummary: WorldStateSyncStatus;
 }
 
 /** Provides writeable forks of the world state at a given block number. */
@@ -65,3 +74,11 @@ export interface WorldStateSynchronizer extends ForkMerkleTreeOperations {
    */
   getCommitted(): MerkleTreeReadOperations;
 }
+
+export const WorldStateSyncStatusSchema = z.object({
+  finalisedBlockNumber: z.number(),
+  latestBlockNumber: z.number(),
+  latestBlockHash: z.string(),
+  oldestHistoricBlockNumber: z.number(),
+  treesAreSynched: z.boolean(),
+}) satisfies z.ZodType<WorldStateSyncStatus>;

yarn-project/circuit-types/src/l2_block_downloader/l2_block_stream.ts

@@ -144,7 +144,7 @@ export class L2BlockStream {
   }
 }
 
-/** Interface to the local view of the chain. Implemented by world-state. */
+/** Interface to the local view of the chain. Implemented by world-state and l2-tips-store. */
 export interface L2BlockStreamLocalDataProvider {
   getL2BlockHash(number: number): Promise<string | undefined>;
   getL2Tips(): Promise<L2Tips>;

yarn-project/circuits.js/src/structs/block_header.ts

@@ -60,6 +60,10 @@ export class BlockHeader {
     return new BlockHeader(...BlockHeader.getFields(fields));
   }
 
+  getSlot() {
+    return this.globalVariables.slotNumber.toBigInt();
+  }
+
   getSize() {
     return (
       this.lastArchive.getSize() +

yarn-project/end-to-end/bootstrap.sh

@@ -49,7 +49,9 @@ function test_cmds {
   echo "$prefix simple e2e_deploy_contract/deploy_method"
   echo "$prefix simple e2e_deploy_contract/legacy"
   echo "$prefix simple e2e_deploy_contract/private_initialization"
-  echo "$prefix simple e2e_epochs"
+  echo "$prefix simple e2e_epochs/epochs_empty_blocks"
+  echo "$prefix simple e2e_epochs/epochs_multi_proof"
+  echo "$prefix simple e2e_epochs/epochs_proof_fails"
   echo "$prefix simple e2e_escrow_contract"
   echo "$prefix simple e2e_event_logs"