@aztec/p2p 3.0.0-nightly.20251015 → 3.0.0-nightly.20251022

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "3.0.0-nightly.20251015",
+  "version": "3.0.0-nightly.20251022",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -67,19 +67,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "3.0.0-nightly.20251015",
-    "@aztec/epoch-cache": "3.0.0-nightly.20251015",
-    "@aztec/ethereum": "3.0.0-nightly.20251015",
-    "@aztec/foundation": "3.0.0-nightly.20251015",
-    "@aztec/kv-store": "3.0.0-nightly.20251015",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20251015",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251015",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251015",
-    "@aztec/simulator": "3.0.0-nightly.20251015",
-    "@aztec/stdlib": "3.0.0-nightly.20251015",
-    "@aztec/telemetry-client": "3.0.0-nightly.20251015",
-    "@chainsafe/discv5": "9.0.0",
-    "@chainsafe/enr": "3.0.0",
+    "@aztec/constants": "3.0.0-nightly.20251022",
+    "@aztec/epoch-cache": "3.0.0-nightly.20251022",
+    "@aztec/ethereum": "3.0.0-nightly.20251022",
+    "@aztec/foundation": "3.0.0-nightly.20251022",
+    "@aztec/kv-store": "3.0.0-nightly.20251022",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251022",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251022",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251022",
+    "@aztec/simulator": "3.0.0-nightly.20251022",
+    "@aztec/stdlib": "3.0.0-nightly.20251022",
+    "@aztec/telemetry-client": "3.0.0-nightly.20251022",
     "@chainsafe/libp2p-gossipsub": "13.0.0",
     "@chainsafe/libp2p-noise": "^15.0.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
@@ -94,6 +92,8 @@
     "@libp2p/prometheus-metrics": "^4.2.4",
     "@libp2p/tcp": "9.0.24",
     "@multiformats/multiaddr": "12.1.14",
+    "@nethermindeth/discv5": "9.0.0-backport-306-v4",
+    "@nethermindeth/enr": "3.0.0-backport-306-v4",
     "interface-datastore": "^8.2.11",
     "interface-store": "^5.1.8",
     "libp2p": "1.5.0",
@@ -104,8 +104,8 @@
     "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
-    "@aztec/archiver": "3.0.0-nightly.20251015",
-    "@aztec/world-state": "3.0.0-nightly.20251015",
+    "@aztec/archiver": "3.0.0-nightly.20251022",
+    "@aztec/world-state": "3.0.0-nightly.20251022",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
@@ -117,7 +117,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
     "uint8arrays": "^5.0.3",
