@aztec/p2p 0.82.2 → 0.82.3-nightly.20250403

package/dest/services/libp2p/libp2p_service.js

@@ -64,6 +64,7 @@ import { ReqResp } from '../reqresp/reqresp.js';
    * @param block - The block received from the peer.
    * @returns The attestation for the block, if any.
    */ blockReceivedCallback;
+    gossipSubEventHandler;
     constructor(clientType, config, node, peerDiscoveryService, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')){
         super(telemetry, 'LibP2PService'), this.clientType = clientType, this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.mempools = mempools, this.l2BlockSource = l2BlockSource, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.logger = logger, this.jobQueue = new SerialQueue(), this.trustedPeersIds = [];
         const peerScoring = new PeerScoring(config);
@@ -76,6 +77,7 @@ import { ReqResp } from '../reqresp/reqresp.js';
         this.node.services.pubsub.score.params.appSpecificWeight = 10;
         this.attestationValidator = new AttestationValidator(epochCache);
         this.blockProposalValidator = new BlockProposalValidator(epochCache);
+        this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
         this.blockReceivedCallback = async (block)=>{
             this.logger.debug(`Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber.toNumber()} from peer.`, {
                 p2pMessageIdentifier: await block.p2pMessageIdentifier()
@@ -230,7 +232,7 @@ import { ReqResp } from '../reqresp/reqresp.js';
             [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this)
         };
         // add GossipSub listener
-        this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.handleGossipSubEvent.bind(this));
+        this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
         // Start running promise for peer discovery
         this.discoveryRunningPromise = new RunningPromise(()=>this.peerManager.heartbeat(), this.logger, this.config.peerCheckIntervalMS);
         this.discoveryRunningPromise.start();
@@ -253,7 +255,7 @@ import { ReqResp } from '../reqresp/reqresp.js';
    * @returns An empty promise.
    */ async stop() {
         // Remove gossip sub listener
-        this.node.services.pubsub.removeEventListener(GossipSubEvent.MESSAGE, this.handleGossipSubEvent.bind(this));
+        this.node.services.pubsub.removeEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
         // Stop peer manager
         this.logger.debug('Stopping peer manager...');
         await this.peerManager.stop();
@@ -383,7 +385,8 @@ import { ReqResp } from '../reqresp/reqresp.js';
             tx
         ]);
     }
