[WIP] Add protection tools

common/src/main/java/bisq/common/app/Capability.java

@@ -32,5 +32,6 @@ public enum Capability {
     BLIND_VOTE,
     ACK_MSG,
     BSQ_BLOCK,
-    DAO_STATE
+    DAO_STATE,
+    SIGNED_ACCOUNT_AGE_WITNESS
 }

common/src/main/proto/pb.proto

@@ -66,6 +66,8 @@ message NetworkEnvelope {
         NewBlindVoteStateHashMessage new_blind_vote_state_hash_message = 40;
         GetBlindVoteStateHashesRequest get_blind_vote_state_hashes_request = 41;
         GetBlindVoteStateHashesResponse get_blind_vote_state_hashes_response = 42;
+
+        FiatReceivedMessage fiat_received_message = 43; // added at v 1.1 as part of trade protocol changes for payout delay
     }
 }
 
@@ -261,6 +263,13 @@ message PayoutTxPublishedMessage {
     string uid = 4;
 }
 
+message FiatReceivedMessage {
+    int64 fiat_received_date = 1;
+    string trade_id = 2;
+    NodeAddress sender_node_address = 3;
+    string uid = 4;
+}
+
 // dispute
 
 message OpenNewDisputeMessage {
@@ -432,6 +441,7 @@ message PersistableNetworkPayload {
         TradeStatistics2 trade_statistics2 = 2;
         ProposalPayload proposal_payload = 3;
         BlindVotePayload blind_vote_payload = 4;
+        SignedWitness signed_witness = 5;
     }
 }
 
@@ -633,6 +643,16 @@ message AccountAgeWitness {
     int64 date = 2;
 }
 
+message SignedWitness {
+    bool signed_by_arbitrator = 1;
+    bytes witness_hash = 2;
+    bytes signature = 3;
+    bytes signer_pub_key = 4;
+    bytes witness_owner_pub_key = 5;
+    int64 date = 6;
+    int64 trade_amount = 7;
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 // Dispute payload
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -1014,6 +1034,7 @@ message PersistableEnvelope {
         MyReputationList my_reputation_list = 25;
         MyProofOfBurnList my_proof_of_burn_list = 26;
         UnconfirmedBsqChangeOutputList unconfirmed_bsq_change_output_list = 27;
+        SignedWitnessStore signed_witness_store = 28;
     }
 }
 
@@ -1054,6 +1075,10 @@ message AccountAgeWitnessStore {
     repeated AccountAgeWitness items = 1;
 }
 
+message SignedWitnessStore {
+    repeated SignedWitness items = 1;
+}
+
 // We use a list not a hash map to save disc space. The hash can be calculated from the payload anyway
 message TradeStatistics2Store {
     repeated TradeStatistics2 items = 1;
@@ -1178,6 +1203,7 @@ message Trade {
         BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG = 28;
         BUYER_SAW_PAYOUT_TX_IN_NETWORK = 29;
         WITHDRAW_COMPLETED = 30;
+        BUYER_RECEIVED_SELLERS_FIAT_PAYMENT_RECEIPT_CONFIRMATION = 31; // Added with 1.1.0 and cannot be put in logical place due PB restrictions
     }
 
     enum Phase {
@@ -1205,6 +1231,9 @@ message Trade {
         FIRST_HALF = 1;
         SECOND_HALF = 2;
         TRADE_PERIOD_OVER = 3;
+        WAITING_FOR_BLOCKCHAIN_CONFIRMATION = 4; // Added with 1.1.0 so it is not in logical order but as we cannot change PB definition we need to keep it that way.
+        PAYOUT_DELAY = 5;
+        RELEASE_BTC = 6;
     }
 
     Offer offer = 1;
@@ -1235,6 +1264,7 @@ message Trade {
     PubKeyRing arbitrator_pub_key_ring = 26;
     PubKeyRing mediator_pub_key_ring = 27;
     string counter_currency_tx_id = 28;
+    int64 fiat_received_date = 29;
 }
 
 message BuyerAsMakerTrade {
@@ -1356,6 +1386,7 @@ message PreferencesPayload {
     int32 ignore_dust_threshold = 51;
     double buyer_security_deposit_as_percent_for_crypto = 52;
     int32 block_notify_port = 53;
+    bool require_authorized_taker = 54;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////