@aztec/aztec-node 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107

package/src/aztec-node/config.ts

@@ -1,21 +1,13 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
-import {
-  type GenesisStateConfig,
-  type L1ContractAddresses,
-  genesisStateConfigMappings,
-  l1ContractAddressesMapping,
-} from '@aztec/ethereum';
+import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
+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 AztecAddressHex,
-  type EthAddressHex,
-  type EthPrivateKey,
-  type EthRemoteSignerAccount,
-  type Hex,
   type KeyStore,
-  type KeyStoreConfig,
   type ValidatorKeyStore,
+  ethPrivateKeySchema,
   keyStoreConfigMappings,
 } from '@aztec/node-keystore';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
@@ -50,7 +42,6 @@ export type AztecNodeConfig = ArchiverConfig &
   Pick<ProverClientUserConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
   P2PConfig &
   DataStoreConfig &
-  KeyStoreConfig &
   SentinelConfig &
   SharedNodeConfig &
   GenesisStateConfig &
@@ -60,6 +51,11 @@ export type AztecNodeConfig = ArchiverConfig &
     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;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
@@ -85,6 +81,16 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
     description: 'Whether the validator is disabled for this node.',
     ...booleanConfigHelper(),
   },
+  skipArchiverInitialSync: {
+    env: 'SKIP_ARCHIVER_INITIAL_SYNC',
+    description: 'Whether to skip waiting for the archiver to be fully synced before starting other services.',
+    ...booleanConfigHelper(false),
+  },
+  debugForceTxProofVerification: {
+    env: 'DEBUG_FORCE_TX_PROOF_VERIFICATION',
+    description: 'Whether to skip waiting for the archiver to be fully synced before starting other services.',
+    ...booleanConfigHelper(false),
+  },
 };
 
 /**
@@ -97,7 +103,7 @@ export function getConfigEnvVars(): AztecNodeConfig {
 
 type ConfigRequiredToBuildKeyStore = TxSenderConfig & SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
 
-function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore) {
+function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
   const validatorKeyStores: ValidatorKeyStore[] = [];
 
   if (
@@ -108,22 +114,13 @@ function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore) {
   ) {
     return undefined;
   }
-  const coinbase = config.coinbase ? config.coinbase.toString() : config.validatorAddresses[0].toString();
-  const feeRecipient = config.feeRecipient ? config.feeRecipient.toString() : AztecAddress.ZERO.toString();
-
-  const publisherAddresses =
-    config.publisherAddresses && config.publisherAddresses.length > 0
-      ? config.publisherAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount)
-      : [];
-
-  const attestors = config.validatorAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount);
 
   validatorKeyStores.push({
-    attester: attestors,
-    feeRecipient: feeRecipient as AztecAddressHex,
-    coinbase: coinbase as EthAddressHex,
+    attester: config.validatorAddresses,
+    feeRecipient: config.feeRecipient ?? AztecAddress.ZERO,
+    coinbase: config.coinbase ?? config.validatorAddresses[0],
     remoteSigner: config.web3SignerUrl,
-    publisher: publisherAddresses,
+    publisher: config.publisherAddresses ?? [],
   });
 
   const keyStore: KeyStore = {
@@ -136,30 +133,26 @@ function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore) {
   return keyStore;
 }
 
-function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore) {
+function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
   const validatorKeyStores: ValidatorKeyStore[] = [];
-  const ethPrivateKeys: EthPrivateKey[] = [];
-  const validatorKeys = config.validatorPrivateKeys ? config.validatorPrivateKeys.getValue() : [];
-  for (let i = 0; i < validatorKeys.length; i++) {
-    const key = validatorKeys[i];
-    const ethPrivateKey: EthPrivateKey = key as Hex<32>;
-    ethPrivateKeys.push(ethPrivateKey);
-  }
+  const ethPrivateKeys = config.validatorPrivateKeys
+    ? config.validatorPrivateKeys.getValue().map((x: string) => ethPrivateKeySchema.parse(x))
+    : [];
 
   if (!ethPrivateKeys.length) {
     return undefined;
   }
-  const coinbase = config.coinbase ? config.coinbase.toString() : privateKeyToAddress(ethPrivateKeys[0]);
-  const feeRecipient = config.feeRecipient ? config.feeRecipient.toString() : AztecAddress.ZERO.toString();
+  const coinbase = config.coinbase ?? EthAddress.fromString(privateKeyToAddress(ethPrivateKeys[0]));
+  const feeRecipient = config.feeRecipient ?? AztecAddress.ZERO;
 
   const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map(k => k.getValue() as EthPrivateKey)
+    ? config.publisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   validatorKeyStores.push({
     attester: ethPrivateKeys,
-    feeRecipient: feeRecipient as AztecAddressHex,
-    coinbase: coinbase as EthAddressHex,
+    feeRecipient: feeRecipient,
+    coinbase: coinbase,
     remoteSigner: undefined,
     publisher: publisherKeys,
   });
@@ -174,7 +167,9 @@ function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore) {
   return keyStore;
 }
 
-export function createKeyStoreForValidator(config: TxSenderConfig & SequencerClientConfig & SharedNodeConfig) {
+export function createKeyStoreForValidator(
+  config: TxSenderConfig & SequencerClientConfig & SharedNodeConfig,
+): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
     return createKeyStoreFromWeb3Signer(config);
   }

package/src/aztec-node/node_metrics.ts

@@ -11,6 +11,9 @@ export class NodeMetrics {
   private receiveTxCount: UpDownCounter;
   private receiveTxDuration: Histogram;
 
+  private snapshotErrorCount: UpDownCounter;
+  private snapshotDuration: Histogram;
+
   constructor(client: TelemetryClient, name = 'AztecNode') {
     const meter = client.getMeter(name);
     this.receiveTxCount = meter.createUpDownCounter(Metrics.NODE_RECEIVE_TX_COUNT, {});
@@ -19,6 +22,19 @@ export class NodeMetrics {
       unit: 'ms',
       valueType: ValueType.INT,
     });
+
+    this.snapshotDuration = meter.createHistogram(Metrics.NODE_SNAPSHOT_DURATION, {
+      description: 'How long taking a snapshot takes',
+      unit: 'ms',
+      valueType: ValueType.INT,
+    });
+
+    this.snapshotErrorCount = meter.createUpDownCounter(Metrics.NODE_SNAPSHOT_ERROR_COUNT, {
+      description: 'How many snapshot errors have happened',
+      valueType: ValueType.INT,
+    });
+
+    this.snapshotErrorCount.add(0);
   }
 
   receivedTx(durationMs: number, isAccepted: boolean) {
@@ -29,4 +45,16 @@ export class NodeMetrics {
       [Attributes.OK]: isAccepted,
     });
   }
+
+  recordSnapshot(durationMs: number) {
+    if (isNaN(durationMs)) {
+      return;
+    }
+
+    this.snapshotDuration.record(Math.ceil(durationMs));
+  }
+
+  recordSnapshotError() {
+    this.snapshotErrorCount.add(1);
+  }
 }