-    /**Process Attestation From Peer
+    /**
+   * Process Attestation From Peer
    * When a proposal is received from a peer, we add it to the attestation pool, so it can be accessed by other services.
    *
    * @param attestation - The attestation to process.
@@ -536,7 +539,7 @@ import { ReqResp } from '../reqresp/reqresp.js';
                 severity: PeerErrorSeverity.HighToleranceError
             },
             metadataValidator: {
-                validator: new MetadataTxValidator(new Fr(this.config.l1ChainId), new Fr(blockNumber)),
+                validator: new MetadataTxValidator(new Fr(this.config.l1ChainId), new Fr(this.config.rollupVersion), new Fr(blockNumber)),
                 severity: PeerErrorSeverity.HighToleranceError
             },
             proofValidator: {

package/dest/test-helpers/reqresp-nodes.js

@@ -30,10 +30,10 @@ import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js
         start,
         addresses: {
             listen: [
-                `/ip4/0.0.0.0/tcp/${port}`
+                `/ip4/127.0.0.1/tcp/${port}`
             ],
             announce: [
-                `/ip4/0.0.0.0/tcp/${port}`
+                `/ip4/127.0.0.1/tcp/${port}`
             ]
         },
         connectionEncryption: [
@@ -173,7 +173,7 @@ export function createBootstrapNodeConfig(privateKey, port, chainConfig) {
         dataDirectory: undefined,
         dataStoreMapSizeKB: 0,
         bootstrapNodes: [],
-        listenAddress: '0.0.0.0'
+        listenAddress: '127.0.0.1'
     };
 }
 export function createBootstrapNodeFromPrivateKey(privateKey, port, telemetry = getTelemetryClient(), chainConfig = emptyChainConfig) {

package/dest/testbench/p2p_client_testbench_worker.js

@@ -35,12 +35,17 @@ function mockAttestationPool() {
         deleteAttestationsOlderThan: ()=>Promise.resolve(),
         deleteAttestationsForSlot: ()=>Promise.resolve(),
         deleteAttestationsForSlotAndProposal: ()=>Promise.resolve(),
-        getAttestationsForSlot: ()=>Promise.resolve([])
+        getAttestationsForSlot: ()=>Promise.resolve([]),
+        getAttestationsForSlotAndProposal: ()=>Promise.resolve([])
     };
 }
 function mockEpochCache() {
     return {
-        getCommittee: ()=>Promise.resolve([]),
+        getCommittee: ()=>Promise.resolve({
+                committee: [],
+                seed: 1n,
+                epoch: 0n
+            }),
         getProposerIndexEncoding: ()=>'0x',
         getEpochAndSlotNow: ()=>({
                 epoch: 0n,

package/dest/testbench/worker_client_manager.js

@@ -11,7 +11,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const workerPath = path.join(__dirname, '../../dest/testbench/p2p_client_testbench_worker.js');
 const testChainConfig = {
     l1ChainId: 31337,
-    version: 1,
+    rollupVersion: 1,
     l1Contracts: {
         rollupAddress: EthAddress.random()
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.82.2",
+  "version": "0.82.3-nightly.20250403",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -65,14 +65,14 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.82.2",
-    "@aztec/epoch-cache": "0.82.2",
-    "@aztec/foundation": "0.82.2",
-    "@aztec/kv-store": "0.82.2",
-    "@aztec/noir-protocol-circuits-types": "0.82.2",
-    "@aztec/protocol-contracts": "0.82.2",
-    "@aztec/stdlib": "0.82.2",
-    "@aztec/telemetry-client": "0.82.2",
+    "@aztec/constants": "0.82.3-nightly.20250403",
+    "@aztec/epoch-cache": "0.82.3-nightly.20250403",
+    "@aztec/foundation": "0.82.3-nightly.20250403",
+    "@aztec/kv-store": "0.82.3-nightly.20250403",
+    "@aztec/noir-protocol-circuits-types": "0.82.3-nightly.20250403",
+    "@aztec/protocol-contracts": "0.82.3-nightly.20250403",
+    "@aztec/stdlib": "0.82.3-nightly.20250403",
+    "@aztec/telemetry-client": "0.82.3-nightly.20250403",
     "@chainsafe/discv5": "9.0.0",
     "@chainsafe/enr": "3.0.0",
     "@chainsafe/libp2p-gossipsub": "13.0.0",
@@ -101,7 +101,7 @@
     "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.82.2",
+    "@aztec/archiver": "0.82.3-nightly.20250403",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.14.6",

package/src/client/p2p_client.ts

@@ -187,6 +187,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   private synchedBlockHashes: AztecAsyncMap<number, string>;
   private synchedLatestBlockNumber: AztecAsyncSingleton<number>;
   private synchedProvenBlockNumber: AztecAsyncSingleton<number>;
+  private synchedLatestSlot: AztecAsyncSingleton<bigint>;
 
   private txPool: TxPool;
   private attestationPool: T extends P2PClientType.Full ? AttestationPool : undefined;
@@ -236,6 +237,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     this.synchedBlockHashes = store.openMap('p2p_pool_block_hashes');
     this.synchedLatestBlockNumber = store.openSingleton('p2p_pool_last_l2_block');
     this.synchedProvenBlockNumber = store.openSingleton('p2p_pool_last_proven_l2_block');
+    this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
 
     this.txPool = mempools.txPool;
     this.attestationPool = mempools.attestationPool!;
@@ -293,12 +295,12 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
         break;
       case 'chain-proven': {
         const from = (await this.getSyncedProvenBlockNum()) + 1;
-        const limit = event.blockNumber - from + 1;
+        const limit = event.block.number - from + 1;
         await this.handleProvenL2Blocks(await this.l2BlockSource.getBlocks(from, limit));
         break;
       }
       case 'chain-pruned':
-        await this.handlePruneL2Blocks(event.blockNumber);
+        await this.handlePruneL2Blocks(event.block.number);
         break;
       default: {
         const _: never = event;
@@ -380,8 +382,16 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     return this.p2pService.propagate(proposal);
   }
 
-  public async getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
-    return (await this.attestationPool?.getAttestationsForSlot(slot, proposalId)) ?? [];
+  public async getAttestationsForSlot(slot: bigint, proposalId?: string): Promise<BlockAttestation[]> {
+    return (
+      (await (proposalId
+        ? this.attestationPool?.getAttestationsForSlotAndProposal(slot, proposalId)
+        : this.attestationPool?.getAttestationsForSlot(slot))) ?? []
+    );
+  }
+
+  public addAttestation(attestation: BlockAttestation): Promise<void> {
+    return this.attestationPool?.addAttestations([attestation]) ?? Promise.resolve();
   }
 
   // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
@@ -592,6 +602,11 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     return (await this.synchedProvenBlockNumber.getAsync()) ?? INITIAL_L2_BLOCK_NUM - 1;
   }
 
+  /** Returns latest L2 slot for which we have seen an L2 block. */
+  public async getSyncedLatestSlot(): Promise<bigint> {
+    return (await this.synchedLatestSlot.getAsync()) ?? BigInt(0);
+  }
+
   /**
    * Method to check the status the p2p client.
    * @returns Information about p2p client status: state & syncedToBlockNum.
@@ -659,12 +674,13 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
 
     await this.markTxsAsMinedFromBlocks(blocks.map(b => b.block));
     await this.addAttestationsToPool(blocks);
-    const lastBlockNum = blocks.at(-1)!.block.number;
+    const lastBlock = blocks.at(-1)!.block;
     await Promise.all(
       blocks.map(async block => this.synchedBlockHashes.set(block.block.number, (await block.block.hash()).toString())),
     );
-    await this.synchedLatestBlockNumber.set(lastBlockNum);
-    this.log.verbose(`Synched to latest block ${lastBlockNum}`);
+    await this.synchedLatestBlockNumber.set(lastBlock.number);
+    await this.synchedLatestSlot.set(lastBlock.header.getSlot());
+    this.log.verbose(`Synched to latest block ${lastBlock.number}`);
     await this.startServiceIfSynched();
   }
 

package/src/config.ts

@@ -371,6 +371,7 @@ export type BootnodeConfig = Pick<
 const bootnodeConfigKeys: (keyof BootnodeConfig)[] = [
   'p2pIp',
   'p2pPort',
+  'listenAddress',
   'peerIdPrivateKey',
   'dataDirectory',
   'dataStoreMapSizeKB',

package/src/mem_pools/attestation_pool/attestation_pool.ts

@@ -50,7 +50,17 @@ export interface AttestationPool {
   deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
 
   /**
-   * Get Attestations for slot
+   * Get all Attestations for all proposals for a given slot
+   *
+   * Retrieve all of the attestations observed pertaining to a given slot
+   *
+   * @param slot - The slot to query
+   * @return BlockAttestations
+   */
+  getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
+
+  /**
+   * Get Attestations for slot and given proposal
    *
    * Retrieve all of the attestations observed pertaining to a given slot
    *
@@ -58,5 +68,5 @@ export interface AttestationPool {
    * @param proposalId - The proposal to query
    * @return BlockAttestations
    */
