@aztec/aztec-node 0.67.1 → 0.68.1

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.67.1",
+  "version": "0.68.1",
   "main": "dest/index.js",
   "type": "module",
-  "exports": "./dest/index.js",
+  "exports": {
+    ".": "./dest/index.js",
+    "./config": "./dest/aztec-node/config.js"
+  },
   "bin": "./dest/bin/index.js",
   "typedocOptions": {
     "entryPoints": [
@@ -20,7 +23,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests"
+    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
     "../package.common.json"
@@ -52,9 +55,9 @@
     "rootDir": "./src",
     "reporters": [
       [
-        "default",
+        "jest-silent-reporter",
         {
-          "summaryThreshold": 9999
+          "useDots": true
         }
       ]
     ],
@@ -64,23 +67,24 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.67.1",
-    "@aztec/bb-prover": "0.67.1",
-    "@aztec/circuit-types": "0.67.1",
-    "@aztec/circuits.js": "0.67.1",
-    "@aztec/ethereum": "0.67.1",
-    "@aztec/foundation": "0.67.1",
-    "@aztec/kv-store": "0.67.1",
-    "@aztec/merkle-tree": "0.67.1",
-    "@aztec/p2p": "0.67.1",
-    "@aztec/protocol-contracts": "0.67.1",
-    "@aztec/prover-client": "0.67.1",
-    "@aztec/sequencer-client": "0.67.1",
-    "@aztec/simulator": "0.67.1",
-    "@aztec/telemetry-client": "0.67.1",
-    "@aztec/types": "0.67.1",
-    "@aztec/validator-client": "0.67.1",
-    "@aztec/world-state": "0.67.1",
+    "@aztec/archiver": "0.68.1",
+    "@aztec/bb-prover": "0.68.1",
+    "@aztec/circuit-types": "0.68.1",
+    "@aztec/circuits.js": "0.68.1",
+    "@aztec/epoch-cache": "0.68.1",
+    "@aztec/ethereum": "0.68.1",
+    "@aztec/foundation": "0.68.1",
+    "@aztec/kv-store": "0.68.1",
+    "@aztec/merkle-tree": "0.68.1",
+    "@aztec/p2p": "0.68.1",
+    "@aztec/protocol-contracts": "0.68.1",
+    "@aztec/prover-client": "0.68.1",
+    "@aztec/sequencer-client": "0.68.1",
+    "@aztec/simulator": "0.68.1",
+    "@aztec/telemetry-client": "0.68.1",
+    "@aztec/types": "0.68.1",
+    "@aztec/validator-client": "0.68.1",
+    "@aztec/world-state": "0.68.1",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
     "tslib": "^2.4.0"

package/src/aztec-node/config.ts

@@ -1,11 +1,11 @@
-import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver';
+import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
-import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p';
-import { type ProverClientConfig, proverClientConfigMappings } from '@aztec/prover-client';
-import { type SequencerClientConfig, sequencerClientConfigMappings } from '@aztec/sequencer-client';
-import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client';
-import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state';
+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 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';

package/src/aztec-node/server.ts

@@ -15,6 +15,7 @@ import {
   MerkleTreeId,
   NullifierMembershipWitness,
   type NullifierWithBlockSource,
+  P2PClientType,
   type ProcessedTx,
   type ProverConfig,
   PublicDataWitness,
@@ -53,12 +54,12 @@ import {
   type PublicDataTreeLeafPreimage,
 } from '@aztec/circuits.js';
 import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
+import { EpochCache } from '@aztec/epoch-cache';
 import { type L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
-import { type ContractArtifact } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import { Timer } from '@aztec/foundation/timer';
+import { DateProvider, Timer } from '@aztec/foundation/timer';
 import { type AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
 import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
@@ -74,7 +75,7 @@ import {
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { GlobalVariableBuilder, type L1Publisher, SequencerClient } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator';
-import { type TelemetryClient } from '@aztec/telemetry-client';
+import { Attributes, type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { createValidatorClient } from '@aztec/validator-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
@@ -85,11 +86,12 @@ import { NodeMetrics } from './node_metrics.js';
 /**
  * The aztec node.
  */
-export class AztecNodeService implements AztecNode {
+export class AztecNodeService implements AztecNode, Traceable {
   private packageVersion: string;
-
   private metrics: NodeMetrics;
 
+  public readonly tracer: Tracer;
+
   constructor(
     protected config: AztecNodeConfig,
     protected readonly p2pClient: P2P,
@@ -109,6 +111,7 @@ export class AztecNodeService implements AztecNode {
   ) {
     this.packageVersion = getPackageInfo().version;
     this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
+    this.tracer = telemetry.getTracer('AztecNodeService');
 
     this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
   }
@@ -136,10 +139,12 @@ export class AztecNodeService implements AztecNode {
       telemetry?: TelemetryClient;
       logger?: Logger;
       publisher?: L1Publisher;
+      dateProvider?: DateProvider;
     } = {},
   ): Promise<AztecNodeService> {
     const telemetry = deps.telemetry ?? new NoopTelemetryClient();
     const log = deps.logger ?? createLogger('node');
+    const dateProvider = deps.dateProvider ?? new DateProvider();
     const ethereumChain = createEthereumChain(config.l1RpcUrl, config.l1ChainId);
     //validate that the actual chain id matches that specified in configuration
     if (config.l1ChainId !== ethereumChain.chainInfo.id) {
@@ -152,7 +157,8 @@ export class AztecNodeService implements AztecNode {
 
     // we identify the P2P transaction protocol by using the rollup contract address.
     // this may well change in future
-    config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
+    const rollupAddress = config.l1Contracts.rollupAddress;
+    config.transactionProtocol = `/aztec/tx/${rollupAddress.toString()}`;
 
     // now create the merkle trees and the world state synchronizer
     const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, telemetry);
@@ -161,13 +167,23 @@ export class AztecNodeService implements AztecNode {
       log.warn(`Aztec node is accepting fake proofs`);
     }
 
+    const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config, { dateProvider });
+
     // create the tx pool and the p2p client, which will need the l2 block source
-    const p2pClient = await createP2PClient(config, archiver, proofVerifier, worldStateSynchronizer, telemetry);
+    const p2pClient = await createP2PClient(
+      P2PClientType.Full,
+      config,
+      archiver,
+      proofVerifier,
+      worldStateSynchronizer,
+      epochCache,
+      telemetry,
+    );
 
     // start both and wait for them to sync from the block source
     await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
 
-    const validatorClient = await createValidatorClient(config, config.l1Contracts.rollupAddress, p2pClient, telemetry);
+    const validatorClient = createValidatorClient(config, { p2pClient, telemetry, dateProvider, epochCache });
 
     // now create the sequencer
     const sequencer = config.disableValidator
@@ -180,6 +196,7 @@ export class AztecNodeService implements AztecNode {
           l2BlockSource: archiver,
           l1ToL2MessageSource: archiver,
           telemetry,
+          dateProvider,
           ...deps,
         });
 
@@ -214,6 +231,10 @@ export class AztecNodeService implements AztecNode {
     return this.blockSource;
   }
 
+  public getContractDataSource(): ContractDataSource {
+    return this.contractDataSource;
+  }
+
   public getP2P(): P2P {
     return this.p2pClient;
   }
@@ -457,7 +478,10 @@ export class AztecNodeService implements AztecNode {
     leafValues: Fr[],
   ): Promise<(bigint | undefined)[]> {
     const committedDb = await this.#getWorldState(blockNumber);
-    return await Promise.all(leafValues.map(leafValue => committedDb.findLeafIndex(treeId, leafValue.toBuffer())));
+    return await committedDb.findLeafIndices(
+      treeId,
+      leafValues.map(x => x.toBuffer()),
+    );
   }
 
   /**
@@ -664,7 +688,7 @@ export class AztecNodeService implements AztecNode {
     nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined> {
     const db = await this.#getWorldState(blockNumber);
-    const index = await db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+    const index = (await db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [nullifier.toBuffer()]))[0];
     if (!index) {
       return undefined;
     }
@@ -779,7 +803,10 @@ export class AztecNodeService implements AztecNode {
    * Simulates the public part of a transaction with the current state.
    * @param tx - The transaction to simulate.
    **/
-  public async simulatePublicCalls(tx: Tx): Promise<PublicSimulationOutput> {
+  @trackSpan('AztecNodeService.simulatePublicCalls', (tx: Tx) => ({
+    [Attributes.TX_HASH]: tx.tryGetTxHash()?.toString(),
+  }))
+  public async simulatePublicCalls(tx: Tx, enforceFeePayment = true): Promise<PublicSimulationOutput> {
     const txHash = tx.getTxHash();
     const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
 
@@ -793,7 +820,11 @@ export class AztecNodeService implements AztecNode {
       feeRecipient,
     );
     const prevHeader = (await this.blockSource.getBlock(-1))?.header;
-    const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.telemetry);
+    const publicProcessorFactory = new PublicProcessorFactory(
+      this.contractDataSource,
+      new DateProvider(),
+      this.telemetry,
+    );
     const fork = await this.worldStateSynchronizer.fork();
 
     this.log.verbose(`Simulating public calls for tx ${tx.getTxHash()}`, {
@@ -803,7 +834,7 @@ export class AztecNodeService implements AztecNode {
     });
 
     try {
-      const processor = publicProcessorFactory.create(fork, prevHeader, newGlobalVariables);
+      const processor = publicProcessorFactory.create(fork, prevHeader, newGlobalVariables, enforceFeePayment);
 
       // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
       const [processedTxs, failedTxs, returns] = await processor.process([tx]);
@@ -836,9 +867,7 @@ export class AztecNodeService implements AztecNode {
       new DataTxValidator(),
       new MetadataTxValidator(new Fr(this.l1ChainId), new Fr(blockNumber)),
       new DoubleSpendTxValidator({
-        getNullifierIndex(nullifier) {
-          return db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
-        },
+        getNullifierIndices: nullifiers => db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers),
       }),
     ];
 
@@ -884,10 +913,8 @@ export class AztecNodeService implements AztecNode {
     return this.contractDataSource.addContractClass(contractClass);
   }
 
-  public addContractArtifact(address: AztecAddress, artifact: ContractArtifact): Promise<void> {
-    this.log.info(`Adding contract artifact ${artifact.name} for ${address.toString()} via API`);
-    // TODO: Node should validate the artifact before accepting it
-    return this.contractDataSource.addContractArtifact(address, artifact);
+  public registerContractFunctionNames(_address: AztecAddress, names: Record<string, string>): Promise<void> {
+    return this.contractDataSource.registerContractFunctionNames(_address, names);
   }
 
   public flushTxs(): Promise<void> {