@aztec/prover-node 0.0.0-test.0 → 0.0.1-commit.001888fc

package/src/config.ts

@@ -1,53 +1,52 @@
-import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
 import {
   type ConfigMappingsType,
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
+  pickConfigMappings,
 } from '@aztec/foundation/config';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
-import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
+import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
+import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
+import type { KeyStore } from '@aztec/node-keystore/types';
+import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import {
   type ProverAgentConfig,
   type ProverBrokerConfig,
   proverAgentConfigMappings,
   proverBrokerConfigMappings,
-} from '@aztec/prover-client/broker';
-import { type ProverClientConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
+} from '@aztec/prover-client/broker/config';
+import { type ProverClientUserConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
 import {
-  type PublisherConfig,
-  type TxSenderConfig,
-  getPublisherConfigMappings,
-  getTxSenderConfigMappings,
+  type ProverPublisherConfig,
+  type ProverTxSenderConfig,
+  proverPublisherConfigMappings,
+  proverTxSenderConfigMappings,
 } from '@aztec/sequencer-client/config';
-import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 
-import { type ProverCoordinationConfig, proverCoordinationConfigMappings } from './prover-coordination/config.js';
-
-export type ProverNodeConfig = ArchiverConfig &
-  ProverClientConfig &
-  P2PConfig &
-  WorldStateConfig &
-  PublisherConfig &
-  TxSenderConfig &
+export type ProverNodeConfig = ProverClientUserConfig &
+  ProverPublisherConfig &
+  ProverTxSenderConfig &
   DataStoreConfig &
-  ProverCoordinationConfig &
-  SpecificProverNodeConfig & {
-    /** Whether to populate the genesis state with initial fee juice for the test accounts */
-    testAccounts: boolean;
-  };
+  KeyStoreConfig &
+  SpecificProverNodeConfig &
+  Pick<SharedNodeConfig, 'web3SignerUrl'>;
 
-type SpecificProverNodeConfig = {
+export type SpecificProverNodeConfig = {
   proverNodeMaxPendingJobs: number;
   proverNodePollingIntervalMs: number;
   proverNodeMaxParallelBlocksPerEpoch: number;
+  proverNodeFailedEpochStore: string | undefined;
+  proverNodeEpochProvingDelayMs: number | undefined;
+  proverNodeDisableProofPublish?: boolean;
   txGatheringTimeoutMs: number;
   txGatheringIntervalMs: number;
-  txGatheringMaxParallelRequests: number;
+  txGatheringBatchSize: number;
+  txGatheringMaxParallelRequestsPerNode: number;
 };
 
-const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
+export const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
   proverNodeMaxPendingJobs: {
     env: 'PROVER_NODE_MAX_PENDING_JOBS',
     description: 'The maximum number of pending jobs for the prover node',
@@ -61,40 +60,52 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
   proverNodeMaxParallelBlocksPerEpoch: {
     env: 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH',
     description: 'The Maximum number of blocks to process in parallel while proving an epoch',
-    ...numberConfigHelper(32),
+    ...numberConfigHelper(0),
   },
-  txGatheringTimeoutMs: {
-    env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
-    description: 'The maximum amount of time to wait for tx data to be available',
-    ...numberConfigHelper(60_000),
+  proverNodeFailedEpochStore: {
+    env: 'PROVER_NODE_FAILED_EPOCH_STORE',
+    description: 'File store where to upload node state when an epoch fails to be proven',
+    defaultValue: undefined,
+  },
+  proverNodeEpochProvingDelayMs: {
+    description: 'Optional delay in milliseconds to wait before proving a new epoch',
+    defaultValue: undefined,
   },
   txGatheringIntervalMs: {
     env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
     description: 'How often to check that tx data is available',
     ...numberConfigHelper(1_000),
   },
-  txGatheringMaxParallelRequests: {
-    env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
-    description: 'How many txs to load up a time',
+  txGatheringBatchSize: {
+    env: 'PROVER_NODE_TX_GATHERING_BATCH_SIZE',
+    description: 'How many transactions to gather from a node in a single request',
+    ...numberConfigHelper(10),
+  },
+  txGatheringMaxParallelRequestsPerNode: {
+    env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE',
+    description: 'How many tx requests to make in parallel to each node',
     ...numberConfigHelper(100),
   },
+  txGatheringTimeoutMs: {
+    env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
+    description: 'How long to wait for tx data to be available before giving up',
+    ...numberConfigHelper(120_000),
+  },
+  proverNodeDisableProofPublish: {
+    env: 'PROVER_NODE_DISABLE_PROOF_PUBLISH',
+    description: 'Whether the prover node skips publishing proofs to L1',
+    ...booleanConfigHelper(false),
+  },
 };
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
   ...dataConfigMappings,
-  ...archiverConfigMappings,
+  ...keyStoreConfigMappings,
   ...proverClientConfigMappings,
-  ...p2pConfigMappings,
-  ...worldStateConfigMappings,
-  ...getPublisherConfigMappings('PROVER'),
-  ...getTxSenderConfigMappings('PROVER'),
-  ...proverCoordinationConfigMappings,
+  ...proverPublisherConfigMappings,
+  ...proverTxSenderConfigMappings,
   ...specificProverNodeConfigMappings,
-  testAccounts: {
-    env: 'TEST_ACCOUNTS',
-    description: 'Whether to populate the genesis state with initial fee juice for the test accounts.',
-    ...booleanConfigHelper(false),
-  },
+  ...pickConfigMappings(sharedNodeConfigMappings, ['web3SignerUrl']),
 };
 
 export function getProverNodeConfigFromEnv(): ProverNodeConfig {
@@ -113,3 +124,70 @@ export function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig
     ...getConfigFromMappings(bbConfigMappings),
   };
 }
+
+function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | undefined {
+  // If we don't have a valid prover Id then we can't build a valid key store with remote signers
+  if (config.proverId === undefined) {
+    return undefined;
+  }
+
+  // Also, we need at least one publisher address.
+  const publishers = config.proverPublisherAddresses ?? [];
+
+  if (publishers.length === 0) {
+    return undefined;
+  }
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover: {
+      id: config.proverId,
+      publisher: publishers,
+    },
+    remoteSigner: config.web3SignerUrl,
+    validators: undefined,
+  };
+  return keyStore;
+}
+
+function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
+  // Extract the publisher keys from the provided config.
+  const publisherKeys = config.proverPublisherPrivateKeys
+    ? config.proverPublisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
+    : [];
+
+  // There must be at least 1.
+  if (publisherKeys.length === 0) {
+    return undefined;
+  }
+
+  // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
+  // Otherwise create one of the form ("0x12345678....." as EthAccount).
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover:
+      config.proverId === undefined
+        ? publisherKeys[0]
+        : {
+            id: config.proverId,
+            publisher: publisherKeys,
+          },
+    remoteSigner: undefined,
+    validators: undefined,
+  };
+  return keyStore;
+}
+
+export function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined {
+  if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
+    const keyStore = createKeyStoreFromWeb3Signer(config);
+    if (keyStore) {
+      return keyStore;
+    }
+  }
+
+  return createKeyStoreFromPublisherKeys(config);
+}