-  getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+  getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
 }

package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts

@@ -45,25 +45,45 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
   it('should add attestations to pool', async () => {
     const slotNumber = 420;
     const archive = Fr.random();
-    const attestations = await Promise.all(signers.map(signer => mockAttestation(signer, slotNumber, archive)));
+    const attestations = await Promise.all(
+      signers.slice(0, -1).map(signer => mockAttestation(signer, slotNumber, archive)),
+    );
 
     await ap.addAttestations(attestations);
 
     // Check metrics have been updated.
     expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
 
-    const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
+    const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
+    expect(retrievedAttestations.length).toBe(attestations.length);
+    compareAttestations(retrievedAttestations, attestations);
 
-    expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
+    const retrievedAttestationsForSlot = await ap.getAttestationsForSlot(BigInt(slotNumber));
+    expect(retrievedAttestationsForSlot.length).toBe(attestations.length);
+    compareAttestations(retrievedAttestationsForSlot, attestations);
 
-    compareAttestations(retreivedAttestations, attestations);
+    // Add another one
+    const newAttestation = await mockAttestation(signers[NUMBER_OF_SIGNERS_PER_TEST - 1], slotNumber, archive);
+    await ap.addAttestations([newAttestation]);
+    expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(1);
+    const retrievedAttestationsAfterAdd = await ap.getAttestationsForSlotAndProposal(
+      BigInt(slotNumber),
+      archive.toString(),
+    );
+    expect(retrievedAttestationsAfterAdd.length).toBe(attestations.length + 1);
+    compareAttestations(retrievedAttestationsAfterAdd, [...attestations, newAttestation]);
+    const retrievedAttestationsForSlotAfterAdd = await ap.getAttestationsForSlot(BigInt(slotNumber));
+    expect(retrievedAttestationsForSlotAfterAdd.length).toBe(attestations.length + 1);
+    compareAttestations(retrievedAttestationsForSlotAfterAdd, [...attestations, newAttestation]);
 
     // Delete by slot
     await ap.deleteAttestationsForSlot(BigInt(slotNumber));
+    expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length + 1);
 
-    expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-
-    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
+    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(
+      BigInt(slotNumber),
+      archive.toString(),
+    );
     expect(retreivedAttestationsAfterDelete.length).toBe(0);
   });
 
