feat: tx verification & peer scoring on p2p layer

yarn-project/aztec-node/src/aztec-node/server.test.ts

@@ -6,6 +6,7 @@ import {
   type L2LogsSource,
   MerkleTreeId,
   type MerkleTreeOperations,
+  type WorldStateSynchronizer,
   mockTxForRollup,
 } from '@aztec/circuit-types';
 import { AztecAddress, EthAddress, Fr, GasFees, GlobalVariables, MaxBlockNumber } from '@aztec/circuits.js';
@@ -14,7 +15,6 @@ import { type P2P } from '@aztec/p2p';
 import { type GlobalVariableBuilder } from '@aztec/sequencer-client';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { type ContractDataSource } from '@aztec/types/contracts';
-import { type WorldStateSynchronizer } from '@aztec/world-state';
 
 import { type MockProxy, mock, mockFn } from 'jest-mock-extended';
 

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -27,6 +27,7 @@ import {
   TxReceipt,
   TxStatus,
   type TxValidator,
+  type WorldStateSynchronizer,
   partitionReverts,
 } from '@aztec/circuit-types';
 import {
@@ -53,20 +54,23 @@ import { Timer } from '@aztec/foundation/timer';
 import { type AztecKVStore } from '@aztec/kv-store';
 import { createStore, openTmpStore } from '@aztec/kv-store/utils';
 import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
-import { AztecKVTxPool, InMemoryAttestationPool, type P2P, createP2PClient } from '@aztec/p2p';
-import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
-import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
-import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
-import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
-import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
 import {
   AggregateTxValidator,
+  AztecKVTxPool,
   DataTxValidator,
   DoubleSpendTxValidator,
-  GlobalVariableBuilder,
+  InMemoryAttestationPool,
   MetadataTxValidator,
-  SequencerClient,
-} from '@aztec/sequencer-client';
+  type P2P,
+  TxProofValidator,
+  createP2PClient,
+} from '@aztec/p2p';
+import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
+import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
+import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
+import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
+import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
+import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
 import { PublicProcessorFactory, WASMSimulator, WorldStateDB, createSimulationProvider } from '@aztec/simulator';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
@@ -77,11 +81,10 @@ import {
   type ProtocolContractAddresses,
 } from '@aztec/types/contracts';
 import { createValidatorClient } from '@aztec/validator-client';
-import { MerkleTrees, type WorldStateSynchronizer, createWorldStateSynchronizer } from '@aztec/world-state';
+import { MerkleTrees, createWorldStateSynchronizer } from '@aztec/world-state';
 
 import { type AztecNodeConfig, getPackageInfo } from './config.js';
 import { NodeMetrics } from './node_metrics.js';
-import { TxProofValidator } from './tx_validator/tx_proof_validator.js';
 
 /**
  * The aztec node.
@@ -150,18 +153,21 @@ export class AztecNodeService implements AztecNode {
     // this may well change in future
     config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
 
+    // now create the merkle trees and the world state synchronizer
+    const worldStateSynchronizer = await createWorldStateSynchronizer(config, store, archiver, telemetry);
+
     // create the tx pool and the p2p client, which will need the l2 block source
     const p2pClient = await createP2PClient(
       config,
       store,
       new AztecKVTxPool(store, telemetry),
       new InMemoryAttestationPool(),
       archiver,
+      new GlobalVariableBuilder(config),
+      new TestCircuitVerifier(),
+      worldStateSynchronizer,
     );
 
-    // now create the merkle trees and the world state synchronizer
-    const worldStateSynchronizer = await createWorldStateSynchronizer(config, store, archiver, telemetry);
-
     // start both and wait for them to sync from the block source
     await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
 

yarn-project/circuit-types/src/global_variable_builder.ts

@@ -0,0 +1,21 @@
+import type { AztecAddress, EthAddress, Fr, GlobalVariables } from '@aztec/circuits.js';
+
+/**
+ * Interface for building global variables for Aztec blocks.
+ */
+export interface GlobalVariableBuilder {
+  /**
+   * Builds global variables for a given block.
+   * @param blockNumber - The block number to build global variables for.
+   * @param coinbase - The address to receive block reward.
+   * @param feeRecipient - The address to receive fees.
+   * @param slotNumber - Optional. The slot number to use for the global variables. If undefined, it will be calculated.
+   * @returns A promise that resolves to the GlobalVariables for the given block number.
+   */
+  buildGlobalVariables(
+    blockNumber: Fr,
+    coinbase: EthAddress,
+    feeRecipient: AztecAddress,
+    slotNumber?: bigint,
+  ): Promise<GlobalVariables>;
+}

