@aztec/p2p 0.86.0 → 0.87.0

package/dest/enr/generate-enr.js

@@ -1,9 +1,10 @@
 import { emptyChainConfig } from '@aztec/stdlib/config';
 import { ENR, SignableENR } from '@chainsafe/enr';
 import { multiaddr } from '@multiformats/multiaddr';
-import { AZTEC_ENR_KEY } from '../types/index.js';
+import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from '../types/index.js';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js';
-import { setAztecEnrKey } from '../versioning.js';
+import { setAztecClientVersionEnrKey, setAztecEnrKey } from '../versioning.js';
+export { ENR };
 export async function createBootnodeENRandPeerId(privateKey, p2pIp, p2pBroadcastPort, l1ChainId) {
     const peerId = await createLibP2PPeerIdFromPrivateKey(privateKey);
     const enr = SignableENR.createFromPeerId(peerId);
@@ -19,6 +20,25 @@ export async function createBootnodeENRandPeerId(privateKey, p2pIp, p2pBroadcast
         peerId
     };
 }
+export function createNodeENR(peerId, multiAddrUdp, multiAddrTcp, chainConfig, packageVersion) {
+    // create ENR from PeerId
+    const enr = SignableENR.createFromPeerId(peerId);
+    // Add aztec identification to ENR
+    const versions = setAztecEnrKey(enr, chainConfig);
+    // Add aztec client version to ENR
+    setAztecClientVersionEnrKey(enr, packageVersion);
+    // set location multiaddr in ENR record
+    if (multiAddrUdp) {
+        enr.setLocationMultiaddr(multiAddrUdp);
+    }
+    if (multiAddrTcp) {
+        enr.setLocationMultiaddr(multiAddrTcp);
+    }
+    return {
+        enr,
+        versions
+    };
+}
 export async function printENR(enr, log) {
     const decoded = ENR.decodeTxt(enr);
     log(`PeerID: ${await decoded.peerId()}`);
@@ -27,4 +47,6 @@ export async function printENR(enr, log) {
     log(`TCP: ${decoded.tcp}`);
     const aztec = decoded.kvs.get(AZTEC_ENR_KEY);
     log(`Aztec version: ${aztec?.toString()}`);
+    const aztecClientVersion = decoded.kvs.get(AZTEC_ENR_CLIENT_VERSION_KEY);
+    log(`Aztec client version ${aztecClientVersion ? aztecClientVersion.toString() : 'N/A'}`);
 }

package/dest/index.d.ts

@@ -1,5 +1,6 @@
 export * from './bootstrap/bootstrap.js';
 export * from './client/index.js';
+export * from './enr/index.js';
 export * from './config.js';
 export * from './mem_pools/attestation_pool/index.js';
 export * from './mem_pools/tx_pool/index.js';

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC"}

package/dest/index.js

@@ -1,5 +1,6 @@
 export * from './bootstrap/bootstrap.js';
 export * from './client/index.js';
+export * from './enr/index.js';
 export * from './config.js';
 export * from './mem_pools/attestation_pool/index.js';
 export * from './mem_pools/tx_pool/index.js';

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

@@ -62,5 +62,7 @@ export interface AttestationPool {
      * @return BlockAttestations
      */
     getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+    /** Returns whether the pool is empty. */
+    isEmpty(): Promise<boolean>;
 }
 //# sourceMappingURL=attestation_pool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE;;;;OAIG;IACH,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;;OAMG;IACH,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD;;;;;;OAMG;IACH,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvD;;;;;;;OAOG;IACH,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtF;;;;;;;OAOG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAElE;;;;;;;;OAQG;IACH,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;CAClG"}
+{"version":3,"file":"attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE;;;;OAIG;IACH,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;;OAMG;IACH,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD;;;;;;OAMG;IACH,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvD;;;;;;;OAOG;IACH,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtF;;;;;;;OAOG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAElE;;;;;;;;OAQG;IACH,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEjG,yCAAyC;IACzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7B"}

package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js

@@ -108,12 +108,12 @@ export function describeAttestationPool(getAttestationPool) {
         const attestations = signers.map((signer, i)=>mockAttestation(signer, slotNumbers[i]));
         await ap.addAttestations(attestations);
         for (const attestation of attestations){
-            const slot = attestation.payload.header.globalVariables.slotNumber;
+            const slot = attestation.payload.header.slotNumber;
             const archive = attestation.archive.toString();
             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);
+            expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
         }
     });
     it('should store attestations by differing slot and archive', async ()=>{
@@ -132,12 +132,12 @@ export function describeAttestationPool(getAttestationPool) {
         const attestations = signers.map((signer, i)=>mockAttestation(signer, slotNumbers[i], archives[i]));
         await ap.addAttestations(attestations);
         for (const attestation of attestations){
-            const slot = attestation.payload.header.globalVariables.slotNumber;
+            const slot = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
             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);
+            expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
         }
     });
     it('should delete attestations', async ()=>{

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

@@ -10,6 +10,7 @@ export declare class KvAttestationPool implements AttestationPool {
     private proposalsForSlot;
     private attestationsForProposal;
     constructor(store: AztecAsyncKVStore, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    isEmpty(): Promise<boolean>;
     private getProposalKey;
     private getAttestationKey;
     addAttestations(attestations: BlockAttestation[]): Promise<void>;

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,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,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;CAkBjF"}
+{"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;IASzC,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;IA2BhE,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;CAkBjF"}

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -19,6 +19,12 @@ export class KvAttestationPool {
         this.attestationsForProposal = store.openMultiMap('attestations_for_proposal');
         this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
     }
+    async isEmpty() {
+        for await (const _ of this.attestations.entriesAsync()){
+            return false;
+        }
+        return true;
+    }
     getProposalKey(slot, proposalId) {
         const slotStr = typeof slot === 'string' ? slot : new Fr(slot).toString();
         const proposalIdStr = typeof proposalId === 'string' ? proposalId : Buffer.isBuffer(proposalId) ? Fr.fromBuffer(proposalId).toString() : proposalId.toString();
@@ -30,7 +36,7 @@ export class KvAttestationPool {
     async addAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+                const slotNumber = attestation.payload.header.slotNumber;
                 const proposalId = attestation.archive;
                 const address = attestation.getSender().toString();
                 await this.attestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
@@ -113,7 +119,7 @@ export class KvAttestationPool {
     async deleteAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+                const slotNumber = attestation.payload.header.slotNumber;
                 const proposalId = attestation.archive;
                 const address = attestation.getSender().toString();
                 await this.attestations.delete(this.getAttestationKey(slotNumber, proposalId, address));

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

@@ -7,6 +7,7 @@ export declare class InMemoryAttestationPool implements AttestationPool {
     private metrics;
     private attestations;
     constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    isEmpty(): Promise<boolean>;
     getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
     getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
     addAttestations(attestations: BlockAttestation[]): Promise<void>;

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;;IAKE,OAAO,CAAC,GAAG;IAJ1E,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAExG,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAAuC;IAK1G,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;IAqC1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAerF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB3E"}
+{"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;IAM7C,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;IAqC1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAerF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB3E"}

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -10,6 +10,9 @@ export class InMemoryAttestationPool {
         this.attestations = new Map();
         this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
     }
+    isEmpty() {
+        return Promise.resolve(this.attestations.size === 0);
+    }
     getAttestationsForSlot(slot) {
         return Promise.resolve(Array.from(this.attestations.get(slot)?.values() ?? []).flatMap((proposalAttestationMap)=>Array.from(proposalAttestationMap.values())));
     }
@@ -26,7 +29,7 @@ export class InMemoryAttestationPool {
     addAttestations(attestations) {
         for (const attestation of attestations){
             // Perf: order and group by slot before insertion
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+            const slotNumber = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
             const address = attestation.getSender();
             const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
@@ -93,7 +96,7 @@ export class InMemoryAttestationPool {
     }
     deleteAttestations(attestations) {
         for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+            const slotNumber = attestation.payload.header.slotNumber;
             const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
             if (slotAttestationMap) {
                 const proposalId = attestation.archive.toString();

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,WAClB,eAAe,SACjB,MAAM,YACH,EAAE,QACN,MAAM,EAAE,KACZ,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;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"}

package/dest/mem_pools/attestation_pool/mocks.js

@@ -26,8 +26,8 @@ import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 ].map(()=>TxHash.random()))=>{
     // Use arbitrary numbers for all other than slot
     const header = makeHeader(1, 2, slot);
-    const payload = new ConsensusPayload(header, archive, txs);
+    const payload = new ConsensusPayload(header.toPropose(), archive, header.state, txs);
     const hash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
     const signature = signer.sign(hash);
-    return new BlockAttestation(payload, signature);
+    return new BlockAttestation(header.globalVariables.blockNumber, payload, signature);
 };

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

@@ -23,10 +23,12 @@ export declare class AztecKVTxPool implements TxPool {
         maxTxPoolSize?: number;
         archivedTxLimit?: number;
     }, log?: Logger);
+    isEmpty(): Promise<boolean>;
     markAsMined(txHashes: TxHash[], blockNumber: number): Promise<void>;
     markMinedAsPending(txHashes: TxHash[]): Promise<void>;
     getPendingTxHashes(): Promise<TxHash[]>;
     getMinedTxHashes(): Promise<[TxHash, number][]>;
+    getPendingTxCount(): Promise<number>;
     getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
     /**
      * Checks if a transaction exists in the pool and returns it.
@@ -65,6 +67,7 @@ export declare class AztecKVTxPool implements TxPool {
      */
     getAllTxHashes(): Promise<TxHash[]>;
     setMaxTxPoolSize(maxSizeBytes: number | undefined): Promise<void>;
+    markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
     /**
      * Creates a GasTxValidator instance.
      * @param db - DB for the validator to use
@@ -119,5 +122,6 @@ export declare class AztecKVTxPool implements TxPool {
     private evictInvalidTxsAfterReorg;
     private addPendingTxIndices;
     private removePendingTxIndices;
+    private increasePendingTxCount;
 }
 //# 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":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAA0D,MAAM,iBAAiB,CAAC;AAGjH,OAAO,KAAK,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIxG,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,EAAE,YAAY,EAAE,MAAM,oDAAoD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAGpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;;IA8C1C;;;;;;;OAOG;gBAED,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,iBAAiB,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,GAAE,eAAsC,EACjD,MAAM,GAAE;QACN,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,CAAC;KACrB,EACN,GAAG,SAA8B;IAsB5B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKvC,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAK/C,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,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCrE;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IASvC;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzC,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxE;;;;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;IA4BxB;;;;;;OAMG;YACW,mBAAmB;IAsCjC;;;;;;;;;;OAUG;YACW,0BAA0B;IAwDxC;;;;;OAKG;YACW,yBAAyB;YAqCzB,mBAAmB;YAMnB,sBAAsB;CAMrC"}
+{"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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"}

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js

@@ -22,7 +22,9 @@ import { getPendingTxPriority } from './priority.js';
     /** Index from tx hash to its tx size (in bytes), filtered by pending txs. */ #pendingTxHashToSize;
     /** Index from tx hash to its header hash, filtered by pending txs. */ #pendingTxHashToHeaderHash;
     /** The cumulative tx size in bytes that the pending txs in the pool take up. */ #pendingTxSize;
+    /** Count of total pending txs. */ #pendingTxCount;
     /** In-memory mapping of pending tx hashes to the hydrated pending tx in the pool. */ #pendingTxs;
+    /** In-memory set of txs that should not be evicted from the pool. */ #nonEvictableTxs;
     /** KV store for archived txs. */ #archive;
     /** Archived txs map for future lookup. */ #archivedTxs;
     /** Indexes of the archived txs by insertion order. */ #archivedTxIndices;
@@ -44,8 +46,10 @@ import { getPendingTxPriority } from './priority.js';
         this.#pendingTxHashToSize = store.openMap('pendingTxHashToSize');
         this.#pendingTxHashToHeaderHash = store.openMap('pendingTxHashToHeaderHash');
         this.#pendingTxSize = store.openSingleton('pendingTxSize');
+        this.#pendingTxCount = store.openSingleton('pendingTxCount');
         this.#maxTxPoolSize = config.maxTxPoolSize;
         this.#pendingTxs = new Map();
+        this.#nonEvictableTxs = new Set();
         this.#archivedTxs = archive.openMap('archivedTxs');
         this.#archivedTxIndices = archive.openMap('archivedTxIndices');
         this.#archivedTxLimit = config.archivedTxLimit ?? 0;
@@ -55,14 +59,20 @@ import { getPendingTxPriority } from './priority.js';
         this.#log = log;
         this.#metrics = new PoolInstrumentation(telemetry, PoolName.TX_POOL, ()=>store.estimateSize());
     }
-    markAsMined(txHashes, blockNumber) {
+    async isEmpty() {
+        for await (const _ of this.#txs.entriesAsync()){
+            return false;
+        }
+        return true;
+    }
+    async markAsMined(txHashes, blockNumber) {
         if (txHashes.length === 0) {
             return Promise.resolve();
         }
         let deletedPending = 0;
         const minedNullifiers = new Set();
         const minedFeePayers = new Set();
-        return this.#store.transactionAsync(async ()=>{
+        await this.#store.transactionAsync(async ()=>{
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             for (const hash of txHashes){
                 const key = hash.toString();
@@ -79,16 +89,21 @@ import { getPendingTxPriority } from './priority.js';
             }
             this.#metrics.recordAddedObjects(txHashes.length, 'mined');
             await this.#pendingTxSize.set(pendingTxSize);
+            await this.increasePendingTxCount(-deletedPending);
             const numTxsEvicted = await this.evictInvalidTxsAfterMining(txHashes, blockNumber, minedNullifiers, minedFeePayers);
             this.#metrics.recordRemovedObjects(deletedPending + numTxsEvicted, 'pending');
         });
+        // We update this after the transaction above. This ensures that the non-evictable transactions are not evicted
+        // until any that have been mined are marked as such.
+        // The non-evictable set is not considered when evicting transactions that are invalid after a block is mined.
+        this.#nonEvictableTxs.clear();
     }
-    markMinedAsPending(txHashes) {
+    async markMinedAsPending(txHashes) {
         if (txHashes.length === 0) {
             return Promise.resolve();
         }
         let markedAsPending = 0;
-        return this.#store.transactionAsync(async ()=>{
+        await this.#store.transactionAsync(async ()=>{
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             for (const hash of txHashes){
                 const key = hash.toString();
@@ -102,13 +117,13 @@ import { getPendingTxPriority } from './priority.js';
                 }
             }
             await this.#pendingTxSize.set(pendingTxSize);
-        }).then(async ()=>{
-            const numInvalidTxsEvicted = await this.evictInvalidTxsAfterReorg(txHashes);
-            const { numLowPriorityTxsEvicted, numNewTxsEvicted } = await this.evictLowPriorityTxs(txHashes);
-            this.#metrics.recordAddedObjects(markedAsPending - numNewTxsEvicted, 'pending');
-            this.#metrics.recordRemovedObjects(numInvalidTxsEvicted + numLowPriorityTxsEvicted - numNewTxsEvicted, 'pending');
-            this.#metrics.recordRemovedObjects(markedAsPending, 'mined');
         });
+        const numInvalidTxsEvicted = await this.evictInvalidTxsAfterReorg(txHashes);
+        const { numLowPriorityTxsEvicted, numNewTxsEvicted } = await this.evictLowPriorityTxs(txHashes);
+        await this.increasePendingTxCount(markedAsPending);
+        this.#metrics.recordAddedObjects(markedAsPending - numNewTxsEvicted, 'pending');
+        this.#metrics.recordRemovedObjects(numInvalidTxsEvicted + numLowPriorityTxsEvicted - numNewTxsEvicted, 'pending');
+        this.#metrics.recordRemovedObjects(markedAsPending, 'mined');
     }
     async getPendingTxHashes() {
         const vals = await toArray(this.#pendingTxPriorityToHash.valuesAsync({
@@ -123,6 +138,9 @@ import { getPendingTxPriority } from './priority.js';
                 blockNumber
             ]);
     }
+    async getPendingTxCount() {
+        return await this.#pendingTxCount.getAsync() ?? 0;
+    }
     async getTxStatus(txHash) {
         const key = txHash.toString();
         const [isMined, isKnown] = await Promise.all([
@@ -187,26 +205,31 @@ import { getPendingTxPriority } from './priority.js';
                 txStats: await tx.getStats()
             })));
         await this.#store.transactionAsync(async ()=>{
-            let pendingCount = 0;
+            let addedCount = 0;
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             await Promise.all(txs.map(async (tx, i)=>{
                 const { txHash, txStats } = hashesAndStats[i];
+                const key = txHash.toString();
+                if (await this.#txs.hasAsync(key)) {
+                    this.#log.debug(`Tx ${txHash.toString()} already exists in the pool`);
+                    return;
+                }
                 this.#log.verbose(`Adding tx ${txHash.toString()} to pool`, {
                     eventName: 'tx-added-to-pool',
                     ...txStats
                 });
-                const key = txHash.toString();
                 await this.#txs.set(key, tx.toBuffer());
                 if (!await this.#minedTxHashToBlock.hasAsync(key)) {
-                    pendingCount++;
+                    addedCount++;
                     pendingTxSize += tx.getSize();
                     await this.addPendingTxIndices(tx, key);
                     this.#metrics.recordSize(tx);
                 }
             }));
+            await this.increasePendingTxCount(addedCount);
             await this.#pendingTxSize.set(pendingTxSize);
             const { numLowPriorityTxsEvicted, numNewTxsEvicted } = await this.evictLowPriorityTxs(hashesAndStats.map(({ txHash })=>txHash));
-            this.#metrics.recordAddedObjects(pendingCount - numNewTxsEvicted, 'pending');
+            this.#metrics.recordAddedObjects(addedCount - numNewTxsEvicted, 'pending');
             this.#metrics.recordRemovedObjects(numLowPriorityTxsEvicted - numNewTxsEvicted, 'pending');
         });
     }