package/src/factory.ts

@@ -1,99 +1,179 @@
-import { type Archiver, createArchiver } from '@aztec/archiver';
-import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
-import { EpochCache } from '@aztec/epoch-cache';
-import { L1TxUtils, RollupContract, createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import type { Archiver } from '@aztec/archiver';
+import type { BlobClientInterface } from '@aztec/blob-client/client';
+import { Blob } from '@aztec/blob-lib';
+import type { EpochCacheInterface } from '@aztec/epoch-cache';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { makeL1HttpTransport } from '@aztec/ethereum/client';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
+import { PublisherManager } from '@aztec/ethereum/publisher-manager';
+import { pick } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
-import { createProverClient } from '@aztec/prover-client';
+import { DateProvider } from '@aztec/foundation/timer';
+import { KeystoreManager } from '@aztec/node-keystore';
+import { createForwarderL1TxUtilsFromSigners, createL1TxUtilsFromSigners } from '@aztec/node-lib/factories';
+import { type ProverClientConfig, type ProverClientUserConfig, createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
-import type { ProverCoordination, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
-import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
-import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
-import { createWorldStateSynchronizer } from '@aztec/world-state';
+import {
+  type ProverPublisherConfig,
+  type ProverTxSenderConfig,
+  getPublisherConfigFromProverConfig,
+} from '@aztec/sequencer-client';
+import type {
+  ITxProvider,
+  ProverConfig,
+  ProvingJobBroker,
+  Service,
+  WorldStateSynchronizer,
+} from '@aztec/stdlib/interfaces/server';
+import { L1Metrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import type { ProverNodeConfig } from './config.js';
+import { createPublicClient } from 'viem';
+
+import type { SpecificProverNodeConfig } from './config.js';
 import { EpochMonitor } from './monitors/epoch-monitor.js';
-import { createProverCoordination } from './prover-coordination/factory.js';
-import { ProverNodePublisher } from './prover-node-publisher.js';
-import { ProverNode, type ProverNodeOptions } from './prover-node.js';
+import { ProverNode } from './prover-node.js';
+import { ProverPublisherFactory } from './prover-publisher-factory.js';
+
+export type ProverNodeDeps = {
+  telemetry?: TelemetryClient;
+  log?: Logger;
+  archiver: Archiver;
+  publisherFactory?: ProverPublisherFactory;
+  broker?: ProvingJobBroker;
+  l1TxUtils?: L1TxUtils;
+  dateProvider?: DateProvider;
+  worldStateSynchronizer: WorldStateSynchronizer;
+  p2pClient: { getTxProvider(): ITxProvider } & Partial<Service>;
+  epochCache: EpochCacheInterface;
+  blobClient: BlobClientInterface;
+  keyStoreManager?: KeystoreManager;
+};
 
-/** Creates a new prover node given a config. */
+/** Creates a new prover node subsystem given a config and dependencies */
 export async function createProverNode(
-  config: ProverNodeConfig & DataStoreConfig,
-  deps: {
-    telemetry?: TelemetryClient;
-    log?: Logger;
-    aztecNodeTxProvider?: ProverCoordination;
-    archiver?: Archiver;
-    publisher?: ProverNodePublisher;
-    blobSinkClient?: BlobSinkClientInterface;
-    broker?: ProvingJobBroker;
-    l1TxUtils?: L1TxUtils;
-  } = {},
-  options: {
-    prefilledPublicData?: PublicDataTreeLeaf[];
-  } = {},
+  userConfig: SpecificProverNodeConfig &
+    ProverConfig &
+    ProverClientUserConfig &
+    ProverPublisherConfig &
+    ProverTxSenderConfig,
+  deps: ProverNodeDeps,
 ) {
+  const config = { ...userConfig };
   const telemetry = deps.telemetry ?? getTelemetryClient();
-  const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
-  const log = deps.log ?? createLogger('prover-node');
-  const archiver = deps.archiver ?? (await createArchiver(config, blobSinkClient, { blockUntilSync: true }, telemetry));
-  log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
-
-  const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
-  const worldStateSynchronizer = await createWorldStateSynchronizer(
-    worldStateConfig,
-    archiver,
-    options.prefilledPublicData,
-    telemetry,
-  );
-  await worldStateSynchronizer.start();
+  const dateProvider = deps.dateProvider ?? new DateProvider();
+  const log = deps.log ?? createLogger('prover');
+
+  const { p2pClient, archiver, keyStoreManager, worldStateSynchronizer } = deps;
+
+  // Extract the prover signers from the key store and verify that we have one.
+  await keyStoreManager?.validateSigners();
+  const proverSigners = keyStoreManager?.createProverSigners();
+
+  if (proverSigners === undefined) {
+    throw new Error('Failed to create prover key store configuration');
+  } else if (proverSigners.signers.length === 0) {
+    throw new Error('No prover signers found in the key store');
+  }
+
+  log.info(`Creating prover with publishers ${proverSigners.signers.map(signer => signer.address.toString()).join()}`);
+
+  // Only consider user provided config if it is valid
+  const proverIdInUserConfig = config.proverId === undefined || config.proverId.isZero() ? undefined : config.proverId;
+
+  // ProverId: Take from key store if provided, otherwise from user config if valid, otherwise address of first signer
+  const proverId = proverSigners.id ?? proverIdInUserConfig ?? proverSigners.signers[0].address;
+
+  // Now create the prover client configuration from this.
+  const proverClientConfig: ProverClientConfig = { ...config, proverId };
 
   const broker = deps.broker ?? (await createAndStartProvingBroker(config, telemetry));
-  const prover = await createProverClient(config, worldStateSynchronizer, broker, telemetry);
 
-  const { l1RpcUrls: rpcUrls, l1ChainId: chainId, publisherPrivateKey } = config;
+  const prover = await createProverClient(proverClientConfig, worldStateSynchronizer, broker, telemetry);
+
+  const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
   const chain = createEthereumChain(rpcUrls, chainId);
-  const { publicClient, walletClient } = createL1Clients(rpcUrls, publisherPrivateKey, chain.chainInfo);
+
+  const publicClient = createPublicClient({
+    chain: chain.chainInfo,
+    transport: makeL1HttpTransport(config.l1RpcUrls, { timeout: config.l1HttpTimeoutMS }),
+    pollingInterval: config.viemPollingIntervalMS,
+  });
 
   const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
 
-  const l1TxUtils = deps.l1TxUtils ?? new L1TxUtils(publicClient, walletClient, log, config);
-  const publisher = deps.publisher ?? new ProverNodePublisher(config, { telemetry, rollupContract, l1TxUtils });
+  const l1TxUtils = deps.l1TxUtils
+    ? [deps.l1TxUtils]
+    : config.proverPublisherForwarderAddress
+      ? await createForwarderL1TxUtilsFromSigners(
+          publicClient,
+          proverSigners.signers,
+          config.proverPublisherForwarderAddress,
+          { ...config, scope: 'prover' },
+          { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider, kzg: Blob.getViemKzgInstance() },
+        )
+      : await createL1TxUtilsFromSigners(
+          publicClient,
+          proverSigners.signers,
+          { ...config, scope: 'prover' },
+          { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
+        );
 
-  const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
+  const publisherFactory =
+    deps.publisherFactory ??
+    new ProverPublisherFactory(config, {
+      rollupContract,
+      publisherManager: new PublisherManager(l1TxUtils, getPublisherConfigFromProverConfig(config), log.getBindings()),
+      telemetry,
+    });
 
-  // If config.p2pEnabled is true, createProverCoordination will create a p2p client where txs are requested
-  // If config.p2pEnabled is false, createProverCoordination request information from the AztecNode
-  const proverCoordination = await createProverCoordination(config, {
-    aztecNodeTxProvider: deps.aztecNodeTxProvider,
-    worldStateSynchronizer,
+  const proverNodeConfig = {
+    ...pick(
+      config,
+      'proverNodeMaxPendingJobs',
+      'proverNodeMaxParallelBlocksPerEpoch',
+      'proverNodePollingIntervalMs',
+      'proverNodeEpochProvingDelayMs',
+      'txGatheringMaxParallelRequests',
+      'txGatheringIntervalMs',
+      'txGatheringTimeoutMs',
+      'proverNodeFailedEpochStore',
+      'proverNodeDisableProofPublish',
+      'dataDirectory',
+      'l1ChainId',
+      'rollupVersion',
+    ),
+  };
+
+  const epochMonitor = await EpochMonitor.create(
     archiver,
-    epochCache,
+    { pollingIntervalMs: config.proverNodePollingIntervalMs, provingDelayMs: config.proverNodeEpochProvingDelayMs },
     telemetry,
-  });
+  );
 
-  const proverNodeConfig: ProverNodeOptions = {
-    maxPendingJobs: config.proverNodeMaxPendingJobs,
-    pollingIntervalMs: config.proverNodePollingIntervalMs,
-    maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
-    txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
-    txGatheringIntervalMs: config.txGatheringIntervalMs,
-    txGatheringTimeoutMs: config.txGatheringTimeoutMs,
-  };
+  const l1Metrics = new L1Metrics(
+    telemetry.getMeter('ProverNodeL1Metrics'),
+    publicClient,
+    l1TxUtils.map(utils => utils.getSenderAddress()),
+  );
 
-  const epochMonitor = await EpochMonitor.create(archiver, proverNodeConfig, telemetry);
+  // Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
+  const delayer = l1TxUtils[0]?.delayer;
 
   return new ProverNode(
     prover,
-    publisher,
+    publisherFactory,
     archiver,
     archiver,
     archiver,
     worldStateSynchronizer,
-    proverCoordination,
+    p2pClient,
     epochMonitor,
+    rollupContract,
+    l1Metrics,
     proverNodeConfig,
     telemetry,
+    delayer,
+    dateProvider,
   );
 }

package/src/index.ts

@@ -1,5 +1,6 @@
+export * from './actions/index.js';
 export * from './config.js';
 export * from './factory.js';
-export * from './http.js';
+export * from './monitors/index.js';
 export * from './prover-node-publisher.js';
 export * from './prover-node.js';

package/src/job/epoch-proving-job-data.ts

@@ -0,0 +1,82 @@
+import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { CommitteeAttestation } from '@aztec/stdlib/block';
+import { Checkpoint } from '@aztec/stdlib/checkpoint';
+import { BlockHeader, Tx } from '@aztec/stdlib/tx';
+
+/** All data from an epoch used in proving. */
+export type EpochProvingJobData = {
+  epochNumber: EpochNumber;
+  checkpoints: Checkpoint[];
+  txs: Map<string, Tx>;
+  l1ToL2Messages: Record<CheckpointNumber, Fr[]>;
+  previousBlockHeader: BlockHeader;
+  attestations: CommitteeAttestation[];
+};
+
+export function validateEpochProvingJobData(data: EpochProvingJobData) {
+  if (data.checkpoints.length === 0) {
+    throw new Error('No checkpoints to prove');
+  }
+
+  const firstBlockNumber = data.checkpoints[0].blocks[0].number;
+  const previousBlockNumber = data.previousBlockHeader.getBlockNumber();
+  if (previousBlockNumber + 1 !== firstBlockNumber) {
+    throw new Error(
+      `Initial block number ${firstBlockNumber} does not match previous block header ${previousBlockNumber}`,
+    );
+  }
+
+  for (const checkpoint of data.checkpoints) {
+    if (!(checkpoint.number in data.l1ToL2Messages)) {
+      throw new Error(`Missing L1 to L2 messages for checkpoint number ${checkpoint.number}`);
+    }
+  }
+}
+
+export function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer {
+  const checkpoints = data.checkpoints.map(checkpoint => checkpoint.toBuffer());
+  const txs = Array.from(data.txs.values()).map(tx => tx.toBuffer());
+  const l1ToL2Messages = Object.entries(data.l1ToL2Messages).map(([checkpointNumber, messages]) => [
+    Number(checkpointNumber),
+    messages.length,
+    ...messages,
+  ]);
+  const attestations = data.attestations.map(attestation => attestation.toBuffer());
+
+  return serializeToBuffer(
+    data.epochNumber,
+    data.previousBlockHeader,
+    checkpoints.length,
+    ...checkpoints,
+    txs.length,
+    ...txs,
+    l1ToL2Messages.length,
+    ...l1ToL2Messages,
+    attestations.length,
+    ...attestations,
+  );
+}
+
+export function deserializeEpochProvingJobData(buf: Buffer): EpochProvingJobData {
+  const reader = BufferReader.asReader(buf);
+  const epochNumber = EpochNumber(reader.readNumber());
+  const previousBlockHeader = reader.readObject(BlockHeader);
+  const checkpoints = reader.readVector(Checkpoint);
+  const txArray = reader.readVector(Tx);
+
+  const l1ToL2MessageCheckpointCount = reader.readNumber();
+  const l1ToL2Messages: Record<number, Fr[]> = {};
+  for (let i = 0; i < l1ToL2MessageCheckpointCount; i++) {
+    const checkpointNumber = CheckpointNumber(reader.readNumber());
+    const messages = reader.readVector(Fr);
+    l1ToL2Messages[checkpointNumber] = messages;
+  }
+
+  const attestations = reader.readVector(CommitteeAttestation);
+
+  const txs = new Map<string, Tx>(txArray.map(tx => [tx.getTxHash().toString(), tx]));
+
+  return { epochNumber, previousBlockHeader, checkpoints, txs, l1ToL2Messages, attestations };
+}