-    "viem": "2.23.7"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "files": [
     "dest",

package/src/bootstrap/bootstrap.ts

@@ -3,10 +3,10 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { P2PBootstrapApi } from '@aztec/stdlib/interfaces/server';
 import { OtelMetricsAdapter, type TelemetryClient } from '@aztec/telemetry-client';
 
-import { Discv5, type Discv5EventEmitter } from '@chainsafe/discv5';
-import { ENR, type SignableENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
 import { type Multiaddr, multiaddr } from '@multiformats/multiaddr';
+import { Discv5, type Discv5EventEmitter } from '@nethermindeth/discv5';
+import { ENR, type SignableENR } from '@nethermindeth/enr';
 
 import type { BootnodeConfig } from '../config.js';
 import { createBootnodeENRandPeerId } from '../enr/generate-enr.js';

package/src/client/factory.ts

@@ -14,7 +14,7 @@ import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-clien
 import { P2PClient } from '../client/p2p_client.js';
 import type { P2PConfig } from '../config.js';
 import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
-import { InMemoryAttestationPool } from '../mem_pools/attestation_pool/memory_attestation_pool.js';
+import { KvAttestationPool } from '../mem_pools/attestation_pool/kv_attestation_pool.js';
 import type { MemPools } from '../mem_pools/interface.js';
 import { AztecKVTxPool, type TxPool } from '../mem_pools/tx_pool/index.js';
 import { DummyP2PService } from '../services/dummy_service.js';
@@ -35,6 +35,7 @@ export type P2PClientDeps<T extends P2PClientType> = {
 export const P2P_STORE_NAME = 'p2p';
 export const P2P_ARCHIVE_STORE_NAME = 'p2p-archive';
 export const P2P_PEER_STORE_NAME = 'p2p-peers';
+export const P2P_ATTESTATION_STORE_NAME = 'p2p-attestation';
 
 export async function createP2PClient<T extends P2PClientType>(
   clientType: T,
@@ -64,6 +65,12 @@ export async function createP2PClient<T extends P2PClientType>(
   const store = deps.store ?? (await createStore(P2P_STORE_NAME, 2, config, createLogger('p2p:lmdb-v2')));
   const archive = await createStore(P2P_ARCHIVE_STORE_NAME, 1, config, createLogger('p2p-archive:lmdb-v2'));
   const peerStore = await createStore(P2P_PEER_STORE_NAME, 1, config, createLogger('p2p-peer:lmdb-v2'));
+  const attestationStore = await createStore(
+    P2P_ATTESTATION_STORE_NAME,
+    1,
+    config,
+    createLogger('p2p-attestation:lmdb-v2'),
+  );
   const l1Constants = await archiver.getL1Constants();
 
   const mempools: MemPools<T> = {
@@ -75,7 +82,7 @@ export async function createP2PClient<T extends P2PClientType>(
       }),
     attestationPool:
       clientType === P2PClientType.Full
-        ? ((deps.attestationPool ?? new InMemoryAttestationPool(telemetry)) as T extends P2PClientType.Full
+        ? ((deps.attestationPool ?? new KvAttestationPool(attestationStore, telemetry)) as T extends P2PClientType.Full
             ? AttestationPool
             : undefined)
         : undefined,

package/src/client/interface.ts

@@ -3,8 +3,8 @@ import type { P2PApiFull } from '@aztec/stdlib/interfaces/server';
 import type { BlockProposal, P2PClientType } from '@aztec/stdlib/p2p';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
 
-import type { ENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
+import type { ENR } from '@nethermindeth/enr';
 
 import type { P2PConfig } from '../config.js';
 import type { AuthRequest, StatusMessage } from '../services/index.js';

package/src/client/p2p_client.ts

@@ -26,8 +26,8 @@ import {
   trackSpan,
 } from '@aztec/telemetry-client';
 
-import type { ENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
+import type { ENR } from '@nethermindeth/enr';
 
 import { type P2PConfig, getP2PDefaultConfig } from '../config.js';
 import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
@@ -387,6 +387,10 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     return this.attestationPool?.addAttestations(attestations) ?? Promise.resolve();
   }
 
+  public deleteAttestation(attestation: BlockAttestation): Promise<void> {
+    return this.attestationPool?.deleteAttestations([attestation]) ?? Promise.resolve();
+  }
+
   // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
   // ^ This pattern is not my favorite (md)
   public registerBlockProposalHandler(handler: P2PBlockReceivedCallback): void {

package/src/enr/generate-enr.ts

@@ -2,9 +2,9 @@ import type { LogFn } from '@aztec/foundation/log';
 import { type ChainConfig, emptyChainConfig } from '@aztec/stdlib/config';
 import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 
-import { ENR, SignableENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
 import { type Multiaddr, multiaddr } from '@multiformats/multiaddr';
+import { ENR, SignableENR } from '@nethermindeth/enr';
 
 import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from '../types/index.js';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js';

package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts

@@ -117,7 +117,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
     expect(retreivedAttestations.length).toBe(1);
     expect(retreivedAttestations[0].toBuffer()).toEqual(attestations[0].toBuffer());
-    expect(retreivedAttestations[0].getSender().toString()).toEqual(signer.address.toString());
+    expect(retreivedAttestations[0].getSender()?.toString()).toEqual(signer.address.toString());
 
     // Try adding them on another operation and check they are still not duplicated
     await ap.addAttestations([attestations[0]]);
@@ -291,7 +291,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       expect(retrievedProposal).toBeDefined();
       // Should have the second proposal
       expect(retrievedProposal!.toBuffer()).toEqual(proposal2.toBuffer());
-      expect(retrievedProposal!.getSender().toString()).toBe(signers[1].address.toString());
+      expect(retrievedProposal!.getSender()?.toString()).toBe(signers[1].address.toString());
     });
 
     it('should handle block proposals with different slots and same archive', async () => {

package/src/mem_pools/attestation_pool/kv_attestation_pool.ts

@@ -66,7 +66,19 @@ export class KvAttestationPool implements AttestationPool {
       for (const attestation of attestations) {
         const slotNumber = attestation.payload.header.slotNumber;
         const proposalId = attestation.archive;
-        const address = attestation.getSender().toString();
+        const sender = attestation.getSender();
+
+        // Skip attestations with invalid signatures
+        if (!sender) {
+          this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
+            signature: attestation.signature.toString(),
+            slotNumber,
+            proposalId,
+          });
+          continue;
+        }
+
+        const address = sender.toString();
 
         await this.attestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
 
@@ -176,7 +188,15 @@ export class KvAttestationPool implements AttestationPool {
       for (const attestation of attestations) {
         const slotNumber = attestation.payload.header.slotNumber;
         const proposalId = attestation.archive;
-        const address = attestation.getSender().toString();
+        const sender = attestation.getSender();
+
+        // Skip attestations with invalid signatures
+        if (!sender) {
+          this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber.toBigInt()}`);
+          continue;
+        }
+
+        const address = sender.toString();
         const key = this.getAttestationKey(slotNumber, proposalId, address);
 
         if (await this.attestations.hasAsync(key)) {

package/src/mem_pools/attestation_pool/memory_attestation_pool.ts

@@ -55,16 +55,26 @@ export class InMemoryAttestationPool implements AttestationPool {
       const slotNumber = attestation.payload.header.slotNumber;
 
       const proposalId = attestation.archive.toString();
-      const address = attestation.getSender();
+      const sender = attestation.getSender();
+
+      // Skip attestations with invalid signatures
+      if (!sender) {
+        this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
+          signature: attestation.signature.toString(),
+          slotNumber,
+          proposalId,
+        });
+        continue;
+      }
 
       const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
       const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-      proposalAttestationMap.set(address.toString(), attestation);
+      proposalAttestationMap.set(sender.toString(), attestation);
 
-      this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${address}`, {
+      this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${sender}`, {
         signature: attestation.signature.toString(),
         slotNumber,
-        address,
+        address: sender,
         proposalId,
       });
     }
@@ -147,9 +157,16 @@ export class InMemoryAttestationPool implements AttestationPool {
         const proposalId = attestation.archive.toString();
         const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
         if (proposalAttestationMap) {
-          const address = attestation.getSender();
-          proposalAttestationMap.delete(address.toString());
-          this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
+          const sender = attestation.getSender();
+
+          // Skip attestations with invalid signatures
+          if (!sender) {
+            this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber.toBigInt()}`);
+            continue;
+          }
+
+          proposalAttestationMap.delete(sender.toString());
+          this.log.debug(`Deleted attestation for slot ${slotNumber} from ${sender}`);
         }
       }
     }

package/src/mem_pools/attestation_pool/mocks.ts

@@ -35,8 +35,11 @@ export const mockAttestation = (
   const header = makeL2BlockHeader(1, 2, slot);
   const payload = new ConsensusPayload(header.toCheckpointHeader(), archive, header.state);
 
-  const hash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
-  const signature = signer.sign(hash);
+  const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+  const attestationSignature = signer.sign(attestationHash);
 
-  return new BlockAttestation(header.globalVariables.blockNumber, payload, signature);
+  const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+  const proposerSignature = signer.sign(proposalHash);
+
+  return new BlockAttestation(header.globalVariables.blockNumber, payload, attestationSignature, proposerSignature);
 };

package/src/msg_validators/attestation_validator/attestation_validator.ts

@@ -1,31 +1,64 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { NoCommitteeError } from '@aztec/ethereum';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import { type BlockAttestation, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
 
 export class AttestationValidator implements P2PValidator<BlockAttestation> {
   private epochCache: EpochCacheInterface;
+  private logger: Logger;
 
   constructor(epochCache: EpochCacheInterface) {
     this.epochCache = epochCache;
+    this.logger = createLogger('p2p:attestation-validator');
   }
 
   async validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined> {
+    const slotNumberBigInt = message.payload.header.slotNumber.toBigInt();
+
     try {
-      const { currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
+      const { currentProposer, nextProposer, currentSlot, nextSlot } =
+        await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
 
-      const slotNumberBigInt = message.payload.header.slotNumber.toBigInt();
       if (slotNumberBigInt !== currentSlot && slotNumberBigInt !== nextSlot) {
+        this.logger.warn(
+          `Attestation slot ${slotNumberBigInt} is not current (${currentSlot}) or next (${nextSlot}) slot`,
+        );
         return PeerErrorSeverity.HighToleranceError;
       }
 
+      // Verify the signature is valid
       const attester = message.getSender();
+      if (attester === undefined) {
+        this.logger.warn(`Invalid signature in attestation for slot ${slotNumberBigInt}`);
+        return PeerErrorSeverity.LowToleranceError;
+      }
+
+      // Verify the attester is in the committee for this slot
       if (!(await this.epochCache.isInCommittee(slotNumberBigInt, attester))) {
+        this.logger.warn(`Attester ${attester.toString()} is not in committee for slot ${slotNumberBigInt}`);
+        return PeerErrorSeverity.HighToleranceError;
+      }
+
+      // Verify the proposer signature matches the expected proposer for this slot
+      const proposer = message.getProposer();
+      const expectedProposer = slotNumberBigInt === currentSlot ? currentProposer : nextProposer;
+      if (!expectedProposer) {
+        this.logger.warn(`No proposer defined for slot ${slotNumberBigInt}`);
         return PeerErrorSeverity.HighToleranceError;
       }
+      if (!proposer.equals(expectedProposer)) {
+        this.logger.warn(
+          `Proposer signature mismatch in attestation. ` +
+            `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumberBigInt}`,
+        );
+        return PeerErrorSeverity.HighToleranceError;
+      }
+
       return undefined;
     } catch (e) {
       // People shouldn't be sending us attestations if the committee doesn't exist
       if (e instanceof NoCommitteeError) {
+        this.logger.warn(`No committee exists for attestation for slot ${slotNumberBigInt}`);
         return PeerErrorSeverity.LowToleranceError;
       }
       throw e;

package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts

@@ -14,6 +14,13 @@ export class BlockProposalValidator implements P2PValidator<BlockProposal> {
 
   async validate(block: BlockProposal): Promise<PeerErrorSeverity | undefined> {
     try {
+      // Check signature validity first - invalid signatures are a high-severity issue
+      const proposer = block.getSender();
+      if (!proposer) {
+        this.logger.debug(`Penalizing peer for block proposal with invalid signature`);
+        return PeerErrorSeverity.MidToleranceError;
+      }
+
       const { currentProposer, nextProposer, currentSlot, nextSlot } =
         await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
 
@@ -25,12 +32,11 @@ export class BlockProposalValidator implements P2PValidator<BlockProposal> {
       }
 
       // Check that the block proposal is from the current or next proposer
-      const proposer = block.getSender();
       if (slotNumberBigInt === currentSlot && currentProposer !== undefined && !proposer.equals(currentProposer)) {
         this.logger.debug(`Penalizing peer for invalid proposer for current slot ${slotNumberBigInt}`, {
           currentProposer,
           nextProposer,
-          proposer,
+          proposer: proposer.toString(),
         });
         return PeerErrorSeverity.MidToleranceError;
       }
@@ -39,11 +45,20 @@ export class BlockProposalValidator implements P2PValidator<BlockProposal> {
         this.logger.debug(`Penalizing peer for invalid proposer for next slot ${slotNumberBigInt}`, {
           currentProposer,
           nextProposer,
-          proposer,
+          proposer: proposer.toString(),
         });
         return PeerErrorSeverity.MidToleranceError;
       }
 
+      // Validate tx hashes for all txs embedded in the proposal
+      if (!(await Promise.all(block.txs?.map(tx => tx.validateTxHash()) ?? [])).every(v => v)) {
+        this.logger.warn(`Penalizing peer for invalid tx hashes in block proposal`, {
+          proposer,
+          slotNumber: slotNumberBigInt,
+        });
+        return PeerErrorSeverity.LowToleranceError;
+      }
+
       return undefined;
     } catch (e) {
       // People shouldn't be sending us block proposals if the committee doesn't exist

package/src/msg_validators/tx_validator/factory.ts

@@ -20,6 +20,7 @@ import { DoubleSpendTxValidator } from './double_spend_validator.js';
 import { GasTxValidator } from './gas_validator.js';
 import { MetadataTxValidator } from './metadata_validator.js';
 import { PhasesTxValidator } from './phases_validator.js';
+import { TimestampTxValidator } from './timestamp_validator.js';
 import { TxPermittedValidator } from './tx_permitted_validator.js';
 import { TxProofValidator } from './tx_proof_validator.js';
 
@@ -59,13 +60,18 @@ export function createTxMessageValidators(
         validator: new MetadataTxValidator({
           l1ChainId: new Fr(l1ChainId),
           rollupVersion: new Fr(rollupVersion),
-          timestamp,
-          blockNumber,
           protocolContractsHash,
           vkTreeRoot: getVKTreeRoot(),
         }),
         severity: PeerErrorSeverity.HighToleranceError,
       },
+      timestampValidator: {
+        validator: new TimestampTxValidator<Tx>({
+          timestamp,
+          blockNumber,
+        }),
+        severity: PeerErrorSeverity.MidToleranceError,
+      },
       doubleSpendValidator: {
         validator: new DoubleSpendTxValidator({
           nullifiersExist: async (nullifiers: Buffer[]) => {

package/src/msg_validators/tx_validator/index.ts

@@ -10,3 +10,4 @@ export * from './test_utils.js';
 export * from './allowed_public_setup.js';
 export * from './archive_cache.js';
 export * from './tx_permitted_validator.js';
+export * from './timestamp_validator.js';

package/src/msg_validators/tx_validator/metadata_validator.ts

@@ -6,12 +6,9 @@ import {
   TX_ERROR_INCORRECT_PROTOCOL_CONTRACTS_HASH,
   TX_ERROR_INCORRECT_ROLLUP_VERSION,
   TX_ERROR_INCORRECT_VK_TREE_ROOT,
-  TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP,
   type TxValidationResult,
   type TxValidator,
-  getTxHash,
 } from '@aztec/stdlib/tx';
-import type { UInt64 } from '@aztec/stdlib/types';
 
 export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
   #log = createLogger('p2p:tx_validator:tx_metadata');
@@ -20,11 +17,6 @@ export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
     private values: {
       l1ChainId: Fr;
       rollupVersion: Fr;
-      // Timestamp at which we will validate that the tx is not expired. This is typically the timestamp of the block
-      // being built.
-      timestamp: UInt64;
-      // Block number in which the tx is considered to be included.
-      blockNumber: number;
       vkTreeRoot: Fr;
       protocolContractsHash: Fr;
     },
@@ -38,9 +30,6 @@ export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
     if (!this.#hasCorrectRollupVersion(tx)) {
       errors.push(TX_ERROR_INCORRECT_ROLLUP_VERSION);
     }
-    if (!this.#isValidForTimestamp(tx)) {
-      errors.push(TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP);
-    }
     if (!this.#hasCorrectVkTreeRoot(tx)) {
       errors.push(TX_ERROR_INCORRECT_VK_TREE_ROOT);
     }
@@ -83,29 +72,6 @@ export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
     }
   }
 
-  #isValidForTimestamp(tx: T): boolean {
-    const includeByTimestamp = tx.data.includeByTimestamp;
-    // If building block 1, we skip the expiration check. For details on why see the `validate_include_by_timestamp`
-    // function in `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
-    const buildingBlock1 = this.values.blockNumber === 1;
-
-    if (!buildingBlock1 && includeByTimestamp < this.values.timestamp) {
-      if (tx.data.constants.anchorBlockHeader.globalVariables.blockNumber === 0) {
-        this.#log.warn(
-          `A tx built against a genesis block failed to be included in block 1 which is the only block in which txs built against a genesis block are allowed to be included.`,
-        );
-      }
-      this.#log.verbose(
-        `Rejecting tx ${getTxHash(tx)} for low expiration timestamp. Tx expiration timestamp: ${includeByTimestamp}, timestamp: ${
-          this.values.timestamp
-        }.`,
-      );
-      return false;
-    } else {
-      return true;
-    }
-  }
-
   #hasCorrectRollupVersion(tx: T): boolean {
     if (!tx.data.constants.txContext.version.equals(this.values.rollupVersion)) {
       this.#log.verbose(

package/src/msg_validators/tx_validator/timestamp_validator.ts

@@ -0,0 +1,46 @@
+import { createLogger } from '@aztec/foundation/log';
+import {
+  type AnyTx,
+  TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP,
+  type TxValidationResult,
+  type TxValidator,
+  getTxHash,
+} from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+
+export class TimestampTxValidator<T extends AnyTx> implements TxValidator<T> {
+  #log = createLogger('p2p:tx_validator:timestamp');
+
+  constructor(
+    private values: {
+      // Timestamp at which we will validate that the tx is not expired. This is typically the timestamp of the block
+      // being built.
+      timestamp: UInt64;
+      // Block number in which the tx is considered to be included.
+      blockNumber: number;
+    },
+  ) {}
+
+  validateTx(tx: T): Promise<TxValidationResult> {
+    const includeByTimestamp = tx.data.includeByTimestamp;
+    // If building block 1, we skip the expiration check. For details on why see the `validate_include_by_timestamp`
+    // function in `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
+    const buildingBlock1 = this.values.blockNumber === 1;
+
+    if (!buildingBlock1 && includeByTimestamp < this.values.timestamp) {
+      if (tx.data.constants.anchorBlockHeader.globalVariables.blockNumber === 0) {
+        this.#log.warn(
+          `A tx built against a genesis block failed to be included in block 1 which is the only block in which txs built against a genesis block are allowed to be included.`,
+        );
+      }
+      this.#log.verbose(
+        `Rejecting tx ${getTxHash(tx)} for low expiration timestamp. Tx expiration timestamp: ${includeByTimestamp}, timestamp: ${
+          this.values.timestamp
+        }.`,
+      );
+      return Promise.resolve({ result: 'invalid', reason: [TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP] });
+    } else {
+      return Promise.resolve({ result: 'valid' });
+    }
+  }
+}

package/src/services/discv5/discV5_service.ts

@@ -3,10 +3,10 @@ import { sleep } from '@aztec/foundation/sleep';
 import { type ComponentsVersions, checkCompressedComponentVersion } from '@aztec/stdlib/versioning';
 import { OtelMetricsAdapter, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import { Discv5, type Discv5EventEmitter, type IDiscv5CreateOptions } from '@chainsafe/discv5';
-import { ENR, SignableENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
 import { type Multiaddr, multiaddr } from '@multiformats/multiaddr';
+import { Discv5, type Discv5EventEmitter, type IDiscv5CreateOptions } from '@nethermindeth/discv5';
+import { ENR, SignableENR } from '@nethermindeth/enr';
 import EventEmitter from 'events';
 
 import type { P2PConfig } from '../../config.js';

package/src/services/dummy_service.ts

@@ -3,8 +3,8 @@ import type { PeerInfo } from '@aztec/stdlib/interfaces/server';
 import type { Gossipable, PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
 
-import type { ENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
+import type { ENR } from '@nethermindeth/enr';
 import EventEmitter from 'events';
 
 import type { PeerManagerInterface } from './peer-manager/interface.js';