@@ -240,6 +263,7 @@ import { getPendingTxPriority } from './priority.js';
                 }
             }
             await this.#pendingTxSize.set(pendingTxSize);
+            await this.increasePendingTxCount(-pendingDeleted);
             this.#metrics.recordRemovedObjects(pendingDeleted, 'pending');
             this.#metrics.recordRemovedObjects(minedDeleted, 'mined');
         });
@@ -267,6 +291,10 @@ import { getPendingTxPriority } from './priority.js';
         this.#maxTxPoolSize = maxSizeBytes;
         return Promise.resolve();
     }
+    markTxsAsNonEvictable(txHashes) {
+        txHashes.forEach((txHash)=>this.#nonEvictableTxs.add(txHash.toString()));
+        return Promise.resolve();
+    }
     /**
    * Creates a GasTxValidator instance.
    * @param db - DB for the validator to use
@@ -355,6 +383,9 @@ import { getPendingTxPriority } from './priority.js';
         let pendingTxsSize = await this.#pendingTxSize.getAsync() ?? 0;
         if (pendingTxsSize > this.#maxTxPoolSize) {
             for await (const txHash of this.#pendingTxPriorityToHash.valuesAsync()){
+                if (this.#nonEvictableTxs.has(txHash.toString())) {
+                    continue;
+                }
                 this.#log.verbose(`Evicting tx ${txHash} from pool due to low priority to satisfy max tx size limit`);
                 txsToEvict.push(TxHash.fromString(txHash));
                 const txSize = await this.#pendingTxHashToSize.getAsync(txHash.toString()) ?? (await this.getPendingTxByHash(txHash))?.getSize();
@@ -473,4 +504,9 @@ import { getPendingTxPriority } from './priority.js';
         await this.#pendingTxHashToHeaderHash.delete(txHash);
         this.#pendingTxs.delete(txHash);
     }
+    async increasePendingTxCount(count) {
+        const pendingTxCount = await this.#pendingTxCount.getAsync() ?? 0;
+        this.#log.debug(`Increasing pending tx count: current ${pendingTxCount} + count ${count} = ${pendingTxCount + count}`);
+        await this.#pendingTxCount.set(pendingTxCount + count);
+    }
 }

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

@@ -18,10 +18,12 @@ export declare class InMemoryTxPool implements TxPool {
      * @param log - A logger.
      */
     constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    isEmpty(): Promise<boolean>;
     markAsMined(txHashes: TxHash[], blockNumber: number): Promise<void>;
     markMinedAsPending(txHashes: TxHash[]): Promise<void>;
     getPendingTxHashes(): Promise<TxHash[]>;
     getMinedTxHashes(): Promise<[TxHash, number][]>;
+    getPendingTxCount(): Promise<number>;
     getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
     /**
      * Checks if a transaction exists in the pool and returns it.
@@ -55,5 +57,6 @@ export declare class InMemoryTxPool implements TxPool {
      */
     getAllTxHashes(): Promise<TxHash[]>;
     setMaxTxPoolSize(_maxSizeBytes: number | undefined): Promise<void>;
+    markTxsAsNonEvictable(_: TxHash[]): Promise<void>;
 }
 //# sourceMappingURL=memory_tx_pool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAcoB,OAAO,CAAC,GAAG;IAb1E;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;gBACS,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAA8B;IAOjG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7C,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAM/C,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAW5E;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAK3D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IAG7D,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIvC,mBAAmB,IAAI,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAIrD;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD;;;OAGG;IACI,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIjC;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI1C,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAGnE"}
