@streamr/dht 101.1.2 → 102.0.0-beta.0

package/src/dht/recursive-operation/RecursiveOperationManager.ts

@@ -6,7 +6,7 @@ import {
     RouteMessageAck,
     RouteMessageError,
     RouteMessageWrapper
-} from '../../proto/packages/dht/protos/DhtRpc'
+} from '../../../generated/packages/dht/protos/DhtRpc'
 import { Router } from '../routing/Router'
 import { RoutingMode } from '../routing/RoutingSession'
 import { Logger, areEqualBinaries, runAndWaitForEvents3, wait } from '@streamr/utils'
@@ -17,13 +17,13 @@ import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote'
 import { ITransport } from '../../transport/ITransport'
 import { LocalDataStore } from '../store/LocalDataStore'
 import { ListeningRpcCommunicator } from '../../transport/ListeningRpcCommunicator'
-import { RecursiveOperationSessionRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
+import { RecursiveOperationSessionRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client'
 import { SortedContactList } from '../contact/SortedContactList'
 import { getPreviousPeer } from '../routing/getPreviousPeer'
 import { createRouteMessageAck } from '../routing/RouterRpcLocal'
 import { ServiceID } from '../../types/ServiceID'
 import { RecursiveOperationRpcLocal } from './RecursiveOperationRpcLocal'
-import { DhtAddress, areEqualPeerDescriptors, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../identifiers'
+import { DhtAddress, areEqualPeerDescriptors, toDhtAddress, toNodeId, toDhtAddressRaw } from '../../identifiers'
 import { getDistance } from '../PeerManager'
 import { ConnectionsView } from '../../exports'
 
@@ -99,7 +99,7 @@ export class RecursiveOperationManager {
         if (this.options.connectionsView.getConnectionCount() === 0) {
             const dataEntries = Array.from(this.options.localDataStore.values(targetId))
             session.onResponseReceived(
-                getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor),
+                toNodeId(this.options.localPeerDescriptor),
                 [this.options.localPeerDescriptor],
                 [this.options.localPeerDescriptor],
                 dataEntries,
@@ -131,7 +131,7 @@ export class RecursiveOperationManager {
                 this.sendResponse([this.options.localPeerDescriptor], this.options.localPeerDescriptor, session.getId(), [], dataEntries, true)
             }
         } else if (operation === RecursiveOperation.DELETE_DATA) {
-            this.options.localDataStore.markAsDeleted(targetId, getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor))
+            this.options.localDataStore.markAsDeleted(targetId, toNodeId(this.options.localPeerDescriptor))
         }
         this.ongoingSessions.delete(session.getId())
         session.stop()
@@ -150,7 +150,7 @@ export class RecursiveOperationManager {
         if (isOwnNode && this.ongoingSessions.has(serviceId)) {
             this.ongoingSessions.get(serviceId)!
                 .onResponseReceived(
-                    getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor),
+                    toNodeId(this.options.localPeerDescriptor),
                     routingPath,
                     closestConnectedNodes,
                     dataEntries,
@@ -180,7 +180,7 @@ export class RecursiveOperationManager {
         if (this.stopped) {
             return createRouteMessageAck(routedMessage, RouteMessageError.STOPPED)
         }
-        const targetId = getDhtAddressFromRaw(routedMessage.target)
+        const targetId = toDhtAddress(routedMessage.target)
         const request = (routedMessage.message!.body as { recursiveOperationRequest: RecursiveOperationRequest }).recursiveOperationRequest
         // TODO use options option or named constant?
         const closestConnectedNodes = this.getClosestConnectedNodes(targetId, 5)
@@ -188,7 +188,7 @@ export class RecursiveOperationManager {
             ? Array.from(this.options.localDataStore.values(targetId))
             : []
         if (request.operation === RecursiveOperation.DELETE_DATA) {
-            this.options.localDataStore.markAsDeleted(targetId, getNodeIdFromPeerDescriptor(routedMessage.sourcePeer!))
+            this.options.localDataStore.markAsDeleted(targetId, toNodeId(routedMessage.sourcePeer!))
         }
         if (areEqualBinaries(this.options.localPeerDescriptor.nodeId, routedMessage.target)) {
             // TODO this is also very similar case to what we do at line 255, could simplify the code paths?
@@ -235,7 +235,7 @@ export class RecursiveOperationManager {
     }
 
     private isPeerCloserToIdThanSelf(peer: PeerDescriptor, nodeIdOrDataKey: DhtAddress): boolean {
-        const nodeIdOrDataKeyRaw = getRawFromDhtAddress(nodeIdOrDataKey)
+        const nodeIdOrDataKeyRaw = toDhtAddressRaw(nodeIdOrDataKey)
         const distance1 = getDistance(peer.nodeId, nodeIdOrDataKeyRaw)
         const distance2 = getDistance(this.options.localPeerDescriptor.nodeId, nodeIdOrDataKeyRaw)
         return distance1 < distance2

package/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts

@@ -1,9 +1,9 @@
 import { Logger } from '@streamr/utils'
-import { PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
-import { IRecursiveOperationRpc } from '../../proto/packages/dht/protos/DhtRpc.server'
+import { PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc'
+import { IRecursiveOperationRpc } from '../../../generated/packages/dht/protos/DhtRpc.server'
 import { createRouteMessageAck } from '../routing/RouterRpcLocal'
 import { getPreviousPeer } from '../routing/getPreviousPeer'
-import { getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { toNodeId } from '../../identifiers'
 
 const logger = new Logger(module)
 
@@ -26,7 +26,7 @@ export class RecursiveOperationRpcLocal implements IRecursiveOperationRpc {
         if (this.options.isMostLikelyDuplicate(routedMessage.requestId)) {
             return createRouteMessageAck(routedMessage, RouteMessageError.DUPLICATE)
         }
-        const remoteNodeId = getNodeIdFromPeerDescriptor(getPreviousPeer(routedMessage) ?? routedMessage.sourcePeer!)
+        const remoteNodeId = toNodeId(getPreviousPeer(routedMessage) ?? routedMessage.sourcePeer!)
         logger.trace(`Received routeRequest call from ${remoteNodeId}`)
         this.options.addToDuplicateDetector(routedMessage.requestId)
         return this.options.doRouteRequest(routedMessage)

package/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts

@@ -1,10 +1,10 @@
 import { Logger } from '@streamr/utils'
 import { v4 } from 'uuid'
-import { RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
-import { RecursiveOperationRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
+import { RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc'
+import { RecursiveOperationRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client'
 import { RpcRemote } from '../contact/RpcRemote'
 import { getPreviousPeer } from '../routing/getPreviousPeer'
-import { getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { toNodeId } from '../../identifiers'
 
 const logger = new Logger(module)
 
@@ -32,9 +32,9 @@ export class RecursiveOperationRpcRemote extends RpcRemote<RecursiveOperationRpc
         } catch (err) {
             const previousPeer = getPreviousPeer(params)
             const fromNode = previousPeer
-                ? getNodeIdFromPeerDescriptor(previousPeer)
-                : getNodeIdFromPeerDescriptor(params.sourcePeer!)
-            const toNode = getNodeIdFromPeerDescriptor(this.getPeerDescriptor())
+                ? toNodeId(previousPeer)
+                : toNodeId(params.sourcePeer!)
+            const toNode = toNodeId(this.getPeerDescriptor())
             logger.debug(`Failed to send routeRequest message from ${fromNode} to ${toNode}`, { err })
             return false
         }

package/src/dht/recursive-operation/RecursiveOperationSession.ts

@@ -9,7 +9,7 @@ import {
     RouteMessageAck,
     RecursiveOperationRequest,
     Message
-} from '../../proto/packages/dht/protos/DhtRpc'
+} from '../../../generated/packages/dht/protos/DhtRpc'
 import { ITransport } from '../../transport/ITransport'
 import { ListeningRpcCommunicator } from '../../transport/ListeningRpcCommunicator'
 import { Contact } from '../contact/Contact'
@@ -17,7 +17,7 @@ import { SortedContactList } from '../contact/SortedContactList'
 import { RecursiveOperationResult } from './RecursiveOperationManager'
 import { ServiceID } from '../../types/ServiceID'
 import { RecursiveOperationSessionRpcLocal } from './RecursiveOperationSessionRpcLocal'
-import { DhtAddress, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../identifiers'
+import { DhtAddress, toDhtAddress, toNodeId, toDhtAddressRaw } from '../../identifiers'
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 
 export interface RecursiveOperationSessionEvents {
@@ -100,7 +100,7 @@ export class RecursiveOperationSession extends EventEmitter<RecursiveOperationSe
         const routeMessage: RouteMessageWrapper = {
             message: msg,
             requestId: v4(),
-            target: getRawFromDhtAddress(this.options.targetId),
+            target: toDhtAddressRaw(this.options.targetId),
             sourcePeer: this.options.localPeerDescriptor,
             reachableThrough: [],
             routingPath: [],
@@ -151,9 +151,9 @@ export class RecursiveOperationSession extends EventEmitter<RecursiveOperationSe
     }
 
     private addKnownHops(routingPath: PeerDescriptor[]) {
-        const localNodeId = getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor)
+        const localNodeId = toNodeId(this.options.localPeerDescriptor)
         routingPath.forEach((desc) => {
-            const newNodeId = getNodeIdFromPeerDescriptor(desc)
+            const newNodeId = toNodeId(desc)
             if (localNodeId !== newNodeId) {
                 this.allKnownHops.add(newNodeId)
             }
@@ -161,8 +161,8 @@ export class RecursiveOperationSession extends EventEmitter<RecursiveOperationSe
     }
 
     private setHopAsReported(desc: PeerDescriptor) {
-        const localNodeId = getNodeIdFromPeerDescriptor(this.options.localPeerDescriptor)
-        const newNodeId = getNodeIdFromPeerDescriptor(desc)
+        const localNodeId = toNodeId(this.options.localPeerDescriptor)
+        const newNodeId = toNodeId(desc)
         if (localNodeId !== newNodeId) {
             this.reportedHops.add(newNodeId)
         }
@@ -180,7 +180,7 @@ export class RecursiveOperationSession extends EventEmitter<RecursiveOperationSe
 
     private processFoundData(dataEntries: DataEntry[]): void {
         dataEntries.forEach((entry) => {
-            const creatorNodeId = getDhtAddressFromRaw(entry.creator)
+            const creatorNodeId = toDhtAddress(entry.creator)
             const existingEntry = this.foundData.get(creatorNodeId)
             if (!existingEntry || existingEntry.createdAt! < entry.createdAt! 
                 || (existingEntry.createdAt! <= entry.createdAt! && entry.deleted)) {

package/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts

@@ -1,10 +1,10 @@
-import { IRecursiveOperationSessionRpc } from '../../proto/packages/dht/protos/DhtRpc.server'
-import { Empty } from '../../proto/google/protobuf/empty'
-import { DataEntry, RecursiveOperationResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { IRecursiveOperationSessionRpc } from '../../../generated/packages/dht/protos/DhtRpc.server'
+import { Empty } from '../../../generated/google/protobuf/empty'
+import { DataEntry, RecursiveOperationResponse, PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import { Logger } from '@streamr/utils'
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { DhtCallContext } from '../../rpc-protocol/DhtCallContext'
-import { DhtAddress, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { DhtAddress, toNodeId } from '../../identifiers'
 
 const logger = new Logger(module)
 
@@ -27,7 +27,7 @@ export class RecursiveOperationSessionRpcLocal implements IRecursiveOperationSes
     }
     
     async sendResponse(report: RecursiveOperationResponse, context: ServerCallContext): Promise<Empty> {
-        const remoteNodeId = getNodeIdFromPeerDescriptor((context as DhtCallContext).incomingSourceDescriptor!)
+        const remoteNodeId = toNodeId((context as DhtCallContext).incomingSourceDescriptor!)
         logger.trace('RecursiveOperationResponse arrived: ' + JSON.stringify(report))
         this.options.onResponseReceived(remoteNodeId, report.routingPath, report.closestConnectedNodes, report.dataEntries, report.noCloserNodesFound)
         return {}

package/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts

@@ -3,8 +3,8 @@ import {
     DataEntry,
     PeerDescriptor,
     RecursiveOperationResponse
-} from '../../proto/packages/dht/protos/DhtRpc'
-import { RecursiveOperationSessionRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
+} from '../../../generated/packages/dht/protos/DhtRpc'
+import { RecursiveOperationSessionRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client'
 import { RpcRemote } from '../contact/RpcRemote'
 
 const logger = new Logger(module)

package/src/dht/routing/Router.ts

@@ -1,11 +1,11 @@
-import { Message, PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
+import { Message, PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc'
 import { RoutingMode, RoutingRemoteContact, RoutingSession, RoutingSessionEvents } from './RoutingSession'
 import { Logger, executeSafePromise, raceEvents3, withTimeout } from '@streamr/utils'
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator'
 import { DuplicateDetector } from './DuplicateDetector'
 import { v4 } from 'uuid'
 import { RouterRpcLocal, createRouteMessageAck } from './RouterRpcLocal'
-import { DhtAddress, areEqualPeerDescriptors, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { DhtAddress, areEqualPeerDescriptors, toDhtAddress, toNodeId } from '../../identifiers'
 import { RoutingTablesCache } from './RoutingTablesCache'
 
 export interface RouterOptions {
@@ -31,6 +31,8 @@ export class Router {
     private readonly duplicateRequestDetector: DuplicateDetector = new DuplicateDetector(10000)
     private stopped = false
     private readonly options: RouterOptions
+    private messagesRouted = 0
+    private messagesSent = 0
 
     constructor(options: RouterOptions) {
         this.options = options
@@ -73,7 +75,7 @@ export class Router {
     public send(msg: Message, reachableThrough: PeerDescriptor[]): void {
         msg.sourceDescriptor = this.options.localPeerDescriptor
         const targetPeerDescriptor = msg.targetDescriptor!
-        const forwardingEntry = this.forwardingTable.get(getNodeIdFromPeerDescriptor(targetPeerDescriptor))
+        const forwardingEntry = this.forwardingTable.get(toNodeId(targetPeerDescriptor))
         if (forwardingEntry && forwardingEntry.peerDescriptors.length > 0) {
             const forwardedMessage: RouteMessageWrapper = {
                 message: msg,
@@ -107,22 +109,21 @@ export class Router {
                 throw new Error(error)
             }
         }
+        this.messagesSent += 1
     }
 
     public doRouteMessage(routedMessage: RouteMessageWrapper, mode = RoutingMode.ROUTE, excludedPeer?: DhtAddress): RouteMessageAck {
         if (this.stopped) {
             return createRouteMessageAck(routedMessage, RouteMessageError.STOPPED)
         }
-        logger.trace(`Routing message ${routedMessage.requestId} from ${getNodeIdFromPeerDescriptor(routedMessage.sourcePeer!)} `
-            + `to ${getDhtAddressFromRaw(routedMessage.target)}`)
+        logger.trace(`Routing message ${routedMessage.requestId} from ${toNodeId(routedMessage.sourcePeer!)} `
+            + `to ${toDhtAddress(routedMessage.target)}`)
         const session = this.createRoutingSession(routedMessage, mode, excludedPeer)
         const contacts = session.updateAndGetRoutablePeers()
         if (contacts.length > 0) {
             this.addRoutingSession(session)
-            // eslint-disable-next-line promise/catch-or-return
             logger.trace('starting to raceEvents from routingSession: ' + session.sessionId)
             let eventReceived: Promise<unknown>
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             executeSafePromise(async () => {
                 eventReceived = raceEvents3<RoutingSessionEvents>(
                     session,
@@ -142,6 +143,7 @@ export class Router {
                 this.removeRoutingSession(session.sessionId) 
             })
             session.sendMoreRequests(contacts)
+            this.messagesRouted += 1
             return createRouteMessageAck(routedMessage)
         } else {
             logger.trace('no targets', { sessionId: session.sessionId })
@@ -150,7 +152,7 @@ export class Router {
     }
 
     private createRoutingSession(routedMessage: RouteMessageWrapper, mode: RoutingMode, excludedNode?: DhtAddress): RoutingSession {
-        const excludedNodeIds = new Set<DhtAddress>(routedMessage.routingPath.map((descriptor) => getNodeIdFromPeerDescriptor(descriptor)))
+        const excludedNodeIds = new Set<DhtAddress>(routedMessage.routingPath.map((descriptor) => toNodeId(descriptor)))
         if (excludedNode) {
             excludedNodeIds.add(excludedNode)
         }
@@ -192,7 +194,7 @@ export class Router {
     }
 
     onNodeDisconnected(peerDescriptor: PeerDescriptor): void {
-        this.routingTablesCache.onNodeDisconnected(getNodeIdFromPeerDescriptor(peerDescriptor))
+        this.routingTablesCache.onNodeDisconnected(toNodeId(peerDescriptor))
     }
 
     public resetCache(): void {
@@ -213,13 +215,20 @@ export class Router {
         this.routingTablesCache.reset()
     }
 
+    getDiagnosticInfo(): Record<string, unknown> {
+        return {
+            messagesRouted: this.messagesRouted,
+            messagesSent: this.messagesSent
+        }
+    }
+
     private setForwardingEntries(routedMessage: RouteMessageWrapper): void {
         const reachableThroughWithoutSelf = routedMessage.reachableThrough.filter((peer) => {
             return !areEqualPeerDescriptors(peer, this.options.localPeerDescriptor)
         })
         
         if (reachableThroughWithoutSelf.length > 0) {
-            const sourceNodeId = getNodeIdFromPeerDescriptor(routedMessage.sourcePeer!)
+            const sourceNodeId = toNodeId(routedMessage.sourcePeer!)
             if (this.forwardingTable.has(sourceNodeId)) {
                 const oldEntry = this.forwardingTable.get(sourceNodeId)
                 clearTimeout(oldEntry!.timeout)

package/src/dht/routing/RouterRpcLocal.ts

@@ -1,9 +1,9 @@
 import { Logger, areEqualBinaries } from '@streamr/utils'
-import { Message, PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
-import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server'
+import { Message, PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc'
+import { IRouterRpc } from '../../../generated/packages/dht/protos/DhtRpc.server'
 import { DuplicateDetector } from './DuplicateDetector'
 import { RoutingMode } from './RoutingSession'
-import { areEqualPeerDescriptors, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { areEqualPeerDescriptors, toDhtAddress, toNodeId } from '../../identifiers'
 import { v4 } from 'uuid'
 
 interface RouterRpcLocalOptions {
@@ -34,8 +34,8 @@ export class RouterRpcLocal implements IRouterRpc {
 
     async routeMessage(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck> {
         if (this.options.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
-            logger.trace(`Routing message ${routedMessage.requestId} from ${getNodeIdFromPeerDescriptor(routedMessage.sourcePeer!)} `
-                + `to ${getDhtAddressFromRaw(routedMessage.target)} is likely a duplicate`)
+            logger.trace(`Routing message ${routedMessage.requestId} from ${toNodeId(routedMessage.sourcePeer!)} `
+                + `to ${toDhtAddress(routedMessage.target)} is likely a duplicate`)
             return createRouteMessageAck(routedMessage, RouteMessageError.DUPLICATE)
         }
         logger.trace(`Processing received routeMessage ${routedMessage.requestId}`)
@@ -52,8 +52,8 @@ export class RouterRpcLocal implements IRouterRpc {
 
     async forwardMessage(forwardMessage: RouteMessageWrapper): Promise<RouteMessageAck> {
         if (this.options.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
-            logger.trace(`Forwarding message ${forwardMessage.requestId} from ${getNodeIdFromPeerDescriptor(forwardMessage.sourcePeer!)} `
-                + `to ${getDhtAddressFromRaw(forwardMessage.target)} is likely a duplicate`)
+            logger.trace(`Forwarding message ${forwardMessage.requestId} from ${toNodeId(forwardMessage.sourcePeer!)} `
+                + `to ${toDhtAddress(forwardMessage.target)} is likely a duplicate`)
             return createRouteMessageAck(forwardMessage, RouteMessageError.DUPLICATE)
         }
         logger.trace(`Processing received forward routeMessage ${forwardMessage.requestId}`)

package/src/dht/routing/RouterRpcRemote.ts

@@ -1,10 +1,10 @@
 import { Logger, areEqualBinaries } from '@streamr/utils'
 import { v4 } from 'uuid'
-import { RouteMessageError, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
-import { RouterRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
+import { RouteMessageError, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc'
+import { RouterRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client'
 import { RpcRemote } from '../contact/RpcRemote'
 import { getPreviousPeer } from './getPreviousPeer'
-import { getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { toNodeId } from '../../identifiers'
 
 const logger = new Logger(module)
 
@@ -39,9 +39,9 @@ export class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
         } catch (err) {
             const previousPeer = getPreviousPeer(params)
             const fromNode = previousPeer
-                ? getNodeIdFromPeerDescriptor(previousPeer)
-                : getNodeIdFromPeerDescriptor(params.sourcePeer!)
-            const toNode = getNodeIdFromPeerDescriptor(this.getPeerDescriptor())
+                ? toNodeId(previousPeer)
+                : toNodeId(params.sourcePeer!)
+            const toNode = toNodeId(this.getPeerDescriptor())
             logger.trace(`Failed to send routeMessage from ${fromNode} to ${toNode}`, { err })
             return false
         }
@@ -69,9 +69,9 @@ export class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
         } catch (err) {
             const previousPeer = getPreviousPeer(params)
             const fromNode = previousPeer
-                ? getNodeIdFromPeerDescriptor(previousPeer)
-                : getNodeIdFromPeerDescriptor(params.sourcePeer!)
-            const toNode = getNodeIdFromPeerDescriptor(this.getPeerDescriptor())
+                ? toNodeId(previousPeer)
+                : toNodeId(params.sourcePeer!)
+            const toNode = toNodeId(this.getPeerDescriptor())
             logger.trace(`Failed to send forwardMessage from ${fromNode} to ${toNode}`, { err })
             return false
         }

package/src/dht/routing/RoutingSession.ts

@@ -2,14 +2,14 @@ import { SortedContactList } from '../contact/SortedContactList'
 import { Logger } from '@streamr/utils'
 import EventEmitter from 'eventemitter3'
 import { v4 } from 'uuid'
-import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
+import { PeerDescriptor, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc'
 import { RouterRpcRemote, ROUTING_TIMEOUT } from './RouterRpcRemote'
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator'
-import { RecursiveOperationRpcClient, RouterRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
+import { RecursiveOperationRpcClient, RouterRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client'
 import { Contact } from '../contact/Contact'
 import { RecursiveOperationRpcRemote } from '../recursive-operation/RecursiveOperationRpcRemote'
 import { getPreviousPeer } from './getPreviousPeer'
-import { DhtAddress, areEqualPeerDescriptors, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../../identifiers'
+import { DhtAddress, areEqualPeerDescriptors, toDhtAddress, toNodeId } from '../../identifiers'
 import { pull } from 'lodash'
 import { RoutingTable, RoutingTablesCache } from './RoutingTablesCache'
 
@@ -160,14 +160,14 @@ export class RoutingSession extends EventEmitter<RoutingSessionEvents> {
     updateAndGetRoutablePeers(): RoutingRemoteContact[] {
         logger.trace('getRoutablePeers() sessionId: ' + this.sessionId)
         const previousPeer = getPreviousPeer(this.options.routedMessage)
-        const previousId = previousPeer ? getNodeIdFromPeerDescriptor(previousPeer) : undefined
-        const targetId = getDhtAddressFromRaw(this.options.routedMessage.target)
+        const previousId = previousPeer ? toNodeId(previousPeer) : undefined
+        const targetId = toDhtAddress(this.options.routedMessage.target)
         let routingTable: RoutingTable
         if (this.options.routingTablesCache.has(targetId, previousId)) {
             routingTable = this.options.routingTablesCache.get(targetId, previousId)!
         } else {
             routingTable = new SortedContactList<RoutingRemoteContact>({
-                referenceId: getDhtAddressFromRaw(this.options.routedMessage.target),
+                referenceId: toDhtAddress(this.options.routedMessage.target),
                 maxSize: ROUTING_TABLE_MAX_SIZE,
                 allowToContainReferenceId: true,
                 nodeIdDistanceLimit: previousId
@@ -196,8 +196,7 @@ export class RoutingSession extends EventEmitter<RoutingSessionEvents> {
         }
         while ((this.ongoingRequests.size < this.options.parallelism) && (uncontacted.length > 0) && !this.stopped) {
             const nextPeer = uncontacted.shift()
-            // eslint-disable-next-line max-len
-            logger.trace(`Sending routeMessage request to contact: ${getNodeIdFromPeerDescriptor(nextPeer!.getPeerDescriptor())} (sessionId=${this.sessionId})`)
+            logger.trace(`Sending routeMessage request to contact: ${toNodeId(nextPeer!.getPeerDescriptor())} (sessionId=${this.sessionId})`)
             this.contactedPeers.add(nextPeer!.getNodeId())
             this.ongoingRequests.add(nextPeer!.getNodeId())
             this.addParallelRootIfSource(nextPeer!.getNodeId())

package/src/dht/routing/getPreviousPeer.ts

@@ -1,5 +1,5 @@
 import { last } from 'lodash'
-import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
+import { PeerDescriptor, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc'
 
 export const getPreviousPeer = (routeMessage: RouteMessageWrapper): PeerDescriptor | undefined => {
     return last(routeMessage.routingPath)

package/src/dht/store/LocalDataStore.ts

@@ -1,5 +1,5 @@
-import { DataEntry } from '../../proto/packages/dht/protos/DhtRpc'
-import { DhtAddress, getDhtAddressFromRaw } from '../../identifiers'
+import { DataEntry } from '../../../generated/packages/dht/protos/DhtRpc'
+import { DhtAddress, toDhtAddress } from '../../identifiers'
 import { MapWithTtl } from '@streamr/utils'
 
 export class LocalDataStore {
@@ -16,8 +16,8 @@ export class LocalDataStore {
     private store: Map<DhtAddress, MapWithTtl<DhtAddress, DataEntry>> = new Map()
 
     public storeEntry(dataEntry: DataEntry): boolean {
-        const key = getDhtAddressFromRaw(dataEntry.key)
-        const creatorNodeId = getDhtAddressFromRaw(dataEntry.creator)
+        const key = toDhtAddress(dataEntry.key)
+        const creatorNodeId = toDhtAddress(dataEntry.creator)
         if (!this.store.has(key)) {
             this.store.set(key, new MapWithTtl((e) => Math.min(e.ttl, this.maxTtl)))
         }

package/src/dht/store/StoreManager.ts

@@ -3,19 +3,19 @@ import { Logger } from '@streamr/utils'
 import {
     DhtAddress,
     areEqualPeerDescriptors,
-    getDhtAddressFromRaw,
-    getNodeIdFromPeerDescriptor,
-    getRawFromDhtAddress
+    toDhtAddress,
+    toNodeId,
+    toDhtAddressRaw
 } from '../../identifiers'
-import { Any } from '../../proto/google/protobuf/any'
-import { Timestamp } from '../../proto/google/protobuf/timestamp'
+import { Any } from '../../../generated/google/protobuf/any'
+import { Timestamp } from '../../../generated/google/protobuf/timestamp'
 import {
     DataEntry,
     PeerDescriptor,
     RecursiveOperation,
     ReplicateDataRequest,
     StoreDataRequest, StoreDataResponse
-} from '../../proto/packages/dht/protos/DhtRpc'
+} from '../../../generated/packages/dht/protos/DhtRpc'
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator'
 import { ServiceID } from '../../types/ServiceID'
 import { getClosestNodes } from '../contact/getClosestNodes'
@@ -85,7 +85,7 @@ export class StoreManager {
     private async replicateDataToContact(dataEntry: DataEntry, contact: PeerDescriptor): Promise<void> {
         const rpcRemote = this.options.createRpcRemote(contact)
         try {
-            await rpcRemote.replicateData({ entry: dataEntry })
+            await rpcRemote.replicateData({ entry: dataEntry }, true)
         } catch (e) {
             logger.trace('replicateData() threw an exception ' + e)
         }
@@ -99,8 +99,8 @@ export class StoreManager {
         const ttl = this.options.highestTtl // ToDo: make TTL decrease according to some nice curve
         const createdAt = Timestamp.now()
         for (let i = 0; i < closestNodes.length && successfulNodes.length < this.options.redundancyFactor; i++) {
-            const keyRaw = getRawFromDhtAddress(key)
-            const creatorRaw = getRawFromDhtAddress(creator)
+            const keyRaw = toDhtAddressRaw(key)
+            const creatorRaw = toDhtAddressRaw(creator)
             if (areEqualPeerDescriptors(this.options.localPeerDescriptor, closestNodes[i])) {
                 this.options.localDataStore.storeEntry({
                     key: keyRaw,
@@ -136,7 +136,7 @@ export class StoreManager {
     private async replicateDataToClosestNodes(): Promise<void> {
         const dataEntries = Array.from(this.options.localDataStore.values())
         await Promise.all(dataEntries.map(async (dataEntry) => {
-            const dataKey = getDhtAddressFromRaw(dataEntry.key)
+            const dataKey = toDhtAddress(dataEntry.key)
             const neighbors = getClosestNodes(
                 dataKey,
                 this.options.getNeighbors(),
@@ -145,7 +145,7 @@ export class StoreManager {
             await Promise.all(neighbors.map(async (neighbor) => {
                 const rpcRemote = this.options.createRpcRemote(neighbor)
                 try {
-                    await rpcRemote.replicateData({ entry: dataEntry })
+                    await rpcRemote.replicateData({ entry: dataEntry }, false)
                 } catch (err) {
                     logger.trace('Failed to replicate data in replicateDataToClosestNodes', { err })
                 }
@@ -159,7 +159,7 @@ export class StoreManager {
             [...this.options.getNeighbors(), this.options.localPeerDescriptor],
             { 
                 maxCount: this.options.redundancyFactor,
-                excludedNodeIds: excludedNode !== undefined ? new Set([getNodeIdFromPeerDescriptor(excludedNode)]) : undefined
+                excludedNodeIds: excludedNode !== undefined ? new Set([toNodeId(excludedNode)]) : undefined
             }
         )
     }

package/src/dht/store/StoreRpcLocal.ts

@@ -1,17 +1,17 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { Logger, executeSafePromise } from '@streamr/utils'
-import { Empty } from '../../proto/google/protobuf/empty'
-import { Timestamp } from '../../proto/google/protobuf/timestamp'
+import { Empty } from '../../../generated/google/protobuf/empty'
+import { Timestamp } from '../../../generated/google/protobuf/timestamp'
 import {
     DataEntry,
     PeerDescriptor,
     ReplicateDataRequest,
     StoreDataRequest, StoreDataResponse
-} from '../../proto/packages/dht/protos/DhtRpc'
-import { IStoreRpc } from '../../proto/packages/dht/protos/DhtRpc.server'
+} from '../../../generated/packages/dht/protos/DhtRpc'
+import { IStoreRpc } from '../../../generated/packages/dht/protos/DhtRpc.server'
 import { DhtCallContext } from '../../rpc-protocol/DhtCallContext'
 import { LocalDataStore } from './LocalDataStore'
-import { areEqualPeerDescriptors, DhtAddress, getDhtAddressFromRaw } from '../../identifiers'
+import { areEqualPeerDescriptors, DhtAddress, toDhtAddress } from '../../identifiers'
 
 interface StoreRpcLocalOptions {
     localDataStore: LocalDataStore
@@ -32,7 +32,7 @@ export class StoreRpcLocal implements IStoreRpc {
 
     async storeData(request: StoreDataRequest): Promise<StoreDataResponse> {
         logger.trace('storeData()')
-        const key = getDhtAddressFromRaw(request.key)
+        const key = toDhtAddress(request.key)
         const isLocalNodeStorer = this.isLocalNodeStorer(key)
         this.options.localDataStore.storeEntry({ 
             key: request.key,
@@ -57,7 +57,7 @@ export class StoreRpcLocal implements IStoreRpc {
         if (wasStored) {
             this.replicateDataToNeighbors((context as DhtCallContext).incomingSourceDescriptor!, request.entry!)
         }
-        const key = getDhtAddressFromRaw(dataEntry.key)
+        const key = toDhtAddress(dataEntry.key)
         if (!this.isLocalNodeStorer(key)) {
             this.options.localDataStore.setAllEntriesAsStale(key)
         }
@@ -70,7 +70,7 @@ export class StoreRpcLocal implements IStoreRpc {
     }
 
     private replicateDataToNeighbors(requestor: PeerDescriptor, dataEntry: DataEntry): void {
-        const dataKey = getDhtAddressFromRaw(dataEntry.key)
+        const dataKey = toDhtAddress(dataEntry.key)
         const storers = this.options.getStorers(dataKey)
         const isLocalNodePrimaryStorer = areEqualPeerDescriptors(storers[0], this.options.localPeerDescriptor)
         // If we are the closest to the data, get storageRedundancyFactor - 1 nearest node to the data, and