@streamr/trackerless-network 102.0.0-beta.0 → 102.0.0-beta.1

package/src/exports.ts

@@ -1,5 +1,5 @@
 export { NetworkNode, createNetworkNode } from './NetworkNode'
-export { NetworkOptions, NetworkStack, NodeInfo } from './NetworkStack'
+export { NetworkOptions, NetworkStack } from './NetworkStack'
 export { ContentDeliveryManagerOptions, streamPartIdToDataKey } from './logic/ContentDeliveryManager'
 export {
     ContentType,
@@ -11,6 +11,8 @@ export {
     MessageRef,
     ProxyDirection,
     SignatureType,
-    StreamMessage
-} from './proto/packages/trackerless-network/protos/NetworkRpc'
+    StreamMessage,
+    ControlLayerInfo
+} from '../generated/packages/trackerless-network/protos/NetworkRpc'
 export { ExternalRpcClient, ExternalRpcClientClass } from './logic/ExternalNetworkRpc'
+export { NodeInfo, StreamPartitionInfo, ContentDeliveryLayerNeighborInfo } from './types'

package/src/logic/ContentDeliveryLayerNode.ts

@@ -10,15 +10,14 @@ import { Logger, StreamPartID, addManagedEventListener } from '@streamr/utils'
 import { EventEmitter } from 'eventemitter3'
 import {
     CloseTemporaryConnection,
-    ContentDeliveryLayerNeighborInfo,
     LeaveStreamPartNotice,
     MessageID,
     MessageRef,
     StreamMessage,
     TemporaryConnectionRequest,
     TemporaryConnectionResponse,
-} from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { ContentDeliveryRpcLocal } from './ContentDeliveryRpcLocal'
 import { ContentDeliveryRpcRemote } from './ContentDeliveryRpcRemote'
 import { DiscoveryLayerNode } from './DiscoveryLayerNode'
@@ -32,6 +31,7 @@ import { Propagation } from './propagation/Propagation'
 import { ProxyConnectionRpcLocal } from './proxy/ProxyConnectionRpcLocal'
 import { TemporaryConnectionRpcLocal } from './temporary-connection/TemporaryConnectionRpcLocal'
 import { markAndCheckDuplicate } from './utils'
