@aztec/p2p 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/services/data_store.js

@@ -1,33 +1,35 @@
-var _AztecDatastore_memoryDatastore, _AztecDatastore_dbDatastore, _AztecDatastore_batchOps;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { filter, map, sort, take } from '@aztec/foundation/iterable';
 import { Key } from 'interface-datastore';
 class KeyNotFoundError extends Error {
-    constructor(message) {
+    code;
+    constructor(message){
         super(message);
         this.code = 'ERR_NOT_FOUND';
     }
 }
 export class AztecDatastore {
-    constructor(db, { maxMemoryItems } = { maxMemoryItems: 50 }) {
-        _AztecDatastore_memoryDatastore.set(this, void 0);
-        _AztecDatastore_dbDatastore.set(this, void 0);
-        _AztecDatastore_batchOps.set(this, []);
-        __classPrivateFieldSet(this, _AztecDatastore_memoryDatastore, new Map(), "f");
-        __classPrivateFieldSet(this, _AztecDatastore_dbDatastore, db.openMap('p2p_datastore'), "f");
+    #memoryDatastore;
+    #dbDatastore;
+    #batchOps = [];
+    maxMemoryItems;
+    constructor(db, { maxMemoryItems } = {
+        maxMemoryItems: 50
+    }){
+        this.#memoryDatastore = new Map();
+        this.#dbDatastore = db.openMap('p2p_datastore');
         this.maxMemoryItems = maxMemoryItems;
     }
     async has(key) {
-        return __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").has(key.toString()) || (await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").hasAsync(key.toString()));
+        return this.#memoryDatastore.has(key.toString()) || await this.#dbDatastore.hasAsync(key.toString());
     }
     async get(key) {
         const keyStr = key.toString();
-        const memoryItem = __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").get(keyStr);
+        const memoryItem = this.#memoryDatastore.get(keyStr);
         if (memoryItem) {
             memoryItem.lastAccessedMs = Date.now();
             return memoryItem.data;
         }
-        const dbItem = await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").getAsync(keyStr);
+        const dbItem = await this.#dbDatastore.getAsync(keyStr);
         if (!dbItem) {
             throw new KeyNotFoundError(`Key not found`);
         }
@@ -37,72 +39,71 @@ export class AztecDatastore {
         return this._put(key, val);
     }
     async *putMany(source) {
-        for await (const { key, value } of source) {
+        for await (const { key, value } of source){
             await this.put(key, value);
             yield key;
         }
     }
     async *getMany(source) {
-        for await (const key of source) {
+        for await (const key of source){
             yield {
                 key,
-                value: await this.get(key),
+                value: await this.get(key)
             };
         }
     }
     async *deleteMany(source) {
-        for await (const key of source) {
+        for await (const key of source){
             await this.delete(key);
             yield key;
         }
     }
     async delete(key) {
-        __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").delete(key.toString());
-        await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").delete(key.toString());
+        this.#memoryDatastore.delete(key.toString());
+        await this.#dbDatastore.delete(key.toString());
     }
     batch() {
         return {
-            put: (key, value) => {
-                __classPrivateFieldGet(this, _AztecDatastore_batchOps, "f").push({
+            put: (key, value)=>{
+                this.#batchOps.push({
                     type: 'put',
                     key,
-                    value,
+                    value
                 });
             },
-            delete: key => {
-                __classPrivateFieldGet(this, _AztecDatastore_batchOps, "f").push({
+            delete: (key)=>{
+                this.#batchOps.push({
                     type: 'del',
-                    key,
+                    key
                 });
             },
-            commit: async () => {
-                for (const op of __classPrivateFieldGet(this, _AztecDatastore_batchOps, "f")) {
+            commit: async ()=>{
+                for (const op of this.#batchOps){
                     if (op.type === 'put' && op.value) {
                         await this.put(op.key, op.value);
-                    }
-                    else if (op.type === 'del') {
+                    } else if (op.type === 'del') {
                         await this.delete(op.key);
                     }
                 }
-                __classPrivateFieldSet(this, _AztecDatastore_batchOps, [], "f"); // Clear operations after commit
-            },
+                this.#batchOps = []; // Clear operations after commit
+            }
         };
     }
     query(q) {
         let it = this.all(); //
         const { prefix, filters, orders, offset, limit } = q;
         if (prefix != null) {
-            it = filter(it, e => e.key.toString().startsWith(`${prefix}`));
+            it = filter(it, (e)=>e.key.toString().startsWith(`${prefix}`));
         }
         if (Array.isArray(filters)) {
-            it = filters.reduce((it, f) => filter(it, f), it);
+            it = filters.reduce((it, f)=>filter(it, f), it);
         }
         if (Array.isArray(orders)) {
-            it = orders.reduce((it, f) => sort(it, f), it);
+            it = orders.reduce((it, f)=>sort(it, f), it);
         }
         if (offset != null) {
             let i = 0;
-            it = filter(it, () => i++ >= offset);
+            it = filter(it, ()=>i++ >= offset);
         }
         if (limit != null) {
             it = take(it, limit);
@@ -110,20 +111,20 @@ export class AztecDatastore {
         return it;
     }
     queryKeys(q) {
-        let it = map(this.all(), ({ key }) => key);
+        let it = map(this.all(), ({ key })=>key);
         const { prefix, filters, orders, offset, limit } = q;
         if (prefix != null) {
-            it = filter(it, e => e.toString().startsWith(`${prefix}`));
+            it = filter(it, (e)=>e.toString().startsWith(`${prefix}`));
         }
         if (Array.isArray(filters)) {
-            it = filters.reduce((it, f) => filter(it, f), it);
+            it = filters.reduce((it, f)=>filter(it, f), it);
         }
         if (Array.isArray(orders)) {
-            it = orders.reduce((it, f) => sort(it, f), it);
+            it = orders.reduce((it, f)=>sort(it, f), it);
         }
         if (offset != null) {
             let i = 0;
-            it = filter(it, () => i++ >= offset);
+            it = filter(it, ()=>i++ >= offset);
         }
         if (limit != null) {
             it = take(it, limit);
@@ -132,47 +133,48 @@ export class AztecDatastore {
     }
     async _put(key, val) {
         const keyStr = key.toString();
-        while (__classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").size >= this.maxMemoryItems) {
+        while(this.#memoryDatastore.size >= this.maxMemoryItems){
             this.pruneMemoryDatastore();
         }
-        const memoryItem = __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").get(keyStr);
+        const memoryItem = this.#memoryDatastore.get(keyStr);
         if (memoryItem) {
             // update existing
             memoryItem.lastAccessedMs = Date.now();
             memoryItem.data = val;
-        }
-        else {
+        } else {
             // new entry
-            __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").set(keyStr, { data: val, lastAccessedMs: Date.now() });
+            this.#memoryDatastore.set(keyStr, {
+                data: val,
+                lastAccessedMs: Date.now()
+            });
         }
         // Always add to DB
-        await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").set(keyStr, val);
+        await this.#dbDatastore.set(keyStr, val);
         return key;
     }
     async *all() {
-        for (const [key, value] of __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").entries()) {
+        for (const [key, value] of this.#memoryDatastore.entries()){
             yield {
                 key: new Key(key),
-                value: value.data,
+                value: value.data
             };
         }
-        for await (const [key, value] of __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").entriesAsync()) {
-            if (!__classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").has(key)) {
+        for await (const [key, value] of this.#dbDatastore.entriesAsync()){
+            if (!this.#memoryDatastore.has(key)) {
                 yield {
                     key: new Key(key),
-                    value,
+                    value
                 };
             }
         }
     }
     /**
-     * Prune memory store
-     */
-    pruneMemoryDatastore() {
+   * Prune memory store
+   */ pruneMemoryDatastore() {
         let oldestAccessedMs = Date.now() + 1000;
         let oldestKey = undefined;
         let oldestValue = undefined;
-        for (const [key, value] of __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f")) {
+        for (const [key, value] of this.#memoryDatastore){
             if (value.lastAccessedMs < oldestAccessedMs) {
                 oldestAccessedMs = value.lastAccessedMs;
                 oldestKey = key;
@@ -180,9 +182,7 @@ export class AztecDatastore {
             }
         }
         if (oldestKey && oldestValue) {
-            __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").delete(oldestKey);
+            this.#memoryDatastore.delete(oldestKey);
         }
     }
 }
-_AztecDatastore_memoryDatastore = new WeakMap(), _AztecDatastore_dbDatastore = new WeakMap(), _AztecDatastore_batchOps = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data_store.js","sourceRoot":"","sources":["../../src/services/data_store.ts"],"names":[],"mappings":"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"}

package/dest/services/discv5/discV5_service.d.ts

@@ -23,6 +23,7 @@ export declare class DiscV5Service extends EventEmitter implements PeerDiscovery
     private currentState;
     readonly bootstrapNodes: string[];
     private bootstrapNodePeerIds;
+    private bootstrapNodeEnrs;
     private startTime;
     constructor(peerId: PeerId, config: P2PConfig, telemetry?: TelemetryClient, logger?: import("@aztec/foundation/log").Logger);
     start(): Promise<void>;
@@ -34,6 +35,7 @@ export declare class DiscV5Service extends EventEmitter implements PeerDiscovery
     isBootstrapPeer(peerId: PeerId): boolean;
     stop(): Promise<void>;
     private onEnrAdded;
+    private isOurBootnode;
     private onDiscovered;
     private validateEnr;
 }

package/dest/services/discv5/discV5_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discV5_service.d.ts","sourceRoot":"","sources":["../../../src/services/discv5/discV5_service.ts"],"names":[],"mappings":";AAGA,OAAO,EAAsB,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGvG,OAAO,EAAE,GAAG,EAAe,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAE,KAAK,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAK9E;;GAEG;AACH,qBAAa,aAAc,SAAQ,YAAa,YAAW,oBAAoB;IAqB3E,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,MAAM;IAvBhB,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAA8B;IAE5C,0BAA0B;IAC1B,OAAO,CAAC,GAAG,CAAc;IAEzB,2BAA2B;IAC3B,OAAO,CAAC,QAAQ,CAAqB;IAErC,sBAAsB;IACtB,OAAO,CAAC,kBAAkB,CAAY;IAEtC,OAAO,CAAC,YAAY,CAA8B;IAElD,SAAgB,cAAc,EAAE,MAAM,EAAE,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAAgB;IAE5C,OAAO,CAAC,SAAS,CAAK;gBAGZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACzB,SAAS,GAAE,eAAsC,EACzC,MAAM,yCAAqC;IAyDxC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCtB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB1C,WAAW,IAAI,GAAG,EAAE;IAIpB,MAAM,IAAI,GAAG;IAIb,SAAS,IAAI,MAAM;IAInB,SAAS,IAAI,kBAAkB;IAI/B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIlC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YASpB,UAAU;IAOxB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,WAAW;CA0BpB"}
+{"version":3,"file":"discV5_service.d.ts","sourceRoot":"","sources":["../../../src/services/discv5/discV5_service.ts"],"names":[],"mappings":";AAGA,OAAO,EAAsB,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGvG,OAAO,EAAE,GAAG,EAAe,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,EAAE,KAAK,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAI9E;;GAEG;AACH,qBAAa,aAAc,SAAQ,YAAa,YAAW,oBAAoB;IAsB3E,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,MAAM;IAxBhB,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAA8B;IAE5C,0BAA0B;IAC1B,OAAO,CAAC,GAAG,CAAc;IAEzB,2BAA2B;IAC3B,OAAO,CAAC,QAAQ,CAAqB;IAErC,sBAAsB;IACtB,OAAO,CAAC,kBAAkB,CAAY;IAEtC,OAAO,CAAC,YAAY,CAA8B;IAElD,SAAgB,cAAc,EAAE,MAAM,EAAE,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,iBAAiB,CAAa;IAEtC,OAAO,CAAC,SAAS,CAAK;gBAGZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACzB,SAAS,GAAE,eAAsC,EACzC,MAAM,yCAAqC;IA+DxC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuCtB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB1C,WAAW,IAAI,GAAG,EAAE;IAIpB,MAAM,IAAI,GAAG;IAIb,SAAS,IAAI,MAAM;IAInB,SAAS,IAAI,kBAAkB;IAI/B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIlC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YASpB,UAAU;IAOxB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,WAAW;CA0BpB"}

package/dest/services/discv5/discV5_service.js

@@ -1,31 +1,36 @@
-import { checkCompressedComponentVersion } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
+import { checkCompressedComponentVersion } from '@aztec/stdlib/versioning';
 import { OtelMetricsAdapter, getTelemetryClient } from '@aztec/telemetry-client';
 import { Discv5 } from '@chainsafe/discv5';
 import { ENR, SignableENR } from '@chainsafe/enr';
 import { multiaddr } from '@multiformats/multiaddr';
 import EventEmitter from 'events';
+import { AZTEC_ENR_KEY, Discv5Event, PeerEvent } from '../../types/index.js';
 import { convertToMultiaddr } from '../../util.js';
 import { setAztecEnrKey } from '../../versioning.js';
 import { PeerDiscoveryState } from '../service.js';
-import { AZTEC_ENR_KEY, Discv5Event, PeerEvent } from '../types.js';
 const delayBeforeStart = 2000; // 2sec
 /**
  * Peer discovery service using Discv5.
- */
-export class DiscV5Service extends EventEmitter {
-    constructor(peerId, config, telemetry = getTelemetryClient(), logger = createLogger('p2p:discv5_service')) {
-        super();
-        this.peerId = peerId;
-        this.config = config;
-        this.logger = logger;
-        this.currentState = PeerDiscoveryState.STOPPED;
-        this.bootstrapNodes = [];
-        this.bootstrapNodePeerIds = [];
-        this.startTime = 0;
+ */ export class DiscV5Service extends EventEmitter {
+    peerId;
+    config;
+    logger;
+    /** The Discv5 instance */ discv5;
+    /** This instance's ENR */ enr;
+    /** Version identifiers. */ versions;
+    /** UDP listen addr */ listenMultiAddrUdp;
+    currentState;
+    bootstrapNodes;
+    bootstrapNodePeerIds;
+    bootstrapNodeEnrs;
+    startTime;
+    constructor(peerId, config, telemetry = getTelemetryClient(), logger = createLogger('p2p:discv5_service')){
+        super(), this.peerId = peerId, this.config = config, this.logger = logger, this.currentState = PeerDiscoveryState.STOPPED, this.bootstrapNodes = [], this.bootstrapNodePeerIds = [], this.bootstrapNodeEnrs = [], this.startTime = 0;
         const { tcpAnnounceAddress, udpAnnounceAddress, udpListenAddress, bootstrapNodes } = config;
         this.bootstrapNodes = bootstrapNodes ?? [];
+        this.bootstrapNodeEnrs = this.bootstrapNodes.map((x)=>ENR.decodeTxt(x));
         // create ENR from PeerId
         this.enr = SignableENR.createFromPeerId(peerId);
         // Add aztec identification to ENR
@@ -44,13 +49,15 @@ export class DiscV5Service extends EventEmitter {
         this.discv5 = Discv5.create({
             enr: this.enr,
             peerId,
-            bindAddrs: { ip4: this.listenMultiAddrUdp },
+            bindAddrs: {
+                ip4: this.listenMultiAddrUdp
+            },
             config: {
                 lookupTimeout: 2000,
                 requestTimeout: 2000,
-                allowUnverifiedSessions: true,
+                allowUnverifiedSessions: true
             },
-            metricsRegistry,
+            metricsRegistry
         });
         // Hook onto the onEstablished method to check the peer's version from the ENR,
         // so we don't add it to our dht if it doesn't have the correct version.
@@ -59,8 +66,13 @@ export class DiscV5Service extends EventEmitter {
         // being "readded" constantly, we'll need to keep an eye on whether this
         // turns out to be a problem or not.
         const origOnEstablished = this.discv5.onEstablished.bind(this.discv5);
-        this.discv5.onEstablished = (...args) => {
+        this.discv5.onEstablished = (...args)=>{
             const enr = args[1];
+            // A special case is for bootnodes. If this is a bootnode and we have been told to skip version checks
+            // then proceed straight to handling the event
+            if (!this.config.bootstrapNodeEnrVersionCheck && this.isOurBootnode(enr)) {
+                return origOnEstablished(...args);
+            }
             if (this.validateEnr(enr)) {
                 return origOnEstablished(...args);
             }
@@ -80,16 +92,15 @@ export class DiscV5Service extends EventEmitter {
             peerId: this.peerId,
             enrUdp: await this.enr.getFullMultiaddr('udp'),
             enrTcp: await this.enr.getFullMultiaddr('tcp'),
-            versions: this.versions,
+            versions: this.versions
         });
         this.currentState = PeerDiscoveryState.RUNNING;
         // Add bootnode ENR if provided
         if (this.bootstrapNodes?.length) {
             // Do this conversion once since it involves an async function call
-            const bootstrapNodesEnrs = this.bootstrapNodes.map(enr => ENR.decodeTxt(enr));
-            this.bootstrapNodePeerIds = await Promise.all(bootstrapNodesEnrs.map(enr => enr.peerId()));
+            this.bootstrapNodePeerIds = await Promise.all(this.bootstrapNodeEnrs.map((enr)=>enr.peerId()));
             this.logger.info(`Adding ${this.bootstrapNodes} bootstrap nodes ENRs: ${this.bootstrapNodes.join(', ')}`);
-            for (const enr of bootstrapNodesEnrs) {
+            for (const enr of this.bootstrapNodeEnrs){
                 try {
                     if (this.config.bootstrapNodeEnrVersionCheck) {
                         const value = enr.kvs.get(AZTEC_ENR_KEY);
@@ -99,8 +110,7 @@ export class DiscV5Service extends EventEmitter {
                         checkCompressedComponentVersion(Buffer.from(value).toString(), this.versions);
                     }
                     this.discv5.addEnr(enr);
-                }
-                catch (e) {
+                } catch (e) {
                     this.logger.error(`Error adding bootratrap node ${enr.encodeTxt()}`, e);
                 }
             }
@@ -118,8 +128,7 @@ export class DiscV5Service extends EventEmitter {
         }
         try {
             await this.discv5.findRandomNode();
-        }
-        catch (err) {
+        } catch (err) {
             this.logger.error(`Error running discV5 random node query: ${err}`);
         }
     }
@@ -136,7 +145,7 @@ export class DiscV5Service extends EventEmitter {
         return this.currentState;
     }
     isBootstrapPeer(peerId) {
-        return this.bootstrapNodePeerIds.some(node => node.equals(peerId));
+        return this.bootstrapNodePeerIds.some((node)=>node.equals(peerId));
     }
     async stop() {
         await this.discv5.off(Discv5Event.DISCOVERED, this.onDiscovered);
@@ -147,10 +156,32 @@ export class DiscV5Service extends EventEmitter {
     async onEnrAdded(enr) {
         const multiAddrTcp = await enr.getFullMultiaddr('tcp');
         const multiAddrUdp = await enr.getFullMultiaddr('udp');
-        this.logger.debug(`Added ENR ${enr.encodeTxt()}`, { multiAddrTcp, multiAddrUdp, nodeId: enr.nodeId });
+        this.logger.debug(`Added ENR ${enr.encodeTxt()}`, {
+            multiAddrTcp,
+            multiAddrUdp,
+            nodeId: enr.nodeId
+        });
         this.onDiscovered(enr);
     }
+    isOurBootnode(enr) {
+        return this.bootstrapNodeEnrs.some((x)=>x.nodeId === enr.nodeId);
+    }
     onDiscovered(enr) {
+        // Find out if this is one of our bootnodes
+        if (this.isOurBootnode(enr)) {
+            // it is, what we do here depends
+            if (!this.config.bootstrapNodesAsFullPeers) {
+                // we don't consider bootnodes as full peers, don't perform any checks and don't emit anything
+                return;
+            }
+            if (!this.config.bootstrapNodeEnrVersionCheck) {
+                // we do consider bootnodes to be full peers and we have been told to NOT version check them, so emit
+                this.logger.trace(`Skipping version check for bootnode ${enr.nodeId}`);
+                this.emit(PeerEvent.DISCOVERED, enr);
+                return;
+            }
+        // here, we do consider bootnodes as full peers and we must version check so we continue to regular validation
+        }
         if (this.validateEnr(enr)) {
             this.emit(PeerEvent.DISCOVERED, enr);
         }
@@ -159,28 +190,25 @@ export class DiscV5Service extends EventEmitter {
         // Check the peer is an aztec peer
         const value = enr.kvs.get(AZTEC_ENR_KEY);
         if (!value) {
-            this.logger.warn(`Peer ${enr.nodeId} does not have aztec key in ENR`);
+            this.logger.warn(`Peer node ${enr.nodeId} does not have aztec key in ENR`);
             return false;
         }
+        // And check it has the correct version
         let compressedVersion;
         try {
-            // And check it has the correct version
             compressedVersion = Buffer.from(value).toString();
             checkCompressedComponentVersion(compressedVersion, this.versions);
             return true;
-        }
-        catch (err) {
+        } catch (err) {
             if (err.name === 'ComponentsVersionsError') {
-                this.logger.warn(`Peer ${enr.nodeId} has incorrect version: ${err.message}`, {
+                this.logger.warn(`Peer node ${enr.nodeId} has incorrect version: ${err.message}`, {
                     compressedVersion,
-                    expected: this.versions,
+                    expected: this.versions
                 });
-            }
-            else {
+            } else {
                 this.logger.error(`Error checking peer version`, err);
             }
         }
         return false;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"discV5_service.js","sourceRoot":"","sources":["../../../src/services/discv5/discV5_service.ts"],"names":[],"mappings":"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"}

package/dest/services/dummy_service.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { BlockAttestation, BlockProposal, Gossipable, PeerInfo, TxHash } from '@aztec/circuit-types';
+import type { PeerInfo } from '@aztec/stdlib/interfaces/server';
+import type { BlockAttestation, BlockProposal, Gossipable } from '@aztec/stdlib/p2p';
+import { TxHash } from '@aztec/stdlib/tx';
 import type { PeerId } from '@libp2p/interface';
 import EventEmitter from 'events';
-import { type ReqRespSubProtocol, type SubProtocolMap } from './reqresp/interface.js';
+import type { ReqRespSubProtocol, SubProtocolMap } from './reqresp/interface.js';
 import { type P2PService, type PeerDiscoveryService, PeerDiscoveryState } from './service.js';
 /**
  * A dummy implementation of the P2P Service.

package/dest/services/dummy_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dummy_service.d.ts","sourceRoot":"","sources":["../../src/services/dummy_service.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE1G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE9F;;GAEG;AACH,qBAAa,eAAgB,YAAW,UAAU;IAChD,wCAAwC;IACxC,QAAQ,IAAI,QAAQ,EAAE;IAItB;;;OAGG;IACI,KAAK;IAIZ;;;OAGG;IACI,IAAI;IAIX;;;OAGG;IACI,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,EAAE,CAAC;IAE3C;;;OAGG;IACI,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE;IAE7B;;OAEG;IACI,6BAA6B,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC;IAE3F;;;;;OAKG;IACI,WAAW,CAAC,QAAQ,SAAS,kBAAkB,EACpD,SAAS,EAAE,QAAQ,EACnB,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,GAC1D,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC;IAI1E;;;;;OAKG;IACI,gBAAgB,CAAC,QAAQ,SAAS,kBAAkB,EACzD,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAC7D,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IAIhE;;;OAGG;IACI,MAAM,IAAI,SAAS;CAG3B;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,YAAa,YAAW,oBAAoB;IACzF,OAAO,CAAC,YAAY,CAA8B;IAC3C,cAAc,EAAE,MAAM,EAAE,CAAM;IAErC;;;OAGG;IACI,KAAK;IAIZ;;;OAGG;IACI,IAAI;IAIX;;;OAGG;IACI,WAAW;IAIX,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAInC,SAAS,IAAI,kBAAkB;IAI/B,MAAM,IAAI,SAAS;CAG3B"}
+{"version":3,"file":"dummy_service.d.ts","sourceRoot":"","sources":["../../src/services/dummy_service.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE9F;;GAEG;AACH,qBAAa,eAAgB,YAAW,UAAU;IAChD,wCAAwC;IACxC,QAAQ,IAAI,QAAQ,EAAE;IAItB;;;OAGG;IACI,KAAK;IAIZ;;;OAGG;IACI,IAAI;IAIX;;;OAGG;IACI,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,EAAE,CAAC;IAE3C;;;OAGG;IACI,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE;IAE7B;;OAEG;IACI,6BAA6B,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC;IAE3F;;;;;OAKG;IACI,WAAW,CAAC,QAAQ,SAAS,kBAAkB,EACpD,SAAS,EAAE,QAAQ,EACnB,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,GAC1D,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC;IAI1E;;;;;OAKG;IACI,gBAAgB,CAAC,QAAQ,SAAS,kBAAkB,EACzD,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAC7D,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IAIhE;;;OAGG;IACI,MAAM,IAAI,SAAS;CAG3B;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,YAAa,YAAW,oBAAoB;IACzF,OAAO,CAAC,YAAY,CAA8B;IAC3C,cAAc,EAAE,MAAM,EAAE,CAAM;IAErC;;;OAGG;IACI,KAAK;IAIZ;;;OAGG;IACI,IAAI;IAIX;;;OAGG;IACI,WAAW;IAIX,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAInC,SAAS,IAAI,kBAAkB;IAI/B,MAAM,IAAI,SAAS;CAG3B"}