Add mediation support

common/src/main/proto/pb.proto

@@ -44,8 +44,7 @@ message NetworkEnvelope {
 
         OpenNewDisputeMessage open_new_dispute_message = 22;
         PeerOpenedDisputeMessage peer_opened_dispute_message = 23;
-        // ChatMessage in java class. We cannot rename protobuf definition because it would break backward compatibility
-        DisputeCommunicationMessage dispute_communication_message = 24;
+        ChatMessage chat_message = 24;
         DisputeResultMessage dispute_result_message = 25;
         PeerPublishedDisputePayoutTxMessage peer_published_dispute_payout_tx_message = 26;
 
@@ -307,8 +306,7 @@ message PeerOpenedDisputeMessage {
     SupportType type = 4;
 }
 
-// ChatMessage in java class. We cannot rename protobuf definition because it would break backward compatibility
-message DisputeCommunicationMessage {
+message ChatMessage {
     int64 date = 1;
     string trade_id = 2;
     int32 trader_id = 3;
@@ -704,10 +702,9 @@ message Dispute {
     string contract_as_json = 15;
     string maker_contract_signature = 16;
     string taker_contract_signature = 17;
-    PubKeyRing arbitrator_pub_key_ring = 18; // Is agentPubKeyRing in java, but we cannot rename because of backward compatibility
+    PubKeyRing agent_pub_key_ring = 18;
     bool is_support_ticket = 19;
-    // ChatMessage in java class. We cannot rename protobuf definition because it would break backward compatibility
-    repeated DisputeCommunicationMessage dispute_communication_messages = 20;
+    repeated ChatMessage chat_message = 20;
     bool is_closed = 21;
     DisputeResult dispute_result = 22;
     string dispute_payout_tx_id = 23;
@@ -744,8 +741,7 @@ message DisputeResult {
     bool id_verification = 6;
     bool screen_cast = 7;
     string summary_notes = 8;
-    // ChatMessage in java class. We cannot rename protobuf definition because it would break backward compatibility
-    DisputeCommunicationMessage dispute_communication_message = 9;
+    ChatMessage chat_message = 9;
     bytes arbitrator_signature = 10;
     int64 buyer_payout_amount = 11;
     int64 seller_payout_amount = 12;
@@ -1036,7 +1032,7 @@ message PersistableEnvelope {
 
         TradableList tradable_list = 6;
         TradeStatisticsList trade_statistics_list = 7 [deprecated = true]; // Was used in pre v0.6.0 version. Not used anymore.
-        DisputeList dispute_list = 8; // mapped to java class ArbitrationDisputeList  We cannot rename protobuf definition because it would break backward compatibility
+        ArbitrationDisputeList arbitration_dispute_list = 8;
 
         PreferencesPayload preferences_payload = 9;
         UserPayload user_payload = 10;
@@ -1296,8 +1292,7 @@ message Trade {
     PubKeyRing arbitrator_pub_key_ring = 26;
     PubKeyRing mediator_pub_key_ring = 27;
     string counter_currency_tx_id = 28;
-    // ChatMessage in java class. We cannot rename protobuf definition because it would break backward compatibility
-    repeated DisputeCommunicationMessage communication_messages = 29;
+    repeated ChatMessage chat_message = 29;
     MediationResultState mediation_result_state = 30;
 }
 
@@ -1362,7 +1357,7 @@ message TradingPeer {
 // Dispute
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-message DisputeList {
+message ArbitrationDisputeList {
     repeated Dispute dispute = 1;
 }
 

core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java

@@ -153,8 +153,8 @@ public NetworkEnvelope fromProto(protobuf.NetworkEnvelope proto) throws Protobuf
                     return OpenNewDisputeMessage.fromProto(proto.getOpenNewDisputeMessage(), this, messageVersion);
                 case PEER_OPENED_DISPUTE_MESSAGE:
                     return PeerOpenedDisputeMessage.fromProto(proto.getPeerOpenedDisputeMessage(), this, messageVersion);
-                case DISPUTE_COMMUNICATION_MESSAGE:
-                    return ChatMessage.fromProto(proto.getDisputeCommunicationMessage(), messageVersion);
+                case CHAT_MESSAGE:
+                    return ChatMessage.fromProto(proto.getChatMessage(), messageVersion);
                 case DISPUTE_RESULT_MESSAGE:
                     return DisputeResultMessage.fromProto(proto.getDisputeResultMessage(), messageVersion);
                 case PEER_PUBLISHED_DISPUTE_PAYOUT_TX_MESSAGE:

core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java

@@ -33,10 +33,10 @@
 import bisq.core.dao.state.model.governance.BallotList;
 import bisq.core.dao.state.model.governance.MeritList;
 import bisq.core.dao.state.unconfirmed.UnconfirmedBsqChangeOutputList;
-import bisq.core.support.dispute.arbitration.ArbitrationDisputeList;
-import bisq.core.support.dispute.mediation.MediationDisputeList;
 import bisq.core.payment.PaymentAccountList;
 import bisq.core.proto.CoreProtoResolver;
+import bisq.core.support.dispute.arbitration.ArbitrationDisputeList;
+import bisq.core.support.dispute.mediation.MediationDisputeList;
 import bisq.core.trade.TradableList;
 import bisq.core.trade.statistics.TradeStatistics2Store;
 import bisq.core.user.PreferencesPayload;
@@ -102,8 +102,8 @@ public PersistableEnvelope fromProto(protobuf.PersistableEnvelope proto) {
                             btcWalletService.get());
                 case TRADE_STATISTICS_LIST:
                     throw new ProtobufferRuntimeException("TRADE_STATISTICS_LIST is not used anymore");
-                case DISPUTE_LIST:
-                    return ArbitrationDisputeList.fromProto(proto.getDisputeList(),
+                case ARBITRATION_DISPUTE_LIST:
+                    return ArbitrationDisputeList.fromProto(proto.getArbitrationDisputeList(),
                             this,
                             new Storage<>(storageDir, this, corruptedDatabaseFilesHandler));
                 case MEDIATION_DISPUTE_LIST:

core/src/main/java/bisq/core/support/dispute/Dispute.java

@@ -192,10 +192,10 @@ public protobuf.Dispute toProtoMessage() {
                 .setTradeDate(tradeDate)
                 .setContract(contract.toProtoMessage())
                 .setContractAsJson(contractAsJson)
-                .setArbitratorPubKeyRing(agentPubKeyRing.toProtoMessage()) // We renamed to agentPubKeyRing but need to keep protobuf as it was to be backward compatible
+                .setAgentPubKeyRing(agentPubKeyRing.toProtoMessage()) // We renamed to agentPubKeyRing but need to keep protobuf as it was to be backward compatible
                 .setIsSupportTicket(isSupportTicket)
-                .addAllDisputeCommunicationMessages(clonedChatMessages.stream()
-                        .map(msg -> msg.toProtoNetworkEnvelope().getDisputeCommunicationMessage())
+                .addAllChatMessage(clonedChatMessages.stream()
+                        .map(msg -> msg.toProtoNetworkEnvelope().getChatMessage())
                         .collect(Collectors.toList()))
                 .setIsClosed(isClosedProperty.get())
                 .setOpeningDate(openingDate)
@@ -229,10 +229,10 @@ public static Dispute fromProto(protobuf.Dispute proto, CoreProtoResolver corePr
                 proto.getContractAsJson(),
                 ProtoUtil.stringOrNullFromProto(proto.getMakerContractSignature()),
                 ProtoUtil.stringOrNullFromProto(proto.getTakerContractSignature()),
-                PubKeyRing.fromProto(proto.getArbitratorPubKeyRing()), // We renamed to agentPubKeyRing but need to keep protobuf as it was to be backward compatible
+                PubKeyRing.fromProto(proto.getAgentPubKeyRing()), // We renamed to agentPubKeyRing but need to keep protobuf as it was to be backward compatible
                 proto.getIsSupportTicket());
 
-        dispute.chatMessages.addAll(proto.getDisputeCommunicationMessagesList().stream()
+        dispute.chatMessages.addAll(proto.getChatMessageList().stream()
                 .map(ChatMessage::fromPayloadProto)
                 .collect(Collectors.toList()));
 

core/src/main/java/bisq/core/support/dispute/DisputeResult.java

@@ -138,7 +138,7 @@ public static DisputeResult fromProto(protobuf.DisputeResult proto) {
                 proto.getIdVerification(),
                 proto.getScreenCast(),
                 proto.getSummaryNotes(),
-                proto.getDisputeCommunicationMessage() == null ? null : ChatMessage.fromPayloadProto(proto.getDisputeCommunicationMessage()),
+                proto.getChatMessage() == null ? null : ChatMessage.fromPayloadProto(proto.getChatMessage()),
                 proto.getArbitratorSignature().toByteArray(),
                 proto.getBuyerPayoutAmount(),
                 proto.getSellerPayoutAmount(),
@@ -166,7 +166,7 @@ public protobuf.DisputeResult toProtoMessage() {
         Optional.ofNullable(arbitratorPubKey).ifPresent(arbitratorPubKey -> builder.setArbitratorPubKey(ByteString.copyFrom(arbitratorPubKey)));
         Optional.ofNullable(winner).ifPresent(result -> builder.setWinner(protobuf.DisputeResult.Winner.valueOf(winner.name())));
         Optional.ofNullable(chatMessage).ifPresent(chatMessage ->
-                builder.setDisputeCommunicationMessage(chatMessage.toProtoNetworkEnvelope().getDisputeCommunicationMessage()));
+                builder.setChatMessage(chatMessage.toProtoNetworkEnvelope().getChatMessage()));
 
         return builder.build();
     }

core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeList.java

@@ -67,11 +67,11 @@ private ArbitrationDisputeList(Storage<ArbitrationDisputeList> storage, List<Dis
 
     @Override
     public Message toProtoMessage() {
-        return protobuf.PersistableEnvelope.newBuilder().setDisputeList(protobuf.DisputeList.newBuilder()
+        return protobuf.PersistableEnvelope.newBuilder().setArbitrationDisputeList(protobuf.ArbitrationDisputeList.newBuilder()
                 .addAllDispute(ProtoUtil.collectionToProto(new ArrayList<>(list)))).build();
     }
 
-    public static ArbitrationDisputeList fromProto(protobuf.DisputeList proto,
+    public static ArbitrationDisputeList fromProto(protobuf.ArbitrationDisputeList proto,
                                                    CoreProtoResolver coreProtoResolver,
                                                    Storage<ArbitrationDisputeList> storage) {
         List<Dispute> list = proto.getDisputeList().stream()

core/src/main/java/bisq/core/support/messages/ChatMessage.java

@@ -204,7 +204,7 @@ private ChatMessage(SupportType supportType,
     // We cannot rename protobuf definition because it would break backward compatibility
     @Override
     public protobuf.NetworkEnvelope toProtoNetworkEnvelope() {
-        protobuf.DisputeCommunicationMessage.Builder builder = protobuf.DisputeCommunicationMessage.newBuilder()
+        protobuf.ChatMessage.Builder builder = protobuf.ChatMessage.newBuilder()
                 .setType(SupportType.toProtoMessage(supportType))
                 .setTradeId(tradeId)
                 .setTraderId(traderId)
@@ -222,12 +222,12 @@ public protobuf.NetworkEnvelope toProtoNetworkEnvelope() {
         Optional.ofNullable(sendMessageErrorProperty.get()).ifPresent(builder::setSendMessageError);
         Optional.ofNullable(ackErrorProperty.get()).ifPresent(builder::setAckError);
         return getNetworkEnvelopeBuilder()
-                .setDisputeCommunicationMessage(builder)
+                .setChatMessage(builder)
                 .build();
     }
 
-    // The protobuf definition DisputeCommunicationMessage cannot be changed as it would break backward compatibility.
-    public static ChatMessage fromProto(protobuf.DisputeCommunicationMessage proto,
+    // The protobuf definition ChatMessage cannot be changed as it would break backward compatibility.
+    public static ChatMessage fromProto(protobuf.ChatMessage proto,
                                         int messageVersion) {
         // If we get a msg from an old client type will be ordinal 0 which is the dispute entry and as we only added
         // the trade case it is the desired behaviour.
@@ -252,7 +252,7 @@ public static ChatMessage fromProto(protobuf.DisputeCommunicationMessage proto,
         return chatMessage;
     }
 
-    public static ChatMessage fromPayloadProto(protobuf.DisputeCommunicationMessage proto) {
+    public static ChatMessage fromPayloadProto(protobuf.ChatMessage proto) {
         // We have the case that an envelope got wrapped into a payload.
         // We don't check the message version here as it was checked in the carrier envelope already (in connection class)
         // Payloads don't have a message version and are also used for persistence
@@ -265,7 +265,7 @@ public static ChatMessage fromPayloadProto(protobuf.DisputeCommunicationMessage
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void addAllAttachments(List<Attachment> attachments) {
+    private void addAllAttachments(List<Attachment> attachments) {
         this.attachments.addAll(attachments);
     }
 

core/src/main/java/bisq/core/trade/Trade.java

@@ -461,8 +461,8 @@ public Message toProtoMessage() {
                 .setState(Trade.State.toProtoMessage(state))
                 .setDisputeState(Trade.DisputeState.toProtoMessage(disputeState))
                 .setTradePeriodState(Trade.TradePeriodState.toProtoMessage(tradePeriodState))
-                .addAllCommunicationMessages(chatMessages.stream()
-                        .map(msg -> msg.toProtoNetworkEnvelope().getDisputeCommunicationMessage())
+                .addAllChatMessage(chatMessages.stream()
+                        .map(msg -> msg.toProtoNetworkEnvelope().getChatMessage())
                         .collect(Collectors.toList()));
 
         Optional.ofNullable(takerFeeTxId).ifPresent(builder::setTakerFeeTxId);
@@ -510,7 +510,7 @@ public static Trade fromProto(Trade trade, protobuf.Trade proto, CoreProtoResolv
         trade.setCounterCurrencyTxId(proto.getCounterCurrencyTxId().isEmpty() ? null : proto.getCounterCurrencyTxId());
         trade.setMediationResultState(MediationResultState.fromProto(proto.getMediationResultState()));
 
-        trade.chatMessages.addAll(proto.getCommunicationMessagesList().stream()
+        trade.chatMessages.addAll(proto.getChatMessageList().stream()
                 .map(ChatMessage::fromPayloadProto)
                 .collect(Collectors.toList()));