+import { ContentDeliveryLayerNeighborInfo } from '../types'
 
 export interface Events {
     message: (message: StreamMessage) => void
@@ -93,9 +93,9 @@ export class ContentDeliveryLayerNode extends EventEmitter<Events> {
                     return
                 }
                 const contact = this.options.nearbyNodeView.get(remoteNodeId)
-                || this.options.randomNodeView.get(remoteNodeId)
-                || this.options.neighbors.get(remoteNodeId)
-                || this.options.proxyConnectionRpcLocal?.getConnection(remoteNodeId)?.remote
+                ?? this.options.randomNodeView.get(remoteNodeId)
+                ?? this.options.neighbors.get(remoteNodeId)
+                ?? this.options.proxyConnectionRpcLocal?.getConnection(remoteNodeId)?.remote
                 // TODO: check integrity of notifier?
                 if (contact) {
                     this.options.discoveryLayerNode.removeContact(remoteNodeId)

package/src/logic/ContentDeliveryManager.ts

@@ -20,7 +20,7 @@ import {
 import { createHash } from 'crypto'
 import { EventEmitter } from 'eventemitter3'
 import { sampleSize } from 'lodash'
-import { ProxyDirection, StreamMessage, StreamPartitionInfo } from '../proto/packages/trackerless-network/protos/NetworkRpc'
+import { ProxyDirection, StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { ContentDeliveryLayerNode } from './ContentDeliveryLayerNode'
 import { ControlLayerNode } from './ControlLayerNode'
 import { DiscoveryLayerNode } from './DiscoveryLayerNode'
@@ -30,6 +30,7 @@ import { StreamPartReconnect } from './StreamPartReconnect'
 import { createContentDeliveryLayerNode } from './createContentDeliveryLayerNode'
 import { ProxyClient } from './proxy/ProxyClient'
 import { ConnectionManager } from '@streamr/dht/src/exports'
+import { StreamPartitionInfo } from '../types'
 
 export type StreamPartDelivery = {
     broadcast: (msg: StreamMessage) => void
@@ -250,7 +251,8 @@ export class ContentDeliveryManager extends EventEmitter<Events> {
             rpcRequestTimeout: EXISTING_CONNECTION_TIMEOUT,
             dhtJoinTimeout: 20000,  // TODO use options option or named constant?
             periodicallyPingNeighbors: true,
-            periodicallyPingRingContacts: true
+            periodicallyPingRingContacts: true,
+            neighborPingLimit: 16
         })
     }
 

package/src/logic/ContentDeliveryRpcLocal.ts

@@ -1,14 +1,14 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { DhtAddress, DhtCallContext, ListeningRpcCommunicator, PeerDescriptor, toNodeId } from '@streamr/dht'
 import { StreamPartID } from '@streamr/utils'
-import { Empty } from '../proto/google/protobuf/empty'
+import { Empty } from '../../generated/google/protobuf/empty'
 import {
     LeaveStreamPartNotice,
     MessageID,
     MessageRef,
     StreamMessage
-} from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { IContentDeliveryRpc } from '../proto/packages/trackerless-network/protos/NetworkRpc.server'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { IContentDeliveryRpc } from '../../generated/packages/trackerless-network/protos/NetworkRpc.server'
 
 export interface ContentDeliveryRpcLocalOptions {
     localPeerDescriptor: PeerDescriptor

package/src/logic/ContentDeliveryRpcRemote.ts

@@ -3,8 +3,8 @@ import { Logger, StreamPartID } from '@streamr/utils'
 import {
     LeaveStreamPartNotice,
     StreamMessage
-} from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 const logger = new Logger(module)
 

package/src/logic/ControlLayerNode.ts

@@ -1,5 +1,5 @@
 import { ConnectionsView, DataEntry, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht'
-import { Any } from '../proto/google/protobuf/any'
+import { Any } from '../../generated/google/protobuf/any'
 
 export interface ControlLayerNode extends ITransport {
     joinDht(entryPointDescriptors: PeerDescriptor[]): Promise<void>

package/src/logic/DiscoveryLayerNode.ts

@@ -12,11 +12,11 @@ export interface DiscoveryLayerNodeEvents {
 
 export interface DiscoveryLayerNode {
     on<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
-    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
-    off<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     on<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
-    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
+    off<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
     off<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
+    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void
+    once<T extends keyof DiscoveryLayerNodeEvents>(eventName: T, listener: () => void): void
     removeContact: (nodeId: DhtAddress) => void
     getClosestContacts: (maxCount?: number) => PeerDescriptor[]
     getRandomContacts: (maxCount?: number) => PeerDescriptor[]

package/src/logic/DuplicateMessageDetector.ts

@@ -83,7 +83,7 @@ export class GapMisMatchError extends Error {
  */
 export class DuplicateMessageDetector {
     private readonly maxGapCount: number
-    private readonly gaps: Array<[NumberPair, NumberPair]>
+    private readonly gaps: [NumberPair, NumberPair][]
 
     constructor(maxGapCount = 10000) {
         this.maxGapCount = maxGapCount
@@ -94,7 +94,7 @@ export class DuplicateMessageDetector {
      * returns true if number has not yet been seen (i.e. is not a duplicate)
      */
     markAndCheck(previousNumber: NumberPair | null, number: NumberPair): boolean | never {
-        if (previousNumber && previousNumber.greaterThanOrEqual(number)) {
+        if (previousNumber?.greaterThanOrEqual(number)) {
             throw new InvalidNumberingError()
         }
 

package/src/logic/PeerDescriptorStoreManager.ts

@@ -5,7 +5,7 @@ import {
     areEqualPeerDescriptors
 } from '@streamr/dht'
 import { Logger, scheduleAtInterval } from '@streamr/utils'
-import { Any } from '../proto/google/protobuf/any'
+import { Any } from '../../generated/google/protobuf/any'
 
 const parsePeerDescriptor = (dataEntries: DataEntry[]): PeerDescriptor[] => {
     return dataEntries.filter((entry) => !entry.deleted).map((entry) => Any.unpack(entry.data!, PeerDescriptor))

package/src/logic/createContentDeliveryLayerNode.ts

@@ -5,7 +5,7 @@ import { NeighborUpdateManager } from './neighbor-discovery/NeighborUpdateManage
 import { StrictContentDeliveryLayerNodeOptions, ContentDeliveryLayerNode } from './ContentDeliveryLayerNode'
 import { NodeList } from './NodeList'
 import { Propagation } from './propagation/Propagation'
-import { StreamMessage } from '../proto/packages/trackerless-network/protos/NetworkRpc'
+import { StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import type { MarkOptional } from 'ts-essentials'
 import { ProxyConnectionRpcLocal } from './proxy/ProxyConnectionRpcLocal'
 import { Inspector } from './inspect/Inspector'

package/src/logic/inspect/InspectSession.ts

@@ -1,7 +1,7 @@
-import { EventEmitter } from 'eventemitter3'
-import { MessageID } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { binaryToHex } from '@streamr/utils'
 import { DhtAddress } from '@streamr/dht'
+import { toUserId } from '@streamr/utils'
+import { EventEmitter } from 'eventemitter3'
+import { MessageID } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
 
 export interface Events {
     done: () => void
@@ -12,8 +12,9 @@ interface InspectSessionOptions {
 }
 
 const createMessageKey = (messageId: MessageID): string => {
-    return `${binaryToHex(messageId.publisherId)}:${messageId.messageChainId}:${messageId.timestamp}:${messageId.sequenceNumber}`
+    return `${toUserId(messageId.publisherId)}:${messageId.messageChainId}:${messageId.timestamp}:${messageId.sequenceNumber}`
 }
+
 export class InspectSession extends EventEmitter<Events> {
     
     // Boolean indicates if the message has been received by the inspected node

package/src/logic/inspect/Inspector.ts

@@ -1,7 +1,7 @@
 import { ConnectionLocker, DhtAddress, ListeningRpcCommunicator, LockID, PeerDescriptor, toNodeId } from '@streamr/dht'
 import { Logger, StreamPartID, waitForEvent3 } from '@streamr/utils'
-import { MessageID } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { TemporaryConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { MessageID } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { TemporaryConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { TemporaryConnectionRpcRemote } from '../temporary-connection/TemporaryConnectionRpcRemote'
 import { InspectSession, Events as InspectSessionEvents } from './InspectSession'
 

package/src/logic/neighbor-discovery/HandshakeRpcLocal.ts

@@ -13,8 +13,8 @@ import {
     InterleaveResponse,
     StreamPartHandshakeRequest,
     StreamPartHandshakeResponse
-} from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { IHandshakeRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
+} from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { IHandshakeRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server'
 import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote'
 import { NodeList } from '../NodeList'
 import { HandshakeRpcRemote } from './HandshakeRpcRemote'

package/src/logic/neighbor-discovery/HandshakeRpcRemote.ts

@@ -1,8 +1,8 @@
 import { DhtAddress, PeerDescriptor, RpcRemote, toNodeId, toDhtAddressRaw } from '@streamr/dht'
 import { Logger, StreamPartID } from '@streamr/utils'
 import { v4 } from 'uuid'
-import { InterleaveRequest, InterleaveResponse, StreamPartHandshakeRequest } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { HandshakeRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { InterleaveRequest, InterleaveResponse, StreamPartHandshakeRequest } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { HandshakeRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 const logger = new Logger(module)
 

package/src/logic/neighbor-discovery/Handshaker.ts

@@ -5,10 +5,10 @@ import {
     InterleaveResponse,
     StreamPartHandshakeRequest,
     StreamPartHandshakeResponse
-} from '../../proto/packages/trackerless-network/protos/NetworkRpc'
+} from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
 import {
     ContentDeliveryRpcClient, HandshakeRpcClient
-} from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+} from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote'
 import { NodeList } from '../NodeList'
 import { HandshakeRpcLocal } from './HandshakeRpcLocal'

package/src/logic/neighbor-discovery/NeighborUpdateManager.ts

@@ -1,7 +1,7 @@
 import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor, toNodeId } from '@streamr/dht'
 import { Logger, StreamPartID, scheduleAtInterval } from '@streamr/utils'
-import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { NeighborUpdateRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { NeighborUpdate } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { NeighborUpdateRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { NodeList } from '../NodeList'
 import { NeighborFinder } from './NeighborFinder'
 import { NeighborUpdateRpcLocal } from './NeighborUpdateRpcLocal'

package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts

@@ -1,9 +1,9 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { DhtAddress, DhtCallContext, ListeningRpcCommunicator, PeerDescriptor, toNodeId } from '@streamr/dht'
 import { StreamPartID } from '@streamr/utils'
-import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { INeighborUpdateRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
+import { NeighborUpdate } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
+import { INeighborUpdateRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server'
 import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote'
 import { NodeList } from '../NodeList'
 import { NeighborFinder } from './NeighborFinder'

package/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts

@@ -1,7 +1,7 @@
 import { PeerDescriptor, RpcRemote, toNodeId } from '@streamr/dht'
 import { Logger, StreamPartID } from '@streamr/utils'
-import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { NeighborUpdateRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { NeighborUpdate } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { NeighborUpdateRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 const logger = new Logger(module)
 

package/src/logic/node-info/NodeInfoClient.ts

@@ -1,7 +1,7 @@
 import { DhtCallContext, PeerDescriptor } from '@streamr/dht'
 import { RpcCommunicator } from '@streamr/proto-rpc'
-import { NodeInfo } from '../../NetworkStack'
-import { NodeInfoRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { NodeInfo } from '../../types'
+import { NodeInfoRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { NodeInfoRpcRemote } from './NodeInfoRpcRemote'
 
 export class NodeInfoClient {

package/src/logic/node-info/NodeInfoRpcLocal.ts

@@ -1,5 +1,5 @@
-import { NodeInfoRequest, NodeInfoResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { INodeInfoRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
+import { NodeInfoRequest, NodeInfoResponse } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { INodeInfoRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server'
 import { NetworkStack } from '../../NetworkStack'
 import { ListeningRpcCommunicator } from '@streamr/dht'
 

package/src/logic/node-info/NodeInfoRpcRemote.ts

@@ -1,5 +1,5 @@
-import { NodeInfoResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { NodeInfoRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { NodeInfoResponse } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { NodeInfoRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { RpcRemote } from '@streamr/dht'
 
 export class NodeInfoRpcRemote extends RpcRemote<NodeInfoRpcClient> {

package/src/logic/propagation/Propagation.ts

@@ -1,5 +1,5 @@
 import { DhtAddress } from '@streamr/dht'
-import { StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
+import { StreamMessage } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { PropagationTask, PropagationTaskStore } from './PropagationTaskStore'
 
 type SendToNeighborFn = (neighborId: DhtAddress, msg: StreamMessage) => Promise<void>

package/src/logic/propagation/PropagationTaskStore.ts

@@ -1,5 +1,5 @@
 import { DhtAddress } from '@streamr/dht'
-import { MessageRef, StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
+import { MessageRef, StreamMessage } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { FifoMapWithTTL } from './FifoMapWithTTL'
 
 export interface PropagationTask {

package/src/logic/proxy/ProxyClient.ts

@@ -15,8 +15,8 @@ import {
     MessageRef,
     ProxyDirection,
     StreamMessage
-} from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient, ProxyConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+} from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient, ProxyConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { ContentDeliveryRpcLocal } from '../ContentDeliveryRpcLocal'
 import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote'
 import { DuplicateMessageDetector } from '../DuplicateMessageDetector'
@@ -28,7 +28,6 @@ import { ProxyConnectionRpcRemote } from './ProxyConnectionRpcRemote'
 
 // TODO use options option or named constant?
 export const retry = async <T>(task: () => Promise<T>, description: string, abortSignal: AbortSignal, delay = 10000): Promise<T> => {
-    // eslint-disable-next-line no-constant-condition
     while (true) {
         try {
             const result = await task()

package/src/logic/proxy/ProxyConnectionRpcLocal.ts

@@ -1,15 +1,15 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { DhtAddress, DhtCallContext, ListeningRpcCommunicator, PeerDescriptor, toNodeId } from '@streamr/dht'
-import { Logger, StreamPartID, UserID, binaryToHex, toEthereumAddress } from '@streamr/utils'
+import { Logger, StreamPartID, toUserId, UserID } from '@streamr/utils'
 import { EventEmitter } from 'eventemitter3'
 import {
     ProxyConnectionRequest,
     ProxyConnectionResponse,
     ProxyDirection,
     StreamMessage
-} from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { IProxyConnectionRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
+} from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
+import { IProxyConnectionRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server'
 import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote'
 
 const logger = new Logger(module)
@@ -64,7 +64,7 @@ export class ProxyConnectionRpcLocal extends EventEmitter<Events> implements IPr
         if (msg.body.oneofKind === 'groupKeyRequest') {
             try {
                 const recipientId = msg.body.groupKeyRequest.recipientId
-                return this.getNodeIdsForUserId(toEthereumAddress(binaryToHex(recipientId, true)))
+                return this.getNodeIdsForUserId(toUserId(recipientId))
             } catch (err) {
                 logger.trace(`Could not parse GroupKeyRequest`, { err })
                 return []
@@ -88,7 +88,7 @@ export class ProxyConnectionRpcLocal extends EventEmitter<Events> implements IPr
         const remoteNodeId = toNodeId(senderPeerDescriptor)
         this.connections.set(remoteNodeId, {
             direction: request.direction,
-            userId: toEthereumAddress(binaryToHex(request.userId, true)),
+            userId: toUserId(request.userId),
             remote: new ContentDeliveryRpcRemote(
                 this.options.localPeerDescriptor,
                 senderPeerDescriptor,

package/src/logic/proxy/ProxyConnectionRpcRemote.ts

@@ -1,7 +1,7 @@
 import { EXISTING_CONNECTION_TIMEOUT, RpcRemote } from '@streamr/dht'
-import { Logger, UserID, hexToBinary } from '@streamr/utils'
-import { ProxyConnectionRequest, ProxyDirection } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ProxyConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { Logger, UserID, toUserIdRaw } from '@streamr/utils'
+import { ProxyConnectionRequest, ProxyDirection } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ProxyConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 const logger = new Logger(module)
 
@@ -10,7 +10,7 @@ export class ProxyConnectionRpcRemote extends RpcRemote<ProxyConnectionRpcClient
     async requestConnection(direction: ProxyDirection, userId: UserID): Promise<boolean> {
         const request: ProxyConnectionRequest = {
             direction,
-            userId: hexToBinary(userId)
+            userId: toUserIdRaw(userId)
         }
         const options = this.formDhtRpcOptions({
             timeout: EXISTING_CONNECTION_TIMEOUT

package/src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts

@@ -1,15 +1,15 @@
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { ConnectionLocker, DhtAddress, DhtCallContext, ListeningRpcCommunicator, toNodeId } from '@streamr/dht'
 import { StreamPartID } from '@streamr/utils'
-import { Empty } from '../../proto/google/protobuf/empty'
-import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc'
+import { Empty } from '../../../generated/google/protobuf/empty'
+import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc'
 import {
     CloseTemporaryConnection,
     TemporaryConnectionRequest,
     TemporaryConnectionResponse
-} from '../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { ITemporaryConnectionRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
+} from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
+import { ITemporaryConnectionRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server'
 import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote'
 import { NodeList } from '../NodeList'
 

package/src/logic/temporary-connection/TemporaryConnectionRpcRemote.ts

@@ -1,6 +1,6 @@
 import { RpcRemote, toNodeId } from '@streamr/dht'
 import { Logger } from '@streamr/utils'
-import { TemporaryConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { TemporaryConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 const logger = new Logger(module)
 

package/src/logic/utils.ts

@@ -1,13 +1,13 @@
-import { DuplicateMessageDetector, NumberPair } from './DuplicateMessageDetector' 
-import { MessageID, MessageRef } from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { binaryToHex } from '@streamr/utils'
+import { toUserId } from '@streamr/utils'
+import { MessageID, MessageRef } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { DuplicateMessageDetector, NumberPair } from './DuplicateMessageDetector'
 
 export const markAndCheckDuplicate = (
     duplicateDetectors: Map<string, DuplicateMessageDetector>,
     currentMessage: MessageID, 
     previousMessageRef?: MessageRef
 ): boolean => {
-    const detectorKey = `${binaryToHex(currentMessage.publisherId)}-${currentMessage.messageChainId}`
+    const detectorKey = `${toUserId(currentMessage.publisherId)}-${currentMessage.messageChainId}`
     const previousNumberPair = previousMessageRef ?
         new NumberPair(Number(previousMessageRef.timestamp), previousMessageRef.sequenceNumber) : null
     const currentNumberPair = new NumberPair(Number(currentMessage.timestamp), currentMessage.sequenceNumber)

package/src/types.ts

@@ -0,0 +1,13 @@
+import { ChangeFieldType } from '@streamr/utils'
+import { MarkRequired } from 'ts-essentials'
+import {
+    ContentDeliveryLayerNeighborInfo as ContentDeliveryLayerNeighborInfo_,
+    NodeInfoResponse,
+    StreamPartitionInfo as StreamPartitionInfo_
+} from '../generated/packages/trackerless-network/protos/NetworkRpc'
+
+// These types are part of trackerless-network's public API. Therefore removing optionality from fields which are 
+// actually required. TODO: could do the same thing for other generated interfaces which are part of the public API.
+export type ContentDeliveryLayerNeighborInfo = MarkRequired<ContentDeliveryLayerNeighborInfo_, 'peerDescriptor'>
+export type StreamPartitionInfo = ChangeFieldType<Required<StreamPartitionInfo_>, 'contentDeliveryLayerNeighbors', ContentDeliveryLayerNeighborInfo[]>
+export type NodeInfo = ChangeFieldType<Required<NodeInfoResponse>, 'streamPartitions', StreamPartitionInfo[]>

package/test/benchmark/first-message.ts

@@ -14,6 +14,8 @@ import {
     StreamPartIDUtils,
     toStreamID,
     toStreamPartID,
+    toUserId,
+    toUserIdRaw,
     utf8ToBinary, waitForEvent3
 } from '@streamr/utils'
 import fs from 'fs'
@@ -21,7 +23,7 @@ import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNo
 import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 import { NetworkNode } from '../../src/NetworkNode'
-import { ContentType, EncryptionType, SignatureType } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { ContentType, EncryptionType, SignatureType } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor, createNetworkNodeWithSimulator } from '../utils/utils'
 
 const numNodes = 10000
@@ -88,7 +90,7 @@ const measureJoiningTime = async () => {
                 streamPartition: 0,
                 timestamp: i,
                 sequenceNumber: Math.floor(Math.random() * 20000),
-                publisherId: hexToBinary('0x2222'),
+                publisherId: toUserIdRaw(toUserId('0x2222')),
                 messageChainId: 'msgChainId'
             },
             body: {

package/test/end-to-end/content-delivery-layer-node-with-real-connections.test.ts

@@ -1,5 +1,5 @@
 import { ConnectionManager, DhtNode, PeerDescriptor } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { ControlLayerNode } from '../../src/logic/ControlLayerNode'
 import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
@@ -106,10 +106,15 @@ describe('content delivery layer node with real connections', () => {
             dhtNode2.stop(),
             dhtNode3.stop(),
             dhtNode4.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode1.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode2.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode3.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode4.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode5.stop(),
             (epDhtNode.getTransport() as ConnectionManager).stop(),
             (dhtNode1.getTransport() as ConnectionManager).stop(),
@@ -120,7 +125,7 @@ describe('content delivery layer node with real connections', () => {
     })
 
     it('can fully connected topologies ', async () => {
-        await waitForCondition(() => {
+        await until(() => {
             return contentDeliveryLayerNode1.getNeighbors().length >= 3
                 && contentDeliveryLayerNode2.getNeighbors().length >= 3
                 && contentDeliveryLayerNode3.getNeighbors().length >= 3
@@ -141,7 +146,7 @@ describe('content delivery layer node with real connections', () => {
         contentDeliveryLayerNode4.on('message', () => receivedMessageCount += 1)
         contentDeliveryLayerNode5.on('message', () => receivedMessageCount += 1)
 
-        await waitForCondition(() => {
+        await until(() => {
             return contentDeliveryLayerNode1.getNeighbors().length >= 3
                 && contentDeliveryLayerNode2.getNeighbors().length >= 3
                 && contentDeliveryLayerNode3.getNeighbors().length >= 3
@@ -155,6 +160,6 @@ describe('content delivery layer node with real connections', () => {
             randomUserId()
         )
         contentDeliveryLayerNode1.broadcast(msg)
-        await waitForCondition(() => receivedMessageCount >= 4)
+        await until(() => receivedMessageCount >= 4)
     })
 })

package/test/end-to-end/external-network-rpc.test.ts

@@ -1,7 +1,7 @@
 import { NetworkNode } from '../../src/NetworkNode'
 import { NetworkStack } from '../../src/NetworkStack'
-import { StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { HandshakeRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { HandshakeRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 describe('ExternalNetworkRpc', () => {

package/test/end-to-end/inspect.test.ts

@@ -1,7 +1,7 @@
 import { randomUserId } from '@streamr/test-utils'
-import { StreamPartIDUtils, hexToBinary, utf8ToBinary, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, hexToBinary, toUserIdRaw, utf8ToBinary, until } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
-import { ContentType, EncryptionType, SignatureType, StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { ContentType, EncryptionType, SignatureType, StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
@@ -44,7 +44,7 @@ describe('inspect', () => {
             streamPartition: StreamPartIDUtils.getStreamPartition(STREAM_PART_ID),
             timestamp: 666,
             sequenceNumber: 0,
-            publisherId: hexToBinary(randomUserId()),
+            publisherId: toUserIdRaw(randomUserId()),
             messageChainId: 'msgChainId'
         },
         previousMessageRef: {
@@ -98,7 +98,7 @@ describe('inspect', () => {
         inspectedNode.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
         inspectorNode.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
 
-        await waitForCondition(() => 
+        await until(() => 
             publisherNode.stack.getContentDeliveryManager().getNeighbors(STREAM_PART_ID).length === 2 
             && inspectedNode.stack.getContentDeliveryManager().getNeighbors(STREAM_PART_ID).length === 2 
             && inspectorNode.stack.getContentDeliveryManager().getNeighbors(STREAM_PART_ID).length === 2