ConfidentialMessage: Add version field

bisq-network · Dec 12, 2022 · 59bcca6 · 59bcca6
1 parent b705c27
commit 59bcca6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/network/src/main/java/bisq/network/p2p/services/confidential/ConfidentialMessage.java b/network/src/main/java/bisq/network/p2p/services/confidential/ConfidentialMessage.java
@@ -34,10 +34,18 @@
 @EqualsAndHashCode
 @Getter
 public final class ConfidentialMessage implements NetworkMessage, DistributedData {
+    private static final int VERSION = 0;
+
+    private final int version;
     private final ConfidentialData confidentialData;
     private final String receiverKeyId;
 
     public ConfidentialMessage(ConfidentialData confidentialData, String receiverKeyId) {
+        this(VERSION, confidentialData, receiverKeyId);
+    }
+
+    private ConfidentialMessage(int version, ConfidentialData confidentialData, String receiverKeyId) {
+        this.version = version;
         this.confidentialData = confidentialData;
         this.receiverKeyId = receiverKeyId;
     }
@@ -46,14 +54,18 @@ public ConfidentialMessage(ConfidentialData confidentialData, String receiverKey
     public bisq.network.protobuf.NetworkMessage toProto() {
         return getNetworkMessageBuilder().setConfidentialMessage(
                 bisq.network.protobuf.ConfidentialMessage.newBuilder()
+                        .setVersion(VERSION)
                         .setConfidentialData(confidentialData.toProto())
                         .setReceiverKeyId(receiverKeyId)
         ).build();
     }
 
     public static ConfidentialMessage fromProto(bisq.network.protobuf.ConfidentialMessage proto) {
-        return new ConfidentialMessage(ConfidentialData.fromProto(proto.getConfidentialData()),
-                proto.getReceiverKeyId());
+        return new ConfidentialMessage(
+                proto.getVersion(),
+                ConfidentialData.fromProto(proto.getConfidentialData()),
+                proto.getReceiverKeyId()
+        );
     }
 
     @Override

diff --git a/network/src/main/proto/network.proto b/network/src/main/proto/network.proto
@@ -99,8 +99,9 @@ message Pong {
 }
 
 message ConfidentialMessage {
-  security.ConfidentialData confidentialData = 1;
-  string receiverKeyId = 2;
+  uint32 version = 1;
+  security.ConfidentialData confidentialData = 2;
+  string receiverKeyId = 3;
 }
 
 message InventoryRequest {