@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.017a351

package/src/enr/generate-enr.ts

@@ -1,22 +1,26 @@
 import type { LogFn } from '@aztec/foundation/log';
 import { type ChainConfig, emptyChainConfig } from '@aztec/stdlib/config';
+import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 
-import { ENR, SignableENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
-import { multiaddr } from '@multiformats/multiaddr';
+import { type Multiaddr, multiaddr } from '@multiformats/multiaddr';
+import { ENR, SignableENR } from '@nethermindeth/enr';
 
-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: string,
-  udpAnnounceAddress: string,
+  p2pIp: string,
+  p2pBroadcastPort: 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, p2pBroadcastPort, 'udp'));
   enr.setLocationMultiaddr(publicAddr);
 
   const config: ChainConfig = {
@@ -28,12 +32,41 @@ export async function createBootnodeENRandPeerId(
   return { enr, peerId };
 }
 
+export function createNodeENR(
+  peerId: PeerId,
+  multiAddrUdp: Multiaddr | undefined,
+  multiAddrTcp: Multiaddr | undefined,
+  chainConfig: ChainConfig,
+  packageVersion: string,
+): { enr: SignableENR; versions: ComponentsVersions } {
+  // 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: string, log: LogFn) {
   const decoded = ENR.decodeTxt(enr);
   log(`PeerID: ${await decoded.peerId()}`);
   log(`IP: ${decoded.ip}`);
   log(`UDP: ${decoded.udp}`);
   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/src/errors/attestation-pool.error.ts

@@ -0,0 +1,13 @@
+export class AttestationPoolError extends Error {
+  constructor(message?: string) {
+    super(message);
+    this.name = 'AttestationPoolError';
+  }
+}
+
+export class ProposalSlotCapExceededError extends AttestationPoolError {
+  constructor(message?: string) {
+    super(message);
+    this.name = 'ProposalSlotCapExceededError';
+  }
+}

package/src/errors/p2p-service.error.ts

@@ -0,0 +1,11 @@
+/** Checkpoint Proposal Received Callback Not Registered Error
+ *
+ * Error triggered if the allNodesCheckpointReceivedCallback is not registered
+ * @category Errors
+ */
+export class CheckpointProposalReceivedCallbackNotRegisteredError extends Error {
+  constructor() {
+    super('FATAL (allNodesCheckpointReceivedCallback): All nodes should register a checkpoint proposal handler');
+    this.name = 'CheckpointProposalReceivedCallbackNotRegisteredError';
+  }
+}

package/src/errors/reqresp.error.ts

@@ -8,28 +8,3 @@ export class IndividualReqRespTimeoutError extends Error {
     super(`Request to peer timed out`);
   }
 }
-
-/** Collective request timeout error
- *
- * This error will be thrown when a req resp request times out regardless of the peer.
- * @category Errors
- */
-export class CollectiveReqRespTimeoutError extends Error {
-  constructor() {
-    super(`Request to all peers timed out`);
-  }
-}
-
-/** Invalid response error
- *
- * This error will be thrown when a response is received that is not valid.
- *
- * This error does not need to be punished as message validators will handle punishing invalid
- * requests
- * @category Errors
- */
-export class InvalidResponseError extends Error {
-  constructor() {
-    super(`Invalid response received`);
-  }
-}

package/src/errors/tx-pool.error.ts

@@ -0,0 +1,12 @@
+import type { TxPoolRejectionError } from '../mem_pools/tx_pool_v2/eviction/interfaces.js';
+
+/** Error thrown when a transaction is not added to the mempool. */
+export class TxPoolError extends Error {
+  public readonly data: TxPoolRejectionError;
+
+  constructor(public readonly reason: TxPoolRejectionError) {
+    super(reason.message);
+    this.name = 'TxPoolError';
+    this.data = reason;
+  }
+}

package/src/index.ts

@@ -1,7 +1,11 @@
+export { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
+export type { PeerId } from '@libp2p/interface';
+
 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';
+export * from './mem_pools/tx_pool_v2/index.js';
 export * from './msg_validators/index.js';
 export * from './services/index.js';