fix(p2p): change connext_address to connext_identifier

BREAKING CHANGE: `connext_address` field in `NodeState` has been renamed
to `connext_identifier`.

Related: opendexnetwork/opendex.network#28
Closes: #1611

Author: Karl Ranna

Diff for: docs/api.md

@@ -32,7 +32,7 @@ type PeerInfo = {
   secondsConnected: number,
   lndPubKeys?: { [currency: string]: string | undefined },
   raidenAddress?: string,
-  connextAddress?: string,
+  connextIdentifier?: string,
 };
 
 enum PeerStatus {
@@ -162,8 +162,8 @@ class Peer extends EventEmitter {
     return this.nodeState ? this.nodeState.raidenAddress : undefined;
   }
 
-  public get connextAddress(): string | undefined {
-    return this.nodeState ? this.nodeState.connextAddress : undefined;
+  public get connextIdentifier(): string | undefined {
+    return this.nodeState ? this.nodeState.connextIdentifier : undefined;
   }
 
   /** Returns a list of trading pairs advertised by this peer. */
@@ -189,7 +189,7 @@ class Peer extends EventEmitter {
       secondsConnected: Math.round((Date.now() - this.connectTime) / 1000),
       lndPubKeys: this.nodeState ? this.nodeState.lndPubKeys : undefined,
       raidenAddress: this.nodeState ? this.nodeState.raidenAddress : undefined,
-      connextAddress: this.nodeState ? this.nodeState.connextAddress : undefined,
+      connextIdentifier: this.nodeState ? this.nodeState.connextIdentifier : undefined,
     };
   }
 
@@ -242,7 +242,7 @@ class Peer extends EventEmitter {
     switch (clientType) {
       case SwapClientType.Lnd: return this.getLndPubKey(currency);
       case SwapClientType.Raiden: return this.raidenAddress;
-      case SwapClientType.Connext: return this.connextAddress;
+      case SwapClientType.Connext: return this.connextIdentifier;
       default: return;
     }
   }

Diff for: lib/p2p/Peer.ts

@@ -125,7 +125,7 @@ class Pool extends EventEmitter {
       addresses: [],
       pairs: [],
       raidenAddress: '',
-      connextAddress: '',
+      connextIdentifier: '',
       lndPubKeys: {},
       lndUris: {},
       tokenIdentifiers: {},
@@ -246,7 +246,7 @@ class Pool extends EventEmitter {
    * packet to currently connected peers to notify them of the change.
    */
   public updateConnextState = (tokenAddresses: Map<string, string>, pubKey?: string) => {
-    this.nodeState.connextAddress = pubKey || '';
+    this.nodeState.connextIdentifier = pubKey || '';
     tokenAddresses.forEach((tokenAddress, currency) => {
       this.nodeState.tokenIdentifiers[currency] = tokenAddress;
     });

Diff for: lib/p2p/Pool.ts

@@ -18,7 +18,7 @@ export const convertNodeState = (nodeState: pb.NodeState.AsObject) => {
     pairs: nodeState.pairsList,
     addresses: nodeState.addressesList,
     raidenAddress: nodeState.raidenAddress,
-    connextAddress: nodeState.connextAddress,
+    connextIdentifier: nodeState.connextIdentifier,
     lndPubKeys: convertKvpArrayToKvps(nodeState.lndPubKeysMap),
     lndUris: convertLndUris(nodeState.lndUrisMap),
     tokenIdentifiers: convertKvpArrayToKvps(nodeState.tokenIdentifiersMap),
@@ -56,7 +56,7 @@ export const serializeNodeState = (nodeState: NodeState): pb.NodeState => {
     return pbAddr;
   }));
   pbNodeState.setRaidenAddress(nodeState.raidenAddress);
-  pbNodeState.setConnextAddress(nodeState.connextAddress);
+  pbNodeState.setConnextIdentifier(nodeState.connextIdentifier);
   if (nodeState.lndPubKeys) {
     setObjectToMap(nodeState.lndPubKeys, pbNodeState.getLndPubKeysMap());
   }

Diff for: lib/p2p/packets/utils.ts

@@ -17,7 +17,7 @@ export type NodeState = {
   addresses: Address[];
   pairs: string[];
   raidenAddress: string;
-  connextAddress: string;
+  connextIdentifier: string;
   /** An object mapping currency symbols to lnd pub keys. */
   lndPubKeys: { [currency: string]: string | undefined };
   /** An object mapping currency symbols to lnd listening uris */

Diff for: lib/p2p/types.ts

@@ -31,7 +31,7 @@ message NodeState {
     map<string, string> lnd_pub_keys = 6;
     map<string, string> token_identifiers = 7;
     map<string, LndUris> lnd_uris = 8;
-    string connext_address = 9;
+    string connext_identifier = 9;
 }
 
 message PingPacket {

Diff for: lib/proto/xudp2p_pb.d.ts

@@ -147,7 +147,7 @@ describe('P2P Pool', () => {
       addresses: [{ host: '1.1.1.1', port: poolPort }, { host: '2.2.2.2', port: poolPort }],
       pairs: [uuid()],
       raidenAddress: uuid(),
-      connextAddress: uuid(),
+      connextIdentifier: uuid(),
       lndPubKeys: { BTC: uuid(), LTC: uuid() },
       lndUris: { BTC: [''], LTC: [''] },
       tokenIdentifiers: { BTC: 'bitcoin-testnet', LTC: 'litecoin-testnet' },
@@ -169,7 +169,7 @@ describe('P2P Pool', () => {
       addresses: [{ host: '1.1.1.1', port: poolPort }, { host: '2.2.2.2', port: poolPort }],
       pairs: [uuid()],
       raidenAddress: uuid(),
-      connextAddress: uuid(),
+      connextIdentifier: uuid(),
       lndPubKeys: { BTC: uuid(), LTC: uuid() },
       lndUris: { BTC: [''], LTC: [''] },
       tokenIdentifiers: { BTC: 'bitcoin-testnet', LTC: 'litecoin-testnet' },

Diff for: lib/proto/xudp2p_pb.js

@@ -193,7 +193,7 @@ describe('Parser', () => {
     addresses: [{ host: '1.1.1.1', port: 8885 }, { host: '2.2.2.2', port: 8885 }],
     pairs: [uuid()],
     raidenAddress: uuid(),
-    connextAddress: uuid(),
+    connextIdentifier: uuid(),
     lndPubKeys: { BTC: uuid(), LTC: uuid() },
     lndUris: { BTC: [''], LTC: [''] },
     tokenIdentifiers: { BTC: 'bitcoin-testnet', LTC: 'litecoin-testnet' },