Revert "update getContactableAddr impl"

This reverts commit 282b0ad.

Dockerfile

@@ -1,12 +1,12 @@
-FROM node:18-alpine as BUILD_IMAGE
+FROM node:16-alpine as BUILD_IMAGE
 WORKDIR /app
 RUN apk update && apk add --no-cache bash && rm -rf /var/cache/apk/*
 RUN apk add --virtual .build-deps alpine-sdk jq
 
 RUN ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2
 
 
-#RUN jq -r '.workspaces |= .[0:2]' package.json > package.json
+RUN jq -r '.workspaces |= .[0:2]' package.json > package.json
 COPY package*.json ./
 RUN npm ci --ignore-scripts --omit-dev
 

packages/portalnetwork/src/transports/capacitorUdp.ts

@@ -9,7 +9,7 @@ import {
   TransportEventEmitter,
 } from '@chainsafe/discv5/transport'
 import { BaseENR } from '@chainsafe/discv5'
-import { SocketAddress, getSocketAddressOnENR } from '@chainsafe/discv5/lib/util/ip.js'
+import { SocketAddress } from '@chainsafe/discv5/lib/util/ip.js'
 
 /**
  * This class is responsible for encoding outgoing Packets and decoding incoming Packets over UDP
@@ -84,6 +84,13 @@ export class CapacitorUDPTransportService
   }
 
   getContactableAddr(enr: BaseENR): SocketAddress | undefined {
-    return getSocketAddressOnENR(enr, this.ipMode)
+    const nodeAddr = this.bindAddrs[0].tuples()
+    return {
+      port: this.bindAddrs[0].nodeAddress().port,
+      ip: {
+        type: 4,
+        octets: nodeAddr[0][1] ?? new Uint8Array([0, 0, 0, 0]),
+      },
+    }
   }
 }

packages/portalnetwork/src/transports/hybridTransport.ts

@@ -12,7 +12,7 @@ import { WebSocketTransportService } from '../index.js'
 import { WakuPortal } from './waku.js'
 import WebRTC from './webRTC.js'
 import { BaseENR, SignableENR, ISocketAddr } from '@chainsafe/discv5'
-import { SocketAddress, getSocketAddressOnENR } from '@chainsafe/discv5/lib/util/ip.js'
+import { SocketAddress } from '@chainsafe/discv5/lib/util/ip.js'
 
 interface IHybridTransportEvents extends ITransportEvents {
   multiAddr: (src: Multiaddr) => void
@@ -149,6 +149,13 @@ export class HybridTransportService
   }
 
   getContactableAddr(enr: BaseENR): SocketAddress | undefined {
-    return getSocketAddressOnENR(enr, this.ipMode)
+    const nodeAddr = this.bindAddrs[0].tuples()
+    return {
+      port: this.bindAddrs[0].nodeAddress().port,
+      ip: {
+        type: 4,
+        octets: nodeAddr[0][1] ?? new Uint8Array([0, 0, 0, 0]),
+      },
+    }
   }
 }

packages/portalnetwork/src/transports/websockets.ts

@@ -11,7 +11,7 @@ import {
 import WebSocketAsPromised from 'websocket-as-promised'
 import WebSocket from 'isomorphic-ws'
 import StrictEventEmitter from 'strict-event-emitter-types/types/src'
-import { SocketAddress, getSocketAddressOnENR } from '@chainsafe/discv5/lib/util/ip.js'
+import { SocketAddress } from '@chainsafe/discv5/lib/util/ip.js'
 import { BaseENR } from '@chainsafe/discv5'
 const log = debug('discv5:transport')
 
@@ -114,6 +114,13 @@ export class WebSocketTransportService
   }
 
   getContactableAddr(enr: BaseENR): SocketAddress | undefined {
-    return getSocketAddressOnENR(enr, this.ipMode)
+    const nodeAddr = this.bindAddrs[0].tuples()
+    return {
+      port: this.bindAddrs[0].nodeAddress().port,
+      ip: {
+        type: 4,
+        octets: nodeAddr[0][1] ?? new Uint8Array([0, 0, 0, 0]),
+      },
+    }
   }
 }