feat: introduce validator client

cspell.json

@@ -105,6 +105,7 @@
     "fuzzers",
     "gitmodules",
     "gitrepo",
+    "Gossipable",
     "gossipsub",
     "grumpkin",
     "gtest",

docker-compose.provernet.yml

@@ -30,6 +30,7 @@ services:
       SEQ_MIN_SECONDS_BETWEEN_BLOCKS: 0
       SEQ_RETRY_INTERVAL: 10000
       SEQ_PUBLISHER_PRIVATE_KEY: "0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a"
+      VALIDATOR_PRIVATE_KEY: "0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a"
       PROVER_REAL_PROOFS: "${PROVER_REAL_PROOFS:-false}"
       ASSUME_PROVEN_UNTIL_BLOCK_NUMBER: "${ASSUME_PROVEN_UNTIL_BLOCK_NUMBER:-4}"
       P2P_ENABLED: false

docs/docs/reference/developer_references/sandbox_reference/sandbox-reference.md

@@ -76,6 +76,9 @@ SEQ_MAX_TX_PER_BLOCK=32 # Maximum txs to go on a block. (default: 32)
 SEQ_MIN_TX_PER_BLOCK=1 # Minimum txs to go on a block. (default: 1)
 SEQ_MAX_SECONDS_BETWEEN_BLOCKS=0 # Sequencer will produce a block with less than the min number of txs once this threshold is reached. (default: 0, means disabled)
 SEQ_MIN_SECONDS_BETWEEN_BLOCKS=0 # Minimum seconds to wait between consecutive blocks. (default: 0)