@@ -82,7 +102,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     // Add them to store and check we end up with only one
     await ap.addAttestations(attestations);
 
-    const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
+    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].payload.txHashes).toEqual(txs);
@@ -90,7 +110,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     // Try adding them on another operation and check they are still not duplicated
     await ap.addAttestations([attestations[0]]);
-    expect(await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString())).toHaveLength(1);
+    expect(await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString())).toHaveLength(1);
   });
 
   it('should store attestations by differing slot', async () => {
@@ -103,7 +123,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       const slot = attestation.payload.header.globalVariables.slotNumber;
       const archive = attestation.archive.toString();
 
-      const retreivedAttestations = await ap.getAttestationsForSlot(slot.toBigInt(), archive);
+      const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot.toBigInt(), archive);
       expect(retreivedAttestations.length).toBe(1);
       expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
       expect(retreivedAttestations[0].payload.header.globalVariables.slotNumber).toEqual(slot);
@@ -123,7 +143,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       const slot = attestation.payload.header.globalVariables.slotNumber;
       const proposalId = attestation.archive.toString();
 
-      const retreivedAttestations = await ap.getAttestationsForSlot(slot.toBigInt(), proposalId);
+      const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot.toBigInt(), proposalId);
       expect(retreivedAttestations.length).toBe(1);
       expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
       expect(retreivedAttestations[0].payload.header.globalVariables.slotNumber).toEqual(slot);
@@ -140,7 +160,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
 
-    const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
+    const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
     compareAttestations(retreivedAttestations, attestations);
 
@@ -148,7 +168,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
 
-    const gottenAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
+    const gottenAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(gottenAfterDelete.length).toBe(0);
   });
 
@@ -160,13 +180,13 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     await ap.addAttestations(attestations);
 
-    const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
+    const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
     compareAttestations(retreivedAttestations, attestations);
 
     await ap.deleteAttestationsForSlot(BigInt(slotNumber));
 
-    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
+    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestationsAfterDelete.length).toBe(0);
   });
 
@@ -187,7 +207,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
     expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations2.length);
 
-    const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
+    const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
     compareAttestations(retreivedAttestations, attestations);
 
@@ -195,10 +215,10 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
 
-    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
+    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestationsAfterDelete.length).toBe(0);
 
-    const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlot(
+    const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlotAndProposal(
       BigInt(slotNumber),
       proposalId2,
     );
@@ -215,14 +235,14 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     await ap.addAttestations(attestations);
 
-    const attestationsForSlot1 = await ap.getAttestationsForSlot(BigInt(1), proposalId);
+    const attestationsForSlot1 = await ap.getAttestationsForSlotAndProposal(BigInt(1), proposalId);
     expect(attestationsForSlot1.length).toBe(signers.length);
 
     const deleteAttestationsSpy = jest.spyOn(ap, 'deleteAttestationsForSlot');
 
     await ap.deleteAttestationsOlderThan(BigInt(73));
 
-    const attestationsForSlot1AfterDelete = await ap.getAttestationsForSlot(BigInt(1), proposalId);
+    const attestationsForSlot1AfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(1), proposalId);
     expect(attestationsForSlot1AfterDelete.length).toBe(0);
 
     expect(deleteAttestationsSpy).toHaveBeenCalledTimes(5);

package/src/mem_pools/attestation_pool/kv_attestation_pool.ts

