@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.001888fc

package/dest/util.js

@@ -1,6 +1,11 @@
+import { SecretValue } from '@aztec/foundation/config';
 import { generateKeyPair, marshalPrivateKey, unmarshalPrivateKey } from '@libp2p/crypto/keys';
 import { createFromPrivKey } from '@libp2p/peer-id-factory';
 import { resolve } from 'dns/promises';
+import { promises as fs } from 'fs';
+import net from 'net';
+import path from 'path';
+const PEER_ID_DATA_DIR_FILE = 'p2p-private-key';
 /**
  * Converts an address string to a multiaddr string.
  * Example usage:
@@ -8,53 +13,34 @@ 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.
  */ export async function getPublicIp() {
-    const resp = await fetch('http://checkip.amazonaws.com/');
+    const resp = await fetch('https://checkip.amazonaws.com/');
     const text = await resp.text();
-    return text.trim();
+    const address = text.trim();
+    if (!isValidIpAddress(address)) {
+        throw new Error(`Received invalid IP address from checkip service: ${address}`);
+    }
+    return address;
+}
+export function isValidIpAddress(address) {
+    const netType = net.isIP(address);
+    return netType === 4;
 }
-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,56 +62,76 @@ 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, p2pBroadcastPort, p2pPort } = config;
+    // If no broadcast port is provided, use the given p2p port as the broadcast port
+    if (!p2pBroadcastPort) {
+        config.p2pBroadcastPort = p2pPort;
+    }
     // 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;
 }
 /**
  * Get the peer id private key
  *
  * 1. Check if we have a peer id private key in the config
- * 2. If not, check we have a peer id private key persisted in the node
- * 3. If not, create a new one, then persist it in the node
+ * 2. If not, check if we have a peer id private key persisted in a file
+ * 3. If no file path or data directory is provided, check if we have a peer id private key in the node's store
+ * 4. If not, create a new one, then persist it in a file if a file path or data directory is provided or in the node's store otherwise
  *
- */ export async function getPeerIdPrivateKey(config, store) {
-    const peerIdPrivateKeySingleton = store.openSingleton('peerIdPrivateKey');
-    if (config.peerIdPrivateKey) {
-        await peerIdPrivateKeySingleton.set(config.peerIdPrivateKey);
+ */ export async function getPeerIdPrivateKey(config, store, logger) {
+    const peerIdPrivateKeyFilePath = config.peerIdPrivateKeyPath ?? (config.dataDirectory ? path.join(config.dataDirectory, PEER_ID_DATA_DIR_FILE) : undefined);
+    let peerIdPrivateKeySingleton;
+    const writePrivateKeyToFile = async (filePath, privateKey)=>{
+        await fs.mkdir(path.dirname(filePath), {
+            recursive: true
+        });
+        await fs.writeFile(filePath, privateKey);
+    };
+    // If the peerIdPrivateKey is provided in the config, we use it and persist it in either a file or the node's store
+    if (config.peerIdPrivateKey && config.peerIdPrivateKey.getValue().trim()) {
+        if (peerIdPrivateKeyFilePath) {
+            await writePrivateKeyToFile(peerIdPrivateKeyFilePath, config.peerIdPrivateKey.getValue());
+        } else {
+            peerIdPrivateKeySingleton = store.openSingleton('peerIdPrivateKey');
+            await peerIdPrivateKeySingleton.set(config.peerIdPrivateKey.getValue());
+        }
         return config.peerIdPrivateKey;
     }
-    const storedPeerIdPrivateKey = await peerIdPrivateKeySingleton.getAsync();
+    // Check to see if we have a peer id private key stored in a file or the node's store
+    let storedPeerIdPrivateKey;
+    const privateKeyFileExists = peerIdPrivateKeyFilePath && await fs.access(peerIdPrivateKeyFilePath).then(()=>true).catch(()=>false);
+    if (peerIdPrivateKeyFilePath && privateKeyFileExists) {
+        await fs.access(peerIdPrivateKeyFilePath);
+        storedPeerIdPrivateKey = await fs.readFile(peerIdPrivateKeyFilePath, 'utf8');
+    } else {
+        peerIdPrivateKeySingleton = store.openSingleton('peerIdPrivateKey');
+        storedPeerIdPrivateKey = await peerIdPrivateKeySingleton.getAsync();
+    }
     if (storedPeerIdPrivateKey) {
-        return storedPeerIdPrivateKey;
+        if (peerIdPrivateKeyFilePath && !privateKeyFileExists) {
+            logger.verbose(`Peer ID private key found in the node's store, persisting it to ${peerIdPrivateKeyFilePath}`);
+            await writePrivateKeyToFile(peerIdPrivateKeyFilePath, storedPeerIdPrivateKey);
+        }
+        return new SecretValue(storedPeerIdPrivateKey);
     }
+    // Generate and persist a new private key
     const newPeerIdPrivateKey = await generateKeyPair('secp256k1');
     const privateKeyString = Buffer.from(marshalPrivateKey(newPeerIdPrivateKey)).toString('hex');
-    await peerIdPrivateKeySingleton.set(privateKeyString);
-    return privateKeyString;
+    if (peerIdPrivateKeyFilePath) {
+        logger.verbose(`Creating new peer ID private key and persisting it to ${peerIdPrivateKeyFilePath}`);
+        await writePrivateKeyToFile(peerIdPrivateKeyFilePath, privateKeyString);
+    } else {
+        logger.warn('Creating new peer ID private key and persisting it to the lmdb store. Key will be lost on rollup upgrade, specify the peer id private key path and restart the node to persist the peer id private key to a file');
+        await peerIdPrivateKeySingleton.set(privateKeyString);
+    }
+    return new SecretValue(privateKeyString);
 }
 /**
  * Create a libp2p peer ID from the private key.

package/dest/versioning.d.ts

@@ -1,12 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { type ComponentsVersions } from '@aztec/stdlib/versioning';
-import type { SignableENR } from '@chainsafe/enr';
+import type { SignableENR } from '@nethermindeth/enr';
 /** Returns the component versions based on config and this build. */
 export declare function getVersions(config: ChainConfig): ComponentsVersions;
 /** Sets the aztec key on the ENR record with versioning info. */
 export declare function setAztecEnrKey(enr: SignableENR, config: ChainConfig, useXxHash?: boolean): ComponentsVersions;
+/** Sets the Aztec client version on ENR record **/
+export declare function setAztecClientVersionEnrKey(enr: SignableENR, clientVersion: string): void;
 /** Checks the given value from an ENR record against the expected versions. */
 export declare function checkAztecEnrVersion(enrValue: Buffer, expectedVersions: ComponentsVersions): void;
-//# sourceMappingURL=versioning.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbmluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ZlcnNpb25pbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBSXhCLE1BQU0sMEJBQTBCLENBQUM7QUFFbEMsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFTdEQscUVBQXFFO0FBQ3JFLHdCQUFnQixXQUFXLENBQUMsTUFBTSxFQUFFLFdBQVcsc0JBRTlDO0FBRUQsaUVBQWlFO0FBQ2pFLHdCQUFnQixjQUFjLENBQUMsR0FBRyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLFNBQVMsVUFBYyxzQkFLNUY7QUFFRCxtREFBbUQ7QUFDbkQsd0JBQWdCLDJCQUEyQixDQUFDLEdBQUcsRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0sUUFJbEY7QUFFRCwrRUFBK0U7QUFDL0Usd0JBQWdCLG9CQUFvQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsa0JBQWtCLFFBVTFGIn0=

package/dest/versioning.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../src/versioning.ts"],"names":[],"mappings":";;AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AASlD,qEAAqE;AACrE,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,sBAE9C;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,UAAc,sBAK5F;AAED,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,QAU1F"}
+{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../src/versioning.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAStD,qEAAqE;AACrE,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,sBAE9C;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,UAAc,sBAK5F;AAED,mDAAmD;AACnD,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,QAIlF;AAED,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,QAU1F"}

package/dest/versioning.js

@@ -1,14 +1,14 @@
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { checkCompressedComponentVersion, compressComponentVersions, getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import xxhashFactory from 'xxhash-wasm';
-import { AZTEC_ENR_KEY } from './types/index.js';
+import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from './types/index.js';
 const USE_XX_HASH = false; // Enable to reduce the size of the ENR record for production
 const XX_HASH_LEN = 8;
 const xxhash = await xxhashFactory();
 /** Returns the component versions based on config and this build. */ export function getVersions(config) {
-    return getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
+    return getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot());
 }
 /** Sets the aztec key on the ENR record with versioning info. */ export function setAztecEnrKey(enr, config, useXxHash = USE_XX_HASH) {
     const versions = getVersions(config);
@@ -16,6 +16,11 @@ const xxhash = await xxhashFactory();
     enr.set(AZTEC_ENR_KEY, value);
     return versions;
 }
+/** Sets the Aztec client version on ENR record **/ export function setAztecClientVersionEnrKey(enr, clientVersion) {
+    if (clientVersion) {
+        enr.set(AZTEC_ENR_CLIENT_VERSION_KEY, Buffer.from(clientVersion));
+    }
+}
 /** Checks the given value from an ENR record against the expected versions. */ export function checkAztecEnrVersion(enrValue, expectedVersions) {
     if (enrValue.length === XX_HASH_LEN) {
         const expected = versionsToEnrValue(expectedVersions, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.001888fc",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -19,14 +19,12 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "start": "node ./dest",
-    "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'"
+    "start:dev": "concurrently -k \"../scripts/tsc.sh --watch\" \"nodemon --watch dest --exec yarn start\""
   },
   "inherits": [
     "../package.common.json"
@@ -62,19 +60,24 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.0-test.1",
-    "@aztec/epoch-cache": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/kv-store": "0.0.0-test.1",
-    "@aztec/noir-protocol-circuits-types": "0.0.0-test.1",
-    "@aztec/protocol-contracts": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
-    "@aztec/telemetry-client": "0.0.0-test.1",
-    "@chainsafe/discv5": "9.0.0",
-    "@chainsafe/enr": "3.0.0",
+    "@aztec/constants": "0.0.1-commit.001888fc",
+    "@aztec/epoch-cache": "0.0.1-commit.001888fc",
+    "@aztec/ethereum": "0.0.1-commit.001888fc",
+    "@aztec/foundation": "0.0.1-commit.001888fc",
+    "@aztec/kv-store": "0.0.1-commit.001888fc",
+    "@aztec/noir-contracts.js": "0.0.1-commit.001888fc",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.001888fc",
+    "@aztec/protocol-contracts": "0.0.1-commit.001888fc",
+    "@aztec/simulator": "0.0.1-commit.001888fc",
+    "@aztec/stdlib": "0.0.1-commit.001888fc",
+    "@aztec/telemetry-client": "0.0.1-commit.001888fc",
     "@chainsafe/libp2p-gossipsub": "13.0.0",
     "@chainsafe/libp2p-noise": "^15.0.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
@@ -82,7 +85,6 @@
     "@libp2p/crypto": "4.0.3",
     "@libp2p/identify": "1.0.18",
     "@libp2p/interface": "1.3.1",
-    "@libp2p/kad-dht": "10.0.4",
     "@libp2p/mplex": "10.0.16",
     "@libp2p/peer-id": "4.0.7",
     "@libp2p/peer-id-factory": "4.1.1",
@@ -90,9 +92,10 @@
     "@libp2p/prometheus-metrics": "^4.2.4",
     "@libp2p/tcp": "9.0.24",
     "@multiformats/multiaddr": "12.1.14",
+    "@nethermindeth/discv5": "9.0.0-backport-306-v4",
+    "@nethermindeth/enr": "3.0.0-backport-306-v4",
     "interface-datastore": "^8.2.11",
     "interface-store": "^5.1.8",
-    "it-pipe": "^3.0.1",
     "libp2p": "1.5.0",
     "semver": "^7.6.0",
     "sha3": "^2.1.4",
@@ -101,19 +104,21 @@
     "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.0-test.1",
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.14.6",
+    "@aztec/archiver": "0.0.1-commit.001888fc",
+    "@aztec/world-state": "0.0.1-commit.001888fc",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "get-port": "^7.1.0",
     "it-drain": "^3.0.5",
     "it-length": "^3.0.6",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.3.3",
     "uint8arrays": "^5.0.3",
-    "viem": "2.22.8"
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "files": [
     "dest",
@@ -122,6 +127,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/bootstrap/bootstrap.ts

@@ -1,29 +1,32 @@
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { P2PBootstrapApi } from '@aztec/stdlib/interfaces/server';
 import { OtelMetricsAdapter, type TelemetryClient } from '@aztec/telemetry-client';
 
-import { Discv5, type Discv5EventEmitter } from '@chainsafe/discv5';
-import { ENR, type SignableENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
 import { type Multiaddr, multiaddr } from '@multiformats/multiaddr';
+import { Discv5, type Discv5EventEmitter } from '@nethermindeth/discv5';
+import { ENR, type SignableENR } from '@nethermindeth/enr';
 
 import type { BootnodeConfig } from '../config.js';
 import { createBootnodeENRandPeerId } from '../enr/generate-enr.js';
-import { convertToMultiaddr, getPeerIdPrivateKey } from '../util.js';
+import { convertToMultiaddr, getPeerIdPrivateKey, getPublicIp } from '../util.js';
 
 /**
  * Encapsulates a 'Bootstrap' node, used for the purpose of assisting new joiners in acquiring peers.
  */
 export class BootstrapNode implements P2PBootstrapApi {
-  private node?: Discv5 & Discv5EventEmitter = undefined;
+  private node?: Discv5EventEmitter = undefined;
   private peerId?: PeerId;
+  private logger: Logger;
 
   constructor(
     private store: AztecAsyncKVStore,
     private telemetry: TelemetryClient,
-    private logger = createLogger('p2p:bootstrap'),
-  ) {}
+    bindings?: LoggerBindings,
+  ) {
+    this.logger = createLogger('p2p:bootstrap', bindings);
+  }
 
   /**
    * Starts the bootstrap node.
@@ -31,25 +34,41 @@ 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 { p2pPort, listenAddress, p2pBroadcastPort, queryForIp } = config;
+    let p2pIp = config.p2pIp;
+    this.logger.info(`Starting bootstrap node with config: ${JSON.stringify(config)}`);
+    if (!p2pIp) {
+      if (queryForIp) {
+        this.logger.info('Querying for public IP address...');
+        const publicIp = await getPublicIp();
+        p2pIp = publicIp;
+        this.logger.info(`Found public IP address: ${publicIp}`);
+      }
+    }
 
-    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);
+    if (!p2pBroadcastPort) {
+      config.p2pBroadcastPort = p2pPort;
+    }
+
+    const listenAddrUdp = multiaddr(convertToMultiaddr(listenAddress, config.p2pBroadcastPort!, 'udp'));
+
+    const peerIdPrivateKey = await getPeerIdPrivateKey(config, this.store, this.logger);
 
     const { enr: ourEnr, peerId } = await createBootnodeENRandPeerId(
-      peerIdPrivateKey,
-      udpAnnounceAddress,
+      peerIdPrivateKey.getValue(),
+      p2pIp,
+      config.p2pBroadcastPort!,
       config.l1ChainId,
     );
     this.peerId = peerId;
 
     this.logger.debug(`Starting bootstrap node ${peerId} listening on ${listenAddrUdp.toString()}`);
 
-    const metricsRegistry = new OtelMetricsAdapter(this.telemetry);
+    const metricsRegistry = new OtelMetricsAdapter(this.telemetry, this.logger.getBindings());
     this.node = Discv5.create({
       enr: ourEnr,
       peerId,