@streamr/dht 100.0.0-testnet-one.4 → 100.0.0-testnet-two.0

package/dist/src/dht/ExternalApiRpcRemote.d.ts

@@ -1,8 +1,8 @@
 import { Any } from '../proto/google/protobuf/any';
 import { DataEntry, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
-import { IExternalApiRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
+import { ExternalApiRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
 import { RpcRemote } from './contact/RpcRemote';
-export declare class ExternalApiRpcRemote extends RpcRemote<IExternalApiRpcClient> {
+export declare class ExternalApiRpcRemote extends RpcRemote<ExternalApiRpcClient> {
     externalFindData(key: Uint8Array): Promise<DataEntry[]>;
     storeData(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
 }

package/dist/src/dht/ExternalApiRpcRemote.js

@@ -8,6 +8,7 @@ class ExternalApiRpcRemote extends RpcRemote_1.RpcRemote {
             key
         };
         const options = this.formDhtRpcOptions({
+            // TODO use config option or named constant?
             timeout: 10000
         });
         try {
@@ -24,6 +25,7 @@ class ExternalApiRpcRemote extends RpcRemote_1.RpcRemote {
             data
         };
         const options = this.formDhtRpcOptions({
+            // TODO use config option or named constant?
             timeout: 10000
         });
         try {

package/dist/src/dht/ExternalApiRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAGA,mDAA+C;AAE/C,MAAa,oBAAqB,SAAQ,qBAAgC;IAEtE,KAAK,CAAC,gBAAgB,CAAC,GAAe;QAClC,MAAM,OAAO,GAA4B;YACrC,GAAG;SACN,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC,OAAO,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG;YACH,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;CACJ;AAhCD,oDAgCC"}
+{"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAGA,mDAA+C;AAE/C,MAAa,oBAAqB,SAAQ,qBAA+B;IAErE,KAAK,CAAC,gBAAgB,CAAC,GAAe;QAClC,MAAM,OAAO,GAA4B;YACrC,GAAG;SACN,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,4CAA4C;YAC5C,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC,OAAO,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG;YACH,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,4CAA4C;YAC5C,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAA;SACZ;IACL,CAAC;CACJ;AAlCD,oDAkCC"}

package/dist/src/dht/PeerManager.d.ts

@@ -1,13 +1,13 @@
-import { PeerID, PeerIDKey } from '../helpers/PeerID';
 import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
 import { DhtNodeRpcRemote } from './DhtNodeRpcRemote';
 import { ConnectionManager } from '../connection/ConnectionManager';
 import EventEmitter from 'eventemitter3';
+import { NodeID } from '../helpers/nodeId';
 interface PeerManagerConfig {
     numberOfNodesPerKBucket: number;
     maxContactListSize: number;
     peerDiscoveryQueryBatchSize: number;
-    ownPeerId: PeerID;
+    localNodeId: NodeID;
     connectionManager: ConnectionManager;
     isLayer0: boolean;
     createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => DhtNodeRpcRemote;
@@ -19,16 +19,15 @@ export interface PeerManagerEvents {
     randomContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
     kBucketEmpty: () => void;
 }
-export declare const getDistance: (peerId1: Uint8Array, peerId2: Uint8Array) => number;
+export declare const getDistance: (nodeId1: NodeID, nodeId2: NodeID) => number;
 export declare class PeerManager extends EventEmitter<PeerManagerEvents> {
-    private bucket?;
-    readonly connections: Map<PeerIDKey, DhtNodeRpcRemote>;
-    private contacts?;
-    private randomPeers?;
-    private readonly config;
+    private bucket;
+    readonly connections: Map<NodeID, DhtNodeRpcRemote>;
+    private contacts;
+    private randomPeers;
     private stopped;
+    private readonly config;
     constructor(config: PeerManagerConfig);
-    private initKBuckets;
     private onKBucketPing;
     private onKBucketRemoved;
     private onKBucketAdded;
@@ -39,14 +38,14 @@ export declare class PeerManager extends EventEmitter<PeerManagerEvents> {
     handlePeerLeaving(peerDescriptor: PeerDescriptor): void;
     private removeContact;
     stop(): void;
-    getClosestNeighborsTo(kademliaId: Uint8Array, limit?: number, excludeSet?: Set<PeerIDKey>): DhtNodeRpcRemote[];
-    getClosestContactsTo(kademliaId: Uint8Array, limit?: number, excludeSet?: Set<PeerIDKey>): DhtNodeRpcRemote[];
-    getNumberOfContacts(excludeSet?: Set<PeerIDKey>): number;
+    getClosestNeighborsTo(referenceId: NodeID, limit?: number, excludedNodeIds?: Set<NodeID>): DhtNodeRpcRemote[];
+    getClosestContactsTo(referenceId: NodeID, limit?: number, excludedNodeIds?: Set<NodeID>): DhtNodeRpcRemote[];
+    getNumberOfContacts(excludedNodeIds?: Set<NodeID>): number;
     getNumberOfConnections(): number;
     getNumberOfNeighbors(): number;
     getNeighbors(): PeerDescriptor[];
-    handlePeerActive(peerId: PeerID): void;
-    handlePeerUnresponsive(peerId: PeerID): void;
+    handlePeerActive(nodeId: NodeID): void;
+    handlePeerUnresponsive(nodeId: NodeID): void;
     handleNewPeers(peerDescriptors: PeerDescriptor[], setActive?: boolean): void;
 }
 export {};

package/dist/src/dht/PeerManager.js

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PeerManager = exports.getDistance = void 0;
 const utils_1 = require("@streamr/utils");
 const k_bucket_1 = __importDefault(require("k-bucket"));
-const PeerID_1 = require("../helpers/PeerID");
 const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
 const RandomContactList_1 = require("./contact/RandomContactList");
 const SortedContactList_1 = require("./contact/SortedContactList");
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const nodeId_1 = require("../helpers/nodeId");
 const logger = new utils_1.Logger(module);
-const getDistance = (peerId1, peerId2) => {
-    return k_bucket_1.default.distance(peerId1, peerId2);
+const getDistance = (nodeId1, nodeId2) => {
+    return k_bucket_1.default.distance((0, utils_1.hexToBinary)(nodeId1), (0, utils_1.hexToBinary)(nodeId2));
 };
 exports.getDistance = getDistance;
 class PeerManager extends eventemitter3_1.default {
@@ -23,11 +23,8 @@ class PeerManager extends eventemitter3_1.default {
         this.connections = new Map();
         this.stopped = false;
         this.config = config;
-        this.initKBuckets();
-    }
-    initKBuckets() {
         this.bucket = new k_bucket_1.default({
-            localNodeId: this.config.ownPeerId.value,
+            localNodeId: (0, utils_1.hexToBinary)(this.config.localNodeId),
             numberOfNodesPerKBucket: this.config.numberOfNodesPerKBucket,
             numberOfNodesToPing: this.config.numberOfNodesPerKBucket
         });
@@ -38,7 +35,7 @@ class PeerManager extends eventemitter3_1.default {
             // TODO: Update contact info to the connection manager and reconnect
         });
         this.contacts = new SortedContactList_1.SortedContactList({
-            referenceId: this.config.ownPeerId,
+            referenceId: this.config.localNodeId,
             maxSize: this.config.maxContactListSize,
             allowToContainReferenceId: false,
             emitEvents: true
@@ -51,7 +48,7 @@ class PeerManager extends eventemitter3_1.default {
             this.randomPeers.addContact(this.config.createDhtNodeRpcRemote(removedContact.getPeerDescriptor()));
         });
         this.contacts.on('newContact', (newContact, activeContacts) => this.emit('newContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
-        this.randomPeers = new RandomContactList_1.RandomContactList(this.config.ownPeerId, this.config.maxContactListSize);
+        this.randomPeers = new RandomContactList_1.RandomContactList(this.config.localNodeId, this.config.maxContactListSize);
         this.randomPeers.on('contactRemoved', (removedContact, activeContacts) => this.emit('randomContactRemoved', removedContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
         this.randomPeers.on('newContact', (newContact, activeContacts) => this.emit('newRandomContact', newContact.getPeerDescriptor(), activeContacts.map((c) => c.getPeerDescriptor())));
     }
@@ -60,7 +57,7 @@ class PeerManager extends eventemitter3_1.default {
             return;
         }
         const sortingList = new SortedContactList_1.SortedContactList({
-            referenceId: this.config.ownPeerId,
+            referenceId: this.config.localNodeId,
             maxSize: 100,
             allowToContainReferenceId: false,
             emitEvents: false
@@ -68,7 +65,7 @@ class PeerManager extends eventemitter3_1.default {
         sortingList.addContacts(oldContacts);
         const sortedContacts = sortingList.getAllContacts();
         this.config.connectionManager?.weakUnlockConnection(sortedContacts[sortedContacts.length - 1].getPeerDescriptor());
-        this.bucket?.remove(sortedContacts[sortedContacts.length - 1].getPeerId().value);
+        this.bucket.remove((0, utils_1.hexToBinary)(sortedContacts[sortedContacts.length - 1].getNodeId()));
         this.bucket.add(newContact);
     }
     onKBucketRemoved(contact) {
@@ -85,10 +82,10 @@ class PeerManager extends eventemitter3_1.default {
         if (this.stopped) {
             return;
         }
-        if (!contact.getPeerId().equals(this.config.ownPeerId)) {
+        if (!(0, nodeId_1.areEqualNodeIds)(contact.getNodeId(), this.config.localNodeId)) {
             // Important to lock here, before the ping result is known
             this.config.connectionManager?.weakLockConnection(contact.getPeerDescriptor());
-            if (this.connections.has(contact.getPeerId().toKey())) {
+            if (this.connections.has(contact.getNodeId())) {
                 logger.trace(`Added new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
             }
             else { // open connection by pinging
@@ -123,19 +120,20 @@ class PeerManager extends eventemitter3_1.default {
     }
     getClosestActiveContactNotInBucket() {
         for (const contactId of this.contacts.getContactIds()) {
-            if (!this.bucket.get(contactId.value) && this.contacts.isActive(contactId)) {
+            if (!this.bucket.get((0, utils_1.hexToBinary)(contactId)) && this.contacts.isActive(contactId)) {
                 return this.contacts.getContact(contactId).contact;
             }
         }
         return undefined;
     }
     handleConnected(peerDescriptor) {
-        if (PeerID_1.PeerID.fromValue(peerDescriptor.nodeId).equals(this.config.ownPeerId)) {
+        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
+        if ((0, nodeId_1.areEqualNodeIds)(nodeId, this.config.localNodeId)) {
             logger.error('handleConnected() to self');
         }
         const rpcRemote = this.config.createDhtNodeRpcRemote(peerDescriptor);
-        if (!this.connections.has(PeerID_1.PeerID.fromValue(rpcRemote.id).toKey())) {
-            this.connections.set(PeerID_1.PeerID.fromValue(rpcRemote.id).toKey(), rpcRemote);
+        if (!this.connections.has(nodeId)) {
+            this.connections.set(nodeId, rpcRemote);
             logger.trace('connectionschange add ' + this.connections.size);
         }
         else {
@@ -145,7 +143,7 @@ class PeerManager extends eventemitter3_1.default {
     }
     handleDisconnected(peerDescriptor, gracefulLeave) {
         logger.trace('disconnected: ' + (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
-        this.connections.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor));
+        this.connections.delete((0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
         if (this.config.isLayer0) {
             this.bucket.remove(peerDescriptor.nodeId);
             if (gracefulLeave === true) {
@@ -165,10 +163,10 @@ class PeerManager extends eventemitter3_1.default {
             return;
         }
         logger.trace(`Removing contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact)}`);
-        const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
-        this.bucket.remove(peerId.value);
-        this.contacts.removeContact(peerId);
-        this.randomPeers.removeContact(peerId);
+        const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact);
+        this.bucket.remove((0, utils_1.hexToBinary)(nodeId));
+        this.contacts.removeContact(nodeId);
+        this.randomPeers.removeContact(nodeId);
     }
     stop() {
         this.stopped = true;
@@ -181,48 +179,35 @@ class PeerManager extends eventemitter3_1.default {
         this.randomPeers.stop();
         this.connections.clear();
     }
-    getClosestNeighborsTo(kademliaId, limit, excludeSet) {
+    getClosestNeighborsTo(referenceId, limit, excludedNodeIds) {
         const closest = new SortedContactList_1.SortedContactList({
-            referenceId: PeerID_1.PeerID.fromValue(kademliaId),
+            referenceId,
             allowToContainReferenceId: true,
-            emitEvents: false
+            emitEvents: false,
+            excludedNodeIds
         });
         this.bucket.toArray().map((contact) => closest.addContact(contact));
-        // TODO should set the excludeSet and limit to SortedContactList constructor and remove these line
-        return closest.getClosestContacts(limit).filter((contact) => {
-            if (!excludeSet) {
-                return true;
-            }
-            else {
-                return !excludeSet.has(contact.getPeerId().toKey());
-            }
-        });
+        return closest.getClosestContacts(limit);
     }
     // TODO reduce copy-paste?
-    getClosestContactsTo(kademliaId, limit, excludeSet) {
+    getClosestContactsTo(referenceId, limit, excludedNodeIds) {
         const closest = new SortedContactList_1.SortedContactList({
-            referenceId: PeerID_1.PeerID.fromValue(kademliaId),
+            referenceId,
             allowToContainReferenceId: true,
-            emitEvents: false
+            emitEvents: false,
+            excludedNodeIds
         });
         this.contacts.getAllContacts().map((contact) => closest.addContact(contact));
         // TODO should set the excludeSet and limit to SortedContactList constructor and remove these line
-        return closest.getClosestContacts(limit).filter((contact) => {
-            if (!excludeSet) {
-                return true;
-            }
-            else {
-                return !excludeSet.has(contact.getPeerId().toKey());
-            }
-        });
+        return closest.getClosestContacts(limit);
     }
-    getNumberOfContacts(excludeSet) {
+    getNumberOfContacts(excludedNodeIds) {
         return this.contacts.getAllContacts().filter((contact) => {
-            if (!excludeSet) {
+            if (!excludedNodeIds) {
                 return true;
             }
             else {
-                return !excludeSet.has(contact.getPeerId().toKey());
+                return !excludedNodeIds.has(contact.getNodeId());
             }
         }).length;
     }
@@ -235,35 +220,35 @@ class PeerManager extends eventemitter3_1.default {
     getNeighbors() {
         return this.bucket.toArray().map((rpcRemote) => rpcRemote.getPeerDescriptor());
     }
-    handlePeerActive(peerId) {
-        this.contacts.setActive(peerId);
+    handlePeerActive(nodeId) {
+        this.contacts.setActive(nodeId);
     }
-    handlePeerUnresponsive(peerId) {
-        this.bucket.remove(peerId.value);
-        this.contacts.removeContact(peerId);
+    handlePeerUnresponsive(nodeId) {
+        this.bucket.remove((0, utils_1.hexToBinary)(nodeId));
+        this.contacts.removeContact(nodeId);
     }
     handleNewPeers(peerDescriptors, setActive) {
         if (this.stopped) {
             return;
         }
         peerDescriptors.forEach((contact) => {
-            const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact);
-            if (!peerId.equals(this.config.ownPeerId)) {
-                logger.trace(`Adding new contact ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact)}`);
+            const nodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact);
+            if (!(0, nodeId_1.areEqualNodeIds)(nodeId, this.config.localNodeId)) {
+                logger.trace(`Adding new contact ${nodeId}`);
                 const remote = this.config.createDhtNodeRpcRemote(contact);
                 const isInBucket = (this.bucket.get(contact.nodeId) !== null);
-                const isInNeighborList = (this.contacts.getContact(peerId) !== undefined);
-                if (isInBucket || isInNeighborList) {
+                const isInContacts = (this.contacts.getContact(nodeId) !== undefined);
+                if (isInBucket || isInContacts) {
                     this.randomPeers.addContact(remote);
                 }
                 if (!isInBucket) {
                     this.bucket.add(remote);
                 }
-                if (!isInNeighborList) {
+                if (!isInContacts) {
                     this.contacts.addContact(remote);
                 }
                 if (setActive) {
-                    this.contacts.setActive(peerId);
+                    this.contacts.setActive(nodeId);
                 }
             }
         });

package/dist/src/dht/PeerManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"PeerManager.js","sourceRoot":"","sources":["../../../src/dht/PeerManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PeerManager.js","sourceRoot":"","sources":["../../../src/dht/PeerManager.ts"],"names":[],"mappings":"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"}

package/dist/src/dht/contact/Contact.d.ts

@@ -1,8 +1,8 @@
-import { PeerID } from '../../helpers/PeerID';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
+import { NodeID } from '../../helpers/nodeId';
 export declare class Contact {
     private peerDescriptor;
     constructor(peerDescriptor: PeerDescriptor);
     getPeerDescriptor(): PeerDescriptor;
-    getPeerId(): PeerID;
+    getNodeId(): NodeID;
 }

package/dist/src/dht/contact/Contact.js

@@ -9,8 +9,8 @@ class Contact {
     getPeerDescriptor() {
         return this.peerDescriptor;
     }
-    getPeerId() {
-        return (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.peerDescriptor);
+    getNodeId() {
+        return (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.peerDescriptor);
     }
 }
 exports.Contact = Contact;

package/dist/src/dht/contact/Contact.js.map

@@ -1 +1 @@
-{"version":3,"file":"Contact.js","sourceRoot":"","sources":["../../../../src/dht/contact/Contact.ts"],"names":[],"mappings":";;;AAEA,qFAAiF;AAEjF,MAAa,OAAO;IAGhB,YAAY,cAA8B;QACtC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAEM,iBAAiB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAEM,SAAS;QACZ,OAAO,IAAA,mDAAwB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IACxD,CAAC;CACJ;AAdD,0BAcC"}
+{"version":3,"file":"Contact.js","sourceRoot":"","sources":["../../../../src/dht/contact/Contact.ts"],"names":[],"mappings":";;;AACA,qFAAoF;AAGpF,MAAa,OAAO;IAIhB,YAAY,cAA8B;QACtC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAEM,iBAAiB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAEM,SAAS;QACZ,OAAO,IAAA,sDAA2B,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAC3D,CAAC;CACJ;AAfD,0BAeC"}

package/dist/src/dht/contact/ContactList.d.ts

@@ -1,5 +1,5 @@
-import { PeerID, PeerIDKey } from '../../helpers/PeerID';
 import EventEmitter from 'eventemitter3';
+import { NodeID } from '../../helpers/nodeId';
 export declare class ContactState<C> {
     contacted: boolean;
     active: boolean;
@@ -11,15 +11,15 @@ export interface Events<C> {
     newContact: (newContact: C, closestContacts: C[]) => void;
 }
 export declare class ContactList<C extends {
-    getPeerId: () => PeerID;
+    getNodeId: () => NodeID;
 }> extends EventEmitter<Events<C>> {
-    protected contactsById: Map<PeerIDKey, ContactState<C>>;
-    protected contactIds: PeerID[];
-    protected ownId: PeerID;
+    protected contactsById: Map<NodeID, ContactState<C>>;
+    protected contactIds: NodeID[];
+    protected localNodeId: NodeID;
     protected maxSize: number;
     protected defaultContactQueryLimit: number;
-    constructor(ownId: PeerID, maxSize: number, defaultContactQueryLimit?: number);
-    getContact(id: PeerID): ContactState<C> | undefined;
+    constructor(localNodeId: NodeID, maxSize: number, defaultContactQueryLimit?: number);
+    getContact(id: NodeID): ContactState<C> | undefined;
     getSize(): number;
     clear(): void;
     stop(): void;

package/dist/src/dht/contact/ContactList.js

@@ -14,17 +14,17 @@ class ContactState {
 }
 exports.ContactState = ContactState;
 class ContactList extends eventemitter3_1.default {
-    constructor(ownId, maxSize, defaultContactQueryLimit = 20) {
+    constructor(localNodeId, maxSize, defaultContactQueryLimit = 20) {
         super();
         this.contactsById = new Map();
         // TODO move this to SortedContactList
         this.contactIds = [];
-        this.ownId = ownId;
+        this.localNodeId = localNodeId;
         this.maxSize = maxSize;
         this.defaultContactQueryLimit = defaultContactQueryLimit;
     }
     getContact(id) {
-        return this.contactsById.get(id.toKey());
+        return this.contactsById.get(id);
     }
     getSize() {
         return this.contactIds.length;

package/dist/src/dht/contact/ContactList.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/ContactList.ts"],"names":[],"mappings":";;;;;;AACA,kEAAwC;AAExC,MAAa,YAAY;IAKrB,YAAY,OAAU;QAJf,cAAS,GAAG,KAAK,CAAA;QACjB,WAAM,GAAG,KAAK,CAAA;QAIjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AARD,oCAQC;AAOD,MAAa,WAAmD,SAAQ,uBAAuB;IAS3F,YACI,KAAa,EACb,OAAe,EACf,wBAAwB,GAAG,EAAE;QAE7B,KAAK,EAAE,CAAA;QAZD,iBAAY,GAAoC,IAAI,GAAG,EAAE,CAAA;QACnE,sCAAsC;QAC5B,eAAU,GAAa,EAAE,CAAA;QAW/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAA;IAC5D,CAAC;IAEM,UAAU,CAAC,EAAU;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;IAC5C,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;IACjC,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QACzB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;CACJ;AArCD,kCAqCC"}
+{"version":3,"file":"ContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/ContactList.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AAGxC,MAAa,YAAY;IAKrB,YAAY,OAAU;QAJf,cAAS,GAAG,KAAK,CAAA;QACjB,WAAM,GAAG,KAAK,CAAA;QAIjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AARD,oCAQC;AAOD,MAAa,WAAmD,SAAQ,uBAAuB;IAS3F,YACI,WAAmB,EACnB,OAAe,EACf,wBAAwB,GAAG,EAAE;QAE7B,KAAK,EAAE,CAAA;QAZD,iBAAY,GAAiC,IAAI,GAAG,EAAE,CAAA;QAChE,sCAAsC;QAC5B,eAAU,GAAa,EAAE,CAAA;QAW/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAA;IAC5D,CAAC;IAEM,UAAU,CAAC,EAAU;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;IACjC,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QACzB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;CACJ;AArCD,kCAqCC"}

package/dist/src/dht/contact/RandomContactList.d.ts

@@ -1,11 +1,11 @@
-import { PeerID } from '../../helpers/PeerID';
+import { NodeID } from '../../helpers/nodeId';
 import { ContactList } from './ContactList';
 export declare class RandomContactList<C extends {
-    getPeerId: () => PeerID;
+    getNodeId: () => NodeID;
 }> extends ContactList<C> {
     private randomness;
-    constructor(ownId: PeerID, maxSize: number, randomness?: number, defaultContactQueryLimit?: number);
+    constructor(localNodeId: NodeID, maxSize: number, randomness?: number, defaultContactQueryLimit?: number);
     addContact(contact: C): void;
-    removeContact(id: PeerID): boolean;
+    removeContact(id: NodeID): boolean;
     getContacts(limit?: number): C[];
 }

package/dist/src/dht/contact/RandomContactList.js

@@ -1,35 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RandomContactList = void 0;
+const nodeId_1 = require("../../helpers/nodeId");
 const ContactList_1 = require("./ContactList");
 class RandomContactList extends ContactList_1.ContactList {
-    constructor(ownId, maxSize, randomness = 0.20, defaultContactQueryLimit) {
-        super(ownId, maxSize, defaultContactQueryLimit);
+    constructor(localNodeId, maxSize, randomness = 0.20, defaultContactQueryLimit) {
+        super(localNodeId, maxSize, defaultContactQueryLimit);
         this.randomness = randomness;
     }
     addContact(contact) {
-        if (this.ownId.equals(contact.getPeerId())) {
+        if ((0, nodeId_1.areEqualNodeIds)(this.localNodeId, contact.getNodeId())) {
             return;
         }
-        if (!this.contactsById.has(contact.getPeerId().toKey())) {
+        if (!this.contactsById.has(contact.getNodeId())) {
             const roll = Math.random();
             if (roll < this.randomness) {
                 if (this.getSize() === this.maxSize && this.getSize() > 0) {
                     const toRemove = this.contactIds[0];
                     this.removeContact(toRemove);
                 }
-                this.contactIds.push(contact.getPeerId());
-                this.contactsById.set(contact.getPeerId().toKey(), new ContactList_1.ContactState(contact));
+                this.contactIds.push(contact.getNodeId());
+                this.contactsById.set(contact.getNodeId(), new ContactList_1.ContactState(contact));
                 this.emit('newContact', contact, this.getContacts());
             }
         }
     }
     removeContact(id) {
-        if (this.contactsById.has(id.toKey())) {
-            const removed = this.contactsById.get(id.toKey()).contact;
-            const index = this.contactIds.findIndex((element) => element.equals(id));
+        if (this.contactsById.has(id)) {
+            const removed = this.contactsById.get(id).contact;
+            const index = this.contactIds.findIndex((nodeId) => (0, nodeId_1.areEqualNodeIds)(nodeId, id));
             this.contactIds.splice(index, 1);
-            this.contactsById.delete(id.toKey());
+            this.contactsById.delete(id);
             this.emit('contactRemoved', removed, this.getContacts());
             return true;
         }
@@ -38,7 +39,7 @@ class RandomContactList extends ContactList_1.ContactList {
     getContacts(limit = this.defaultContactQueryLimit) {
         const ret = [];
         this.contactIds.forEach((contactId) => {
-            const contact = this.contactsById.get(contactId.toKey());
+            const contact = this.contactsById.get(contactId);
             if (contact) {
                 ret.push(contact.contact);
             }

package/dist/src/dht/contact/RandomContactList.js.map

@@ -1 +1 @@
-{"version":3,"file":"RandomContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/RandomContactList.ts"],"names":[],"mappings":";;;AACA,+CAAyD;AAEzD,MAAa,iBAAyD,SAAQ,yBAAc;IAIxF,YACI,KAAa,EACb,OAAe,EACf,UAAU,GAAG,IAAI,EACjB,wBAAiC;QAEjC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAAA;QAC/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC;IAED,UAAU,CAAC,OAAU;QACjB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YACxC,OAAM;SACT;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE;YACrD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YAC1B,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE;gBACxB,IAAI,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;oBACnC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;iBAC/B;gBACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;gBACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBAC7E,IAAI,CAAC,IAAI,CACL,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,WAAW,EAAE,CACrB,CAAA;aACJ;SACJ;IACL,CAAC;IAED,aAAa,CAAC,EAAU;QACpB,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAE,CAAC,OAAO,CAAA;YAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;YACxE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;YACpC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;YACxD,OAAO,IAAI,CAAA;SACd;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,wBAAwB;QACpD,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;YACxD,IAAI,OAAO,EAAE;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;QACL,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ;AA1DD,8CA0DC"}
+{"version":3,"file":"RandomContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/RandomContactList.ts"],"names":[],"mappings":";;;AAAA,iDAA8D;AAC9D,+CAAyD;AAEzD,MAAa,iBAAyD,SAAQ,yBAAc;IAIxF,YACI,WAAmB,EACnB,OAAe,EACf,UAAU,GAAG,IAAI,EACjB,wBAAiC;QAEjC,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAAA;QACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC;IAED,UAAU,CAAC,OAAU;QACjB,IAAI,IAAA,wBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YACxD,OAAM;SACT;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YAC1B,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE;gBACxB,IAAI,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;oBACnC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;iBAC/B;gBACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;gBACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,IAAI,0BAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBACrE,IAAI,CAAC,IAAI,CACL,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,WAAW,EAAE,CACrB,CAAA;aACJ;SACJ;IACL,CAAC;IAED,aAAa,CAAC,EAAU;QACpB,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,OAAO,CAAA;YAClD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,wBAAe,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC5B,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;YACxD,OAAO,IAAI,CAAA;SACd;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,wBAAwB;QACpD,MAAM,GAAG,GAAQ,EAAE,CAAA;QACnB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAChD,IAAI,OAAO,EAAE;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;QACL,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ;AA1DD,8CA0DC"}

package/dist/src/dht/contact/RpcRemote.d.ts

@@ -1,18 +1,21 @@
+import type { ServiceInfo } from '@protobuf-ts/runtime-rpc';
+import { ClassType, ClientTransport, ProtoRpcClient, RpcCommunicator } from '@streamr/proto-rpc';
 import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
-import { ProtoRpcClient } from '@streamr/proto-rpc';
 import { DhtRpcOptions } from '../../rpc-protocol/DhtRpcOptions';
 import { ServiceID } from '../../types/ServiceID';
 export declare const EXISTING_CONNECTION_TIMEOUT = 5000;
-export declare abstract class RpcRemote<T> {
+export declare abstract class RpcRemote<T extends ServiceInfo & ClassType> {
     private readonly localPeerDescriptor;
     private readonly remotePeerDescriptor;
     private readonly serviceId;
     private readonly client;
     private readonly timeout?;
-    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, client: ProtoRpcClient<T>, timeout?: number);
+    constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, serviceId: ServiceID, rpcCommunicator: RpcCommunicator, clientClass: {
+        new (clientTransport: ClientTransport): T;
+    }, timeout?: number);
     getPeerDescriptor(): PeerDescriptor;
     getLocalPeerDescriptor(): PeerDescriptor;
-    getServiceId(): string;
+    getServiceId(): ServiceID;
     getClient(): ProtoRpcClient<T>;
     formDhtRpcOptions(opts?: Omit<DhtRpcOptions, 'sourceDescriptor' | 'targetDescriptor'>): DhtRpcOptions;
 }

package/dist/src/dht/contact/RpcRemote.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcRemote = exports.EXISTING_CONNECTION_TIMEOUT = void 0;
+const proto_rpc_1 = require("@streamr/proto-rpc");
 const IConnection_1 = require("../../connection/IConnection");
 const Connectivity_1 = require("../../helpers/Connectivity");
 // Should connect directly to the server, timeout can be low
@@ -26,10 +27,12 @@ const getTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
     return WEBRTC_TIMEOUT;
 };
 class RpcRemote {
-    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, client, timeout) {
+    constructor(localPeerDescriptor, remotePeerDescriptor, serviceId, rpcCommunicator, 
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
+    clientClass, timeout) {
         this.localPeerDescriptor = localPeerDescriptor;
         this.remotePeerDescriptor = remotePeerDescriptor;
-        this.client = client;
+        this.client = (0, proto_rpc_1.toProtoRpcClient)(new clientClass(rpcCommunicator.getRpcClientTransport()));
         this.serviceId = serviceId;
         this.timeout = timeout;
     }

package/dist/src/dht/contact/RpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"RpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/contact/RpcRemote.ts"],"names":[],"mappings":";;;AAIA,8DAA6D;AAC7D,6DAAmE;AAEnE,4DAA4D;AAC5D,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,uGAAuG;AACvG,kDAAkD;AAClD,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,sFAAsF;AACtF,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B,2CAA2C;AAC9B,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAE/C,MAAM,UAAU,GAAG,CAAC,mBAAmC,EAAE,oBAAoC,EAAU,EAAE;IACrG,MAAM,cAAc,GAAG,IAAA,qCAAsB,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IACxF,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QACpD,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QAC3D,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE;QACjD,OAAO,cAAc,CAAA;KACxB;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,SAAS;IAQ3B,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAoB,EACpB,MAAyB,EACzB,OAAgB;QAEhB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAmE;QACjF,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,mBAAmB;YAC1C,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,oBAAoB,CAAC;YACxF,GAAG,IAAI;SACV,CAAA;IACL,CAAC;CACJ;AA9CD,8BA8CC"}
+{"version":3,"file":"RpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/contact/RpcRemote.ts"],"names":[],"mappings":";;;AACA,kDAAkH;AAClH,8DAA6D;AAC7D,6DAAmE;AAKnE,4DAA4D;AAC5D,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,uGAAuG;AACvG,kDAAkD;AAClD,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,sFAAsF;AACtF,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B,2CAA2C;AAC9B,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAE/C,MAAM,UAAU,GAAG,CAAC,mBAAmC,EAAE,oBAAoC,EAAU,EAAE;IACrG,MAAM,cAAc,GAAG,IAAA,qCAAsB,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IACxF,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QACpD,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,gBAAgB,EAAE;QAC3D,OAAO,wBAAwB,CAAA;KAClC;SAAM,IAAI,cAAc,KAAK,4BAAc,CAAC,MAAM,EAAE;QACjD,OAAO,cAAc,CAAA;KACxB;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAsB,SAAS;IAQ3B,YACI,mBAAmC,EACnC,oBAAoC,EACpC,SAAoB,EACpB,eAAgC;IAChC,mEAAmE;IACnE,WAA0D,EAC1D,OAAgB;QAEhB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,WAAW,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QACxF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAmE;QACjF,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,mBAAmB;YAC1C,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,oBAAoB,CAAC;YACxF,GAAG,IAAI;SACV,CAAA;IACL,CAAC;CACJ;AAhDD,8BAgDC"}