@@ -60,6 +60,9 @@ export class KvAttestationPool implements AttestationPool {
 
         this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${address}`, {
           signature: attestation.signature.toString(),
+          slotNumber,
+          address,
+          proposalId,
         });
       }
     });
@@ -67,7 +70,19 @@ export class KvAttestationPool implements AttestationPool {
     this.metrics.recordAddedObjects(attestations.length);
   }
 
-  public async getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
+  public async getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]> {
+    const slotFr = new Fr(slot);
+    const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+    const attestations: BlockAttestation[] = [];
+
+    for (const proposalId of proposalIds) {
+      attestations.push(...(await this.getAttestationsForSlotAndProposal(slot, proposalId)));
+    }
+
+    return attestations;
+  }
+
+  public async getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
     const attestationIds = await toArray(
       this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)),
     );

package/src/mem_pools/attestation_pool/memory_attestation_pool.ts

@@ -15,7 +15,15 @@ export class InMemoryAttestationPool implements AttestationPool {
     this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
   }
 
-  public getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
+  public getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]> {
+    return Promise.resolve(
+      Array.from(this.attestations.get(slot)?.values() ?? []).flatMap(proposalAttestationMap =>
+        Array.from(proposalAttestationMap.values()),
+      ),
+    );
+  }
+
+  public getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
     const slotAttestationMap = this.attestations.get(slot);
     if (slotAttestationMap) {
       const proposalAttestationMap = slotAttestationMap.get(proposalId);
@@ -40,6 +48,9 @@ export class InMemoryAttestationPool implements AttestationPool {
 
       this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${address}`, {
         signature: attestation.signature.toString(),
+        slotNumber,
+        address,
+        proposalId,
       });
     }
 

package/src/msg_validators/tx_validator/double_spend_validator.ts

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { type AnyTx, Tx, type TxValidationResult, type TxValidator, hasPublicCalls } from '@aztec/stdlib/tx';
+import { type AnyTx, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 
 export interface NullifierSource {
   nullifiersExist: (nullifiers: Buffer[]) => Promise<boolean[]>;
@@ -14,25 +14,20 @@ export class DoubleSpendTxValidator<T extends AnyTx> implements TxValidator<T> {
   }
 
   async validateTx(tx: T): Promise<TxValidationResult> {
-    // Don't need to check for duplicate nullifiers if the tx has public calls
-    // because the AVM will perform merkle insertions as it goes and will fail on
-    // duplicate nullifier. In fact we CANNOT check here because the nullifiers
-    // have already been inserted, and so they will exist in nullifierSource.
-    if (!hasPublicCalls(tx)) {
-      const nullifiers = tx instanceof Tx ? tx.data.getNonEmptyNullifiers() : tx.txEffect.nullifiers;
+    const nullifiers = tx instanceof Tx ? tx.data.getNonEmptyNullifiers() : tx.txEffect.nullifiers;
 
-      // Ditch this tx if it has repeated nullifiers
-      const uniqueNullifiers = new Set(nullifiers);
-      if (uniqueNullifiers.size !== nullifiers.length) {
-        this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for emitting duplicate nullifiers`);
-        return { result: 'invalid', reason: ['Duplicate nullifier in tx'] };
-      }
+    // Ditch this tx if it has repeated nullifiers
+    const uniqueNullifiers = new Set(nullifiers);
+    if (uniqueNullifiers.size !== nullifiers.length) {
+      this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for emitting duplicate nullifiers`);
+      return { result: 'invalid', reason: ['Duplicate nullifier in tx'] };
+    }
 
-      if ((await this.#nullifierSource.nullifiersExist(nullifiers.map(n => n.toBuffer()))).some(Boolean)) {
-        this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for repeating a nullifier`);
-        return { result: 'invalid', reason: ['Existing nullifier'] };
-      }
+    if ((await this.#nullifierSource.nullifiersExist(nullifiers.map(n => n.toBuffer()))).some(Boolean)) {
+      this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for repeating a nullifier`);
+      return { result: 'invalid', reason: ['Existing nullifier'] };
     }
+
     return { result: 'valid' };
   }
 }

package/src/msg_validators/tx_validator/metadata_validator.ts

@@ -5,13 +5,16 @@ import { type AnyTx, Tx, type TxValidationResult, type TxValidator } from '@azte
 export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
   #log = createLogger('p2p:tx_validator:tx_metadata');
 
-  constructor(private chainId: Fr, private blockNumber: Fr) {}
+  constructor(private chainId: Fr, private rollupVersion: Fr, private blockNumber: Fr) {}
 
   async validateTx(tx: T): Promise<TxValidationResult> {
     const errors = [];
     if (!(await this.#hasCorrectChainId(tx))) {
       errors.push('Incorrect chain id');
     }
+    if (!(await this.#hasCorrectRollupVersion(tx))) {
+      errors.push('Incorrect rollup version');
+    }
     if (!(await this.#isValidForBlockNumber(tx))) {
       errors.push('Invalid block number');
     }
@@ -45,4 +48,17 @@ export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
       return true;
     }
   }
+
+  async #hasCorrectRollupVersion(tx: T): Promise<boolean> {
+    if (!tx.data.constants.txContext.version.equals(this.rollupVersion)) {
+      this.#log.warn(
+        `Rejecting tx ${await Tx.getHash(
+          tx,
+        )} because of incorrect rollup version ${tx.data.constants.txContext.version.toNumber()} != ${this.rollupVersion.toNumber()}`,
+      );
+      return false;
+    } else {
+      return true;
+    }
+  }
 }

