feat: improve hot loop logging

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

@@ -1,7 +1,9 @@
 import {
+  EmptyL1RollupConstants,
   type FromLogType,
   type GetUnencryptedLogsResponse,
   type InboxLeaf,
+  type L1RollupConstants,
   type L1ToL2MessageSource,
   type L2Block,
   type L2BlockId,
@@ -16,6 +18,12 @@ import {
   type TxReceipt,
   type UnencryptedL2Log,
 } from '@aztec/circuit-types';
+import {
+  getEpochNumberAtTimestamp,
+  getSlotAtTimestamp,
+  getSlotRangeForEpoch,
+  getTimestampRangeForEpoch,
+} from '@aztec/circuit-types';
 import {
   ContractClassRegisteredEvent,
   ContractInstanceDeployedEvent,
@@ -60,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';
@@ -931,13 +933,3 @@ class ArchiverStoreHelper
     return this.store.getTotalL1ToL2MessageCount();
   }
 }
-
-export type L1RollupConstants = {
-  l1StartBlock: bigint;
-  l1GenesisTime: bigint;
-};
-
-export const EmptyL1RollupConstants: L1RollupConstants = {
-  l1StartBlock: 0n,
-  l1GenesisTime: 0n,
-};

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

@@ -1,6 +1,5 @@
 export * from './archiver.js';
 export * from './config.js';
-export * from './epoch_helpers.js';
 export { type L1Published, type L1PublishedData } from './structs/published.js';
 export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
 export { ArchiverDataStore } from './archiver_store.js';

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

@@ -1,9 +1,8 @@
 import { L2Block, type L2BlockSource, type L2Tips, type TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types';
+import { getSlotRangeForEpoch } from '@aztec/circuit-types';
 import { EthAddress, type Header } from '@aztec/circuits.js';
 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/archiver/src/archiver/epoch_helpers.ts → yarn-project/circuit-types/src/epoch_helpers/index.ts

@@ -24,3 +24,13 @@ export function getTimestampRangeForEpoch(epochNumber: bigint, constants: { l1Ge
     constants.l1GenesisTime + endSlot * BigInt(AZTEC_SLOT_DURATION),
   ];
 }
+
+export type L1RollupConstants = {
+  l1StartBlock: bigint;
+  l1GenesisTime: bigint;
+};
+
+export const EmptyL1RollupConstants: L1RollupConstants = {
+  l1StartBlock: 0n,
+  l1GenesisTime: 0n,
+};

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

@@ -24,3 +24,4 @@ export * from './simulation_error.js';
 export * from './tx/index.js';
 export * from './tx_effect.js';
 export * from './tx_execution_request.js';
+export * from './epoch_helpers/index.js';

yarn-project/sequencer-client/src/publisher/l1-publisher.ts

@@ -1,7 +1,9 @@
 import {
   ConsensusPayload,
+  EmptyL1RollupConstants,
   type EpochProofClaim,
   type EpochProofQuote,
+  type L1RollupConstants,
   type L2Block,
   type TxHash,
   getHashedSignaturePayload,
@@ -139,7 +141,7 @@ export class L1Publisher {
   private sleepTimeMs: number;
   private interrupted = false;
   private metrics: L1PublisherMetrics;
-  public l1ContractConstants: L1RollupConstants;
+  public l1ContractConstants: L1RollupConstants = EmptyL1RollupConstants;
 
   protected log = createDebugLogger('aztec:sequencer:publisher');
 
@@ -211,7 +213,6 @@ export class L1Publisher {
     this.l1ContractConstants = { l1StartBlock, l1GenesisTime };
   }
 
-
   public getSenderAddress(): EthAddress {
     return EthAddress.fromString(this.account.address);
   }
@@ -250,7 +251,7 @@ export class L1Publisher {
    * @return blockNumber - The L2 block number of the next L2 block
    */
   public async canProposeAtNextEthBlock(archive: Buffer): Promise<[bigint, bigint]> {
-    const ts = await this.getL1Timestamp() + BigInt(ETHEREUM_SLOT_DURATION);
+    const ts = (await this.getL1Timestamp()) + BigInt(ETHEREUM_SLOT_DURATION);
     const [slot, blockNumber] = await this.rollupContract.read.canProposeAtTime([ts, `0x${archive.toString('hex')}`]);
     return [slot, blockNumber];
   }
@@ -326,7 +327,7 @@ export class L1Publisher {
       signatures: [],
     },
   ): Promise<void> {
-    const ts = await this.getL1Timestamp() + BigInt(ETHEREUM_SLOT_DURATION);
+    const ts = (await this.getL1Timestamp()) + BigInt(ETHEREUM_SLOT_DURATION);
 
     const formattedSignatures = attestationData.signatures.map(attest => attest.toViemSignature());
     const flags = { ignoreDA: true, ignoreSignatures: formattedSignatures.length == 0 };

yarn-project/sequencer-client/src/sequencer/sequencer.ts

@@ -10,6 +10,7 @@ import {
   type TxValidator,
   type WorldStateSynchronizer,
 } from '@aztec/circuit-types';
+import { getSlotAtTimestamp } from '@aztec/circuit-types';
 import {
   type AllowedElement,
   BlockProofError,
@@ -27,7 +28,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { type Logger, createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer, elapsed } from '@aztec/foundation/timer';
 import { type P2P } from '@aztec/p2p';
@@ -44,7 +45,6 @@ import { prettyLogViemError } from '../publisher/utils.js';
 import { type TxValidatorFactory } from '../tx_validator/tx_validator_factory.js';
 import { type SequencerConfig } from './config.js';
 import { SequencerMetrics } from './metrics.js';
-import { getSlotAtTimestamp } from '@aztec/archiver';
 
 export type ShouldProposeArgs = {
   pendingTxsCount?: number;
@@ -86,6 +86,8 @@ export class Sequencer {
   private metrics: SequencerMetrics;
   private isFlushing: boolean = false;
 
+  private log: Logger;
+
   /**
    * The logging context is attached to every log message from this class
    * It will be updated on each invocation of work()
@@ -110,8 +112,10 @@ export class Sequencer {
     private txValidatorFactory: TxValidatorFactory,
     telemetry: TelemetryClient,
     private config: SequencerConfig = {},
-    private log = createDebugLogger('aztec:sequencer', this.loggingContext),
   ) {
+    // Logging context is set within work() and will be attached to all log messages from this class.
+    this.log = createDebugLogger('aztec:sequencer', this.loggingContext);
+
     this.updateConfig(config);
     this.metrics = new SequencerMetrics(telemetry, () => this.state, 'Sequencer');
     this.log.verbose(`Initialized sequencer with ${this.minTxsPerBLock}-${this.maxTxsPerBlock} txs per block.`);
@@ -243,7 +247,7 @@ export class Sequencer {
     const chainTipArchive =
       chainTip == undefined ? new Fr(GENESIS_ARCHIVE_ROOT).toBuffer() : chainTip?.archive.root.toBuffer();
 
-    let currentL1Timestamp = await this.publisher.getL1Timestamp();
+    const currentL1Timestamp = await this.publisher.getL1Timestamp();
     let slot = getSlotAtTimestamp(currentL1Timestamp, this.publisher.l1ContractConstants);
 
     // Values that will be included in all logs from this point forward.