+
+## Validator variables ##
+VALIDATOR_PRIVATE_KEY=0x01234567890abcde01234567890abcde  # Private key of the ethereum account that will be used to perform validator duties 
 ```
 
 **PXE**

l1-contracts/src/core/sequencer_selection/ILeonidas.sol

@@ -22,6 +22,8 @@ interface ILeonidas {
   function getTimestampForSlot(uint256 _slotNumber) external view returns (uint256);
 
   // Likely removal of these to replace with a size and indiviual getter
+  // Get the current epoch committee
+  function getCurrentEpochCommittee() external view returns (address[] memory);
   function getEpochCommittee(uint256 _epoch) external view returns (address[] memory);
   function getValidators() external view returns (address[] memory);
 }

l1-contracts/src/core/sequencer_selection/Leonidas.sol

@@ -132,6 +132,43 @@ contract Leonidas is Ownable, ILeonidas {
     return epochs[_epoch].committee;
   }
 
+  function getCommitteeAt(uint256 _ts) internal view returns (address[] memory) {
+    uint256 epochNumber = getEpochAt(_ts);
+    if (epochNumber == 0) {
+      return new address[](0);
+    }
+
+    Epoch storage epoch = epochs[epochNumber];
+
+    if (epoch.sampleSeed != 0) {
+      uint256 committeeSize = epoch.committee.length;
+      if (committeeSize == 0) {
+        return new address[](0);
+      }
+      return epoch.committee;
+    }
+
+    // Allow anyone if there is no validator set
+    if (validatorSet.length() == 0) {
+      return new address[](0);
+    }
+
+    // Emulate a sampling of the validators
+    uint256 sampleSeed = _getSampleSeed(epochNumber);
+    return _sampleValidators(epochNumber, sampleSeed);
+  }
+
+  /**
+   * @notice  Get the validator set for the current epoch
+   *
+   * @dev Makes a call to setupEpoch under the hood, this should ONLY be called as a view function, and not from within
+   *      this contract.
+   * @return The validator set for the current epoch
+   */
+  function getCurrentEpochCommittee() external view override(ILeonidas) returns (address[] memory) {
+    return getCommitteeAt(block.timestamp);
+  }
+
   /**
    * @notice  Get the validator set
    *

yarn-project/aztec-node/package.json

@@ -72,6 +72,7 @@
     "@aztec/simulator": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/types": "workspace:^",
+    "@aztec/validator-client": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",

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

@@ -3,6 +3,7 @@ import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } f
 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 { readFileSync } from 'fs';
@@ -16,17 +17,22 @@ export { sequencerClientConfigMappings, SequencerClientConfig } from '@aztec/seq
  */
 export type AztecNodeConfig = ArchiverConfig &
   SequencerClientConfig &
+  ValidatorClientConfig &
   ProverClientConfig &
   WorldStateConfig &
   Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
   P2PConfig & {
     /** Whether the sequencer is disabled for this node. */
     disableSequencer: boolean;
+
+    /** Whether the validator is disabled for this node */
+    disableValidator: boolean;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...archiverConfigMappings,
   ...sequencerClientConfigMappings,
+  ...validatorClientConfigMappings,
   ...proverClientConfigMappings,
   ...worldStateConfigMappings,
   ...p2pConfigMappings,
@@ -35,6 +41,11 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
     description: 'Whether the sequencer is disabled for this node.',
     ...booleanConfigHelper(),
   },
+  disableValidator: {
+    env: 'VALIDATOR_DISABLED',
+    description: 'Whether the validator is disabled for this node.',
+    ...booleanConfigHelper(),
+  },
 };
 
 /**

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

@@ -17,9 +17,9 @@ import {
 import { FunctionSelector, Header } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { BaseHashType } from '@aztec/foundation/hash';
 import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 
 /**
@@ -41,7 +41,7 @@ export function createAztecNodeRpcServer(node: AztecNode) {
       TxEffect,
       LogId,
       TxHash,
-      BaseHashType,
+      Buffer32,
       PublicDataWitness,
       SiblingPath,
     },

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

@@ -52,7 +52,7 @@ 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, type P2P, createP2PClient } from '@aztec/p2p';
+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';
@@ -74,6 +74,7 @@ import {
   type ContractInstanceWithAddress,
   type ProtocolContractAddresses,
 } from '@aztec/types/contracts';
+import { createValidatorClient } from '@aztec/validator-client';
 import { MerkleTrees, type WorldStateSynchronizer, createWorldStateSynchronizer } from '@aztec/world-state';
 
 import { type AztecNodeConfig, getPackageInfo } from './config.js';
@@ -149,7 +150,13 @@ export class AztecNodeService implements AztecNode {
     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, store, new AztecKVTxPool(store, telemetry), archiver);
+    const p2pClient = await createP2PClient(
+      config,
+      store,
+      new AztecKVTxPool(store, telemetry),
+      new InMemoryAttestationPool(),
+      archiver,
+    );
 
     // now create the merkle trees and the world state synchronizer
     const worldStateSynchronizer = await createWorldStateSynchronizer(config, store, archiver);
@@ -166,11 +173,14 @@ export class AztecNodeService implements AztecNode {
 
     const simulationProvider = await createSimulationProvider(config, log);
 
+    const validatorClient = createValidatorClient(config, p2pClient);
+
     // now create the sequencer
     const sequencer = config.disableSequencer
       ? undefined
       : await SequencerClient.new(
           config,
+          validatorClient,
           p2pClient,
           worldStateSynchronizer,
           archiver,

yarn-project/aztec-node/tsconfig.json

@@ -54,6 +54,9 @@
     {
       "path": "../types"
     },
+    {
+      "path": "../validator-client"
+    },
     {
       "path": "../world-state"
     }

yarn-project/aztec.js/src/rpc_clients/pxe_client.ts

@@ -27,7 +27,7 @@ import {
   Point,
 } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
-import { BaseHashType } from '@aztec/foundation/hash';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
 
 /**
@@ -57,7 +57,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       Point,
       TxExecutionRequest,
       TxHash,
-      BaseHashType,
+      Buffer32,
     },
     {
       EncryptedNoteL2BlockL2Logs,

yarn-project/aztec/src/sandbox.ts

@@ -160,6 +160,10 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
     const privKey = hdAccount.getHdKey().privateKey;
     aztecNodeConfig.publisherPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
   }
+  if (!aztecNodeConfig.validatorPrivateKey || aztecNodeConfig.validatorPrivateKey === NULL_KEY) {
+    const privKey = hdAccount.getHdKey().privateKey;
+    aztecNodeConfig.validatorPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
+  }
 
   if (!aztecNodeConfig.p2pEnabled) {
     await deployContractsToL1(aztecNodeConfig, hdAccount);

yarn-project/aztec/terraform/node/main.tf

@@ -240,6 +240,10 @@ resource "aws_ecs_task_definition" "aztec-node" {
           name  = "SEQ_PUBLISHER_PRIVATE_KEY"
           value = local.sequencer_private_keys[count.index]
         },
+        {
+          name  = "VALIDATOR_PRIVATE_KEY"
+          value = local.sequencer_private_keys[count.index]
+        },
         {
           name  = "ROLLUP_CONTRACT_ADDRESS"
           value = data.terraform_remote_state.l1_contracts.outputs.rollup_contract_address

yarn-project/circuit-types/package.json

@@ -80,7 +80,8 @@
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.0.4",
+    "viem": "^2.7.15"
   },
   "files": [
     "dest",

yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts

@@ -1,9 +1,9 @@
 import { FunctionSelector, Header } from '@aztec/circuits.js';
 import { EventSelector, NoteSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { BaseHashType } from '@aztec/foundation/hash';
 import { createJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
 
 import { type AztecNode } from '../../interfaces/aztec-node.js';
@@ -41,7 +41,7 @@ export function createAztecNodeClient(url: string, fetch = defaultFetch): AztecN
       TxEffect,
       LogId,
       TxHash,
-      BaseHashType,
+      Buffer32,
       PublicDataWitness,
       SiblingPath,
     },

yarn-project/circuit-types/src/p2p/block_attestation.test.ts

@@ -1,22 +1,28 @@
 // Serde test for the block attestation type
-import { makeHeader } from '@aztec/circuits.js/testing';
-
 import { BlockAttestation } from './block_attestation.js';
-
-const makeBlockAttestation = (): BlockAttestation => {
-  const blockHeader = makeHeader(1);
-  const signature = Buffer.alloc(64, 1);
-
-  return new BlockAttestation(blockHeader, signature);
-};
+import { makeBlockAttestation, randomSigner } from './mocks.js';
 
 describe('Block Attestation serialization / deserialization', () => {
-  it('Should serialize / deserialize', () => {
-    const attestation = makeBlockAttestation();
+  it('Should serialize / deserialize', async () => {
+    const attestation = await makeBlockAttestation();
 
     const serialized = attestation.toBuffer();
     const deserialized = BlockAttestation.fromBuffer(serialized);
 
     expect(deserialized).toEqual(attestation);
   });
+
+  it('Should serialize / deserialize + recover sender', async () => {
+    const account = randomSigner();
+
+    const proposal = await makeBlockAttestation(account);
+    const serialized = proposal.toBuffer();
+    const deserialized = BlockAttestation.fromBuffer(serialized);
+
+    expect(deserialized).toEqual(proposal);
+
+    // Recover signature
+    const sender = await deserialized.getSender();
+    expect(sender.toChecksumString()).toEqual(account.address);
+  });
 });

yarn-project/circuit-types/src/p2p/block_attestation.ts

@@ -1,11 +1,15 @@
-import { Header } from '@aztec/circuits.js';
-import { BaseHashType } from '@aztec/foundation/hash';
+import { EthAddress, Header } from '@aztec/circuits.js';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { recoverMessageAddress } from 'viem';
+
 import { Gossipable } from './gossipable.js';
+import { Signature } from './signature.js';
 import { TopicType, createTopicString } from './topic_type.js';
 
-export class BlockAttestationHash extends BaseHashType {
+export class BlockAttestationHash extends Buffer32 {
   constructor(hash: Buffer) {
     super(hash);
   }
@@ -20,11 +24,15 @@ export class BlockAttestationHash extends BaseHashType {
 export class BlockAttestation extends Gossipable {
   static override p2pTopic: string;
 
+  private sender: EthAddress | undefined;
+
   constructor(
     /** The block header the attestation is made over */
     public readonly header: Header,
+    // TODO(https://github.com/AztecProtocol/aztec-packages/pull/7727#discussion_r1713670830): temporary
+    public readonly archive: Fr,
     /** The signature of the block attester */
-    public readonly signature: Buffer,
+    public readonly signature: Signature,
   ) {
     super();
   }
@@ -33,16 +41,39 @@ export class BlockAttestation extends Gossipable {
     this.p2pTopic = createTopicString(TopicType.block_attestation);
   }
 
-  override p2pMessageIdentifier(): BaseHashType {
-    return BlockAttestationHash.fromField(this.header.hash());
+  override p2pMessageIdentifier(): Buffer32 {
+    return BlockAttestationHash.fromField(this.archive);
+  }
+
+  /**Get sender
+   *
+   * Lazily evaluate and cache the sender of the attestation
+   * @returns The sender of the attestation
+   */
+  async getSender() {
+    if (!this.sender) {
+      // Recover the sender from the attestation
+      const address = await recoverMessageAddress({
+        message: { raw: this.p2pMessageIdentifier().to0xString() },
+        signature: this.signature.to0xString(),
+      });
+      // Cache the sender for later use
+      this.sender = EthAddress.fromString(address);
+    }
+
+    return this.sender;
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer([this.header, this.signature.length, this.signature]);
+    return serializeToBuffer([this.header, this.archive, this.signature]);
   }
 
   static fromBuffer(buf: Buffer | BufferReader): BlockAttestation {
     const reader = BufferReader.asReader(buf);
-    return new BlockAttestation(reader.readObject(Header), reader.readBuffer());
+    return new BlockAttestation(reader.readObject(Header), reader.readObject(Fr), reader.readObject(Signature));
+  }
+
+  static empty(): BlockAttestation {
+    return new BlockAttestation(Header.empty(), Fr.ZERO, Signature.empty());
   }
 }