From 0331a05b202b2a57f47959d67e476c562ef3c77e Mon Sep 17 00:00:00 2001
From: acolytec3 <17355484+acolytec3@users.noreply.github.com>
Date: Fri, 11 Aug 2023 08:29:48 -0400
Subject: [PATCH] update getContactableAddr impl

---
 Dockerfile                                            |  4 ++--
 packages/portalnetwork/src/transports/capacitorUdp.ts | 11 ++---------
 .../portalnetwork/src/transports/hybridTransport.ts   | 11 ++---------
 packages/portalnetwork/src/transports/websockets.ts   | 11 ++---------
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index da58ac1a4..c2e27c715 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine as BUILD_IMAGE
+FROM node:18-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
@@ -6,7 +6,7 @@ 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
 
diff --git a/packages/portalnetwork/src/transports/capacitorUdp.ts b/packages/portalnetwork/src/transports/capacitorUdp.ts
index 2f332c539..ddcb86e07 100644
--- a/packages/portalnetwork/src/transports/capacitorUdp.ts
+++ b/packages/portalnetwork/src/transports/capacitorUdp.ts
@@ -9,7 +9,7 @@ import {
   TransportEventEmitter,
 } from '@chainsafe/discv5/transport'
 import { BaseENR } from '@chainsafe/discv5'
-import { SocketAddress } from '@chainsafe/discv5/lib/util/ip.js'
+import { SocketAddress, getSocketAddressOnENR } from '@chainsafe/discv5/lib/util/ip.js'
 
 /**
  * This class is responsible for encoding outgoing Packets and decoding incoming Packets over UDP
@@ -84,13 +84,6 @@ export class CapacitorUDPTransportService
   }
 
   getContactableAddr(enr: BaseENR): SocketAddress | undefined {
-    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]),
-      },
-    }
+    return getSocketAddressOnENR(enr, this.ipMode)
   }
 }
diff --git a/packages/portalnetwork/src/transports/hybridTransport.ts b/packages/portalnetwork/src/transports/hybridTransport.ts
index cb402e053..380fccdc3 100644
--- a/packages/portalnetwork/src/transports/hybridTransport.ts
+++ b/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 } from '@chainsafe/discv5/lib/util/ip.js'
+import { SocketAddress, getSocketAddressOnENR } from '@chainsafe/discv5/lib/util/ip.js'
 
 interface IHybridTransportEvents extends ITransportEvents {
   multiAddr: (src: Multiaddr) => void
@@ -149,13 +149,6 @@ export class HybridTransportService
   }
 
   getContactableAddr(enr: BaseENR): SocketAddress | undefined {
-    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]),
-      },
-    }
+    return getSocketAddressOnENR(enr, this.ipMode)
   }
 }
diff --git a/packages/portalnetwork/src/transports/websockets.ts b/packages/portalnetwork/src/transports/websockets.ts
index 4db78dad8..3e8782183 100644
--- a/packages/portalnetwork/src/transports/websockets.ts
+++ b/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 } from '@chainsafe/discv5/lib/util/ip.js'
+import { SocketAddress, getSocketAddressOnENR } from '@chainsafe/discv5/lib/util/ip.js'
 import { BaseENR } from '@chainsafe/discv5'
 const log = debug('discv5:transport')
 
@@ -114,13 +114,6 @@ export class WebSocketTransportService
   }
 
   getContactableAddr(enr: BaseENR): SocketAddress | undefined {
-    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]),
-      },
-    }
+    return getSocketAddressOnENR(enr, this.ipMode)
   }
 }