@streamr/trackerless-network 100.0.0-testnet-two.3 → 100.0.0-testnet-three.0

package/src/proto/packages/dht/protos/DhtRpc.server.ts

@@ -1,11 +1,10 @@
-// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.3 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/dht/protos/DhtRpc.proto" (package "dht", syntax proto3)
 // tslint:disable
 import { ExternalStoreDataResponse } from "./DhtRpc";
 import { ExternalStoreDataRequest } from "./DhtRpc";
 import { ExternalFindDataResponse } from "./DhtRpc";
 import { ExternalFindDataRequest } from "./DhtRpc";
-import { DisconnectNoticeResponse } from "./DhtRpc";
 import { DisconnectNotice } from "./DhtRpc";
 import { UnlockRequest } from "./DhtRpc";
 import { LockResponse } from "./DhtRpc";
@@ -132,9 +131,9 @@ export interface IConnectionLockRpc<T = ServerCallContext> {
      */
     unlockRequest(request: UnlockRequest, context: T): Promise<Empty>;
     /**
-     * @generated from protobuf rpc: gracefulDisconnect(dht.DisconnectNotice) returns (dht.DisconnectNoticeResponse);
+     * @generated from protobuf rpc: gracefulDisconnect(dht.DisconnectNotice) returns (google.protobuf.Empty);
      */
-    gracefulDisconnect(request: DisconnectNotice, context: T): Promise<DisconnectNoticeResponse>;
+    gracefulDisconnect(request: DisconnectNotice, context: T): Promise<Empty>;
 }
 /**
  * @generated from protobuf service dht.ExternalApiRpc

package/src/proto/packages/dht/protos/DhtRpc.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.3 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/dht/protos/DhtRpc.proto" (package "dht", syntax proto3)
 // tslint:disable
 import { Empty } from "../../../google/protobuf/empty";
@@ -218,6 +218,20 @@ export interface PeerDescriptor {
      * @generated from protobuf field: optional uint32 region = 6;
      */
     region?: number;
+    /**
+     * @generated from protobuf field: optional uint32 ipAddress = 7;
+     */
+    ipAddress?: number;
+    /**
+     * @generated from protobuf field: optional bytes publicKey = 8;
+     */
+    publicKey?: Uint8Array;
+    /**
+     * signature of fields 2-8
+     *
+     * @generated from protobuf field: optional bytes signature = 9;
+     */
+    signature?: Uint8Array;
 }
 /**
  * @generated from protobuf message dht.ConnectivityMethod
@@ -264,6 +278,10 @@ export interface RouteMessageWrapper {
      * @generated from protobuf field: repeated dht.PeerDescriptor routingPath = 6;
      */
     routingPath: PeerDescriptor[];
+    /**
+     * @generated from protobuf field: repeated string parallelRootNodeIds = 7;
+     */
+    parallelRootNodeIds: string[];
 }
 /**
  * @generated from protobuf message dht.RouteMessageAck
@@ -317,6 +335,10 @@ export interface ConnectivityResponse {
      * @generated from protobuf field: dht.ConnectivityMethod websocket = 3;
      */
     websocket?: ConnectivityMethod;
+    /**
+     * @generated from protobuf field: uint32 ipAddress = 4;
+     */
+    ipAddress: number;
 }
 /**
  * @generated from protobuf message dht.HandshakeRequest
@@ -514,11 +536,6 @@ export interface DisconnectNotice {
      */
     disconnectMode: DisconnectMode;
 }
-/**
- * @generated from protobuf message dht.DisconnectNoticeResponse
- */
-export interface DisconnectNoticeResponse {
-}
 /**
  * @generated from protobuf message dht.ExternalFindDataRequest
  */
