@aztec/aztec-node 0.0.1-commit.29c6b1a3 → 0.0.1-commit.2c0ee1788

package/src/aztec-node/block_response_helpers.ts

@@ -0,0 +1,131 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import {
+  type BlockData,
+  type BlockDataWithCheckpointContext,
+  type CheckpointedL2Block,
+  type CommitteeAttestation,
+  L2Block,
+} from '@aztec/stdlib/block';
+import type { CheckpointData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import {
+  type BlockIncludeOptions,
+  type BlockResponse,
+  type CheckpointIncludeOptions,
+  type CheckpointResponse,
+  l1PublishInfoFromL1PublishedData,
+} from '@aztec/stdlib/interfaces/client';
+
+/** Projects a full {@link L2Block} into a {@link BlockResponse}, attaching L1 / attestation context when provided. */
+export async function blockResponseFromL2Block(
+  block: L2Block,
+  options: BlockIncludeOptions,
+  context?: { l1?: BlockDataWithCheckpointContext['l1']; attestations?: CommitteeAttestation[] },
+): Promise<BlockResponse> {
+  const response: BlockResponse = {
+    header: block.header,
+    archive: block.archive,
+    hash: await block.hash(),
+    checkpointNumber: block.checkpointNumber,
+    indexWithinCheckpoint: block.indexWithinCheckpoint,
+    number: block.number,
+  };
+  if (options.includeTransactions) {
+    (response as BlockResponse).body = block.body;
+  }
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link BlockData} into a {@link BlockResponse}. */
+export function blockResponseFromBlockData(
+  data: BlockData,
+  blockNumber: BlockNumber,
+  options: BlockIncludeOptions,
+  context?: { l1?: BlockDataWithCheckpointContext['l1']; attestations?: CommitteeAttestation[] },
+): BlockResponse {
+  const response: BlockResponse = {
+    header: data.header,
+    archive: data.archive,
+    hash: data.blockHash,
+    checkpointNumber: data.checkpointNumber,
+    indexWithinCheckpoint: data.indexWithinCheckpoint,
+    number: blockNumber,
+  };
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects a {@link CheckpointedL2Block} into a {@link BlockResponse}. */
+export function blockResponseFromCheckpointedL2Block(
+  cp: CheckpointedL2Block,
+  options: BlockIncludeOptions,
+): Promise<BlockResponse> {
+  return blockResponseFromL2Block(cp.block, options, { l1: cp.l1, attestations: cp.attestations });
+}
+
+/** Projects a {@link PublishedCheckpoint} into a {@link CheckpointResponse}. */
+export async function checkpointResponseFromPublishedCheckpoint(
+  pc: PublishedCheckpoint,
+  options: CheckpointIncludeOptions,
+): Promise<CheckpointResponse> {
+  const response: CheckpointResponse = {
+    number: pc.checkpoint.number,
+    header: pc.checkpoint.header,
+    archive: pc.checkpoint.archive,
+    checkpointOutHash: pc.checkpoint.getCheckpointOutHash(),
+    startBlock: pc.checkpoint.blocks[0]?.number ?? BlockNumber.ZERO,
+    blockCount: pc.checkpoint.blocks.length,
+    feeAssetPriceModifier: pc.checkpoint.feeAssetPriceModifier,
+  };
+  if (options.includeBlocks) {
+    (response as CheckpointResponse).blocks = await Promise.all(
+      pc.checkpoint.blocks.map(block =>
+        blockResponseFromL2Block(block, {
+          includeTransactions: options.includeTransactions,
+          includeL1PublishInfo: false,
+          includeAttestations: false,
+        }),
+      ),
+    );
+  }
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(pc.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = pc.attestations;
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link CheckpointData} into a {@link CheckpointResponse}. `includeBlocks` is ignored (no blocks loaded). */
+export function checkpointResponseFromCheckpointData(
+  cd: CheckpointData,
+  options: CheckpointIncludeOptions,
+): CheckpointResponse {
+  const response: CheckpointResponse = {
+    number: cd.checkpointNumber,
+    header: cd.header,
+    archive: cd.archive,
+    checkpointOutHash: cd.checkpointOutHash,
+    startBlock: cd.startBlock,
+    blockCount: cd.blockCount,
+    feeAssetPriceModifier: cd.feeAssetPriceModifier,
+  };
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(cd.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = cd.attestations;
+  }
+  return response;
+}

package/src/aztec-node/config.ts

@@ -3,7 +3,6 @@ import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethe
 import { type L1ContractAddresses, l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
 import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import {
   type KeyStore,
   type ValidatorKeyStore,
@@ -13,15 +12,21 @@ import {
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import { type ProverClientUserConfig, proverClientConfigMappings } from '@aztec/prover-client/config';
+import {
+  type ProverNodeConfig,
+  proverNodeConfigMappings,
+  specificProverNodeConfigMappings,
+} from '@aztec/prover-node/config';
 import {
   type SequencerClientConfig,
-  type TxSenderConfig,
+  type SequencerTxSenderConfig,
   sequencerClientConfigMappings,
 } from '@aztec/sequencer-client/config';
 import { slasherConfigMappings } from '@aztec/slasher';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type NodeRPCConfig, nodeRpcConfigMappings } from '@aztec/stdlib/config';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
 
@@ -46,16 +51,18 @@ export type AztecNodeConfig = ArchiverConfig &
   SharedNodeConfig &
   GenesisStateConfig &
   NodeRPCConfig &
-  SlasherConfig & {
+  SlasherConfig &
+  ProverNodeConfig & {
     /** L1 contracts addresses */
     l1Contracts: L1ContractAddresses;
     /** Whether the validator is disabled for this node */
     disableValidator: boolean;
     /** Whether to skip waiting for the archiver to be fully synced before starting other services */
     skipArchiverInitialSync: boolean;
-
     /** A flag to force verification of tx Chonk proofs. Only used for testnet */
     debugForceTxProofVerification: boolean;
+    /** Whether to enable the prover node as a subsystem. */
+    enableProverNode: boolean;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
@@ -63,6 +70,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...keyStoreConfigMappings,
   ...archiverConfigMappings,
   ...sequencerClientConfigMappings,
+  ...proverNodeConfigMappings,
   ...validatorClientConfigMappings,
   ...proverClientConfigMappings,
   ...worldStateConfigMappings,
@@ -72,6 +80,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...genesisStateConfigMappings,
   ...nodeRpcConfigMappings,
   ...slasherConfigMappings,
+  ...specificProverNodeConfigMappings,
   l1Contracts: {
     description: 'The deployed L1 contract addresses',
     nested: l1ContractAddressesMapping,
@@ -91,6 +100,11 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
     description: 'Whether to skip waiting for the archiver to be fully synced before starting other services.',
     ...booleanConfigHelper(false),
   },
+  enableProverNode: {
+    env: 'ENABLE_PROVER_NODE',
+    description: 'Whether to enable the prover node as a subsystem.',
+    ...booleanConfigHelper(false),
+  },
 };
 
 /**
@@ -101,7 +115,7 @@ export function getConfigEnvVars(): AztecNodeConfig {
   return getConfigFromMappings<AztecNodeConfig>(aztecNodeConfigMappings);
 }
 
-type ConfigRequiredToBuildKeyStore = TxSenderConfig & SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
+type ConfigRequiredToBuildKeyStore = SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
 
 function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
   const validatorKeyStores: ValidatorKeyStore[] = [];
@@ -120,7 +134,7 @@ function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): Ke
     feeRecipient: config.feeRecipient ?? AztecAddress.ZERO,
     coinbase: config.coinbase ?? config.validatorAddresses[0],
     remoteSigner: config.web3SignerUrl,
-    publisher: config.publisherAddresses ?? [],
+    publisher: config.sequencerPublisherAddresses ?? [],
   });
 
   const keyStore: KeyStore = {
@@ -145,8 +159,10 @@ function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): K
   const coinbase = config.coinbase ?? EthAddress.fromString(privateKeyToAddress(ethPrivateKeys[0]));
   const feeRecipient = config.feeRecipient ?? AztecAddress.ZERO;
 
-  const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
+  const publisherKeys = config.sequencerPublisherPrivateKeys
+    ? config.sequencerPublisherPrivateKeys.map((k: { getValue: () => string }) =>
+        ethPrivateKeySchema.parse(k.getValue()),
+      )
     : [];
 
   validatorKeyStores.push({
@@ -168,7 +184,7 @@ function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): K
 }
 
 export function createKeyStoreForValidator(
-  config: TxSenderConfig & SequencerClientConfig & SharedNodeConfig,
+  config: SequencerTxSenderConfig & SequencerClientConfig & SharedNodeConfig,
 ): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
     return createKeyStoreFromWeb3Signer(config);

package/src/aztec-node/node_metrics.ts

@@ -1,4 +1,11 @@
-import { Attributes, type Histogram, Metrics, type TelemetryClient, type UpDownCounter } from '@aztec/telemetry-client';
+import {
+  Attributes,
+  type Histogram,
+  Metrics,
+  type TelemetryClient,
+  type UpDownCounter,
+  createUpDownCounterWithDefault,
+} from '@aztec/telemetry-client';
 
 export class NodeMetrics {
   private receiveTxCount: UpDownCounter;
@@ -9,14 +16,14 @@ export class NodeMetrics {
 
   constructor(client: TelemetryClient, name = 'AztecNode') {
     const meter = client.getMeter(name);
-    this.receiveTxCount = meter.createUpDownCounter(Metrics.NODE_RECEIVE_TX_COUNT);
+    this.receiveTxCount = createUpDownCounterWithDefault(meter, Metrics.NODE_RECEIVE_TX_COUNT, {
+      [Attributes.OK]: [true, false],
+    });
     this.receiveTxDuration = meter.createHistogram(Metrics.NODE_RECEIVE_TX_DURATION);
 
     this.snapshotDuration = meter.createHistogram(Metrics.NODE_SNAPSHOT_DURATION);
 
-    this.snapshotErrorCount = meter.createUpDownCounter(Metrics.NODE_SNAPSHOT_ERROR_COUNT);
-
-    this.snapshotErrorCount.add(0);
+    this.snapshotErrorCount = createUpDownCounterWithDefault(meter, Metrics.NODE_SNAPSHOT_ERROR_COUNT);
   }
 
   receivedTx(durationMs: number, isAccepted: boolean) {