more nits

ethereumjs · Oct 13, 2023 · f268e02 · f268e02
1 parent 9f4a593
commit f268e02
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -171,8 +171,8 @@ const main = async () => {
   portal.discv5.enableLogs()
 
   // portal.enableLog(
-  //   'ultralight,-FINDNODES,*LightClient:DEBUG,*LightClient:INFO,*BeaconLightClientNetwork,*BOOTSTRAP,*OFFER,*ACCEPT,*FINDCONTENT,*FOUNDCONTENT,*uTP',
-  // )
+  //  'ultralight,-FINDNODES,*LightClient:DEBUG,*LightClient:INFO,*BeaconLightClientNetwork,*BOOTSTRAP,*OFFER,*ACCEPT,*FINDCONTENT,*FOUNDCONTENT,*uTP:FINISHED',
+  //  )
   portal.enableLog('*Portal*,uTP*')
 
   const rpcAddr = args.rpcAddr ?? ip // Set RPC address (used by metrics server and rpc server)

diff --git a/packages/portalnetwork/src/client/client.ts b/packages/portalnetwork/src/client/client.ts
@@ -5,6 +5,7 @@ import {
   NodeId,
   ENR,
   createKeypairFromPeerId,
+  createPeerIdFromKeypair,
 } from '@chainsafe/discv5'
 import { ITalkReqMessage, ITalkRespMessage } from '@chainsafe/discv5/message'
 import { EventEmitter } from 'events'
@@ -224,21 +225,21 @@ export class PortalNetwork extends (EventEmitter as { new (): PortalNetworkEvent
     // if (this.discv5.sessionService.transport instanceof HybridTransportService) {
     //   ;(this.discv5.sessionService as any).send = this.send.bind(this)
     // }
-    this.discv5.sessionService.on('established', async (nodeAddr, enr, _, _verified) => {
+    this.discv5.sessionService.on('established', async (nodeAddr, enr, _, verified) => {
       this.discv5.findEnr(enr.nodeId) === undefined && this.discv5.addEnr(enr)
 
-      // if (!verified || !enr.getLocationMultiaddr('udp')) {
-      //   // If a node provides an invalid ENR during the discv5 handshake, we cache the multiaddr
-      //   // corresponding to the node's observed IP/Port so that we can send outbound messages to
-      //   // those nodes later on if needed.  This is currently used by uTP when responding to
-      //   // FINDCONTENT requests from nodes with invalid ENRs.
-      //   const peerId = await createPeerIdFromKeypair(enr.keypair)
-      //   this.unverifiedSessionCache.set(
-      //     enr.nodeId,
-      //     multiaddr(nodeAddr.socketAddr.toString() + '/p2p/' + peerId.toString())
-      //   )
-      //   this.logger(this.unverifiedSessionCache.get(enr.nodeId))
-      // }
+      if (!verified || !enr.getLocationMultiaddr('udp')) {
+        // If a node provides an invalid ENR during the discv5 handshake, we cache the multiaddr
+        // corresponding to the node's observed IP/Port so that we can send outbound messages to
+        // those nodes later on if needed.  This is currently used by uTP when responding to
+        // FINDCONTENT requests from nodes with invalid ENRs.
+        const peerId = await createPeerIdFromKeypair(enr.keypair)
+        this.unverifiedSessionCache.set(
+          enr.nodeId,
+          multiaddr(nodeAddr.socketAddr.toString() + '/p2p/' + peerId.toString()),
+        )
+        this.logger(this.unverifiedSessionCache.get(enr.nodeId))
+      }
     })
 
     if (opts.metrics) {

diff --git a/packages/portalnetwork/src/subprotocols/beacon/beacon.ts b/packages/portalnetwork/src/subprotocols/beacon/beacon.ts
@@ -514,7 +514,7 @@ export class BeaconLightClientNetwork extends BaseProtocol {
     this.metrics?.contentMessagesSent.inc()
 
     this.logger(
-      `Received handleFindContent request for contentKey: ${toHexString(
+      `Received FindContent request for contentKey: ${toHexString(
         decodedContentMessage.contentKey,
       )}`,
     )

diff --git a/packages/portalnetwork/src/subprotocols/protocol.ts b/packages/portalnetwork/src/subprotocols/protocol.ts
@@ -496,7 +496,7 @@ export abstract class BaseProtocol extends EventEmitter {
     this.metrics?.contentMessagesSent.inc()
 
     this.logger(
-      `Received handleFindContent request for contentKey: ${toHexString(
+      `Received FindContent request for contentKey: ${toHexString(
         decodedContentMessage.contentKey,
       )}`,
     )

diff --git a/packages/portalnetwork/src/wire/utp/Socket/UtpSocket.ts b/packages/portalnetwork/src/wire/utp/Socket/UtpSocket.ts
@@ -169,7 +169,6 @@ export class UtpSocket extends EventEmitter {
     try {
       await this.packetManager.congestionControl.canSend()
     } catch (e) {
-      console.trace(e)
       this.logger(`DATA packet not acked.  Closing connection to ${this.remoteAddress}`)
       await this.sendResetPacket()
       this.close()