@aztec/p2p 1.2.1 → 2.0.0-nightly.20250813

package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js

@@ -1,5 +1,7 @@
 import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
+import { BlockProposal as BlockProposalClass, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
+import { makeHeader } from '@aztec/stdlib/testing';
 import { TxHash } from '@aztec/stdlib/tx';
 import { jest } from '@jest/globals';
 import { mock } from 'jest-mock-extended';
@@ -23,6 +25,18 @@ export function describeAttestationPool(getAttestationPool) {
         const archive = Fr.random();
         return signers.map((signer)=>mockAttestation(signer, slotNumber, archive));
     };
+    const mockBlockProposal = (signer, slotNumber, archive = Fr.random())=>{
+        const blockNumber = 1;
+        const header = makeHeader(1, 2, slotNumber);
+        const payload = new ConsensusPayload(header.toPropose(), archive, header.state);
+        const hash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+        const signature = signer.sign(hash);
+        const txHashes = [
+            TxHash.random(),
+            TxHash.random()
+        ]; // Mock tx hashes
+        return new BlockProposalClass(blockNumber, payload, signature, txHashes);
+    };
     // We compare buffers as the objects can have cached values attached to them which are not serialised
     // using array containing as the kv store does not respect insertion order
     const compareAttestations = (a1, a2)=>{
@@ -67,26 +81,17 @@ export function describeAttestationPool(getAttestationPool) {
     it('should handle duplicate proposals in a slot', async ()=>{
         const slotNumber = 420;
         const archive = Fr.random();
-        const txs = [
-            0,
-            1,
-            2,
-            3,
-            4,
-            5
-        ].map(()=>TxHash.random());
         // Use the same signer for all attestations
         const attestations = [];
         const signer = signers[0];
         for(let i = 0; i < NUMBER_OF_SIGNERS_PER_TEST; i++){
-            attestations.push(mockAttestation(signer, slotNumber, archive, txs));
+            attestations.push(mockAttestation(signer, slotNumber, archive));
         }
         // Add them to store and check we end up with only one
         await ap.addAttestations(attestations);
         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);
         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([
@@ -210,4 +215,106 @@ export function describeAttestationPool(getAttestationPool) {
         expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(69));
         expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(72));
     });
+    describe('BlockProposal in attestation pool', ()=>{
+        it('should add and retrieve block proposal', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            await ap.addBlockProposal(proposal);
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            // This are cached values, so we need to call them to ensure they are not undefined
+            retrievedProposal.payload.getSize();
+            retrievedProposal.signature.getSize();
+            expect(retrievedProposal).toBeDefined();
+            expect(retrievedProposal).toEqual(proposal);
+        });
+        it('should return undefined for non-existent block proposal', async ()=>{
+            const nonExistentId = Fr.random().toString();
+            const retrievedProposal = await ap.getBlockProposal(nonExistentId);
+            expect(retrievedProposal).toBeUndefined();
+        });
+        it('should update block proposal if added twice with same id', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal1 = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal1.archive.toString();
+            await ap.addBlockProposal(proposal1);
+            // Create a new proposal with same archive but different signer
+            const proposal2 = mockBlockProposal(signers[1], slotNumber, archive);
+            await ap.addBlockProposal(proposal2);
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            // Should have the second proposal
+            expect(retrievedProposal.toBuffer()).toEqual(proposal2.toBuffer());
+            expect(retrievedProposal.getSender().toString()).toBe(signers[1].address.toString());
+        });
+        it('should handle block proposals with different slots and same archive', async ()=>{
+            const archive = Fr.random();
+            const proposal1 = mockBlockProposal(signers[0], 100, archive);
+            const proposal2 = mockBlockProposal(signers[1], 200, archive);
+            const proposalId = archive.toString();
+            await ap.addBlockProposal(proposal1);
+            await ap.addBlockProposal(proposal2);
+            // Should get the latest one added
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            expect(retrievedProposal.toBuffer()).toEqual(proposal2.toBuffer());
+            expect(retrievedProposal.slotNumber.toBigInt()).toBe(BigInt(200));
+        });
+        it('should delete block proposal when deleting attestations for slot and proposal', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            // Add proposal and some attestations
+            await ap.addBlockProposal(proposal);
+            const attestations = signers.map((signer)=>mockAttestation(signer, slotNumber, archive));
+            await ap.addAttestations(attestations);
+            // Verify proposal exists
+            let retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            // Delete attestations for slot and proposal
+            await ap.deleteAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+            // Proposal should be deleted
+            retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeUndefined();
+        });
+        it('should delete block proposal when deleting attestations for slot', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            // Add proposal
+            await ap.addBlockProposal(proposal);
+            // Verify proposal exists
+            let retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            // Delete attestations for slot
+            await ap.deleteAttestationsForSlot(BigInt(slotNumber));
+            // Proposal should be deleted
+            retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeUndefined();
+        });
+        it('should be able to fetch both block proposal and attestations', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            // Add proposal first
+            await ap.addBlockProposal(proposal);
+            // Add attestations for the same proposal
+            const attestations = signers.slice(1).map((signer)=>mockAttestation(signer, slotNumber, archive));
+            await ap.addAttestations(attestations);
+            // Retrieve both proposal and attestations
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+            expect(retrievedProposal).toBeDefined();
+            // This are cached values, so we need to call them to ensure they are not undefined
+            retrievedProposal.payload.getSize();
+            retrievedProposal.signature.getSize();
+            expect(retrievedProposal).toEqual(proposal);
+            compareAttestations(retrievedAttestations, attestations);
+        });
+    });
 }

