@aztec/aztec-node 0.0.0-test.1 → 0.0.1-commit.017a351

package/src/aztec-node/config.ts

@@ -1,15 +1,37 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
+import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
 import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import {
+  type KeyStore,
+  type ValidatorKeyStore,
+  ethPrivateKeySchema,
+  keyStoreConfigMappings,
+} from '@aztec/node-keystore';
+import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
-import { type ProverClientConfig, proverClientConfigMappings } from '@aztec/prover-client/config';
-import { type SequencerClientConfig, sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
+import { type ProverClientUserConfig, proverClientConfigMappings } from '@aztec/prover-client/config';
+import {
+  type ProverNodeConfig,
+  proverNodeConfigMappings,
+  specificProverNodeConfigMappings,
+} from '@aztec/prover-node/config';
+import {
+  type SequencerClientConfig,
+  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';
 
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { fileURLToPath } from 'url';
+import { privateKeyToAddress } from 'viem/accounts';
+
+import { type SentinelConfig, sentinelConfigMappings } from '../sentinel/config.js';
 
 export { sequencerClientConfigMappings, type SequencerClientConfig };
 
@@ -19,34 +41,73 @@ export { sequencerClientConfigMappings, type SequencerClientConfig };
 export type AztecNodeConfig = ArchiverConfig &
   SequencerClientConfig &
   ValidatorClientConfig &
-  ProverClientConfig &
+  ProverClientUserConfig &
   WorldStateConfig &
-  Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
+  Pick<ProverClientUserConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
   P2PConfig &
-  DataStoreConfig & {
+  DataStoreConfig &
+  SentinelConfig &
+  SharedNodeConfig &
+  GenesisStateConfig &
+  NodeRPCConfig &
+  SlasherConfig &
+  ProverNodeConfig & {
     /** Whether the validator is disabled for this node */
     disableValidator: boolean;
-    /** Whether to populate the genesis state with initial fee juice for the test accounts */
-    testAccounts: 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;
+    /**
+     * Test-only: use the deterministic AutomineSequencer instead of the production Sequencer.
+     * Requires `aztecTargetCommitteeSize === 0` on the deployed rollup and anvil-backed L1.
+     * See `AUTOMINE_E2E_OPTS` in `end-to-end/src/fixtures/fixtures.ts`.
+     */
+    useAutomineSequencer?: boolean;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
+  ...dataConfigMappings,
+  ...keyStoreConfigMappings,
   ...archiverConfigMappings,
   ...sequencerClientConfigMappings,
+  ...proverNodeConfigMappings,
   ...validatorClientConfigMappings,
   ...proverClientConfigMappings,
   ...worldStateConfigMappings,
   ...p2pConfigMappings,
-  ...dataConfigMappings,
+  ...sentinelConfigMappings,
+  ...sharedNodeConfigMappings,
+  ...genesisStateConfigMappings,
+  ...nodeRpcConfigMappings,
+  ...slasherConfigMappings,
+  ...specificProverNodeConfigMappings,
   disableValidator: {
     env: 'VALIDATOR_DISABLED',
     description: 'Whether the validator is disabled for this node.',
     ...booleanConfigHelper(),
   },
-  testAccounts: {
-    env: 'TEST_ACCOUNTS',
-    description: 'Whether to populate the genesis state with initial fee juice for the test accounts.',
-    ...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),
+  },
+  enableProverNode: {
+    env: 'ENABLE_PROVER_NODE',
+    description: 'Whether to enable the prover node as a subsystem.',
+    ...booleanConfigHelper(false),
+  },
+  useAutomineSequencer: {
+    env: 'USE_AUTOMINE_SEQUENCER',
+    description: 'Test-only: use AutomineSequencer instead of the production Sequencer.',
+    ...booleanConfigHelper(false),
   },
 };
 
@@ -58,14 +119,80 @@ export function getConfigEnvVars(): AztecNodeConfig {
   return getConfigFromMappings<AztecNodeConfig>(aztecNodeConfigMappings);
 }
 
-/**
- * Returns package version.
- */
-export function getPackageVersion() {
-  const releasePleaseManifestPath = resolve(
-    dirname(fileURLToPath(import.meta.url)),
-    '../../../../.release-please-manifest.json',
-  );
-  const version = JSON.parse(readFileSync(releasePleaseManifestPath).toString());
-  return version['.'];
+type ConfigRequiredToBuildKeyStore = SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
+
+function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
+  const validatorKeyStores: ValidatorKeyStore[] = [];
+
+  if (
+    config.web3SignerUrl === undefined ||
+    config.web3SignerUrl.length === 0 ||
+    config.validatorAddresses === undefined ||
+    config.validatorAddresses.length === 0
+  ) {
+    return undefined;
+  }
+
+  validatorKeyStores.push({
+    attester: config.validatorAddresses,
+    feeRecipient: config.feeRecipient ?? AztecAddress.ZERO,
+    coinbase: config.coinbase ?? config.validatorAddresses[0],
+    remoteSigner: config.web3SignerUrl,
+    publisher: config.sequencerPublisherAddresses ?? [],
+  });
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover: undefined,
+    remoteSigner: undefined,
+    validators: validatorKeyStores,
+  };
+  return keyStore;
+}
+
+function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
+  const validatorKeyStores: ValidatorKeyStore[] = [];
+  const ethPrivateKeys = config.validatorPrivateKeys
+    ? config.validatorPrivateKeys.getValue().map((x: string) => ethPrivateKeySchema.parse(x))
+    : [];
+
+  if (!ethPrivateKeys.length) {
+    return undefined;
+  }
+  const coinbase = config.coinbase ?? EthAddress.fromString(privateKeyToAddress(ethPrivateKeys[0]));
+  const feeRecipient = config.feeRecipient ?? AztecAddress.ZERO;
+
+  const publisherKeys = config.sequencerPublisherPrivateKeys
+    ? config.sequencerPublisherPrivateKeys.map((k: { getValue: () => string }) =>
+        ethPrivateKeySchema.parse(k.getValue()),
+      )
+    : [];
+
+  validatorKeyStores.push({
+    attester: ethPrivateKeys,
+    feeRecipient: feeRecipient,
+    coinbase: coinbase,
+    remoteSigner: undefined,
+    publisher: publisherKeys,
+  });
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover: undefined,
+    remoteSigner: undefined,
+    validators: validatorKeyStores,
+  };
+  return keyStore;
+}
+
+export function createKeyStoreForValidator(
+  config: SequencerTxSenderConfig & SequencerClientConfig & SharedNodeConfig,
+): KeyStore | undefined {
+  if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
+    return createKeyStoreFromWeb3Signer(config);
+  }
+
+  return createKeyStoreFromPrivateKeys(config);
 }