+{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAgBzC,OAAO,CAAC,GAAG;IAfb;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;gBAED,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAA8B;IAQpC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7C,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAM/C,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAW5E;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAK3D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IAG7D,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIvC,mBAAmB,IAAI,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAIrD;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD;;;OAGG;IACI,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIjC;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI1C,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlE,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAGlD"}

package/dest/mem_pools/tx_pool/memory_tx_pool.js

@@ -23,6 +23,9 @@ import { getPendingTxPriority } from './priority.js';
         this.pendingTxs = new Set();
         this.metrics = new PoolInstrumentation(telemetry, PoolName.TX_POOL);
     }
+    isEmpty() {
+        return Promise.resolve(this.txs.size === 0);
+    }
     markAsMined(txHashes, blockNumber) {
         const keys = txHashes.map((x)=>x.toBigInt());
         for (const key of keys){
@@ -65,6 +68,9 @@ import { getPendingTxPriority } from './priority.js';
                 blockNumber
             ]));
     }
+    getPendingTxCount() {
+        return Promise.resolve(this.pendingTxs.size);
+    }
     getTxStatus(txHash) {
         const key = txHash.toBigInt();
         if (this.pendingTxs.has(key)) {
@@ -147,4 +153,7 @@ import { getPendingTxPriority } from './priority.js';
     setMaxTxPoolSize(_maxSizeBytes) {
         return Promise.resolve();
     }
+    markTxsAsNonEvictable(_) {
+        return Promise.resolve();
+    }
 }

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

@@ -63,6 +63,8 @@ export interface TxPool {
      * @returns An array of pending transaction hashes found in the tx pool.
      */
     getPendingTxHashes(): Promise<TxHash[]>;
+    /** Returns the number of pending txs in the pool. */
+    getPendingTxCount(): Promise<number>;
     /**
      * Gets the hashes of mined transactions currently in the tx pool.
      * @returns An array of mined transaction hashes found in the tx pool.
@@ -79,5 +81,12 @@ export interface TxPool {
      * @param maxSizeBytes - The maximum size in bytes of the mempool. Set to undefined to disable it
      */
     setMaxTxPoolSize(maxSizeBytes: number | undefined): Promise<void>;
+    /** Returns whether the pool is empty. */
+    isEmpty(): Promise<boolean>;
+    /**
+     * Marks transactions as non-evictible in the pool.
+     * @param txHashes - Hashes of the transactions to mark as non-evictible.
+     */
+    markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
 }
 //# sourceMappingURL=tx_pool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjC;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAErD;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;IAE9D;;;;OAIG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE/C;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAE7D;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;OAIG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;OAGG;IACH,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3B;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEpC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAExC;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAEtE;;;OAGG;IACH,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE"}
+{"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjC;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAErD;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;IAE9D;;;;OAIG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE/C;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAE7D;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;OAIG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;OAGG;IACH,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3B;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEpC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAExC,qDAAqD;IACrD,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAEtE;;;OAGG;IACH,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElE,yCAAyC;IACzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE5B;;;OAGG;IACH,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D"}

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

@@ -1 +1 @@
-{"version":3,"file":"tx_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool_test_suite.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,MAAM,QAiKrD"}
+{"version":3,"file":"tx_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool_test_suite.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,MAAM,QAuKrD"}

package/dest/mem_pools/tx_pool/tx_pool_test_suite.js

@@ -20,6 +20,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         await expect(pool.getPendingTxHashes()).resolves.toEqual([
             await tx1.getTxHash()
         ]);
+        await expect(pool.getPendingTxCount()).resolves.toEqual(1);
     });
     it('Removes txs from the pool', async ()=>{
         const tx1 = await mockTx();
@@ -31,6 +32,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         ]);
         await expect(pool.getTxByHash(await tx1.getTxHash())).resolves.toBeFalsy();
         await expect(pool.getTxStatus(await tx1.getTxHash())).resolves.toBeUndefined();