@@ -848,7 +865,10 @@ class PeerDescriptor$Type extends MessageType$<PeerDescriptor> {
             { no: 3, name: "udp", kind: "message", T: () => ConnectivityMethod },
             { no: 4, name: "tcp", kind: "message", T: () => ConnectivityMethod },
             { no: 5, name: "websocket", kind: "message", T: () => ConnectivityMethod },
-            { no: 6, name: "region", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
+            { no: 6, name: "region", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
+            { no: 7, name: "ipAddress", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
+            { no: 8, name: "publicKey", kind: "scalar", opt: true, T: 12 /*ScalarType.BYTES*/ },
+            { no: 9, name: "signature", kind: "scalar", opt: true, T: 12 /*ScalarType.BYTES*/ }
         ]);
     }
 }
@@ -879,7 +899,8 @@ class RouteMessageWrapper$Type extends MessageType$<RouteMessageWrapper> {
             { no: 3, name: "target", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 4, name: "message", kind: "message", T: () => Message },
             { no: 5, name: "reachableThrough", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
-            { no: 6, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
+            { no: 6, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
+            { no: 7, name: "parallelRootNodeIds", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
@@ -921,7 +942,8 @@ class ConnectivityResponse$Type extends MessageType$<ConnectivityResponse> {
         super("dht.ConnectivityResponse", [
             { no: 1, name: "host", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 2, name: "natType", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "websocket", kind: "message", T: () => ConnectivityMethod }
+            { no: 3, name: "websocket", kind: "message", T: () => ConnectivityMethod },
+            { no: 4, name: "ipAddress", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
@@ -1088,16 +1110,6 @@ class DisconnectNotice$Type extends MessageType$<DisconnectNotice> {
  */
 export const DisconnectNotice = new DisconnectNotice$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class DisconnectNoticeResponse$Type extends MessageType$<DisconnectNoticeResponse> {
-    constructor() {
-        super("dht.DisconnectNoticeResponse", []);
-    }
-}
-/**
- * @generated MessageType for protobuf message dht.DisconnectNoticeResponse
- */
-export const DisconnectNoticeResponse = new DisconnectNoticeResponse$Type();
-// @generated message type with reflection information, may provide speed optimized methods
 class ExternalFindDataRequest$Type extends MessageType$<ExternalFindDataRequest> {
     constructor() {
         super("dht.ExternalFindDataRequest", [
@@ -1176,7 +1188,7 @@ export const WebrtcConnectorRpc = new ServiceType("dht.WebrtcConnectorRpc", [
 export const ConnectionLockRpc = new ServiceType("dht.ConnectionLockRpc", [
     { name: "lockRequest", options: {}, I: LockRequest, O: LockResponse },
     { name: "unlockRequest", options: {}, I: UnlockRequest, O: Empty },
-    { name: "gracefulDisconnect", options: {}, I: DisconnectNotice, O: DisconnectNoticeResponse }
+    { name: "gracefulDisconnect", options: {}, I: DisconnectNotice, O: Empty }
 ]);
 /**
  * @generated ServiceType for protobuf service dht.ExternalApiRpc

package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.3 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/proto-rpc/protos/ProtoRpc.proto" (package "protorpc", syntax proto3)
 // tslint:disable
 import { MessageType } from "@protobuf-ts/runtime";

package/src/proto/packages/trackerless-network/protos/NetworkRpc.client.ts

@@ -1,6 +1,9 @@
-// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.3 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/trackerless-network/protos/NetworkRpc.proto" (syntax proto3)
 // tslint:disable
+import { NodeInfoRpc } from "./NetworkRpc";
+import type { NodeInfoResponse } from "./NetworkRpc";
+import type { NodeInfoRequest } from "./NetworkRpc";
 import { TemporaryConnectionRpc } from "./NetworkRpc";
 import type { TemporaryConnectionResponse } from "./NetworkRpc";
 import type { TemporaryConnectionRequest } from "./NetworkRpc";
@@ -175,3 +178,29 @@ export class TemporaryConnectionRpcClient implements ITemporaryConnectionRpcClie
         return stackIntercept<TemporaryConnectionRequest, TemporaryConnectionResponse>("unary", this._transport, method, opt, input);
     }
 }
+/**
+ * @generated from protobuf service NodeInfoRpc
+ */
+export interface INodeInfoRpcClient {
+    /**
+     * @generated from protobuf rpc: getInfo(NodeInfoRequest) returns (NodeInfoResponse);
+     */
+    getInfo(input: NodeInfoRequest, options?: RpcOptions): UnaryCall<NodeInfoRequest, NodeInfoResponse>;
+}
+/**
+ * @generated from protobuf service NodeInfoRpc
+ */
+export class NodeInfoRpcClient implements INodeInfoRpcClient, ServiceInfo {
+    typeName = NodeInfoRpc.typeName;
+    methods = NodeInfoRpc.methods;
+    options = NodeInfoRpc.options;
+    constructor(private readonly _transport: RpcTransport) {
+    }
+    /**
+     * @generated from protobuf rpc: getInfo(NodeInfoRequest) returns (NodeInfoResponse);
+     */
+    getInfo(input: NodeInfoRequest, options?: RpcOptions): UnaryCall<NodeInfoRequest, NodeInfoResponse> {
+        const method = this.methods[0], opt = this._transport.mergeOptions(options);
+        return stackIntercept<NodeInfoRequest, NodeInfoResponse>("unary", this._transport, method, opt, input);
+    }
+}

package/src/proto/packages/trackerless-network/protos/NetworkRpc.server.ts

@@ -1,6 +1,8 @@
-// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.3 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/trackerless-network/protos/NetworkRpc.proto" (syntax proto3)
 // tslint:disable
+import { NodeInfoResponse } from "./NetworkRpc";
+import { NodeInfoRequest } from "./NetworkRpc";
 import { TemporaryConnectionResponse } from "./NetworkRpc";
 import { TemporaryConnectionRequest } from "./NetworkRpc";
 import { NeighborUpdate } from "./NetworkRpc";
@@ -67,3 +69,12 @@ export interface ITemporaryConnectionRpc<T = ServerCallContext> {
      */
     openConnection(request: TemporaryConnectionRequest, context: T): Promise<TemporaryConnectionResponse>;
 }
+/**
+ * @generated from protobuf service NodeInfoRpc
+ */
+export interface INodeInfoRpc<T = ServerCallContext> {
+    /**
+     * @generated from protobuf rpc: getInfo(NodeInfoRequest) returns (NodeInfoResponse);
+     */
+    getInfo(request: NodeInfoRequest, context: T): Promise<NodeInfoResponse>;
+}

package/src/proto/packages/trackerless-network/protos/NetworkRpc.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.3 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/trackerless-network/protos/NetworkRpc.proto" (syntax proto3)
 // tslint:disable
 import { Empty } from "../../../google/protobuf/empty";
@@ -68,25 +68,29 @@ export interface StreamMessage {
      */
     content: Uint8Array;
     /**
-     * @generated from protobuf field: bytes signature = 5;
+     * @generated from protobuf field: SignatureType signatureType = 5;
+     */
+    signatureType: SignatureType;
+    /**
+     * @generated from protobuf field: bytes signature = 6;
      */
     signature: Uint8Array;
     /**
      * this is a required field but in generated NetworkRpc.ts it is incorrectly annotated as optional (NET-1082)
      *
-     * @generated from protobuf field: MessageID messageId = 6;
+     * @generated from protobuf field: MessageID messageId = 7;
      */
     messageId?: MessageID;
     /**
-     * @generated from protobuf field: optional MessageRef previousMessageRef = 7;
+     * @generated from protobuf field: optional MessageRef previousMessageRef = 8;
      */
     previousMessageRef?: MessageRef;
     /**
-     * @generated from protobuf field: optional string groupKeyId = 8;
+     * @generated from protobuf field: optional string groupKeyId = 9;
      */
     groupKeyId?: string;
     /**
-     * @generated from protobuf field: optional GroupKey newGroupKey = 9;
+     * @generated from protobuf field: optional GroupKey newGroupKey = 10;
      */
     newGroupKey?: GroupKey;
 }
@@ -269,6 +273,58 @@ export interface TemporaryConnectionResponse {
      */
     accepted: boolean;
 }
+/**
+ * @generated from protobuf message StreamPartitionInfo
+ */
+export interface StreamPartitionInfo {
+    /**
+     * @generated from protobuf field: string id = 1;
+     */
+    id: string;
+    /**
+     * @generated from protobuf field: repeated dht.PeerDescriptor controlLayerNeighbors = 2;
+     */
+    controlLayerNeighbors: PeerDescriptor[];
+    /**
+     * @generated from protobuf field: repeated dht.PeerDescriptor deliveryLayerNeighbors = 3;
+     */
+    deliveryLayerNeighbors: PeerDescriptor[];
+}
+/**
+ * @generated from protobuf message ControlLayerInfo
+ */
+export interface ControlLayerInfo {
+    /**
+     * @generated from protobuf field: repeated dht.PeerDescriptor neighbors = 1;
+     */
+    neighbors: PeerDescriptor[];
+    /**
+     * @generated from protobuf field: repeated dht.PeerDescriptor connections = 2;
+     */
+    connections: PeerDescriptor[];
+}
+/**
+ * @generated from protobuf message NodeInfoRequest
+ */
+export interface NodeInfoRequest {
+}
+/**
+ * @generated from protobuf message NodeInfoResponse
+ */
+export interface NodeInfoResponse {
+    /**
+     * @generated from protobuf field: dht.PeerDescriptor peerDescriptor = 1;
+     */
+    peerDescriptor?: PeerDescriptor;
+    /**
+     * @generated from protobuf field: repeated StreamPartitionInfo streamPartitions = 2;
+     */
+    streamPartitions: StreamPartitionInfo[];
+    /**
+     * @generated from protobuf field: optional ControlLayerInfo controlLayer = 3;
+     */
+    controlLayer?: ControlLayerInfo;
+}
 /**
  * @generated from protobuf enum StreamMessageType
  */
@@ -312,6 +368,19 @@ export enum EncryptionType {
      */
     AES = 1
 }
+/**
+ * @generated from protobuf enum SignatureType
+ */
+export enum SignatureType {
+    /**
+     * @generated from protobuf enum value: LEGACY_SECP256K1 = 0;
+     */
+    LEGACY_SECP256K1 = 0,
+    /**
+     * @generated from protobuf enum value: SECP256K1 = 1;
+     */
+    SECP256K1 = 1
+}
 /**
  * @generated from protobuf enum ProxyDirection
  */
@@ -363,11 +432,12 @@ class StreamMessage$Type extends MessageType<StreamMessage> {
             { no: 2, name: "contentType", kind: "enum", T: () => ["ContentType", ContentType] },
             { no: 3, name: "encryptionType", kind: "enum", T: () => ["EncryptionType", EncryptionType] },
             { no: 4, name: "content", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
-            { no: 5, name: "signature", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
-            { no: 6, name: "messageId", kind: "message", T: () => MessageID },
-            { no: 7, name: "previousMessageRef", kind: "message", T: () => MessageRef },
-            { no: 8, name: "groupKeyId", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
-            { no: 9, name: "newGroupKey", kind: "message", T: () => GroupKey }
+            { no: 5, name: "signatureType", kind: "enum", T: () => ["SignatureType", SignatureType] },
+            { no: 6, name: "signature", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
+            { no: 7, name: "messageId", kind: "message", T: () => MessageID },
+            { no: 8, name: "previousMessageRef", kind: "message", T: () => MessageRef },
+            { no: 9, name: "groupKeyId", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
+            { no: 10, name: "newGroupKey", kind: "message", T: () => GroupKey }
         ]);
     }
 }
@@ -545,6 +615,57 @@ class TemporaryConnectionResponse$Type extends MessageType<TemporaryConnectionRe
  * @generated MessageType for protobuf message TemporaryConnectionResponse
  */
 export const TemporaryConnectionResponse = new TemporaryConnectionResponse$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class StreamPartitionInfo$Type extends MessageType<StreamPartitionInfo> {
+    constructor() {
+        super("StreamPartitionInfo", [
+            { no: 1, name: "id", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "controlLayerNeighbors", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
+            { no: 3, name: "deliveryLayerNeighbors", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
+        ]);
+    }
+}
+/**
+ * @generated MessageType for protobuf message StreamPartitionInfo
+ */
+export const StreamPartitionInfo = new StreamPartitionInfo$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class ControlLayerInfo$Type extends MessageType<ControlLayerInfo> {
+    constructor() {
+        super("ControlLayerInfo", [
+            { no: 1, name: "neighbors", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
+            { no: 2, name: "connections", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
+        ]);
+    }
+}
+/**
+ * @generated MessageType for protobuf message ControlLayerInfo
+ */
+export const ControlLayerInfo = new ControlLayerInfo$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class NodeInfoRequest$Type extends MessageType<NodeInfoRequest> {
+    constructor() {
+        super("NodeInfoRequest", []);
+    }
+}
+/**
+ * @generated MessageType for protobuf message NodeInfoRequest
+ */
+export const NodeInfoRequest = new NodeInfoRequest$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class NodeInfoResponse$Type extends MessageType<NodeInfoResponse> {
+    constructor() {
+        super("NodeInfoResponse", [
+            { no: 1, name: "peerDescriptor", kind: "message", T: () => PeerDescriptor },
+            { no: 2, name: "streamPartitions", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => StreamPartitionInfo },
+            { no: 3, name: "controlLayer", kind: "message", T: () => ControlLayerInfo }
+        ]);
+    }
+}
+/**
+ * @generated MessageType for protobuf message NodeInfoResponse
+ */
+export const NodeInfoResponse = new NodeInfoResponse$Type();
 /**
  * @generated ServiceType for protobuf service DeliveryRpc
  */
@@ -577,3 +698,9 @@ export const NeighborUpdateRpc = new ServiceType("NeighborUpdateRpc", [
 export const TemporaryConnectionRpc = new ServiceType("TemporaryConnectionRpc", [
     { name: "openConnection", options: {}, I: TemporaryConnectionRequest, O: TemporaryConnectionResponse }
 ]);
+/**
+ * @generated ServiceType for protobuf service NodeInfoRpc
+ */
+export const NodeInfoRpc = new ServiceType("NodeInfoRpc", [
+    { name: "getInfo", options: {}, I: NodeInfoRequest, O: NodeInfoResponse }
+]);

package/test/benchmark/first-message.ts

@@ -1,10 +1,27 @@
 /* eslint-disable no-console */
 
-import { DhtNode, LatencyType, Simulator, getNodeIdFromPeerDescriptor, getRandomRegion } from '@streamr/dht'
-import { MessageID, StreamMessage, StreamMessageType, StreamPartID, StreamPartIDUtils, toStreamID, toStreamPartID } from '@streamr/protocol'
+import {
+    DhtNode,
+    getNodeIdFromPeerDescriptor,
+    getRandomRegion,
+    LatencyType,
+    PeerDescriptor,
+    Simulator
+} from '@streamr/dht'
+import {
+    ContentType,
+    EncryptionType,
+    MessageID,
+    SignatureType,
+    StreamMessage,
+    StreamMessageType,
+    StreamPartID,
+    StreamPartIDUtils,
+    toStreamID,
+    toStreamPartID
+} from '@streamr/protocol'
 import { hexToBinary, utf8ToBinary, waitForEvent3 } from '@streamr/utils'
 import fs from 'fs'
-import { PeerDescriptor } from '@streamr/dht'
 import { NetworkNode } from '../../src/NetworkNode'
 import { streamPartIdToDataKey } from '../../src/logic/EntryPointDiscovery'
 import { createMockPeerDescriptor, createNetworkNodeWithSimulator } from '../utils/utils'
@@ -78,12 +95,15 @@ const measureJoiningTime = async () => {
                 '2222' as any,
                 'msgChainId'
             ),
-            prevMsgRef: null,
             content: utf8ToBinary(JSON.stringify({
                 hello: 'world'
             })),
             messageType: StreamMessageType.MESSAGE,
+            contentType: ContentType.JSON,
+            encryptionType: EncryptionType.NONE,
             signature: hexToBinary('0x1234'),
+            signatureType: SignatureType.SECP256K1,
+
         })
         streamParts.get(stream)!.broadcast(streamMessage)
     }, 1000)
@@ -138,11 +158,11 @@ run().then(() => {
     const foundData = nodes[0].stack.getLayer0Node().getDataFromDht(streamPartIdToDataKey(streamParts[0]))
     console.log(foundData)
     const layer0Node = currentNode.stack.getLayer0Node() as DhtNode
-    console.log(layer0Node.getAllNeighborPeerDescriptors().length)
-    console.log(layer0Node.getNumberOfConnections())
+    console.log(layer0Node.getNeighbors().length)
+    console.log(layer0Node.getConnectionCount())
     const streamPartDelivery = streamrNode.getStreamPartDelivery(streamParts[0])! as { layer1Node: Layer1Node, node: RandomGraphNode }
-    console.log(streamPartDelivery.layer1Node.getAllNeighborPeerDescriptors())
-    console.log(streamPartDelivery.node.getTargetNeighborIds())
+    console.log(streamPartDelivery.layer1Node.getNeighbors())
+    console.log(streamPartDelivery.node.getNeighbors())
     console.log(nodes[nodes.length - 1])
     if (publishInterval) {
         clearInterval(publishInterval)

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

@@ -1,4 +1,13 @@
-import { MessageID, MessageRef, StreamMessage, StreamMessageType, StreamPartIDUtils } from '@streamr/protocol'
+import {
+    ContentType,
+    EncryptionType,
+    MessageID,
+    MessageRef,
+    SignatureType,
+    StreamMessage,
+    StreamMessageType,
+    StreamPartIDUtils
+} from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
 import { hexToBinary, utf8ToBinary, waitForCondition } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
@@ -52,6 +61,9 @@ describe('inspect', () => {
             hello: 'world'
         })),
         messageType: StreamMessageType.MESSAGE,
+        contentType: ContentType.JSON,
+        encryptionType: EncryptionType.NONE,
+        signatureType: SignatureType.SECP256K1,
         signature: hexToBinary('0x1234'),
     })
     

package/test/end-to-end/proxy-and-full-node.test.ts

@@ -1,4 +1,14 @@
-import { MessageID, MessageRef, StreamMessage, StreamMessageType, StreamPartID, StreamPartIDUtils } from '@streamr/protocol'
+import {
+    ContentType,
+    EncryptionType,
+    MessageID,
+    MessageRef,
+    SignatureType,
+    StreamMessage,
+    StreamMessageType,
+    StreamPartID,
+    StreamPartIDUtils
+} from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
 import { hexToBinary, utf8ToBinary, waitForEvent3 } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
@@ -22,6 +32,9 @@ const createMessage = (streamPartId: StreamPartID): StreamMessage => {
             hello: 'world'
         })),
         messageType: StreamMessageType.MESSAGE,
+        contentType: ContentType.JSON,
+        encryptionType: EncryptionType.NONE,
+        signatureType: SignatureType.SECP256K1,
         signature: hexToBinary('0x1234'),
     })
 }

package/test/end-to-end/proxy-connections.test.ts

@@ -1,4 +1,13 @@
-import { MessageID, MessageRef, StreamMessage, StreamMessageType, StreamPartIDUtils } from '@streamr/protocol'
+import {
+    ContentType,
+    EncryptionType,
+    MessageID,
+    MessageRef,
+    SignatureType,
+    StreamMessage,
+    StreamMessageType,
+    StreamPartIDUtils
+} from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
 import { hexToBinary, utf8ToBinary, wait, waitForCondition, waitForEvent3 } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
@@ -24,7 +33,10 @@ const MESSAGE = new StreamMessage({
         hello: 'world'
     })),
     messageType: StreamMessageType.MESSAGE,
-    signature: hexToBinary('0x1234')
+    encryptionType: EncryptionType.NONE,
+    signatureType: SignatureType.SECP256K1,
+    signature: hexToBinary('0x1234'),
+    contentType: ContentType.JSON
 })
 
 describe('Proxy connections', () => {

package/test/end-to-end/proxy-key-exchange.test.ts

@@ -1,13 +1,16 @@
 import {
+    ContentType,
     EncryptionType,
     GroupKeyRequest,
     GroupKeyResponse,
     MessageID,
+    serializeGroupKeyRequest,
+    serializeGroupKeyResponse, SignatureType,
     StreamMessage,
     StreamMessageType,
     StreamPartIDUtils
 } from '@streamr/protocol'
-import { hexToBinary, toEthereumAddress, utf8ToBinary, waitForEvent3 } from '@streamr/utils'
+import { hexToBinary, toEthereumAddress, waitForEvent3 } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import { ProxyDirection } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
@@ -69,14 +72,14 @@ describe('proxy group key exchange', () => {
         await publisher.setProxies(STREAM_PART_ID, [proxyNodeDescriptor], ProxyDirection.PUBLISH, publisherUserId)
         await subscriber.setProxies(STREAM_PART_ID, [proxyNodeDescriptor], ProxyDirection.SUBSCRIBE, subscriberUserId)
 
-        const requestContent = utf8ToBinary(new GroupKeyRequest({
+        const groupKeyRequest = new GroupKeyRequest({
             recipient: publisherUserId,
             requestId: 'requestId',
             rsaPublicKey: 'mockKey',
             groupKeyIds: [
                 'mock'
             ],
-        }).serialize())
+        })
         const request = new StreamMessage({
             messageId: new MessageID(
                 StreamPartIDUtils.getStreamID(STREAM_PART_ID),
@@ -87,8 +90,10 @@ describe('proxy group key exchange', () => {
                 '0'
             ),
             messageType: StreamMessageType.GROUP_KEY_REQUEST,
+            contentType: ContentType.JSON,
             encryptionType: EncryptionType.NONE,
-            content: requestContent,
+            content: serializeGroupKeyRequest(groupKeyRequest),
+            signatureType: SignatureType.SECP256K1,
             signature: hexToBinary('1234')
         })
 
@@ -102,11 +107,11 @@ describe('proxy group key exchange', () => {
         await publisher.setProxies(STREAM_PART_ID, [proxyNodeDescriptor], ProxyDirection.PUBLISH, publisherUserId)
         await subscriber.setProxies(STREAM_PART_ID, [proxyNodeDescriptor], ProxyDirection.SUBSCRIBE, subscriberUserId)
 
-        const responseContent = utf8ToBinary(new GroupKeyResponse({
+        const groupKeyResponse = new GroupKeyResponse({
             recipient: publisherUserId,
             requestId: 'requestId',
             encryptedGroupKeys: []
-        }).serialize())
+        })
         const response = new StreamMessage({
             messageId: new MessageID(
                 StreamPartIDUtils.getStreamID(STREAM_PART_ID),
@@ -117,8 +122,10 @@ describe('proxy group key exchange', () => {
                 '0'
             ),
             messageType: StreamMessageType.GROUP_KEY_RESPONSE,
-            encryptionType: EncryptionType.RSA,
-            content: responseContent,
+            contentType: ContentType.JSON,
+            encryptionType: EncryptionType.NONE,
+            content: serializeGroupKeyResponse(groupKeyResponse),
+            signatureType: SignatureType.SECP256K1,
             signature: hexToBinary('1234')
         })