package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts

@@ -1,5 +1,5 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
 export declare class KvAttestationPool implements AttestationPool {
@@ -7,6 +7,7 @@ export declare class KvAttestationPool implements AttestationPool {
     private log;
     private metrics;
     private attestations;
+    private proposals;
     private proposalsForSlot;
     private attestationsForProposal;
     constructor(store: AztecAsyncKVStore, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
@@ -21,5 +22,7 @@ export declare class KvAttestationPool implements AttestationPool {
     deleteAttestationsForSlot(slot: bigint): Promise<void>;
     deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
     deleteAttestations(attestations: BlockAttestation[]): Promise<void>;
+    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
 }
 //# sourceMappingURL=kv_attestation_pool.d.ts.map

package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kv_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/kv_attestation_pool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,iBAAkB,YAAW,eAAe;IAQrD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IATb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,uBAAuB,CAAqC;gBAG1D,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC;IAStD,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAOxC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBhE,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAYjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBhG,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBjF"}
+{"version":3,"file":"kv_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/kv_attestation_pool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,iBAAkB,YAAW,eAAe;IAYrD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IAbb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,SAAS,CAGf;IACF,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,uBAAuB,CAAqC;gBAG1D,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC;IAUtD,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAOxC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBhE,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAYjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBhG,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnE,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAahE,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAM3E"}

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
 export class KvAttestationPool {
@@ -9,6 +9,7 @@ export class KvAttestationPool {
     log;
     metrics;
     attestations;
+    proposals;
     proposalsForSlot;
     attestationsForProposal;
     constructor(store, telemetry = getTelemetryClient(), log = createLogger('aztec:attestation_pool')){
@@ -20,6 +21,7 @@ export class KvAttestationPool {
             };
         };
         this.attestations = store.openMap('attestations');
+        this.proposals = store.openMap('proposals');
         this.proposalsForSlot = store.openMultiMap('proposals_for_slot');
         this.attestationsForProposal = store.openMultiMap('attestations_for_proposal');
         this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
@@ -100,6 +102,7 @@ export class KvAttestationPool {
                 for (const attestation of attestations){
                     await this.attestations.delete(attestation);
                 }
+                await this.proposals.delete(proposalId);
                 await this.attestationsForProposal.delete(this.getProposalKey(slotFr, proposalId));
             }
             this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
@@ -114,6 +117,7 @@ export class KvAttestationPool {
             for (const attestation of attestations){
                 await this.attestations.delete(attestation);
             }
+            await this.proposals.delete(proposalId);
             await this.proposalsForSlot.deleteValue(slotString, proposalId);
             await this.attestationsForProposal.delete(this.getProposalKey(slotString, proposalId));
             this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
@@ -134,4 +138,21 @@ export class KvAttestationPool {
             }
         });
     }
+    async getBlockProposal(id) {
+        const buffer = await this.proposals.getAsync(id);
+        try {
+            if (buffer && buffer.length > 0) {
+                return BlockProposal.fromBuffer(buffer);
+            }
+        } catch  {
+            return Promise.resolve(undefined);
+        }
+        return Promise.resolve(undefined);
+    }
+    async addBlockProposal(blockProposal) {
+        await this.store.transactionAsync(async ()=>{
+            await this.proposalsForSlot.set(blockProposal.slotNumber.toString(), blockProposal.archive.toString());
+            await this.proposals.set(blockProposal.payload.archive.toString(), blockProposal.toBuffer());
+        });
+    }
 }

package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts

@@ -1,4 +1,4 @@
-import type { BlockAttestation } from '@aztec/stdlib/p2p';
+import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
 export declare class InMemoryAttestationPool implements AttestationPool {
@@ -6,6 +6,7 @@ export declare class InMemoryAttestationPool implements AttestationPool {
     private log;
     private metrics;
     private attestations;
+    private proposals;
     constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     private poolStats;
     isEmpty(): Promise<boolean>;
@@ -16,5 +17,7 @@ export declare class InMemoryAttestationPool implements AttestationPool {
     deleteAttestationsForSlot(slot: bigint): Promise<void>;
     deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
     deleteAttestations(attestations: BlockAttestation[]): Promise<void>;
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
+    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
 }
 //# sourceMappingURL=memory_attestation_pool.d.ts.map

package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAO3D,OAAO,CAAC,GAAG;IANb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAGlH,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC;IAMpD,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWhG,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAgB3E"}
+{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAQ3D,OAAO,CAAC,GAAG;IAPb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;IACpH,OAAO,CAAC,SAAS,CAA6B;gBAG5C,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC;IAOpD,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWhG,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnE,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAGxE"}

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -5,6 +5,7 @@ export class InMemoryAttestationPool {
     log;
     metrics;
     attestations;
+    proposals;
     constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:attestation_pool')){
         this.log = log;
         this.poolStats = ()=>{
@@ -13,6 +14,7 @@ export class InMemoryAttestationPool {
             });
         };
         this.attestations = new Map();
+        this.proposals = new Map();
         this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
     }
     poolStats;
@@ -81,8 +83,14 @@ export class InMemoryAttestationPool {
     deleteAttestationsForSlot(slot) {
         // We count the number of attestations we are removing
         const numberOfAttestations = this.#getNumberOfAttestationsInSlot(slot);
+        const proposalIdsToDelete = this.attestations.get(slot)?.keys();
+        let proposalIdsToDeleteCount = 0;
+        proposalIdsToDelete?.forEach((proposalId)=>{
+            this.proposals.delete(proposalId);
+            proposalIdsToDeleteCount++;
+        });
         this.attestations.delete(slot);
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
+        this.log.verbose(`Removed ${numberOfAttestations} attestations and ${proposalIdsToDeleteCount} proposals for slot ${slot}`);
         return Promise.resolve();
     }
     deleteAttestationsForSlotAndProposal(slot, proposalId) {
@@ -94,6 +102,7 @@ export class InMemoryAttestationPool {
                 this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
             }
         }
+        this.proposals.delete(proposalId);
         return Promise.resolve();
     }
     deleteAttestations(attestations) {
@@ -112,6 +121,17 @@ export class InMemoryAttestationPool {
         }
         return Promise.resolve();
     }
+    addBlockProposal(blockProposal) {
+        // We initialize slot-proposal mapping if it does not exist
+        // This is important to ensure we can delete this proposal if there were not attestations for it
+        const slotProposalMapping = getSlotOrDefault(this.attestations, blockProposal.slotNumber.toBigInt());
+        slotProposalMapping.set(blockProposal.payload.archive.toString(), new Map());
+        this.proposals.set(blockProposal.payload.archive.toString(), blockProposal);
+        return Promise.resolve();
+    }
+    getBlockProposal(id) {
+        return Promise.resolve(this.proposals.get(id));
+    }
 }
 /**
  * Get Slot or Default

package/dest/mem_pools/attestation_pool/mocks.d.ts

@@ -1,7 +1,6 @@
 import type { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BlockAttestation } from '@aztec/stdlib/p2p';
-import { TxHash } from '@aztec/stdlib/tx';
 import { type LocalAccount } from 'viem/accounts';
 /** Generate Account
  *
@@ -15,5 +14,5 @@ export declare const generateAccount: () => LocalAccount;
  * @param slot The slot number the attestation is for
  * @returns A Block Attestation
  */
-export declare const mockAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr, txs?: TxHash[]) => BlockAttestation;
+export declare const mockAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr) => BlockAttestation;
 //# sourceMappingURL=mocks.d.ts.map

package/dest/mem_pools/attestation_pool/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,eAAe,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAO,YAGlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,eAAe,EACvB,OAAM,MAAU,EAChB,UAAS,EAAgB,EACzB,MAAK,MAAM,EAAkD,KAC5D,gBASF,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,eAAe,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAO,YAGlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,eAAe,EACvB,OAAM,MAAU,EAChB,UAAS,EAAgB,KACxB,gBASF,CAAC"}

package/dest/mem_pools/attestation_pool/mocks.js

@@ -1,7 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BlockAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
 import { makeHeader } from '@aztec/stdlib/testing';
-import { TxHash } from '@aztec/stdlib/tx';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 /** Generate Account
  *
@@ -16,17 +15,10 @@ import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
  * @param signer A viem signer to create a signature
  * @param slot The slot number the attestation is for
  * @returns A Block Attestation
- */ export const mockAttestation = (signer, slot = 0, archive = Fr.random(), txs = [
-    0,
-    1,
-    2,
-    3,
-    4,
-    5
-].map(()=>TxHash.random()))=>{
+ */ export const mockAttestation = (signer, slot = 0, archive = Fr.random())=>{
     // Use arbitrary numbers for all other than slot
     const header = makeHeader(1, 2, slot);
-    const payload = new ConsensusPayload(header.toPropose(), archive, header.state, txs);
+    const payload = new ConsensusPayload(header.toPropose(), archive, header.state);
     const hash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
     const signature = signer.sign(hash);
     return new BlockAttestation(header.globalVariables.blockNumber, payload, signature);

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts

@@ -1,15 +1,17 @@
 import { type Logger } from '@aztec/foundation/log';
+import type { TypedEventEmitter } from '@aztec/foundation/types';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { MerkleTreeReadOperations, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { ArchiveCache } from '../../msg_validators/tx_validator/archive_cache.js';
 import { GasTxValidator } from '../../msg_validators/tx_validator/gas_validator.js';
-import type { TxPool, TxPoolOptions } from './tx_pool.js';
+import type { TxPool, TxPoolEvents, TxPoolOptions } from './tx_pool.js';
+declare const AztecKVTxPool_base: new () => TypedEventEmitter<TxPoolEvents>;
 /**
  * KV implementation of the Transaction Pool.
  */
-export declare class AztecKVTxPool implements TxPool {
+export declare class AztecKVTxPool extends AztecKVTxPool_base implements TxPool {
     #private;
     /** The tx evicion logic will kick after pool size is greater than maxTxPoolSize * txPoolOverflowFactor */
     txPoolOverflowFactor: number;
@@ -57,7 +59,9 @@ export declare class AztecKVTxPool implements TxPool {
      * @param txs - An array of txs to be added to the pool.
      * @returns Empty promise.
      */
-    addTxs(txs: Tx[]): Promise<number>;
+    addTxs(txs: Tx[], opts?: {
+        source?: string;
+    }): Promise<number>;
     /**
      * Deletes transactions from the pool. Tx hashes that are not present are ignored.
      * @param txHashes - An array of tx hashes to be removed from the tx pool.
@@ -131,4 +135,5 @@ export declare class AztecKVTxPool implements TxPool {
     private addPendingTxIndices;
     private removePendingTxIndices;
 }
+export {};
 //# sourceMappingURL=aztec_kv_tx_pool.d.ts.map

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec_kv_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/aztec_kv_tx_pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aztec_kv_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/aztec_kv_tx_pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAA0D,MAAM,iBAAiB,CAAC;AAGjH,OAAO,KAAK,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIxG,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAKnF,OAAO,EAAE,YAAY,EAAE,MAAM,oDAAoD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAGpF,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;kCAKpB,UAAU,iBAAiB,CAAC,YAAY,CAAC;AAH7F;;GAEG;AACH,qBAAa,aAAc,SAAQ,kBAA4D,YAAW,MAAM;;IAS9G,0GAA0G;IAC1G,oBAAoB,EAAE,MAAM,CAAK;IA0CjC;;;;;;;OAOG;gBAED,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,iBAAiB,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,GAAE,eAAsC,EACjD,MAAM,GAAE,aAAkB,EAC1B,GAAG,SAA8B;IA0BnC,OAAO,CAAC,QAAQ,CASd;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAMxC;;;;;;OAMG;IACU,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCxE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrD,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKvC,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAK/C,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAalF;;;;OAIG;IACU,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAU3D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IAY7D,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIpD;;;;OAIG;IACU,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAUzE;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAwC/E;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCrE;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IASvC;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzC,YAAY,CAAC,EAAE,aAAa,EAAE,oBAAoB,EAAE,eAAe,EAAE,EAAE,aAAa,GAAG,IAAI;IAwB3F,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/D;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,EAAE,EAAE,wBAAwB,GAAG,cAAc;IAI5E;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,CAAC,EAAE,EAAE,wBAAwB,GAAG,YAAY;IAIxE;;;;;OAKG;YACW,kBAAkB;IAoBhC;;;;OAIG;YACW,UAAU;IA2CxB;;;;;;OAMG;YACW,mBAAmB;IA8CjC;;;;;;;;;;OAUG;YACW,0BAA0B;IA4DxC;;;;;OAKG;YACW,yBAAyB;YAqCzB,mBAAmB;YAMnB,sBAAsB;CAMrC"}

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js

@@ -8,13 +8,14 @@ import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import assert from 'assert';
+import EventEmitter from 'node:events';
 import { ArchiveCache } from '../../msg_validators/tx_validator/archive_cache.js';
 import { GasTxValidator } from '../../msg_validators/tx_validator/gas_validator.js';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
 import { getPendingTxPriority } from './priority.js';
 /**
  * KV implementation of the Transaction Pool.
- */ export class AztecKVTxPool {
+ */ export class AztecKVTxPool extends EventEmitter {
     #store;
     /** Our tx pool, stored as a Map, with K: tx hash and V: the transaction. */ #txs;
     /** The maximum cumulative tx size that the pending txs in the pool take up. */ #maxTxPoolSize = 0;
@@ -41,6 +42,7 @@ import { getPendingTxPriority } from './priority.js';
    * @param archivedTxLimit - The number of txs to archive.
    * @param log - A logger.
    */ constructor(store, archive, worldStateSynchronizer, telemetry = getTelemetryClient(), config = {}, log = createLogger('p2p:tx_pool')){
+        super();
         this.#log = log;
         this.updateConfig(config);
         this.#txs = store.openMap('txs');
@@ -208,12 +210,12 @@ import { getPendingTxPriority } from './priority.js';
    * Adds a list of transactions to the pool. Duplicates are ignored.
    * @param txs - An array of txs to be added to the pool.
    * @returns Empty promise.
-   */ async addTxs(txs) {
-        let addedCount = 0;
-        const hashesAndStats = await Promise.all(txs.map(async (tx)=>({
-                txHash: await tx.getTxHash(),
-                txStats: await tx.getStats()
-            })));
+   */ async addTxs(txs, opts = {}) {
+        const addedTxs = [];
+        const hashesAndStats = txs.map((tx)=>({
+                txHash: tx.getTxHash(),
+                txStats: tx.getStats()
+            }));
         await this.#store.transactionAsync(async ()=>{
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             await Promise.all(txs.map(async (tx, i)=>{
@@ -228,8 +230,8 @@ import { getPendingTxPriority } from './priority.js';
                     ...txStats
                 });
                 await this.#txs.set(key, tx.toBuffer());
+                addedTxs.push(tx);
                 if (!await this.#minedTxHashToBlock.hasAsync(key)) {
-                    addedCount++;
                     pendingTxSize += tx.getSize();
                     await this.addPendingTxIndices(tx, key);
                     this.#metrics.recordSize(tx);
@@ -238,13 +240,22 @@ import { getPendingTxPriority } from './priority.js';
             await this.#pendingTxSize.set(pendingTxSize);
             await this.evictLowPriorityTxs(hashesAndStats.map(({ txHash })=>txHash));
         });
-        return addedCount;
+        if (addedTxs.length > 0) {
+            this.emit('txs-added', {
+                ...opts,
+                txs: addedTxs
+            });
+        }
+        return addedTxs.length;
     }
     /**
    * Deletes transactions from the pool. Tx hashes that are not present are ignored.
    * @param txHashes - An array of tx hashes to be removed from the tx pool.
    * @returns Empty promise.
    */ deleteTxs(txHashes, eviction = false) {
+        if (txHashes.length === 0) {
+            return Promise.resolve();
+        }
         const deletedTxs = [];
         const poolDbTx = this.#store.transactionAsync(async ()=>{
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
@@ -266,6 +277,9 @@ import { getPendingTxPriority } from './priority.js';
             }
             await this.#pendingTxSize.set(pendingTxSize);
         });
+        this.#log.debug(`Deleted ${txHashes.length} txs from pool`, {
+            txHashes
+        });
         return this.#archivedTxLimit ? poolDbTx.then(()=>this.archiveTxs(deletedTxs)) : poolDbTx;
     }
     /**
@@ -357,33 +371,46 @@ import { getPendingTxPriority } from './priority.js';
    * @param txs - The list of transactions to archive.
    * @returns Empty promise.
    */ async archiveTxs(txs) {
-        const txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
-        await this.#archive.transactionAsync(async ()=>{
-            // calcualte the head and tail indices of the archived txs by insertion order.
-            let headIdx = ((await this.#archivedTxIndices.entriesAsync({
-                limit: 1,
-                reverse: true
-            }).next()).value?.[0] ?? -1) + 1;
-            let tailIdx = (await this.#archivedTxIndices.entriesAsync({
-                limit: 1
-            }).next()).value?.[0] ?? 0;
-            for(let i = 0; i < txs.length; i++){
-                const tx = txs[i];
-                while(headIdx - tailIdx >= this.#archivedTxLimit){
-                    const txHash = await this.#archivedTxIndices.getAsync(tailIdx);
-                    if (txHash) {
-                        await this.#archivedTxs.delete(txHash);
-                        await this.#archivedTxIndices.delete(tailIdx);
+        if (txs.length === 0) {
+            return;
+        }
+        try {
+            const txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+            await this.#archive.transactionAsync(async ()=>{
+                // calculate the head and tail indices of the archived txs by insertion order.
+                let headIdx = ((await this.#archivedTxIndices.entriesAsync({
+                    limit: 1,
+                    reverse: true
+                }).next()).value?.[0] ?? -1) + 1;
+                let tailIdx = (await this.#archivedTxIndices.entriesAsync({
+                    limit: 1
+                }).next()).value?.[0] ?? 0;
+                for(let i = 0; i < txs.length; i++){
+                    const tx = txs[i];
+                    while(headIdx - tailIdx >= this.#archivedTxLimit){
+                        const txHash = await this.#archivedTxIndices.getAsync(tailIdx);
+                        if (txHash) {
+                            await this.#archivedTxs.delete(txHash);
+                            await this.#archivedTxIndices.delete(tailIdx);
+                        }
+                        tailIdx++;
                     }
-                    tailIdx++;
+                    const archivedTx = new Tx(tx.txHash, tx.data, ClientIvcProof.empty(), tx.contractClassLogFields, tx.publicFunctionCalldata);
+                    const txHash = txHashes[i].toString();
+                    await this.#archivedTxs.set(txHash, archivedTx.toBuffer());
+                    await this.#archivedTxIndices.set(headIdx, txHash);
+                    headIdx++;
                 }
-                const archivedTx = new Tx(tx.data, ClientIvcProof.empty(), tx.contractClassLogFields, tx.publicFunctionCalldata);
-                const txHash = txHashes[i].toString();
-                await this.#archivedTxs.set(txHash, archivedTx.toBuffer());
-                await this.#archivedTxIndices.set(headIdx, txHash);
-                headIdx++;
-            }
-        });
+                this.#log.debug(`Archived ${txs.length} txs`, {
+                    txHashes
+                });
+                this.#log.debug(`Total archived txs: ${headIdx - tailIdx}`);
+            });
+        } catch (error) {
+            this.#log.error(`Error archiving txs`, {
+                error
+            });
+        }
     }
     /**
    * Evicts pending txs with the lowest priority fees from the pool to accomodate the max tx count and cumulative max tx size
@@ -468,9 +495,9 @@ import { getPendingTxPriority } from './priority.js';
                 continue;
             }
             // Evict pending txs with an expiration timestamp less than or equal to the mined block timestamp
-            const includeByTimestamp = tx.data.rollupValidationRequests.includeByTimestamp;
-            if (includeByTimestamp.isSome && includeByTimestamp.value <= timestamp) {
-                this.#log.verbose(`Evicting tx ${txHash} from pool due to the tx being expired (includeByTimestamp: ${includeByTimestamp.value}, mined block timestamp: ${timestamp})`);
+            const includeByTimestamp = tx.data.includeByTimestamp;
+            if (includeByTimestamp <= timestamp) {
+                this.#log.verbose(`Evicting tx ${txHash} from pool due to the tx being expired (includeByTimestamp: ${includeByTimestamp}, mined block timestamp: ${timestamp})`);
                 txsToEvict.push(TxHash.fromString(txHash));
                 continue;
             }

package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts

@@ -1,10 +1,12 @@
+import type { TypedEventEmitter } from '@aztec/foundation/types';
 import { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { TxPool, TxPoolOptions } from './tx_pool.js';
+import type { TxPool, TxPoolEvents, TxPoolOptions } from './tx_pool.js';
+declare const InMemoryTxPool_base: new () => TypedEventEmitter<TxPoolEvents>;
 /**
  * In-memory implementation of the Transaction Pool.
  */
-export declare class InMemoryTxPool implements TxPool {
+export declare class InMemoryTxPool extends InMemoryTxPool_base implements TxPool {
     private log;
     /**
      * Our tx pool, stored as a Map in-memory, with K: tx hash and V: the transaction.
@@ -40,7 +42,9 @@ export declare class InMemoryTxPool implements TxPool {
      * @param txs - An array of txs to be added to the pool.
      * @returns Empty promise.
      */
-    addTxs(txs: Tx[]): Promise<number>;
+    addTxs(txs: Tx[], opts?: {
+        source?: string;
+    }): Promise<number>;
     /**
      * Deletes transactions from the pool. Tx hashes that are not present are ignored.
      * @param txHashes - An array of tx hashes to be removed from the tx pool.
@@ -60,4 +64,5 @@ export declare class InMemoryTxPool implements TxPool {
     updateConfig(_config: TxPoolOptions): void;
     markTxsAsNonEvictable(_: TxHash[]): Promise<void>;
 }
+export {};
 //# sourceMappingURL=memory_tx_pool.d.ts.map