yarn-project/circuit-types/src/index.ts

@@ -22,3 +22,4 @@ export * from './tx/index.js';
 export * from './tx_effect.js';
 export * from './tx_execution_request.js';
 export * from './p2p/index.js';
+export * from './global_variable_builder.js';

yarn-project/circuit-types/src/interfaces/index.ts

@@ -11,3 +11,4 @@ export * from './server_circuit_prover.js';
 export * from './private_kernel_prover.js';
 export * from './tx-provider.js';
 export * from './merkle_tree_operations.js';
+export * from './world_state.js';

yarn-project/world-state/src/synchronizer/world_state_synchronizer.ts → yarn-project/circuit-types/src/interfaces/world_state.ts

@@ -1,4 +1,4 @@
-import { type MerkleTreeOperations } from '../world-state-db/index.js';
+import { type MerkleTreeOperations } from './merkle_tree_operations.js';
 
 /**
  * Defines the possible states of the world state synchronizer.

yarn-project/p2p/package.json

@@ -60,6 +60,7 @@
     "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
+    "@aztec/simulator": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "@chainsafe/discv5": "9.0.0",
     "@chainsafe/enr": "3.0.0",

yarn-project/p2p/src/client/index.ts

@@ -1,4 +1,9 @@
-import { type L2BlockSource } from '@aztec/circuit-types';
+import type {
+  ClientProtocolCircuitVerifier,
+  GlobalVariableBuilder,
+  L2BlockSource,
+  WorldStateSynchronizer,
+} from '@aztec/circuit-types';
 import { type AztecKVStore } from '@aztec/kv-store';
 
 import { type AttestationPool } from '../attestation_pool/attestation_pool.js';
@@ -13,66 +18,85 @@ import { getPublicIp, resolveAddressIfNecessary, splitAddressPort } from '../uti
 export * from './p2p_client.js';
 
 export const createP2PClient = async (
-  config: P2PConfig,
+  _config: P2PConfig,
   store: AztecKVStore,
   txPool: TxPool,
   attestationsPool: AttestationPool,
   l2BlockSource: L2BlockSource,
+  globalVariableBuilder: GlobalVariableBuilder,
+  proofVerifier: ClientProtocolCircuitVerifier,
+  worldStateSynchronizer: WorldStateSynchronizer,
 ) => {
   let p2pService;
+  let config = _config;
 
-  if (config.p2pEnabled) {
-    // If announceTcpAddress or announceUdpAddress are not provided, query for public IP if config allows
-
-    const {
-      tcpAnnounceAddress: configTcpAnnounceAddress,
-      udpAnnounceAddress: configUdpAnnounceAddress,
-      queryForIp,
-    } = config;
-
-    config.tcpAnnounceAddress = configTcpAnnounceAddress
-      ? await resolveAddressIfNecessary(configTcpAnnounceAddress)
-      : undefined;
-    config.udpAnnounceAddress = configUdpAnnounceAddress
-      ? await resolveAddressIfNecessary(configUdpAnnounceAddress)
-      : undefined;
-
-    // create variable for re-use if needed
-    let publicIp;
-
-    // check if no announce IP was provided
-    const splitTcpAnnounceAddress = splitAddressPort(configTcpAnnounceAddress || '', true);
-    if (splitTcpAnnounceAddress.length == 2 && splitTcpAnnounceAddress[0] === '') {
-      if (queryForIp) {
-        publicIp = await getPublicIp();
-        const tcpAnnounceAddress = `${publicIp}:${splitTcpAnnounceAddress[1]}`;
-        config.tcpAnnounceAddress = tcpAnnounceAddress;
-      } else {
-        throw new Error(
-          `Invalid announceTcpAddress provided: ${configTcpAnnounceAddress}. Expected format: <addr>:<port>`,
-        );
-      }
-    }
-
-    const splitUdpAnnounceAddress = splitAddressPort(configUdpAnnounceAddress || '', true);
-    if (splitUdpAnnounceAddress.length == 2 && splitUdpAnnounceAddress[0] === '') {
-      // If announceUdpAddress is not provided, use announceTcpAddress
-      if (!queryForIp && config.tcpAnnounceAddress) {
-        config.udpAnnounceAddress = config.tcpAnnounceAddress;
-      } else if (queryForIp) {
-        const udpPublicIp = publicIp || (await getPublicIp());
-        const udpAnnounceAddress = `${udpPublicIp}:${splitUdpAnnounceAddress[1]}`;
-        config.udpAnnounceAddress = udpAnnounceAddress;
-      }
-    }
+  if (_config.p2pEnabled) {
+    config = await configureP2PClientAddresses(_config);
 
     // Create peer discovery service
     const peerId = await createLibP2PPeerId(config.peerIdPrivateKey);
     const discoveryService = new DiscV5Service(peerId, config);
 
-    p2pService = await LibP2PService.new(config, discoveryService, peerId, txPool, attestationsPool, store);
+    p2pService = await LibP2PService.new(
+      config,
+      discoveryService,
+      peerId,
+      txPool,
+      attestationsPool,
+      l2BlockSource,
+      globalVariableBuilder,
+      proofVerifier,
+      worldStateSynchronizer,
+      store,
+    );
   } else {
     p2pService = new DummyP2PService();
   }
   return new P2PClient(store, l2BlockSource, txPool, attestationsPool, p2pService, config.keepProvenTxsInPoolFor);
 };
+
+async function configureP2PClientAddresses(config: P2PConfig) {
+  const {
+    tcpAnnounceAddress: configTcpAnnounceAddress,
+    udpAnnounceAddress: configUdpAnnounceAddress,
+    queryForIp,
+  } = config;
+
+  config.tcpAnnounceAddress = configTcpAnnounceAddress
+    ? await resolveAddressIfNecessary(configTcpAnnounceAddress)
+    : undefined;
+  config.udpAnnounceAddress = configUdpAnnounceAddress
+    ? await resolveAddressIfNecessary(configUdpAnnounceAddress)
+    : undefined;
+
+  // create variable for re-use if needed
+  let publicIp;
+
+  // check if no announce IP was provided
+  const splitTcpAnnounceAddress = splitAddressPort(configTcpAnnounceAddress || '', true);
+  if (splitTcpAnnounceAddress.length == 2 && splitTcpAnnounceAddress[0] === '') {
+    if (queryForIp) {
+      publicIp = await getPublicIp();
+      const tcpAnnounceAddress = `${publicIp}:${splitTcpAnnounceAddress[1]}`;
+      config.tcpAnnounceAddress = tcpAnnounceAddress;
+    } else {
+      throw new Error(
+        `Invalid announceTcpAddress provided: ${configTcpAnnounceAddress}. Expected format: <addr>:<port>`,
+      );
+    }
+  }
+
+  const splitUdpAnnounceAddress = splitAddressPort(configUdpAnnounceAddress || '', true);
+  if (splitUdpAnnounceAddress.length == 2 && splitUdpAnnounceAddress[0] === '') {
+    // If announceUdpAddress is not provided, use announceTcpAddress
+    if (!queryForIp && config.tcpAnnounceAddress) {
+      config.udpAnnounceAddress = config.tcpAnnounceAddress;
+    } else if (queryForIp) {
+      const udpPublicIp = publicIp || (await getPublicIp());
+      const udpAnnounceAddress = `${udpPublicIp}:${splitUdpAnnounceAddress[1]}`;
+      config.udpAnnounceAddress = udpAnnounceAddress;
+    }
+  }
+
+  return config;
+}

yarn-project/p2p/src/index.ts

@@ -4,3 +4,4 @@ export * from './tx_pool/index.js';
 export * from './attestation_pool/index.js';
 export * from './service/index.js';
 export * from './bootstrap/bootstrap.js';
+export * from './tx_validator/index.js';