+        await expect(pool.getPendingTxCount()).resolves.toEqual(0);
     });
     it('Marks txs as mined', async ()=>{
         const tx1 = await mockTx(1);
@@ -53,6 +55,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         await expect(pool.getPendingTxHashes()).resolves.toEqual([
             await tx2.getTxHash()
         ]);
+        await expect(pool.getPendingTxCount()).resolves.toEqual(1);
     });
     it('Marks txs as pending after being mined', async ()=>{
         const tx1 = await mockTx(1);
@@ -74,6 +77,7 @@ import { mockTx } from '@aztec/stdlib/testing';
             await tx1.getTxHash(),
             await tx2.getTxHash()
         ]));
+        await expect(pool.getPendingTxCount()).resolves.toEqual(2);
     });
     it('Only marks txs as pending if they are known', async ()=>{
         const tx1 = await mockTx(1);
@@ -107,6 +111,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         await expect(pool.getPendingTxHashes()).resolves.toEqual([
             await tx1.getTxHash()
         ]); // tx2 is not in the pool
+        await expect(pool.getPendingTxCount()).resolves.toEqual(1);
     });
     it('Returns all transactions in the pool', async ()=>{
         const tx1 = await mockTx(1);
@@ -124,6 +129,7 @@ import { mockTx } from '@aztec/stdlib/testing';
             tx2,
             tx3
         ]));