package/src/services/libp2p/libp2p_service.ts

@@ -102,6 +102,8 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
    */
   private blockReceivedCallback: (block: BlockProposal) => Promise<BlockAttestation | undefined>;
 
+  private gossipSubEventHandler: (e: CustomEvent<GossipsubMessage>) => void;
+
   constructor(
     private clientType: T,
     private config: P2PConfig,
@@ -139,6 +141,8 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
     this.attestationValidator = new AttestationValidator(epochCache);
     this.blockProposalValidator = new BlockProposalValidator(epochCache);
 
+    this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
+
     this.blockReceivedCallback = async (block: BlockProposal): Promise<BlockAttestation | undefined> => {
       this.logger.debug(
         `Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber.toNumber()} from peer.`,
@@ -329,7 +333,7 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
     };
 
     // add GossipSub listener
-    this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.handleGossipSubEvent.bind(this));
+    this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
 
     // Start running promise for peer discovery
     this.discoveryRunningPromise = new RunningPromise(
@@ -360,7 +364,7 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
    */
   public async stop() {
     // Remove gossip sub listener
-    this.node.services.pubsub.removeEventListener(GossipSubEvent.MESSAGE, this.handleGossipSubEvent.bind(this));
+    this.node.services.pubsub.removeEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
 
     // Stop peer manager
     this.logger.debug('Stopping peer manager...');
@@ -521,7 +525,8 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
     await this.mempools.txPool.addTxs([tx]);
   }
 
-  /**Process Attestation From Peer
+  /**
+   * Process Attestation From Peer
    * When a proposal is received from a peer, we add it to the attestation pool, so it can be accessed by other services.
    *
    * @param attestation - The attestation to process.
@@ -716,7 +721,11 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
         severity: PeerErrorSeverity.HighToleranceError,
       },
       metadataValidator: {
-        validator: new MetadataTxValidator(new Fr(this.config.l1ChainId), new Fr(blockNumber)),
+        validator: new MetadataTxValidator(
+          new Fr(this.config.l1ChainId),
+          new Fr(this.config.rollupVersion),
+          new Fr(blockNumber),
+        ),
         severity: PeerErrorSeverity.HighToleranceError,
       },
       proofValidator: {

package/src/test-helpers/reqresp-nodes.ts

@@ -55,8 +55,8 @@ export async function createLibp2pNode(
   const options: Libp2pOptions = {
     start,
     addresses: {
-      listen: [`/ip4/0.0.0.0/tcp/${port}`],
-      announce: [`/ip4/0.0.0.0/tcp/${port}`],
+      listen: [`/ip4/127.0.0.1/tcp/${port}`],
+      announce: [`/ip4/127.0.0.1/tcp/${port}`],
     },
     connectionEncryption: [noise()],
     streamMuxers: [yamux()],
@@ -239,7 +239,7 @@ export function createBootstrapNodeConfig(privateKey: string, port: number, chai
     dataDirectory: undefined,
     dataStoreMapSizeKB: 0,
     bootstrapNodes: [],
-    listenAddress: '0.0.0.0',
+    listenAddress: '127.0.0.1',
   };
 }
 

package/src/testbench/p2p_client_testbench_worker.ts

@@ -48,12 +48,13 @@ function mockAttestationPool(): AttestationPool {
     deleteAttestationsForSlot: () => Promise.resolve(),
     deleteAttestationsForSlotAndProposal: () => Promise.resolve(),
     getAttestationsForSlot: () => Promise.resolve([]),
+    getAttestationsForSlotAndProposal: () => Promise.resolve([]),
   };
 }
 
 function mockEpochCache(): EpochCacheInterface {
   return {
-    getCommittee: () => Promise.resolve([] as EthAddress[]),
+    getCommittee: () => Promise.resolve({ committee: [], seed: 1n, epoch: 0n }),
     getProposerIndexEncoding: () => '0x' as `0x${string}`,
     getEpochAndSlotNow: () => ({ epoch: 0n, slot: 0n, ts: 0n }),
     computeProposerIndex: () => 0n,