feat: tx verification & peer scoring on p2p layer

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

@@ -6,16 +6,16 @@ import {
   type L2LogsSource,
   type MerkleTreeAdminOperations,
   MerkleTreeId,
+  type WorldStateSynchronizer,
   mockTxForRollup,
 } from '@aztec/circuit-types';
-import { AztecAddress, EthAddress, Fr, GasFees, GlobalVariables, MaxBlockNumber } from '@aztec/circuits.js';
+import { EthAddress, Fr, MaxBlockNumber } from '@aztec/circuits.js';
 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';
+import { type MockProxy, mock } from 'jest-mock-extended';
 
 import { type AztecNodeConfig, getConfigEnvVars } from './config.js';
 import { AztecNodeService } from './server.js';
@@ -30,10 +30,6 @@ describe('aztec node', () => {
   let node: AztecNode;
 
   const chainId = new Fr(12345);
-  const version = Fr.ZERO;
-  const coinbase = EthAddress.random();
-  const feeRecipient = AztecAddress.random();
-  const gasFees = GasFees.empty();
 
   beforeEach(() => {
     lastBlockNumber = 0;
@@ -48,7 +44,7 @@ describe('aztec node', () => {
     });
 
     const l2BlockSource = mock<L2BlockSource>({
-      getBlockNumber: mockFn().mockResolvedValue(lastBlockNumber),
+      getBlockNumber: () => Promise.resolve(lastBlockNumber),
     });
 
     const l2LogsSource = mock<L2LogsSource>();
@@ -80,7 +76,7 @@ describe('aztec node', () => {
       l1ToL2MessageSource,
       worldState,
       undefined,
-      31337,
+      12345,
       1,
       globalVariablesBuilder,
       new TestCircuitVerifier(),
@@ -96,21 +92,7 @@ describe('aztec node', () => {
       });
       const doubleSpendTx = txs[0];
       const doubleSpendWithExistingTx = txs[1];
-
-      const mockedGlobalVariables = new GlobalVariables(
-        chainId,
-        version,
-        new Fr(lastBlockNumber + 1),
-        new Fr(1),
-        Fr.ZERO,
-        coinbase,
-        feeRecipient,
-        gasFees,
-      );
-
-      globalVariablesBuilder.buildGlobalVariables
-        .mockResolvedValueOnce(mockedGlobalVariables)
-        .mockResolvedValueOnce(mockedGlobalVariables);
+      lastBlockNumber += 1;
 
       expect(await node.isValidTx(doubleSpendTx)).toBe(true);
 
@@ -119,10 +101,6 @@ describe('aztec node', () => {
 
       expect(await node.isValidTx(doubleSpendTx)).toBe(false);
 
-      globalVariablesBuilder.buildGlobalVariables
-        .mockResolvedValueOnce(mockedGlobalVariables)
-        .mockResolvedValueOnce(mockedGlobalVariables);
-
       expect(await node.isValidTx(doubleSpendWithExistingTx)).toBe(true);
 
       // We make a nullifier from `doubleSpendWithExistingTx` a part of the nullifier tree, so it gets rejected as double spend
@@ -134,27 +112,13 @@ describe('aztec node', () => {
       });
 
       expect(await node.isValidTx(doubleSpendWithExistingTx)).toBe(false);
+      lastBlockNumber = 0;
     });
 
     it('tests that the node correctly validates chain id', async () => {
       const tx = mockTxForRollup(0x10000);
       tx.data.constants.txContext.chainId = chainId;
 
-      const mockedGlobalVariables = new GlobalVariables(
-        chainId,
-        version,
-        new Fr(lastBlockNumber + 1),
-        new Fr(1),
-        Fr.ZERO,
-        coinbase,
-        feeRecipient,
-        gasFees,
-      );
-
-      globalVariablesBuilder.buildGlobalVariables
-        .mockResolvedValueOnce(mockedGlobalVariables)
-        .mockResolvedValueOnce(mockedGlobalVariables);
-
       expect(await node.isValidTx(tx)).toBe(true);
 
       // We make the chain id on the tx not equal to the configured chain id
@@ -185,21 +149,7 @@ describe('aztec node', () => {
         toBuffer: () => Fr.ZERO.toBuffer(),
       };
 
-      const mockedGlobalVariables = new GlobalVariables(
-        chainId,
-        version,
-        new Fr(lastBlockNumber + 5),
-        new Fr(1),
-        Fr.ZERO,
-        coinbase,
-        feeRecipient,
-        gasFees,
-      );
-
-      globalVariablesBuilder.buildGlobalVariables
-        .mockResolvedValueOnce(mockedGlobalVariables)
-        .mockResolvedValueOnce(mockedGlobalVariables)
-        .mockResolvedValueOnce(mockedGlobalVariables);
+      lastBlockNumber = 3;
 
       // Default tx with no max block number should be valid
       expect(await node.isValidTx(noMaxBlockNumberMetadata)).toBe(true);

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 {
@@ -52,20 +53,22 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
-import { 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,
   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';
@@ -76,11 +79,10 @@ import {
   type ProtocolContractAddresses,
 } from '@aztec/types/contracts';
 import { createValidatorClient } from '@aztec/validator-client';
-import { type WorldStateSynchronizer, createWorldStateSynchronizer } from '@aztec/world-state';
+import { 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.
@@ -145,17 +147,23 @@ export class AztecNodeService implements AztecNode {
     // this may well change in future
     config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
 
-    // create the tx pool and the p2p client, which will need the l2 block source
-    const p2pClient = await createP2PClient(config, new InMemoryAttestationPool(), archiver, telemetry);
-
     // now create the merkle trees and the world state synchronizer
     const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, telemetry);
+    const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
+
+    // create the tx pool and the p2p client, which will need the l2 block source
+    const p2pClient = await createP2PClient(
+      config,
+      new InMemoryAttestationPool(),
+      archiver,
+      proofVerifier,
+      worldStateSynchronizer,
+      telemetry,
+    );
 
     // start both and wait for them to sync from the block source
     await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
 
-    const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
-
     const simulationProvider = await createSimulationProvider(config, log);
 
     const validatorClient = createValidatorClient(config, p2pClient);
@@ -749,20 +757,12 @@ export class AztecNodeService implements AztecNode {
 
   public async isValidTx(tx: Tx, isSimulation: boolean = false): Promise<boolean> {
     const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
-
-    const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(
-      new Fr(blockNumber),
-      // We only need chainId and block number, thus coinbase and fee recipient can be set to 0.
-      EthAddress.ZERO,
-      AztecAddress.ZERO,
-    );
-
     // These validators are taken from the sequencer, and should match.
     // The reason why `phases` and `gas` tx validator is in the sequencer and not here is because
     // those tx validators are customizable by the sequencer.
     const txValidators: TxValidator<Tx | ProcessedTx>[] = [
       new DataTxValidator(),
-      new MetadataTxValidator(newGlobalVariables),
+      new MetadataTxValidator(new Fr(this.l1ChainId), new Fr(blockNumber)),
       new DoubleSpendTxValidator(new WorldStateDB(this.worldStateSynchronizer.getLatest())),
     ];
 

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 MerkleTreeAdminOperations, type MerkleTreeOperations } from '../world-state-db/index.js';
+import type { MerkleTreeAdminOperations, MerkleTreeOperations } from './merkle_tree_operations.js';
 
 /**
  * Defines the possible states of the world state synchronizer.