+        await expect(pool.getPendingTxCount()).resolves.toEqual(3);
     });
     it('Returns all txHashes in the pool', async ()=>{
         const tx1 = await mockTx(1);
@@ -135,12 +141,14 @@ import { mockTx } from '@aztec/stdlib/testing';
             tx3
         ]);
         const poolTxHashes = await pool.getAllTxHashes();
+        const expectedHashes = await Promise.all([
+            tx1,
+            tx2,
+            tx3
+        ].map((tx)=>tx.getTxHash()));
         expect(poolTxHashes).toHaveLength(3);
-        expect(poolTxHashes).toEqual(expect.arrayContaining([
-            await tx1.getTxHash(),
-            await tx2.getTxHash(),
-            await tx3.getTxHash()
-        ]));
+        expect(poolTxHashes).toEqual(expect.arrayContaining(expectedHashes));
+        await expect(pool.getPendingTxCount()).resolves.toEqual(3);
     });
     it('Returns txs by their hash', async ()=>{
         const tx1 = await mockTx(1);

package/dest/msg_validators/attestation_validator/attestation_validator.js

@@ -6,7 +6,7 @@ export class AttestationValidator {
     }
     async validate(message) {
         const { currentSlot, nextSlot } = await this.epochCache.getProposerInCurrentOrNextSlot();
-        const slotNumberBigInt = message.payload.header.globalVariables.slotNumber.toBigInt();
+        const slotNumberBigInt = message.payload.header.slotNumber.toBigInt();
         if (slotNumberBigInt !== currentSlot && slotNumberBigInt !== nextSlot) {
             return PeerErrorSeverity.HighToleranceError;
         }

package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js

@@ -10,7 +10,7 @@ export class BlockProposalValidator {
     async validate(block) {
         const { currentProposer, nextProposer, currentSlot, nextSlot } = await this.epochCache.getProposerInCurrentOrNextSlot();
         // Check that the attestation is for the current or next slot
-        const slotNumberBigInt = block.payload.header.globalVariables.slotNumber.toBigInt();
+        const slotNumberBigInt = block.payload.header.slotNumber.toBigInt();
         if (slotNumberBigInt !== currentSlot && slotNumberBigInt !== nextSlot) {
             this.logger.debug(`Penalizing peer for invalid slot number ${slotNumberBigInt}, current slot: ${currentSlot}, next slot: ${nextSlot}`);
             return PeerErrorSeverity.HighToleranceError;