libp2p 0.46.17-fdcb801e → 0.46.18

package/src/connection-manager/dial-queue.ts

@@ -348,7 +348,7 @@ export class DialQueue {
     }
 
     // resolve addresses - this can result in a one-to-many translation when dnsaddrs are resolved
-    const resolvedAddresses = (await Promise.all(
+    let resolvedAddresses = (await Promise.all(
       addrs.map(async addr => {
         const result = await resolveMultiaddrs(addr.multiaddr, options)
 
@@ -364,6 +364,29 @@ export class DialQueue {
     ))
       .flat()
 
+    // ensure the peer id is appended to the multiaddr
+    if (peerId != null) {
+      const peerIdMultiaddr = `/p2p/${peerId.toString()}`
+      resolvedAddresses = resolvedAddresses.map(addr => {
+        const lastProto = addr.multiaddr.protos().pop()
+
+        // do not append peer id to path multiaddrs
+        if (lastProto?.path === true) {
+          return addr
+        }
+
+        // append peer id to multiaddr if it is not already present
+        if (addr.multiaddr.getPeerId() == null) {
+          return {
+            multiaddr: addr.multiaddr.encapsulate(peerIdMultiaddr),
+            isCertified: addr.isCertified
+          }
+        }
+
+        return addr
+      })
+    }
+
     const filteredAddrs = resolvedAddresses.filter(addr => {
       // filter out any multiaddrs that we do not have transports for
       if (this.transportManager.transportForMultiaddr(addr.multiaddr) == null) {
@@ -396,7 +419,7 @@ export class DialQueue {
       dedupedAddrs.set(maStr, addr)
     }
 
-    let dedupedMultiaddrs = [...dedupedAddrs.values()]
+    const dedupedMultiaddrs = [...dedupedAddrs.values()]
 
     if (dedupedMultiaddrs.length === 0 || dedupedMultiaddrs.length > this.maxPeerAddrsToDial) {
       log('addresses for %p before filtering', peerId ?? 'unknown peer', resolvedAddresses.map(({ multiaddr }) => multiaddr.toString()))
@@ -413,30 +436,6 @@ export class DialQueue {
       throw new CodeError('dial with more addresses than allowed', codes.ERR_TOO_MANY_ADDRESSES)
     }
 
-    // ensure the peer id is appended to the multiaddr
-    if (peerId != null) {
-      const peerIdMultiaddr = `/p2p/${peerId.toString()}`
-      dedupedMultiaddrs = dedupedMultiaddrs.map(addr => {
-        const addressPeerId = addr.multiaddr.getPeerId()
-        const lastProto = addr.multiaddr.protos().pop()
-
-        // do not append peer id to path multiaddrs
-        if (lastProto?.path === true) {
-          return addr
-        }
-
-        // append peer id to multiaddr if it is not already present
-        if (addressPeerId !== peerId.toString()) {
-          return {
-            multiaddr: addr.multiaddr.encapsulate(peerIdMultiaddr),
-            isCertified: addr.isCertified
-          }
-        }
-
-        return addr
-      })
-    }
-
     const gatedAdrs: Address[] = []
 
     for (const addr of dedupedMultiaddrs) {

package/src/identify/identify.ts

@@ -4,6 +4,7 @@ import { logger } from '@libp2p/logger'
 import { peerIdFromKeys } from '@libp2p/peer-id'
 import { RecordEnvelope, PeerRecord } from '@libp2p/peer-record'
 import { type Multiaddr, multiaddr, protocols } from '@multiformats/multiaddr'
+import { IP_OR_DOMAIN } from '@multiformats/multiaddr-matcher'
 import { pbStream } from 'it-protobuf-stream'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
@@ -345,6 +346,12 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
         signedPeerRecord = envelope.marshal().subarray()
       }
 
+      let observedAddr: Uint8Array | undefined = connection.remoteAddr.bytes
+
+      if (!IP_OR_DOMAIN.matches(connection.remoteAddr)) {
+        observedAddr = undefined
+      }
+
       const pb = pbStream(stream).pb(Identify)
 
       await pb.write({
@@ -353,7 +360,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
         publicKey,
         listenAddrs: multiaddrs.map(addr => addr.bytes),
         signedPeerRecord,
-        observedAddr: connection.remoteAddr.bytes,
+        observedAddr,
         protocols: peerData.protocols
       }, {
         signal

package/src/upgrader.ts

@@ -432,7 +432,7 @@ export class DefaultUpgrader implements Upgrader {
           throw new CodeError('Stream is not multiplexed', codes.ERR_MUXER_UNAVAILABLE)
         }
 
-        log('%s: starting new stream on %s', direction, protocols)
+        log('%s-%s: starting new stream on %s', connection.id, direction, protocols)
         const muxedStream = await muxer.newStream()
 
         try {

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '0.46.17-fdcb801e'
+export const version = '0.46.18'
 export const name = 'libp2p'