package/src/aztec-node/node_metrics.ts

@@ -4,21 +4,26 @@ import {
   Metrics,
   type TelemetryClient,
   type UpDownCounter,
-  ValueType,
+  createUpDownCounterWithDefault,
 } from '@aztec/telemetry-client';
 
 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, {});
-    this.receiveTxDuration = meter.createHistogram(Metrics.NODE_RECEIVE_TX_DURATION, {
-      description: 'The duration of the receiveTx method',
-      unit: 'ms',
-      valueType: ValueType.INT,
+    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 = createUpDownCounterWithDefault(meter, Metrics.NODE_SNAPSHOT_ERROR_COUNT);
   }
 
   receivedTx(durationMs: number, isAccepted: boolean) {
@@ -29,4 +34,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);
+  }
 }

package/src/aztec-node/public_data_overrides.ts

@@ -0,0 +1,35 @@
+import { PublicDataWrite } from '@aztec/stdlib/avm';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import type { PublicStorageOverride } from '@aztec/stdlib/interfaces/client';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+
+/**
+ * Injects public-state overrides into an (ephemeral) world-state fork before simulation.
+ *
+ * Each override is written via the same `sequentialInsert` path the public processor
+ * uses during real transaction execution, so low-leaf updates and root coherence are
+ * handled identically for both simulation and proof generation.
+ *
+ * Writes never reach committed world state — the fork is thrown away after simulation.
+ */
+export async function applyPublicDataOverrides(
+  fork: MerkleTreeWriteOperations,
+  publicStorage: PublicStorageOverride[] | undefined,
+): Promise<void> {
+  if (!publicStorage?.length) {
+    return;
+  }
+
+  const writes = await Promise.all(
+    publicStorage.map(async o => {
+      const leafSlot = await computePublicDataTreeLeafSlot(o.contract, o.slot);
+      return new PublicDataWrite(leafSlot, o.value);
+    }),
+  );
+
+  await fork.sequentialInsert(
+    MerkleTreeId.PUBLIC_DATA_TREE,
+    writes.map(w => w.toBuffer()),
+  );
+}