@aztec/p2p 0.80.0 → 0.82.0

package/dest/services/libp2p/libp2p_service.js

@@ -89,10 +89,8 @@ import { ReqResp } from '../reqresp/reqresp.js';
    * @param txPool - The transaction pool to be accessed by the service.
    * @returns The new service.
    */ static async new(clientType, config, peerDiscoveryService, peerId, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, store, telemetry, logger = createLogger('p2p:libp2p_service')) {
-        const { tcpListenAddress, tcpAnnounceAddress, maxPeerCount } = config;
-        const bindAddrTcp = convertToMultiaddr(tcpListenAddress, 'tcp');
-        // We know tcpAnnounceAddress cannot be null here because we set it or throw when setting up the service.
-        const announceAddrTcp = convertToMultiaddr(tcpAnnounceAddress, 'tcp');
+        const { p2pPort, maxPeerCount, listenAddress } = config;
+        const bindAddrTcp = convertToMultiaddr(listenAddress, p2pPort, 'tcp');
         const datastore = new AztecDatastore(store);
         const otelMetricsAdapter = new OtelMetricsAdapter(telemetry);
         const bootstrapNodes = peerDiscoveryService.bootstrapNodes;
@@ -112,9 +110,7 @@ import { ReqResp } from '../reqresp/reqresp.js';
                 listen: [
                     bindAddrTcp
                 ],
-                announce: [
-                    announceAddrTcp
-                ]
+                announce: []
             },
             transports: [
                 tcp({
@@ -208,11 +204,11 @@ import { ReqResp } from '../reqresp/reqresp.js';
             throw new Error('P2P service already started');
         }
         // Get listen & announce addresses for logging
-        const { tcpListenAddress, tcpAnnounceAddress } = this.config;
-        if (!tcpAnnounceAddress) {
+        const { p2pIp, p2pPort } = this.config;
+        if (!p2pIp) {
             throw new Error('Announce address not provided.');
         }
-        const announceTcpMultiaddr = convertToMultiaddr(tcpAnnounceAddress, 'tcp');
+        const announceTcpMultiaddr = convertToMultiaddr(p2pIp, p2pPort, 'tcp');
         // Start job queue, peer discovery service and libp2p node
         this.jobQueue.start();
         await this.peerManager.initializeTrustedPeers();
@@ -246,7 +242,8 @@ import { ReqResp } from '../reqresp/reqresp.js';
         };
         await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
         this.logger.info(`Started P2P service`, {
-            listen: tcpListenAddress,
+            listen: this.config.listenAddress,
+            port: this.config.p2pPort,
             announce: announceTcpMultiaddr,
             peerId: this.node.peerId.toString()
         });

package/dest/test-helpers/make-enrs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-enrs.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-enrs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAQxD;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,qBAM5F;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,mBAerF"}
+{"version":3,"file":"make-enrs.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-enrs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAQxD;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,qBAM5F;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,mBAcrF"}

package/dest/test-helpers/make-enrs.js

@@ -20,10 +20,9 @@ import { setAztecEnrKey } from '../versioning.js';
  */ export async function makeEnr(p2pPrivateKey, port, config) {
     const peerId = await createLibP2PPeerIdFromPrivateKey(p2pPrivateKey);
     const enr = SignableENR.createFromPeerId(peerId);
-    const udpAnnounceAddress = `127.0.0.1:${port}`;
-    const tcpAnnounceAddress = `127.0.0.1:${port}`;
-    const udpPublicAddr = multiaddr(convertToMultiaddr(udpAnnounceAddress, 'udp'));
-    const tcpPublicAddr = multiaddr(convertToMultiaddr(tcpAnnounceAddress, 'tcp'));
+    const p2pIp = `127.0.0.1`;
+    const udpPublicAddr = multiaddr(convertToMultiaddr(p2pIp, port, 'udp'));
+    const tcpPublicAddr = multiaddr(convertToMultiaddr(p2pIp, port, 'tcp'));
     // ENRS must include the network and a discoverable address (udp for discv5)
     setAztecEnrKey(enr, config);
     enr.setLocationMultiaddr(udpPublicAddr);

package/dest/test-helpers/make-test-p2p-clients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-test-p2p-clients.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-test-p2p-clients.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAM5D,UAAU,wBAAwB;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,cAAc,EAAE,sBAAsB,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE,EACf,EACE,kBAAyB,EACzB,aAAa,EACb,kBAAuB,EACvB,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,cAAc,EACd,MAAwC,GACzC,EAAE,wBAAwB,0CA8C5B;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,4CAiBnG"}
+{"version":3,"file":"make-test-p2p-clients.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-test-p2p-clients.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAM5D,UAAU,wBAAwB;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,cAAc,EAAE,sBAAsB,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE,EACf,EACE,kBAAyB,EACzB,aAAa,EACb,kBAAuB,EACvB,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,cAAc,EACd,MAAwC,GACzC,EAAE,wBAAwB,0CAyC5B;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,4CAiBnG"}

package/dest/test-helpers/make-test-p2p-clients.js

@@ -15,17 +15,13 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
  * @param options - The options for the client.
  * @returns The created client.
  */ export async function makeTestP2PClient(peerIdPrivateKey, port, peers, { alwaysTrueVerifier = true, p2pBaseConfig, p2pConfigOverrides = {}, mockAttestationPool, mockTxPool, mockEpochCache, mockWorldState, logger = createLogger('p2p-test-client') }) {
-    const addr = `127.0.0.1:${port}`;
-    const listenAddr = `0.0.0.0:${port}`;
     // Filter nodes so that we only dial active peers
     const config = {
         ...p2pBaseConfig,
         p2pEnabled: true,
         peerIdPrivateKey,
-        tcpListenAddress: listenAddr,
-        udpListenAddress: listenAddr,
-        tcpAnnounceAddress: addr,
-        udpAnnounceAddress: addr,
+        p2pIp: `127.0.0.1`,
+        p2pPort: port,
         bootstrapNodes: peers,
         peerCheckIntervalMS: 1000,
         maxPeerCount: 10,

package/dest/test-helpers/reqresp-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reqresp-nodes.d.ts","sourceRoot":"","sources":["../../src/test-helpers/reqresp-nodes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reqresp-nodes.d.ts","sourceRoot":"","sources":["../../src/test-helpers/reqresp-nodes.ts"],"names":[],"mappings":"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"}

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

@@ -76,10 +76,8 @@ import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js
  */ export async function createTestLibP2PService(clientType, boostrapAddrs = [], l2BlockSource, worldStateSynchronizer, epochCache, mempools, telemetry, port = 0, peerId, chainConfig = emptyChainConfig) {
     peerId = peerId ?? await createSecp256k1PeerId();
     const config = {
-        tcpAnnounceAddress: `127.0.0.1:${port}`,
-        udpAnnounceAddress: `127.0.0.1:${port}`,
-        tcpListenAddress: `0.0.0.0:${port}`,
-        udpListenAddress: `0.0.0.0:${port}`,
+        p2pIp: `127.0.0.1`,
+        p2pPort: port,
         bootstrapNodes: boostrapAddrs,
         peerCheckIntervalMS: 1000,
         maxPeerCount: 5,
@@ -169,12 +167,13 @@ export class AlwaysFalseCircuitVerifier {
 export function createBootstrapNodeConfig(privateKey, port, chainConfig) {
     return {
         l1ChainId: chainConfig.l1ChainId,
-        udpListenAddress: `0.0.0.0:${port}`,
-        udpAnnounceAddress: `127.0.0.1:${port}`,
+        p2pIp: '127.0.0.1',
+        p2pPort: port,
         peerIdPrivateKey: privateKey,
         dataDirectory: undefined,
         dataStoreMapSizeKB: 0,
-        bootstrapNodes: []
+        bootstrapNodes: [],
+        listenAddress: '0.0.0.0'
     };
 }
 export function createBootstrapNodeFromPrivateKey(privateKey, port, telemetry = getTelemetryClient(), chainConfig = emptyChainConfig) {
@@ -189,7 +188,7 @@ export function createBootstrapNodeFromPrivateKey(privateKey, port, telemetry =
  */ export async function getBootstrapNodeEnr(privateKey, port) {
     const peerId = await createLibP2PPeerIdFromPrivateKey(privateKey);
     const enr = SignableENR.createFromPeerId(peerId);
-    const listenAddrUdp = multiaddr(convertToMultiaddr(`127.0.0.1:${port}`, 'udp'));
+    const listenAddrUdp = multiaddr(convertToMultiaddr('127.0.0.1', port, 'udp'));
     enr.setLocationMultiaddr(listenAddrUdp);
     return enr;
 }

package/dest/testbench/worker_client_manager.d.ts

@@ -14,10 +14,6 @@ declare class WorkerClientManager {
     private messageReceivedByClient;
     constructor(logger: Logger, p2pConfig: Partial<P2PConfig>);
     destroy(): void;
-    /**
-     * Creates address strings from a port
-     */
-    private getAddresses;
     /**
      * Creates a client configuration object
      */

package/dest/testbench/worker_client_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker_client_manager.d.ts","sourceRoot":"","sources":["../../src/testbench/worker_client_manager.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,cAAc,CAAC;AAQnE,QAAA,MAAM,eAAe,EAAE,WAMtB,CAAC;AAEF,cAAM,mBAAmB;IAChB,SAAS,EAAE,YAAY,EAAE,CAAM;IAC/B,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,QAAQ,EAAE,MAAM,EAAE,CAAM;IACxB,KAAK,EAAE,MAAM,EAAE,CAAM;IAC5B,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,uBAAuB,CAAgB;gBAEnC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC;IAKzD,OAAO;IAOP;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoD1B;;;;;;OAMG;IACG,iBAAiB,CAAC,eAAe,EAAE,MAAM;IA2C/C,4BAA4B;IAI5B,kCAAkC;IAIlC;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IA4CrD;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAsCxB;;OAEG;IACG,OAAO;CAiCd;AAED,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"worker_client_manager.d.ts","sourceRoot":"","sources":["../../src/testbench/worker_client_manager.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,cAAc,CAAC;AAQnE,QAAA,MAAM,eAAe,EAAE,WAMtB,CAAC;AAEF,cAAM,mBAAmB;IAChB,SAAS,EAAE,YAAY,EAAE,CAAM;IAC/B,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,QAAQ,EAAE,MAAM,EAAE,CAAM;IACxB,KAAK,EAAE,MAAM,EAAE,CAAM;IAC5B,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,uBAAuB,CAAgB;gBAEnC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC;IAKzD,OAAO;IAOP;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAiB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoD1B;;;;;;OAMG;IACG,iBAAiB,CAAC,eAAe,EAAE,MAAM;IA2C/C,4BAA4B;IAI5B,kCAAkC;IAIlC;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IA4CrD;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAsCxB;;OAEG;IACG,OAAO;CAiCd;AAED,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,CAAC"}

package/dest/testbench/worker_client_manager.js

@@ -35,25 +35,15 @@ class WorkerClientManager {
         });
     }
     /**
-   * Creates address strings from a port
-   */ getAddresses(port) {
-        return {
-            addr: `127.0.0.1:${port}`,
-            listenAddr: `0.0.0.0:${port}`
-        };
-    }
-    /**
    * Creates a client configuration object
    */ createClientConfig(clientIndex, port, otherNodes) {
-        const { addr, listenAddr } = this.getAddresses(port);
         return {
             ...getP2PDefaultConfig(),
             p2pEnabled: true,
             peerIdPrivateKey: this.peerIdPrivateKeys[clientIndex],
-            tcpListenAddress: listenAddr,
-            udpListenAddress: listenAddr,
-            tcpAnnounceAddress: addr,
-            udpAnnounceAddress: addr,
+            listenAddress: '127.0.0.1',
+            p2pIp: '127.0.0.1',
+            p2pPort: port,
             bootstrapNodes: [
                 ...otherNodes
             ],

package/dest/types/index.d.ts

@@ -14,7 +14,8 @@ export declare enum PeerEvent {
  */
 export declare enum Discv5Event {
     DISCOVERED = "discovered",
-    ENR_ADDED = "enrAdded"
+    ENR_ADDED = "enrAdded",
+    MULTIADDR_UPDATED = "multiaddrUpdated"
 }
 /**
  * Events emitted from the GossipSub protocol.

package/dest/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA;;qDAEqD;AAErD;;GAEG;AACH,oBAAY,SAAS;IACnB,UAAU,oBAAoB;IAC9B,SAAS,iBAAiB;IAC1B,YAAY,oBAAoB;CACjC;AAED;;GAEG;AACH,oBAAY,WAAW;IACrB,UAAU,eAAe;IACzB,SAAS,aAAa;CACvB;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,OAAO,sBAAsB;CAC9B;AAED;;qDAEqD;AAErD;;GAEG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA;;qDAEqD;AAErD;;GAEG;AACH,oBAAY,SAAS;IACnB,UAAU,oBAAoB;IAC9B,SAAS,iBAAiB;IAC1B,YAAY,oBAAoB;CACjC;AAED;;GAEG;AACH,oBAAY,WAAW;IACrB,UAAU,eAAe;IACzB,SAAS,aAAa;IACtB,iBAAiB,qBAAqB;CACvC;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,OAAO,sBAAsB;CAC9B;AAED;;qDAEqD;AAErD;;GAEG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC"}

package/dest/types/index.js

@@ -13,6 +13,7 @@
  */ export var Discv5Event = /*#__PURE__*/ function(Discv5Event) {
     Discv5Event["DISCOVERED"] = "discovered";
     Discv5Event["ENR_ADDED"] = "enrAdded";
+    Discv5Event["MULTIADDR_UPDATED"] = "multiaddrUpdated";
     return Discv5Event;
 }({});
 /**

package/dest/util.d.ts

@@ -21,17 +21,12 @@ export interface PubSubLibp2p extends Libp2p {
  * @param address - The address string to convert. Has to be in the format <addr>:<port>.
  * @param protocol - The protocol to use in the multiaddr string.
  * @returns A multiaddr compliant string.  */
-export declare function convertToMultiaddr(address: string, protocol: 'tcp' | 'udp'): string;
-/**
- * Splits an <address>:<port> string into its components.
- * @returns The ip6 or ip4 address & port separately
- */
-export declare function splitAddressPort(address: string, allowEmptyAddress: boolean): [string, string];
+export declare function convertToMultiaddr(address: string, port: number, protocol: 'tcp' | 'udp'): string;
 /**
  * Queries the public IP address of the machine.
  */
 export declare function getPublicIp(): Promise<string>;
-export declare function resolveAddressIfNecessary(address: string): Promise<string>;
+export declare function resolveAddressIfNecessary(address: string, port: string): Promise<string>;
 export declare function configureP2PClientAddresses(_config: P2PConfig & DataStoreConfig): Promise<P2PConfig & DataStoreConfig>;
 /**
  * Get the peer id private key

package/dest/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,YAAa,SAAQ,MAAM;IAC1C,QAAQ,EAAE;QACR,MAAM,EAAE,SAAS,CAAC;QAClB,UAAU,EAAE;YACV,iBAAiB,EAAE,iBAAiB,CAAC;SACtC,CAAC;KACH,CAAC;CACH;AAED;;;;;;;6CAO6C;AAC7C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CASnF;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAoB9F;AAED;;GAEG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAInD;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAYhF;AAcD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,SAAS,GAAG,eAAe,GACnC,OAAO,CAAC,SAAS,GAAG,eAAe,CAAC,CA6CtC;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,EACrC,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;GAIG;AACH,wBAAsB,gCAAgC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS1F"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,YAAa,SAAQ,MAAM;IAC1C,QAAQ,EAAE;QACR,MAAM,EAAE,SAAS,CAAC;QAClB,UAAU,EAAE;YACV,iBAAiB,EAAE,iBAAiB,CAAC;SACtC,CAAC;KACH,CAAC;CACH;AAED;;;;;;;6CAO6C;AAC7C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAOjG;AAED;;GAEG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAInD;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9F;AAcD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,SAAS,GAAG,eAAe,GACnC,OAAO,CAAC,SAAS,GAAG,eAAe,CAAC,CActC;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,EACrC,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;GAIG;AACH,wBAAsB,gCAAgC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS1F"}

package/dest/util.js

@@ -8,38 +8,12 @@ import { resolve } from 'dns/promises';
  * const udpAddr = '[2001:db8::1]:8080' -> /ip6/2001:db8::1/udp/8080
  * @param address - The address string to convert. Has to be in the format <addr>:<port>.
  * @param protocol - The protocol to use in the multiaddr string.
- * @returns A multiaddr compliant string.  */ export function convertToMultiaddr(address, protocol) {
-    const [addr, port] = splitAddressPort(address, false);
-    const multiaddrPrefix = addressToMultiAddressType(addr);
+ * @returns A multiaddr compliant string.  */ export function convertToMultiaddr(address, port, protocol) {
+    const multiaddrPrefix = addressToMultiAddressType(address);
     if (multiaddrPrefix === 'dns') {
         throw new Error('Invalid address format. Expected an IPv4 or IPv6 address.');
     }
-    return `/${multiaddrPrefix}/${addr}/${protocol}/${port}`;
-}
-/**
- * Splits an <address>:<port> string into its components.
- * @returns The ip6 or ip4 address & port separately
- */ export function splitAddressPort(address, allowEmptyAddress) {
-    let addr;
-    let port;
-    if (address.startsWith('[')) {
-        // IPv6 address enclosed in square brackets
-        const match = address.match(/^\[([^\]]+)\]:(\d+)$/);
-        if (!match) {
-            throw new Error(`Invalid IPv6 address format:${address}. Expected format: [<addr>]:<port>`);
-        }
-        [, addr, port] = match;
-    } else {
-        // IPv4 address
-        [addr, port] = address.split(':');
-        if (!addr && !allowEmptyAddress || !port) {
-            throw new Error(`Invalid address format: ${address}. Expected format: <addr>:<port>`);
-        }
-    }
-    return [
-        addr,
-        port
-    ];
+    return `/${multiaddrPrefix}/${address}/${protocol}/${port}`;
 }
 /**
  * Queries the public IP address of the machine.
@@ -48,13 +22,12 @@ import { resolve } from 'dns/promises';
     const text = await resp.text();
     return text.trim();
 }
-export async function resolveAddressIfNecessary(address) {
-    const [addr, port] = splitAddressPort(address, false);
-    const multiaddrPrefix = addressToMultiAddressType(addr);
+export async function resolveAddressIfNecessary(address, port) {
+    const multiaddrPrefix = addressToMultiAddressType(address);
     if (multiaddrPrefix === 'dns') {
-        const resolvedAddresses = await resolve(addr);
+        const resolvedAddresses = await resolve(address);
         if (resolvedAddresses.length === 0) {
-            throw new Error(`Could not resolve address: ${addr}`);
+            throw new Error(`Could not resolve address: ${address}`);
         }
         return `${resolvedAddresses[0]}:${port}`;
     } else {
@@ -76,33 +49,15 @@ export async function configureP2PClientAddresses(_config) {
     const config = {
         ..._config
     };
-    const { tcpAnnounceAddress: configTcpAnnounceAddress, udpAnnounceAddress: configUdpAnnounceAddress, queryForIp } = config;
-    config.tcpAnnounceAddress = configTcpAnnounceAddress ? await resolveAddressIfNecessary(configTcpAnnounceAddress) : undefined;
-    config.udpAnnounceAddress = configUdpAnnounceAddress ? await resolveAddressIfNecessary(configUdpAnnounceAddress) : undefined;
-    // create variable for re-use if needed
-    let publicIp;
+    const { p2pIp, queryForIp } = config;
     // check if no announce IP was provided
-    const splitTcpAnnounceAddress = splitAddressPort(configTcpAnnounceAddress || '', true);
-    if (splitTcpAnnounceAddress.length == 2 && splitTcpAnnounceAddress[0] === '') {
+    if (!p2pIp) {
         if (queryForIp) {
-            publicIp = await getPublicIp();
-            const tcpAnnounceAddress = `${publicIp}:${splitTcpAnnounceAddress[1]}`;
-            config.tcpAnnounceAddress = tcpAnnounceAddress;
-        } else {
-            throw new Error(`Invalid announceTcpAddress provided: ${configTcpAnnounceAddress}. Expected format: <addr>:<port>`);
-        }
-    }
-    const splitUdpAnnounceAddress = splitAddressPort(configUdpAnnounceAddress || '', true);
-    if (splitUdpAnnounceAddress.length == 2 && splitUdpAnnounceAddress[0] === '') {
-        // If announceUdpAddress is not provided, use announceTcpAddress
-        if (!queryForIp && config.tcpAnnounceAddress) {
-            config.udpAnnounceAddress = config.tcpAnnounceAddress;
-        } else if (queryForIp) {
-            const udpPublicIp = publicIp || await getPublicIp();
-            const udpAnnounceAddress = `${udpPublicIp}:${splitUdpAnnounceAddress[1]}`;
-            config.udpAnnounceAddress = udpAnnounceAddress;
+            const publicIp = await getPublicIp();
+            config.p2pIp = publicIp;
         }
     }
+    // TODO(md): guard against setting a local ip address as the announce ip
     return config;
 }
 /**

package/package.json

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

package/src/bootstrap/bootstrap.ts

@@ -31,18 +31,19 @@ export class BootstrapNode implements P2PBootstrapApi {
    * @returns An empty promise.
    */
   public async start(config: BootnodeConfig) {
-    const { udpListenAddress, udpAnnounceAddress } = config;
-    const listenAddrUdp = multiaddr(convertToMultiaddr(udpListenAddress, 'udp'));
+    const { p2pIp, p2pPort, listenAddress } = config;
+    const listenAddrUdp = multiaddr(convertToMultiaddr(listenAddress, p2pPort, 'udp'));
 
-    if (!udpAnnounceAddress) {
-      throw new Error('You need to provide a UDP announce address.');
+    if (!p2pIp) {
+      throw new Error('You need to provide a P2P IP address.');
     }
 
     const peerIdPrivateKey = await getPeerIdPrivateKey(config, this.store);
 
     const { enr: ourEnr, peerId } = await createBootnodeENRandPeerId(
       peerIdPrivateKey,
-      udpAnnounceAddress,
+      p2pIp,
+      p2pPort,
       config.l1ChainId,
     );
     this.peerId = peerId;

package/src/client/factory.ts

@@ -36,7 +36,7 @@ export const createP2PClient = async <T extends P2PClientType>(
   telemetry: TelemetryClient = getTelemetryClient(),
   deps: P2PClientDeps<T> = {},
 ) => {
-  let config = { ..._config };
+  let config = { ..._config, dataStoreMapSizeKB: _config.p2pStoreMapSizeKb ?? _config.dataStoreMapSizeKB };
   const logger = deps.logger ?? createLogger('p2p');
   const store = deps.store ?? (await createStore('p2p', 1, config, createLogger('p2p:lmdb-v2')));
   const archive = await createStore('p2p-archive', 1, config, createLogger('p2p-archive:lmdb-v2'));

package/src/client/p2p_client.ts

@@ -1,9 +1,16 @@
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
-import type { L2Block, L2BlockId, L2BlockSource, L2BlockStreamEvent, L2Tips } from '@aztec/stdlib/block';
+import type {
+  L2Block,
+  L2BlockId,
+  L2BlockSource,
+  L2BlockStreamEvent,
+  L2Tips,
+  PublishedL2Block,
+} from '@aztec/stdlib/block';
 import type { P2PApi, PeerInfo, ProverCoordination } from '@aztec/stdlib/interfaces/server';
-import type { BlockAttestation, BlockProposal, P2PClientType } from '@aztec/stdlib/p2p';
+import { BlockAttestation, type BlockProposal, ConsensusPayload, type P2PClientType } from '@aztec/stdlib/p2p';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
 import {
   Attributes,
@@ -617,6 +624,16 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     }
   }
 
+  private async addAttestationsToPool(blocks: PublishedL2Block[]): Promise<void> {
+    const attestations = blocks.flatMap(block => {
+      const payload = ConsensusPayload.fromBlock(block.block);
+      return block.signatures.filter(sig => !sig.isEmpty).map(signature => new BlockAttestation(payload, signature));
+    });
+    await this.attestationPool?.addAttestations(attestations);
+    const slots = blocks.map(b => b.block.header.getSlot()).sort((a, b) => Number(a - b));
+    this.log.debug(`Added ${attestations.length} attestations for slots ${slots[0]}-${slots.at(-1)} to the pool`);
+  }
+
   /**
    * Deletes txs from these blocks.
    * @param blocks - A list of existing blocks with txs that the P2P client needs to ensure the tx pool is reconciled with.
@@ -635,15 +652,16 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * @param blocks - A list of existing blocks with txs that the P2P client needs to ensure the tx pool is reconciled with.
    * @returns Empty promise.
    */
-  private async handleLatestL2Blocks(blocks: L2Block[]): Promise<void> {
+  private async handleLatestL2Blocks(blocks: PublishedL2Block[]): Promise<void> {
     if (!blocks.length) {
       return Promise.resolve();
     }
 
-    await this.markTxsAsMinedFromBlocks(blocks);
-    const lastBlockNum = blocks[blocks.length - 1].number;
+    await this.markTxsAsMinedFromBlocks(blocks.map(b => b.block));
+    await this.addAttestationsToPool(blocks);
+    const lastBlockNum = blocks.at(-1)!.block.number;
     await Promise.all(
-      blocks.map(async block => this.synchedBlockHashes.set(block.number, (await block.hash()).toString())),
+      blocks.map(async block => this.synchedBlockHashes.set(block.block.number, (await block.block.hash()).toString())),
     );
     await this.synchedLatestBlockNumber.set(lastBlockNum);
     this.log.verbose(`Synched to latest block ${lastBlockNum}`);

package/src/config.ts

@@ -46,24 +46,19 @@ export interface P2PConfig extends P2PReqRespConfig, ChainConfig {
   l2QueueSize: number;
 
   /**
-   * The announce address for TCP.
+   * The port for the P2P service.
    */
-  tcpAnnounceAddress?: string;
+  p2pPort: number;
 
   /**
-   * The announce address for UDP.
+   * The IP address for the P2P service.
    */
-  udpAnnounceAddress?: string;
+  p2pIp?: string;
 
   /**
-   * The listen address for TCP.
+   * The listen address.
    */
-  tcpListenAddress: string;
-
-  /**
-   * The listen address for UDP.
-   */
-  udpListenAddress: string;
+  listenAddress: string;
 
   /**
    * An optional peer id private key. If blank, will generate a random key.
@@ -169,6 +164,11 @@ export interface P2PConfig extends P2PReqRespConfig, ChainConfig {
    * A list of trusted peers.
    */
   trustedPeers: string[];
+
+  /**
+   * The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKB.
+   */
+  p2pStoreMapSizeKb?: number;
 }
 
 export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
@@ -197,25 +197,19 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
     description: 'Size of queue of L2 blocks to store.',
     ...numberConfigHelper(1_000),
   },
-  tcpListenAddress: {
-    env: 'P2P_TCP_LISTEN_ADDR',
-    defaultValue: '0.0.0.0:40400',
-    description: 'The listen address for TCP. Format: <IP_ADDRESS>:<PORT>.',
+  listenAddress: {
+    env: 'P2P_LISTEN_ADDR',
+    defaultValue: '0.0.0.0',
+    description: 'The listen address. ipv4 address.',
   },
-  udpListenAddress: {
-    env: 'P2P_UDP_LISTEN_ADDR',
-    defaultValue: '0.0.0.0:40400',
-    description: 'The listen address for UDP. Format: <IP_ADDRESS>:<PORT>.',
+  p2pPort: {
+    env: 'P2P_PORT',
+    description: 'The port for the P2P service.',
+    ...numberConfigHelper(40400),
   },
-  tcpAnnounceAddress: {
-    env: 'P2P_TCP_ANNOUNCE_ADDR',
-    description:
-      'The announce address for TCP. Format: <IP_ADDRESS>:<PORT>. Leave IP_ADDRESS blank to query for public IP.',
-  },
-  udpAnnounceAddress: {
-    env: 'P2P_UDP_ANNOUNCE_ADDR',
-    description:
-      'The announce address for UDP. Format: <IP_ADDRESS>:<PORT>. Leave IP_ADDRESS blank to query for public IP.',
+  p2pIp: {
+    env: 'P2P_IP',
+    description: 'The IP address for the P2P service. ipv4 address.',
   },
   peerIdPrivateKey: {
     env: 'PEER_ID_PRIVATE_KEY',
@@ -342,6 +336,11 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
     description: 'A list of trusted peers ENRs. Separated by commas.',
     defaultValue: [],
   },
+  p2pStoreMapSizeKb: {
+    env: 'P2P_STORE_MAP_SIZE_KB',
+    parseEnv: (val: string | undefined) => (val ? +val : undefined),
+    description: 'The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKB.',
+  },
   ...p2pReqRespConfigMappings,
   ...chainConfigMappings,
 };
@@ -361,15 +360,18 @@ export function getP2PDefaultConfig(): P2PConfig {
 /**
  * Required P2P config values for a bootstrap node.
  */
-export type BootnodeConfig = Pick<P2PConfig, 'udpAnnounceAddress' | 'peerIdPrivateKey' | 'bootstrapNodes'> &
-  Required<Pick<P2PConfig, 'udpListenAddress'>> &
+export type BootnodeConfig = Pick<
+  P2PConfig,
+  'p2pIp' | 'p2pPort' | 'peerIdPrivateKey' | 'bootstrapNodes' | 'listenAddress'
+> &
+  Required<Pick<P2PConfig, 'p2pIp' | 'p2pPort'>> &
   Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKB'> &
   Pick<ChainConfig, 'l1ChainId'>;
 
 const bootnodeConfigKeys: (keyof BootnodeConfig)[] = [
-  'udpAnnounceAddress',
+  'p2pIp',
+  'p2pPort',
   'peerIdPrivateKey',
-  'udpListenAddress',
   'dataDirectory',
   'dataStoreMapSizeKB',
   'bootstrapNodes',

package/src/enr/generate-enr.ts

@@ -11,12 +11,13 @@ import { setAztecEnrKey } from '../versioning.js';
 
 export async function createBootnodeENRandPeerId(
   privateKey: string,
-  udpAnnounceAddress: string,
+  p2pIp: string,
+  p2pPort: number,
   l1ChainId: number,
 ): Promise<{ enr: SignableENR; peerId: PeerId }> {
   const peerId = await createLibP2PPeerIdFromPrivateKey(privateKey);
   const enr = SignableENR.createFromPeerId(peerId);
-  const publicAddr = multiaddr(convertToMultiaddr(udpAnnounceAddress, 'udp'));
+  const publicAddr = multiaddr(convertToMultiaddr(p2pIp, p2pPort, 'udp'));
   enr.setLocationMultiaddr(publicAddr);
 
   const config: ChainConfig = {