client: merge work (pithos testnet)

packages/client/bin/cli.ts

@@ -78,6 +78,10 @@ const args = require('yargs')
       describe: 'RLPx listening port',
       default: Config.PORT_DEFAULT,
     },
+    extIP: {
+      describe: 'RLPx external IP (default: localhost)',
+      string: true,
+    },
     multiaddrs: {
       describe: 'Network multiaddrs',
       array: true,
@@ -515,6 +519,7 @@ async function run() {
     transports: args.transports,
     bootnodes: args.bootnodes ? parseMultiaddrs(args.bootnodes) : undefined,
     port: args.port,
+    extIP: args.extIP,
     multiaddrs: args.multiaddrs ? parseMultiaddrs(args.multiaddrs) : undefined,
     rpc: args.rpc,
     rpcport: args.rpcport,

packages/client/lib/config.ts

@@ -73,6 +73,13 @@ export interface ConfigOptions {
    */
   port?: number
 
+  /**
+   * RLPx external IP
+   *
+   * Default: `localhost`
+   */
+  extIP?: string
+
   /**
    * Network multiaddrs for libp2p
    * (e.g. /ip4/127.0.0.1/tcp/50505/p2p/QmABC)
@@ -261,6 +268,7 @@ export class Config {
   public readonly transports: string[]
   public readonly bootnodes?: Multiaddr[]
   public readonly port?: number
+  public readonly extIP?: string
   public readonly multiaddrs?: Multiaddr[]
   public readonly rpc: boolean
   public readonly rpcport: number
@@ -299,6 +307,7 @@ export class Config {
     this.transports = options.transports ?? Config.TRANSPORTS_DEFAULT
     this.bootnodes = options.bootnodes
     this.port = options.port ?? Config.PORT_DEFAULT
+    this.extIP = options.extIP
     this.multiaddrs = options.multiaddrs
     this.datadir = options.datadir ?? Config.DATADIR_DEFAULT
     this.key = options.key ?? genPrivateKey()

packages/client/lib/net/server/rlpxserver.ts

@@ -58,8 +58,7 @@ export class RlpxServer extends Server {
   constructor(options: RlpxServerOptions) {
     super(options)
 
-    // TODO: get the external ip from the upnp service
-    this.ip = '::'
+    this.ip = options.config.extIP ?? '::'
     this.discovery = options.config.discV4 || options.config.discDns
     this.clientFilter = options.clientFilter ?? [
       'go1.5',