From bea11ab1f4aa556e3fc65a58ebe8d42b9e24dc0e Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Sun, 12 Sep 2021 09:39:21 -0400
Subject: [PATCH] add HavenoDaemon api class and jest tests supporting version
 and balances (#8)

---
 README.md                 |    1 +
 config/grpc.proto         |    9 +-
 config/pb.proto           |  422 +-
 package-lock.json         |  257 +-
 src/App.tsx               |   31 +-
 src/HavenoDaemon.test.tsx |   32 +
 src/HavenoDaemon.tsx      |  212 +
 src/grpc_pb.js            |   78 +-
 src/pb_pb.js              | 8108 ++++++++++++++++++++++++++-----------
 9 files changed, 6316 insertions(+), 2834 deletions(-)
 create mode 100644 src/HavenoDaemon.test.tsx
 create mode 100644 src/HavenoDaemon.tsx

diff --git a/README.md b/README.md
index 5b8af56a..28d42955 100644
--- a/README.md
+++ b/README.md
@@ -21,4 +21,5 @@ This application is a basic [create-react-app](https://github.com/facebook/creat
 ## How to Update the Protobuf Client
 
 1. Copy grpc.proto and pb.proto from Haveno's [protobuf definitions](https://github.com/haveno-dex/haveno/tree/master/proto/src/main/proto) to ./config.
+2. Install protobuf for your system, e.g. on mac: `brew install protobuf`
 2. `./bin/build_protobuf.sh`
\ No newline at end of file
diff --git a/config/grpc.proto b/config/grpc.proto
index e1c64159..4002f8a1 100644
--- a/config/grpc.proto
+++ b/config/grpc.proto
@@ -606,11 +606,10 @@ message BtcBalanceInfo {
 }
 
 message XmrBalanceInfo {
-    uint64 balance = 1;
-    uint64 availableBalance = 2;
-    uint64 lockedBalance = 3;
-    uint64 reservedBalance = 4;
-    uint64 totalBalance = 5; // balance + reserved
+    uint64 unlockedBalance = 1;
+    uint64 lockedBalance = 2;
+    uint64 reservedOfferBalance = 3;
+    uint64 reservedTradeBalance = 4;
 }
 
 message AddressBalanceInfo {
diff --git a/config/pb.proto b/config/pb.proto
index 8d0aec26..4475a5d3 100644
--- a/config/pb.proto
+++ b/config/pb.proto
@@ -81,15 +81,20 @@ message NetworkEnvelope {
 
         GetInventoryRequest get_inventory_request = 52;
         GetInventoryResponse get_inventory_response = 53;
-        
-        InitTradeRequest init_trade_request = 1001;
-        MakerReadyToFundMultisigRequest maker_ready_to_fund_multisig_request = 1002;
-        MakerReadyToFundMultisigResponse maker_ready_to_fund_multisig_response = 1003;
-        InitMultisigMessage init_multisig_message = 1004;
-        UpdateMultisigRequest update_multisig_request = 1005;
-        UpdateMultisigResponse update_multisig_response = 1006;
-        ArbitratorPayoutTxRequest arbitrator_payout_tx_request = 1007;
-        ArbitratorPayoutTxResponse arbitrator_payout_tx_response = 1008; 
+
+        SignOfferRequest sign_offer_request = 1001;
+        SignOfferResponse sign_offer_response = 1002;
+        InitTradeRequest init_trade_request = 1003;
+        InitMultisigRequest init_multisig_request = 1004;
+        SignContractRequest sign_contract_request = 1005;
+        SignContractResponse sign_contract_response = 1006;
+        DepositRequest deposit_request = 1007;
+        DepositResponse deposit_response = 1008;
+        PaymentAccountPayloadRequest payment_account_payload_request = 1009;
+        UpdateMultisigRequest update_multisig_request = 1010;
+        UpdateMultisigResponse update_multisig_response = 1011;
+        ArbitratorPayoutTxRequest arbitrator_payout_tx_request = 1012;
+        ArbitratorPayoutTxResponse arbitrator_payout_tx_response = 1013;
     }
 }
 
@@ -161,6 +166,26 @@ message GetInventoryResponse {
 
 // offer
 
+message SignOfferRequest {
+    string offer_id = 1;
+    NodeAddress sender_node_address = 2;
+    PubKeyRing pub_key_ring = 3;
+    string sender_account_id = 4;
+    OfferPayload offer_payload = 5;
+    string uid = 6;
+    int64 current_date = 7;
+    string reserve_tx_hash = 8;
+    string reserve_tx_hex = 9;
+    string reserve_tx_key = 10;
+    string payout_address = 11;
+}
+
+message SignOfferResponse {
+    string offer_id = 1;
+    string uid = 2;
+    OfferPayload signed_offer_payload = 3;
+}
+
 message OfferAvailabilityRequest {
     string offer_id = 1;
     PubKeyRing pub_key_ring = 2;
@@ -168,6 +193,7 @@ message OfferAvailabilityRequest {
     repeated int32 supported_capabilities = 4;
     string uid = 5;
     bool is_taker_api_user = 6;
+    InitTradeRequest trade_request = 7;
 }
 
 message OfferAvailabilityResponse {
@@ -175,9 +201,8 @@ message OfferAvailabilityResponse {
     AvailabilityResult availability_result = 2;
     repeated int32 supported_capabilities = 3;
     string uid = 4;
-    NodeAddress arbitrator = 5;
-    NodeAddress mediator = 6;
-    NodeAddress refund_agent = 7;
+    string maker_signature = 5;
+    NodeAddress arbitrator_node_address = 6;
 }
 
 message RefreshOfferMessage {
@@ -282,40 +307,24 @@ message InitTradeRequest {
     PubKeyRing pub_key_ring = 3;
     int64 trade_amount = 4;
     int64 trade_price = 5;
-    int64 tx_fee = 6;
-    int64 trade_fee = 7;
-    string payout_address_string = 8;
-    PaymentAccountPayload payment_account_payload = 9;
-    string account_id = 10;
-    string trade_fee_tx_id = 11;
-    string uid = 12;
-    bytes account_age_witness_signature_of_offer_id = 13;
-    int64 current_date = 14;
-    NodeAddress maker_node_address = 15;
-    NodeAddress taker_node_address = 16;
-    NodeAddress arbitrator_node_address = 17;
+    int64 trade_fee = 6;
+    string account_id = 7;
+    string payment_account_id = 8;
+    string payment_method_id = 9;
+    string uid = 10;
+    bytes account_age_witness_signature_of_offer_id = 11;
+    int64 current_date = 12;
+    NodeAddress maker_node_address = 13;
+    NodeAddress taker_node_address = 14;
+    NodeAddress arbitrator_node_address = 15;
+    string reserve_tx_hash = 16;
+    string reserve_tx_hex = 17;
+    string reserve_tx_key = 18;
+    string payout_address = 19;
+    string maker_signature = 20;
 }
 
-message MakerReadyToFundMultisigRequest {
-    string trade_id = 1;
-    NodeAddress sender_node_address = 2;
-    PubKeyRing pub_key_ring = 3;
-    string uid = 4;
-}
-
-message MakerReadyToFundMultisigResponse {
-	string trade_id = 1;
-	string uid = 2;
-	bool is_maker_ready_to_fund_multisig = 3;
-	string maker_contract_as_json = 4;
-    string maker_contract_signature = 5;
-    string maker_payout_address_string = 6;
-    PaymentAccountPayload maker_payment_account_payload = 7;
-    string maker_account_id = 8;
-    int64 current_date = 9;
-}
-
-message InitMultisigMessage {
+message InitMultisigRequest {
     string trade_id = 1;
     NodeAddress sender_node_address = 2;
     PubKeyRing pub_key_ring = 3;
@@ -325,6 +334,55 @@ message InitMultisigMessage {
     string made_multisig_hex = 7;
 }
 
+message SignContractRequest {
+    string trade_id = 1;
+    NodeAddress sender_node_address = 2;
+    PubKeyRing pub_key_ring = 3;
+    string uid = 4;
+    int64 current_date = 5;
+    string account_id = 6;
+    bytes payment_account_payload_hash = 7;
+    string payout_address = 8;;
+    string deposit_tx_hash = 9;
+}
+
+message SignContractResponse {
+    string trade_id = 1;
+    NodeAddress sender_node_address = 2;
+    PubKeyRing pub_key_ring = 3;
+    string uid = 4;
+    int64 current_date = 5;
+    string contract_signature = 6;
+}
+
+message DepositRequest {
+    string trade_id = 1;
+    NodeAddress sender_node_address = 2;
+    PubKeyRing pub_key_ring = 3;
+    string uid = 4;
+    int64 current_date = 5;
+    string contract_signature = 6;
+    string deposit_tx_hex = 7;
+    string deposit_tx_key = 8;
+}
+
+message DepositResponse {
+    string trade_id = 1;
+    NodeAddress sender_node_address = 2;
+    PubKeyRing pub_key_ring = 3;
+    string uid = 4;
+    int64 current_date = 5;
+}
+
+message PaymentAccountPayloadRequest {
+    string trade_id = 1;
+    NodeAddress sender_node_address = 2;
+    PubKeyRing pub_key_ring = 3;
+    string uid = 4;
+    int64 current_date = 5;
+    PaymentAccountPayload payment_account_payload = 6;
+}
+
 message UpdateMultisigRequest {
     string trade_id = 1;
     NodeAddress sender_node_address = 2;
@@ -855,32 +913,33 @@ message OfferPayload {
     int64 min_amount = 10;
     string base_currency_code = 11;
     string counter_currency_code = 12;
-    repeated NodeAddress arbitrator_node_addresses = 13 [deprecated = true]; // not used anymore but still required as old clients check for nonNull
-    repeated NodeAddress mediator_node_addresses = 14 [deprecated = true]; // not used anymore but still required as old clients check for nonNull
-    string payment_method_id = 15;
-    string maker_payment_account_id = 16;
-    string offer_fee_payment_tx_id = 17;
-    string country_code = 18;
-    repeated string accepted_country_codes = 19;
-    string bank_id = 20;
-    repeated string accepted_bank_ids = 21;
-    string version_nr = 22;
-    int64 block_height_at_offer_creation = 23;
-    int64 tx_fee = 24;
-    int64 maker_fee = 25;
-    bool is_currency_for_maker_fee_btc = 26;
-    int64 buyer_security_deposit = 27;
-    int64 seller_security_deposit = 28;
-    int64 max_trade_limit = 29;
-    int64 max_trade_period = 30;
-    bool use_auto_close = 31;
-    bool use_re_open_after_auto_close = 32;
-    int64 lower_close_price = 33;
-    int64 upper_close_price = 34;
-    bool is_private_offer = 35;
-    string hash_of_challenge = 36;
-    map<string, string> extra_data = 37;
-    int32 protocol_version = 38;
+    string payment_method_id = 13;
+    string maker_payment_account_id = 14;
+    string offer_fee_payment_tx_id = 15;
+    string country_code = 16;
+    repeated string accepted_country_codes = 17;
+    string bank_id = 18;
+    repeated string accepted_bank_ids = 19;
+    string version_nr = 20;
+    int64 block_height_at_offer_creation = 21;
+    int64 tx_fee = 22;
+    int64 maker_fee = 23;
+    bool is_currency_for_maker_fee_btc = 24;
+    int64 buyer_security_deposit = 25;
+    int64 seller_security_deposit = 26;
+    int64 max_trade_limit = 27;
+    int64 max_trade_period = 28;
+    bool use_auto_close = 29;
+    bool use_re_open_after_auto_close = 30;
+    int64 lower_close_price = 31;
+    int64 upper_close_price = 32;
+    bool is_private_offer = 33;
+    string hash_of_challenge = 34;
+    map<string, string> extra_data = 35;
+    int32 protocol_version = 36;
+    
+    NodeAddress arbitrator_node_address = 1001;
+    string arbitrator_signature = 1002;
 }
 
 message AccountAgeWitness {
@@ -920,34 +979,36 @@ message Dispute {
     string trade_id = 1;
     string id = 2;
     int32 trader_id = 3;
-    bool dispute_opener_is_buyer = 4;
-    bool dispute_opener_is_maker = 5;
-    int64 opening_date = 6;
-    PubKeyRing trader_pub_key_ring = 7;
-    int64 trade_date = 8;
-    Contract contract = 9;
-    bytes contract_hash = 10;
-    bytes deposit_tx_serialized = 11;
-    bytes payout_tx_serialized = 12;
-    string deposit_tx_id = 13;
-    string payout_tx_id = 14;
-    string contract_as_json = 15;
-    string maker_contract_signature = 16;
-    string taker_contract_signature = 17;
-    PubKeyRing agent_pub_key_ring = 18;
-    bool is_support_ticket = 19;
-    repeated ChatMessage chat_message = 20;
-    bool is_closed = 21;
-    DisputeResult dispute_result = 22;
-    string dispute_payout_tx_id = 23;
-    SupportType support_type = 24;
-    string mediators_dispute_result = 25;
-    string delayed_payout_tx_id = 26;
-    string donation_address_of_delayed_payout_tx = 27;
-    State state = 28;
-    int64 trade_period_end = 29;
-    map<string, string> extra_data = 30;
-    bool is_opener = 100;
+    bool is_opener = 4;
+    bool dispute_opener_is_buyer = 5;
+    bool dispute_opener_is_maker = 6;
+    int64 opening_date = 7;
+    PubKeyRing trader_pub_key_ring = 8;
+    int64 trade_date = 9;
+    Contract contract = 10;
+    bytes contract_hash = 11;
+    bytes deposit_tx_serialized = 12;
+    bytes payout_tx_serialized = 13;
+    string deposit_tx_id = 14;
+    string payout_tx_id = 15;
+    string contract_as_json = 16;
+    string maker_contract_signature = 17;
+    string taker_contract_signature = 18;
+    PaymentAccountPayload maker_payment_account_payload = 19;
+    PaymentAccountPayload taker_payment_account_payload = 20;
+    PubKeyRing agent_pub_key_ring = 21;
+    bool is_support_ticket = 22;
+    repeated ChatMessage chat_message = 23;
+    bool is_closed = 24;
+    DisputeResult dispute_result = 25;
+    string dispute_payout_tx_id = 26;
+    SupportType support_type = 27;
+    string mediators_dispute_result = 28;
+    string delayed_payout_tx_id = 29;
+    string donation_address_of_delayed_payout_tx = 30;
+    State state = 31;
+    int64 trade_period_end = 32;
+    map<string, string> extra_data = 33;
 }
 
 message Attachment {
@@ -1010,16 +1071,20 @@ message Contract {
     bool is_buyer_maker_and_seller_taker = 6;
     string maker_account_id = 7;
     string taker_account_id = 8;
-    PaymentAccountPayload maker_payment_account_payload = 9;
-    PaymentAccountPayload taker_payment_account_payload = 10;
-    PubKeyRing maker_pub_key_ring = 11;
-    PubKeyRing taker_pub_key_ring = 12;
-    NodeAddress buyer_node_address = 13;
-    NodeAddress seller_node_address = 14;
-    string maker_payout_address_string = 15;
-    string taker_payout_address_string = 16;
-    NodeAddress arbitrator_node_address = 17;
-    int64 lock_time = 18;
+    string maker_payment_method_id = 9;
+    string taker_payment_method_id = 10;
+    bytes maker_payment_account_payload_hash = 11;
+    bytes taker_payment_account_payload_hash = 12;
+    PubKeyRing maker_pub_key_ring = 13;
+    PubKeyRing taker_pub_key_ring = 14;
+    NodeAddress buyer_node_address = 15;
+    NodeAddress seller_node_address = 16;
+    string maker_payout_address_string = 17;
+    string taker_payout_address_string = 18;
+    NodeAddress arbitrator_node_address = 19;
+    int64 lock_time = 20;
+    string maker_deposit_tx_hash = 21;
+    string taker_deposit_tx_hash = 22;
 }
 
 message RawTransactionInput {
@@ -1043,6 +1108,7 @@ enum AvailabilityResult {
     UNCONF_TX_LIMIT_HIT = 11;
     MAKER_DENIED_API_USER = 12;
     PRICE_CHECK_FAILED = 13;
+    MAKER_DENIED_TAKER = 14;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -1352,7 +1418,8 @@ message PersistableEnvelope {
         IgnoredMailboxMap ignored_mailbox_map = 33;
         RemovedPayloadsMap removed_payloads_map = 34;
         
-        XmrAddressEntryList xmr_address_entry_list = 100;
+        XmrAddressEntryList xmr_address_entry_list = 1001;
+        SignedOfferList signed_offer_list = 1002;
     }
 }
 
@@ -1444,7 +1511,7 @@ message XmrAddressEntry {
         TRADE_PAYOUT = 6;
     }
 
-	int32 account_index = 7;
+	int32 subaddress_index = 7;
 	string address_string = 8;
     string offer_id = 9;
     Context context = 10;
@@ -1481,6 +1548,17 @@ message Offer {
     OfferPayload offer_payload = 1;
 }
 
+message SignedOfferList {
+    repeated SignedOffer signed_offer = 1;
+}
+
+message SignedOffer {
+    string offer_id = 1;
+    string reserve_tx_hash = 2;
+    string reserve_tx_hex = 3;
+    string arbitrator_signature = 4;
+}
+
 message OpenOffer {
     enum State {
         PB_ERROR = 0;
@@ -1494,9 +1572,8 @@ message OpenOffer {
     Offer offer = 1;
     State state = 2;
     NodeAddress arbitrator_node_address = 3;
-    NodeAddress mediator_node_address = 4;
-    NodeAddress refund_agent_node_address = 5;
-    int64 trigger_price = 6;
+    int64 trigger_price = 4;
+    repeated string frozen_key_images = 5;
 }
 
 message Tradable {
@@ -1507,6 +1584,8 @@ message Tradable {
         SellerAsMakerTrade seller_as_maker_trade = 4;
         SellerAsTakerTrade seller_as_taker_trade = 5;
         ArbitratorTrade arbitrator_trade = 6;
+        
+        SignedOffer signed_offer = 1001;
     }
 }
 
@@ -1596,34 +1675,30 @@ message Trade {
     Contract contract = 16;
     string contract_as_json = 17;
     bytes contract_hash = 18;
-    string taker_contract_signature = 19;
-    string maker_contract_signature = 20;
-    NodeAddress arbitrator_node_address = 21;
-    NodeAddress mediator_node_address = 22;
-    bytes arbitrator_btc_pub_key = 23;
-    string taker_payment_account_id = 24;
-    string error_message = 25;
-    PubKeyRing arbitrator_pub_key_ring = 26;
-    PubKeyRing mediator_pub_key_ring = 27;
-    string counter_currency_tx_id = 28;
-    repeated ChatMessage chat_message = 29;
-    MediationResultState mediation_result_state = 30;
-    int64 lock_time = 31;
-    bytes delayed_payout_tx_bytes = 32;
-    NodeAddress refund_agent_node_address = 33;
-    PubKeyRing refund_agent_pub_key_ring = 34;
-    RefundResultState refund_result_state = 35;
-    int64 last_refresh_request_date = 36 [deprecated = true];
-    string counter_currency_extra_data = 37;
-    string asset_tx_proof_result = 38; // name of AssetTxProofResult enum
-    string uid = 39;
+    NodeAddress arbitrator_node_address = 19;
+    NodeAddress mediator_node_address = 20;
+    bytes arbitrator_btc_pub_key = 21;
+    string taker_payment_account_id = 22;
+    string error_message = 23;
+    PubKeyRing arbitrator_pub_key_ring = 24;
+    PubKeyRing mediator_pub_key_ring = 25;
+    string counter_currency_tx_id = 26;
+    repeated ChatMessage chat_message = 27;
+    MediationResultState mediation_result_state = 28;
+    int64 lock_time = 29;
+    bytes delayed_payout_tx_bytes = 30;
+    NodeAddress refund_agent_node_address = 31;
+    PubKeyRing refund_agent_pub_key_ring = 32;
+    RefundResultState refund_result_state = 33;
+    int64 last_refresh_request_date = 34 [deprecated = true];
+    string counter_currency_extra_data = 35;
+    string asset_tx_proof_result = 36; // name of AssetTxProofResult enum
+    string uid = 37;
     
-    NodeAddress taker_node_address = 100;
-    PubKeyRing taker_pub_key_ring = 101;
-    string taker_deposit_tx_id = 102;
-    NodeAddress maker_node_address = 103;
-    PubKeyRing maker_pub_key_ring = 104;
-    string maker_deposit_tx_id = 105;
+    NodeAddress maker_node_address = 100; // TODO (woodser): move these into TradingPeer
+    NodeAddress taker_node_address = 101;
+    PubKeyRing taker_pub_key_ring = 102;
+    PubKeyRing maker_pub_key_ring = 103;
 }
 
 message BuyerAsMakerTrade {
@@ -1668,39 +1743,50 @@ message ProcessModel {
     int64 buyer_payout_amount_from_mediation = 19;
     int64 seller_payout_amount_from_mediation = 20;
     
-    TradingPeer maker = 1001;
-    TradingPeer taker = 1002;
-    TradingPeer arbitrator = 1003;
-    NodeAddress temp_trading_peer_node_address = 1004;
-    string prepared_multisig_hex = 1005;
-    string made_multisig_hex = 1006;
-    bool multisig_setup_complete = 1007;
-    bool maker_ready_to_fund_multisig = 1008;
-    bool multisig_deposit_initiated = 1009;
-    string taker_prepared_deposit_tx_id = 1010;
-    string maker_prepared_deposit_tx_id = 1011;
+    string maker_signature = 1001;
+    NodeAddress arbitrator_node_address = 1002;
+    TradingPeer maker = 1003;
+    TradingPeer taker = 1004;
+    TradingPeer arbitrator = 1005;
+    NodeAddress temp_trading_peer_node_address = 1006;
+    string reserve_tx_hash = 1007;
+    repeated string frozen_key_images = 1008;
+    string prepared_multisig_hex = 1009;
+    string made_multisig_hex = 1010;
+    bool multisig_setup_complete = 1011;
+    bool maker_ready_to_fund_multisig = 1012;
+    bool multisig_deposit_initiated = 1013;
 }
 
 message TradingPeer {
     string account_id = 1;
-    PaymentAccountPayload payment_account_payload = 2;
-    string payout_address_string = 3;
-    string contract_as_json = 4;
-    string contract_signature = 5;
-    bytes signature = 6;	// TODO (woodser): remove unused fields? this was buyer-signed payout tx as bytes
-    PubKeyRing pub_key_ring = 7;
-    bytes multi_sig_pub_key = 8;
-    repeated RawTransactionInput raw_transaction_inputs = 9;
-    int64 change_output_value = 10;
-    string change_output_address = 11;
-    bytes account_age_witness_nonce = 12;
-    bytes account_age_witness_signature = 13;
-    int64 current_date = 14;
-    bytes mediated_payout_tx_signature = 15;
+    string payment_account_id = 2;
+    string payment_method_id = 3;
+    bytes payment_account_payload_hash = 4;
+    PaymentAccountPayload payment_account_payload = 5;
+    string payout_address_string = 6;
+    string contract_as_json = 7;
+    string contract_signature = 8;
+    bytes signature = 9;	// TODO (woodser): remove unused fields? this was buyer-signed payout tx as bytes
+    PubKeyRing pub_key_ring = 10;
+    bytes multi_sig_pub_key = 11;
+    repeated RawTransactionInput raw_transaction_inputs = 12;
+    int64 change_output_value = 13;
+    string change_output_address = 14;
+    bytes account_age_witness_nonce = 15;
+    bytes account_age_witness_signature = 16;
+    int64 current_date = 17;
+    bytes mediated_payout_tx_signature = 18;
     
-    string prepared_multisig_hex = 1001;
-    string made_multisig_hex = 1002;
-    string signed_payout_tx_hex = 1003;
+    string reserve_tx_hash = 1001;
+    string reserve_tx_hex = 1002;
+    string reserve_tx_key = 1003;
+    string prepared_multisig_hex = 1004;
+    string made_multisig_hex = 1005;
+    string signed_payout_tx_hex = 1006;
+    string deposit_tx_hash = 1007;
+    string deposit_tx_hex = 1008;
+    string deposit_tx_key = 1009;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/package-lock.json b/package-lock.json
index be81ca37..a735f03a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "haveno-ui-poc",
       "version": "0.1.0",
       "dependencies": {
         "@testing-library/jest-dom": "^5.11.10",
@@ -3634,6 +3635,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
@@ -4865,15 +4877,15 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.4.tgz",
-      "integrity": "sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz",
+      "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001208",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.712",
+        "caniuse-lite": "^1.0.30001254",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.830",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
+        "node-releases": "^1.1.75"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5082,9 +5094,13 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001214",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz",
-      "integrity": "sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg=="
+      "version": "1.0.30001255",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz",
+      "integrity": "sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
     },
     "node_modules/capture-exit": {
       "version": "2.0.0",
@@ -5390,9 +5406,9 @@
       }
     },
     "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
@@ -6605,9 +6621,9 @@
       "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
     },
     "node_modules/dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dependencies": {
         "ip": "^1.1.0",
         "safe-buffer": "^5.0.1"
@@ -6818,9 +6834,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.719",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.719.tgz",
-      "integrity": "sha512-heM78GKSqrIzO9Oz0/y22nTBN7bqSP1Pla2SyU9DiSnQD+Ea9SyyN5RWWlgqsqeBLNDkSlE9J9EHFmdMPzxB/g=="
+      "version": "1.3.833",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.833.tgz",
+      "integrity": "sha512-h+9aVaUHjyunLqtCjJF2jrJ73tYcJqo2cCGKtVAXH9WmnBsb8hiChRQ0P1uXjdxR6Wcfxibephy41c1YlZA/pA=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -13376,9 +13392,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
@@ -14040,9 +14056,9 @@
       }
     },
     "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
@@ -14292,9 +14308,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "7.0.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
       "dependencies": {
         "chalk": "^2.4.2",
         "source-map": "^0.6.1",
@@ -16602,9 +16618,9 @@
       "deprecated": "https://github.com/lydell/resolve-url#deprecated"
     },
     "node_modules/resolve-url-loader": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
-      "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.4.tgz",
+      "integrity": "sha512-D3sQ04o0eeQEySLrcz4DsX3saHfsr8/N6tfhblxgZKXxMT2Louargg12oGNfoTRLV09GXhVUe5/qgA5vdgNigg==",
       "dependencies": {
         "adjust-sourcemap-loader": "3.0.0",
         "camelcase": "5.3.1",
@@ -16612,7 +16628,7 @@
         "convert-source-map": "1.7.0",
         "es6-iterator": "2.0.3",
         "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
+        "postcss": "7.0.36",
         "rework": "1.0.1",
         "rework-visit": "1.0.0",
         "source-map": "0.6.1"
@@ -16661,19 +16677,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-      "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/resolve-url-loader/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -16682,17 +16685,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/resolve-url-loader/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -18561,9 +18553,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -19101,9 +19093,11 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -19398,9 +19392,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -20537,9 +20531,9 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
       "dependencies": {
         "async-limiter": "~1.0.0"
       }
@@ -21330,9 +21324,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -24244,6 +24238,13 @@
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "requires": {
         "type-fest": "^0.21.3"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.21.3",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
+        }
       }
     },
     "ansi-html": {
@@ -25237,15 +25238,15 @@
       }
     },
     "browserslist": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.4.tgz",
-      "integrity": "sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz",
+      "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==",
       "requires": {
-        "caniuse-lite": "^1.0.30001208",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.712",
+        "caniuse-lite": "^1.0.30001254",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.830",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
+        "node-releases": "^1.1.75"
       }
     },
     "bser": {
@@ -25406,9 +25407,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001214",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz",
-      "integrity": "sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg=="
+      "version": "1.0.30001255",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz",
+      "integrity": "sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ=="
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -25656,9 +25657,9 @@
       }
     },
     "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
     },
     "combined-stream": {
       "version": "1.0.8",
@@ -26624,9 +26625,9 @@
       "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
     },
     "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "requires": {
         "ip": "^1.1.0",
         "safe-buffer": "^5.0.1"
@@ -26813,9 +26814,9 @@
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
     },
     "electron-to-chromium": {
-      "version": "1.3.719",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.719.tgz",
-      "integrity": "sha512-heM78GKSqrIzO9Oz0/y22nTBN7bqSP1Pla2SyU9DiSnQD+Ea9SyyN5RWWlgqsqeBLNDkSlE9J9EHFmdMPzxB/g=="
+      "version": "1.3.833",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.833.tgz",
+      "integrity": "sha512-h+9aVaUHjyunLqtCjJF2jrJ73tYcJqo2cCGKtVAXH9WmnBsb8hiChRQ0P1uXjdxR6Wcfxibephy41c1YlZA/pA=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -31820,9 +31821,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
     },
     "normalize-package-data": {
       "version": "2.5.0",
@@ -32323,9 +32324,9 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -32512,9 +32513,9 @@
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "postcss": {
-      "version": "7.0.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
       "requires": {
         "chalk": "^2.4.2",
         "source-map": "^0.6.1",
@@ -34366,9 +34367,9 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
     "resolve-url-loader": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
-      "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.4.tgz",
+      "integrity": "sha512-D3sQ04o0eeQEySLrcz4DsX3saHfsr8/N6tfhblxgZKXxMT2Louargg12oGNfoTRLV09GXhVUe5/qgA5vdgNigg==",
       "requires": {
         "adjust-sourcemap-loader": "3.0.0",
         "camelcase": "5.3.1",
@@ -34376,7 +34377,7 @@
         "convert-source-map": "1.7.0",
         "es6-iterator": "2.0.3",
         "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
+        "postcss": "7.0.36",
         "rework": "1.0.1",
         "rework-visit": "1.0.0",
         "source-map": "0.6.1"
@@ -34410,28 +34411,10 @@
             "json5": "^1.0.1"
           }
         },
-        "postcss": {
-          "version": "7.0.21",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-          "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -35945,9 +35928,9 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -36357,9 +36340,11 @@
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
     },
     "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "optional": true,
+      "peer": true
     },
     "type-is": {
       "version": "1.6.18",
@@ -36588,9 +36573,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -37724,9 +37709,9 @@
           }
         },
         "ws": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+          "version": "6.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
           "requires": {
             "async-limiter": "~1.0.0"
           }
@@ -38168,9 +38153,9 @@
       }
     },
     "ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
       "requires": {}
     },
     "xml-name-validator": {
diff --git a/src/App.tsx b/src/App.tsx
index a2266f92..71bfa681 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,20 +1,19 @@
 import React from 'react';
 import logo from './logo.png';
 import './App.css';
+import {HavenoDaemon} from './HavenoDaemon';
 
-/**
- * These files are generated by protoc-gen-grpc-web (created with `sudo make install-plugin` in grpc-web) using the following command:
- *
- * `protoc -I=./ *.proto --js_out=import_style=commonjs:./ --grpc-web_out=import_style=commonjs,mode=grpcwebtext:./`
- */
-const {GetVersionRequest} = require('./grpc_grpc_web_pb.js');
-const {GetVersionClient} = require('./grpc_pb.js');
+const HAVENO_DAEMON_URL = "http://localhost:8080";
+const HAVENO_DAEMON_PASSWORD = "apitest";
 
 class App extends React.Component<{}, {daemonVersion: string}> {
+  
+  daemon: HavenoDaemon;
     
   constructor(props: any) {
     super(props);
     this.state = {daemonVersion: ""};
+    this.daemon = new HavenoDaemon(HAVENO_DAEMON_URL, HAVENO_DAEMON_PASSWORD);
   }
 
   render() {
@@ -42,18 +41,12 @@ class App extends React.Component<{}, {daemonVersion: string}> {
   }
   
   async componentDidMount() {
-    this.setState({daemonVersion: await this.getDaemonVersion()});
-  }
-  
-  async getDaemonVersion(): Promise<string> {
-    let getVersionClient = new GetVersionClient('http://localhost:8080');
-    let request = new GetVersionRequest();
-    return new Promise(function(resolve, reject) {
-      getVersionClient.getVersion(request, {password: 'apitest'}, function(err: any, response: any) {
-        if (err) reject(err);
-        else resolve(response.getVersion());
-      });
-    });
+    try {
+      this.setState({daemonVersion: await this.daemon.getVersion()});
+    } catch (err) {
+      console.error(err);
+      this.setState({daemonVersion: " not available"});
+    }
   }
 }
 
diff --git a/src/HavenoDaemon.test.tsx b/src/HavenoDaemon.test.tsx
new file mode 100644
index 00000000..711c4650
--- /dev/null
+++ b/src/HavenoDaemon.test.tsx
@@ -0,0 +1,32 @@
+import {HavenoDaemon, HavenoBalances, HavenoOffer} from "./HavenoDaemon";
+
+const HAVENO_UI_VERSION = "1.6.2";
+const HAVENO_DAEMON_URL = "http://localhost:8080";
+const HAVENO_DAEMON_PASSWORD = "apitest";
+
+const daemon = new HavenoDaemon(HAVENO_DAEMON_URL, HAVENO_DAEMON_PASSWORD);
+
+test("Can get the version", async () => {
+  let version = await daemon.getVersion();
+  expect(version).toEqual(HAVENO_UI_VERSION);
+});
+
+test("Can get the user's balances", async () => {
+  let balances: HavenoBalances = await daemon.getBalances();
+  expect(balances.unlockedBalance);
+  expect(balances.lockedBalance);
+  expect(balances.reservedOfferBalance);
+  expect(balances.reservedTradeBalance);
+});
+
+test("Can get offers", async() => {
+  let offers: HavenoOffer[] = await daemon.getOffers("SELL", "XMR");
+  for (let offer of offers) {
+    testOffer(offer);
+  }
+});
+
+function testOffer(offer: HavenoOffer) {
+  expect(offer.id).toHaveLength;
+  // TODO: test rest of offer
+}
\ No newline at end of file
diff --git a/src/HavenoDaemon.tsx b/src/HavenoDaemon.tsx
new file mode 100644
index 00000000..3d9603d3
--- /dev/null
+++ b/src/HavenoDaemon.tsx
@@ -0,0 +1,212 @@
+/**
+ * These imports are generated by protoc-gen-grpc-web (created with `sudo make install-plugin` in grpc-web) using the following command:
+ *
+ * `protoc -I=./ *.proto --js_out=import_style=commonjs:./ --grpc-web_out=import_style=commonjs,mode=grpcwebtext:./`
+ */
+const {GetVersionRequest, WalletsClient, OffersClient} = require('./grpc_grpc_web_pb.js');
+const {GetVersionClient, GetBalancesRequest, GetOffersRequest} = require('./grpc_pb.js');
+
+/**
+ * Haveno daemon client using gRPC.
+ */
+class HavenoDaemon {
+  
+  // instance variables
+  _url: string;
+  _password?: string;
+  _getVersionClient: any;
+  _walletsClient?: any;
+  _offersClient?: any;
+  
+  /**
+   * Construct a client connected to a Haveno daemon.
+   * 
+   * @param {string} url - Haveno daemon url
+   * @param {string} password - Haveno daemon password if applicable 
+   */
+  constructor(url: string, password?: string) {
+    this._url = url;
+    this._password = password;
+  }
+  
+  /**
+   * Get the Haveno version.
+   * 
+   * @return {string} the Haveno daemon version 
+   */
+  async getVersion(): Promise<string> {
+    if (!this._getVersionClient) this._getVersionClient = new GetVersionClient(this._url);
+    let request = new GetVersionRequest();
+    let that = this;
+    return new Promise(function(resolve, reject) {
+      that._getVersionClient.getVersion(request, {password: that._password}, function(err: any, response: any) {
+        if (err) reject(err);
+        else resolve(response.getVersion());
+      });
+    });
+  }
+  
+  /**
+   * Get the user's balances.
+   * 
+   * @return {HavenoBalances} the user's balances
+   */
+  async getBalances(): Promise<HavenoBalances> {
+    if (!this._walletsClient) this._walletsClient = new WalletsClient(this._url);
+    let request = new GetBalancesRequest();
+    let that = this;
+    return new Promise(function(resolve, reject) {
+      that._walletsClient.getBalances(request, {password: that._password}, function(err: any, response: any) {
+        if (err) reject(err);
+        else resolve(new HavenoBalances(
+            BigInt(response.getBalances().getXmr().getUnlockedbalance()),
+            BigInt(response.getBalances().getXmr().getLockedbalance()),
+            BigInt(response.getBalances().getXmr().getReservedofferbalance()),
+            BigInt(response.getBalances().getXmr().getReservedtradebalance())));
+      });
+    });
+  }
+  
+  /**
+   * Get available offers.
+   * 
+   * @param {string} direction - one of "BUY" or "SELL"
+   * @param {string} currencyCode - the currency being bought or sold, e.g. "ETH"
+   * 
+   * @return {HavenoOffer[]} available offers
+   */
+  async getOffers(direction: string, currencyCode: string): Promise<HavenoOffer[]> {
+    if (!this._offersClient) this._offersClient = new OffersClient(this._url);
+    let request = new GetOffersRequest()
+            .setDirection(direction)
+            .setCurrencycode(currencyCode);
+    let that = this;
+    return new Promise(function(resolve, reject) {
+      that._offersClient.getOffers(request, {password: that._password}, function(err: any, response: any) {
+        if (err) reject(err);
+        else {
+          let offers: HavenoOffer[] = [];
+          for (let offer of response.getOffersList()) {
+            offers.push(new HavenoOffer(
+                offer.getId(),
+                offer.getDirection(),
+                offer.getPrice(),
+                offer.getUsemarketbasedprice(),
+                offer.getMarketpricemargin(),
+                offer.getAmount(),
+                offer.getMinamount(),
+                offer.getVolume(),
+                offer.getMinvolume(),
+                offer.getBuyersecuritydeposit(),
+                offer.getTriggerprice(),
+                offer.getIscurrencyformakerfeebtc(),
+                offer.getPaymentaccountid(),
+                offer.getPaymentmethodid(),
+                offer.getPaymentmethodshortname(),
+                offer.getBasecurrencycode(),
+                offer.getCountercurrencycode(),
+                offer.getDate(),
+                offer.getState(),
+                offer.getSellersecuritydeposit(),
+                offer.getOfferfeepaymenttxid(),
+                offer.getTxfee(),
+                offer.getMakerfee()
+            ));
+          }
+          resolve(offers);
+        }
+      });
+    });
+  }
+}
+
+class HavenoBalances {
+  unlockedBalance: bigint;
+  lockedBalance: bigint;
+  reservedOfferBalance: bigint;
+  reservedTradeBalance: bigint;
+  constructor(unlockedBalance: bigint,
+        lockedBalance: bigint,
+        reservedOfferBalance: bigint,
+        reservedTradeBalance: bigint) {
+    this.unlockedBalance = unlockedBalance;
+    this.lockedBalance = lockedBalance;
+    this.reservedOfferBalance = reservedOfferBalance;
+    this.reservedTradeBalance = reservedTradeBalance;
+  }
+}
+
+class HavenoOffer {
+  id: string;
+  direction: string;
+  price: bigint;
+  useMarketBasedPrice: boolean;
+  marketPriceMargin: number;
+  amount: bigint;
+  minAmount: bigint;
+  volume: bigint;
+  minVolume: bigint;
+  buyerSecurityDeposit: bigint;
+  triggerPrice: bigint;
+  isCurrencyForMakerFeeBtc: boolean;
+  paymentAccountId: string;
+  paymentMethodId: string;
+  paymentMethodShortName: string;
+  baseCurrencyCode: string;
+  counterCurrencyCode: string;
+  date: bigint;
+  state: string;
+  sellerSecurityDeposit: bigint;
+  offerFeePaymentTxId: string;
+  txFee: bigint;
+  makerFee: bigint;
+  constructor(id: string,
+        direction: string,
+        price: bigint,
+        useMarketBasedPrice: boolean,
+        marketPriceMargin: number,
+        amount: bigint,
+        minAmount: bigint,
+        volume: bigint,
+        minVolume: bigint,
+        buyerSecurityDeposit: bigint,
+        triggerPrice: bigint,
+        isCurrencyForMakerFeeBtc: boolean,
+        paymentAccountId: string,
+        paymentMethodId: string,
+        paymentMethodShortName: string,
+        baseCurrencyCode: string,
+        counterCurrencyCode: string,
+        date: bigint,
+        state: string,
+        sellerSecurityDeposit: bigint,
+        offerFeePaymentTxId: string,
+        txFee: bigint,
+        makerFee: bigint,) {
+    this.id = id;
+    this.direction = direction;
+    this.price = price;
+    this.useMarketBasedPrice = useMarketBasedPrice;
+    this.marketPriceMargin = marketPriceMargin;
+    this.amount = amount;
+    this.minAmount = minAmount;
+    this.volume = volume;
+    this.minVolume = minVolume;
+    this.buyerSecurityDeposit = buyerSecurityDeposit;
+    this.triggerPrice = triggerPrice;
+    this.isCurrencyForMakerFeeBtc = isCurrencyForMakerFeeBtc;
+    this.paymentAccountId = paymentAccountId;
+    this.paymentMethodId = paymentMethodId;
+    this.paymentMethodShortName = paymentMethodShortName;
+    this.baseCurrencyCode = baseCurrencyCode;
+    this.counterCurrencyCode = counterCurrencyCode;
+    this.date = date;
+    this.state = state;
+    this.sellerSecurityDeposit = sellerSecurityDeposit;
+    this.offerFeePaymentTxId = offerFeePaymentTxId;
+    this.txFee = txFee;
+    this.makerFee = makerFee;
+  }
+}
+
+export {HavenoDaemon, HavenoBalances, HavenoOffer};
\ No newline at end of file
diff --git a/src/grpc_pb.js b/src/grpc_pb.js
index e33bed17..ad2a506f 100644
--- a/src/grpc_pb.js
+++ b/src/grpc_pb.js
@@ -16533,11 +16533,10 @@ proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.toObject = function(opt_inclu
  */
 proto.io.bisq.protobuffer.XmrBalanceInfo.toObject = function(includeInstance, msg) {
   var f, obj = {
-    balance: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    availablebalance: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    lockedbalance: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    reservedbalance: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    totalbalance: jspb.Message.getFieldWithDefault(msg, 5, 0)
+    unlockedbalance: jspb.Message.getFieldWithDefault(msg, 1, 0),
+    lockedbalance: jspb.Message.getFieldWithDefault(msg, 2, 0),
+    reservedofferbalance: jspb.Message.getFieldWithDefault(msg, 3, 0),
+    reservedtradebalance: jspb.Message.getFieldWithDefault(msg, 4, 0)
   };
 
   if (includeInstance) {
@@ -16576,23 +16575,19 @@ proto.io.bisq.protobuffer.XmrBalanceInfo.deserializeBinaryFromReader = function(
     switch (field) {
     case 1:
       var value = /** @type {number} */ (reader.readUint64());
-      msg.setBalance(value);
+      msg.setUnlockedbalance(value);
       break;
     case 2:
       var value = /** @type {number} */ (reader.readUint64());
-      msg.setAvailablebalance(value);
+      msg.setLockedbalance(value);
       break;
     case 3:
       var value = /** @type {number} */ (reader.readUint64());
-      msg.setLockedbalance(value);
+      msg.setReservedofferbalance(value);
       break;
     case 4:
       var value = /** @type {number} */ (reader.readUint64());
-      msg.setReservedbalance(value);
-      break;
-    case 5:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setTotalbalance(value);
+      msg.setReservedtradebalance(value);
       break;
     default:
       reader.skipField();
@@ -16623,49 +16618,42 @@ proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.serializeBinary = function()
  */
 proto.io.bisq.protobuffer.XmrBalanceInfo.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getBalance();
+  f = message.getUnlockedbalance();
   if (f !== 0) {
     writer.writeUint64(
       1,
       f
     );
   }
-  f = message.getAvailablebalance();
+  f = message.getLockedbalance();
   if (f !== 0) {
     writer.writeUint64(
       2,
       f
     );
   }
-  f = message.getLockedbalance();
+  f = message.getReservedofferbalance();
   if (f !== 0) {
     writer.writeUint64(
       3,
       f
     );
   }
-  f = message.getReservedbalance();
+  f = message.getReservedtradebalance();
   if (f !== 0) {
     writer.writeUint64(
       4,
       f
     );
   }
-  f = message.getTotalbalance();
-  if (f !== 0) {
-    writer.writeUint64(
-      5,
-      f
-    );
-  }
 };
 
 
 /**
- * optional uint64 balance = 1;
+ * optional uint64 unlockedBalance = 1;
  * @return {number}
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getBalance = function() {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getUnlockedbalance = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
@@ -16674,16 +16662,16 @@ proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getBalance = function() {
  * @param {number} value
  * @return {!proto.io.bisq.protobuffer.XmrBalanceInfo} returns this
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setBalance = function(value) {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setUnlockedbalance = function(value) {
   return jspb.Message.setProto3IntField(this, 1, value);
 };
 
 
 /**
- * optional uint64 availableBalance = 2;
+ * optional uint64 lockedBalance = 2;
  * @return {number}
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getAvailablebalance = function() {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getLockedbalance = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
@@ -16692,16 +16680,16 @@ proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getAvailablebalance = functio
  * @param {number} value
  * @return {!proto.io.bisq.protobuffer.XmrBalanceInfo} returns this
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setAvailablebalance = function(value) {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setLockedbalance = function(value) {
   return jspb.Message.setProto3IntField(this, 2, value);
 };
 
 
 /**
- * optional uint64 lockedBalance = 3;
+ * optional uint64 reservedOfferBalance = 3;
  * @return {number}
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getLockedbalance = function() {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getReservedofferbalance = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
@@ -16710,16 +16698,16 @@ proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getLockedbalance = function()
  * @param {number} value
  * @return {!proto.io.bisq.protobuffer.XmrBalanceInfo} returns this
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setLockedbalance = function(value) {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setReservedofferbalance = function(value) {
   return jspb.Message.setProto3IntField(this, 3, value);
 };
 
 
 /**
- * optional uint64 reservedBalance = 4;
+ * optional uint64 reservedTradeBalance = 4;
  * @return {number}
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getReservedbalance = function() {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getReservedtradebalance = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
 };
 
@@ -16728,29 +16716,11 @@ proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getReservedbalance = function
  * @param {number} value
  * @return {!proto.io.bisq.protobuffer.XmrBalanceInfo} returns this
  */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setReservedbalance = function(value) {
+proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setReservedtradebalance = function(value) {
   return jspb.Message.setProto3IntField(this, 4, value);
 };
 
 
-/**
- * optional uint64 totalBalance = 5;
- * @return {number}
- */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.getTotalbalance = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
-};
-
-
-/**
- * @param {number} value
- * @return {!proto.io.bisq.protobuffer.XmrBalanceInfo} returns this
- */
-proto.io.bisq.protobuffer.XmrBalanceInfo.prototype.setTotalbalance = function(value) {
-  return jspb.Message.setProto3IntField(this, 5, value);
-};
-
-
 
 
 
diff --git a/src/pb_pb.js b/src/pb_pb.js
index fc8e19df..c561fc75 100644
--- a/src/pb_pb.js
+++ b/src/pb_pb.js
@@ -85,6 +85,8 @@ goog.exportSymbol('proto.io.bisq.protobuffer.DecryptedBallotsWithMerits', null,
 goog.exportSymbol('proto.io.bisq.protobuffer.DecryptedMessageWithPubKey', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.DelayedPayoutTxSignatureRequest', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.DelayedPayoutTxSignatureResponse', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.DepositRequest', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.DepositResponse', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.DepositTxAndDelayedPayoutTxMessage', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.DepositTxMessage', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.Dispute', null, global);
@@ -116,7 +118,7 @@ goog.exportSymbol('proto.io.bisq.protobuffer.GetProposalStateHashesResponse', nu
 goog.exportSymbol('proto.io.bisq.protobuffer.GetUpdatedDataRequest', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.HalCashAccountPayload', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.IgnoredMailboxMap', null, global);
-goog.exportSymbol('proto.io.bisq.protobuffer.InitMultisigMessage', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.InitMultisigRequest', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.InitTradeRequest', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.InputsForDepositTxRequest', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.InputsForDepositTxResponse', null, global);
@@ -127,8 +129,6 @@ goog.exportSymbol('proto.io.bisq.protobuffer.JapanBankAccountPayload', null, glo
 goog.exportSymbol('proto.io.bisq.protobuffer.MailboxItem', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.MailboxMessageList', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.MailboxStoragePayload', null, global);
-goog.exportSymbol('proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest', null, global);
-goog.exportSymbol('proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.MapValue', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.MarketAlertFilter', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.MediatedPayoutTxPublishedMessage', null, global);
@@ -175,6 +175,7 @@ goog.exportSymbol('proto.io.bisq.protobuffer.PaymentAccountFilter', null, global
 goog.exportSymbol('proto.io.bisq.protobuffer.PaymentAccountList', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.PaymentAccountPayload', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.PaymentAccountPayload.MessageCase', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.PaymentAccountPayloadRequest', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.PaymentMethod', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.PayoutTxPublishedMessage', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.Peer', null, global);
@@ -237,6 +238,12 @@ goog.exportSymbol('proto.io.bisq.protobuffer.SepaAccountPayload', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.SepaInstantAccountPayload', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.SequenceNumberEntry', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.SequenceNumberMap', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.SignContractRequest', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.SignContractResponse', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.SignOfferRequest', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.SignOfferResponse', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.SignedOffer', null, global);
+goog.exportSymbol('proto.io.bisq.protobuffer.SignedOfferList', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.SignedWitness', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.SignedWitness.VerificationMethod', null, global);
 goog.exportSymbol('proto.io.bisq.protobuffer.SignedWitnessStore', null, global);
@@ -519,6 +526,48 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.io.bisq.protobuffer.GetInventoryResponse.displayName = 'proto.io.bisq.protobuffer.GetInventoryResponse';
 }
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.io.bisq.protobuffer.SignOfferRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.io.bisq.protobuffer.SignOfferRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.bisq.protobuffer.SignOfferRequest.displayName = 'proto.io.bisq.protobuffer.SignOfferRequest';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.io.bisq.protobuffer.SignOfferResponse = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.io.bisq.protobuffer.SignOfferResponse, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.bisq.protobuffer.SignOfferResponse.displayName = 'proto.io.bisq.protobuffer.SignOfferResponse';
+}
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -802,16 +851,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest = function(opt_data) {
+proto.io.bisq.protobuffer.InitMultisigRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest, jspb.Message);
+goog.inherits(proto.io.bisq.protobuffer.InitMultisigRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.displayName = 'proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest';
+  proto.io.bisq.protobuffer.InitMultisigRequest.displayName = 'proto.io.bisq.protobuffer.InitMultisigRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -823,16 +872,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse = function(opt_data) {
+proto.io.bisq.protobuffer.SignContractRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse, jspb.Message);
+goog.inherits(proto.io.bisq.protobuffer.SignContractRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.displayName = 'proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse';
+  proto.io.bisq.protobuffer.SignContractRequest.displayName = 'proto.io.bisq.protobuffer.SignContractRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -844,16 +893,79 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.io.bisq.protobuffer.InitMultisigMessage = function(opt_data) {
+proto.io.bisq.protobuffer.SignContractResponse = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.io.bisq.protobuffer.InitMultisigMessage, jspb.Message);
+goog.inherits(proto.io.bisq.protobuffer.SignContractResponse, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.io.bisq.protobuffer.InitMultisigMessage.displayName = 'proto.io.bisq.protobuffer.InitMultisigMessage';
+  proto.io.bisq.protobuffer.SignContractResponse.displayName = 'proto.io.bisq.protobuffer.SignContractResponse';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.io.bisq.protobuffer.DepositRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.io.bisq.protobuffer.DepositRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.bisq.protobuffer.DepositRequest.displayName = 'proto.io.bisq.protobuffer.DepositRequest';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.io.bisq.protobuffer.DepositResponse = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.io.bisq.protobuffer.DepositResponse, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.bisq.protobuffer.DepositResponse.displayName = 'proto.io.bisq.protobuffer.DepositResponse';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.io.bisq.protobuffer.PaymentAccountPayloadRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.displayName = 'proto.io.bisq.protobuffer.PaymentAccountPayloadRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -2126,7 +2238,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.io.bisq.protobuffer.OfferPayload = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.io.bisq.protobuffer.OfferPayload.repeatedFields_, null);
+  jspb.Message.initialize(this, opt_data, 0, 500, proto.io.bisq.protobuffer.OfferPayload.repeatedFields_, null);
 };
 goog.inherits(proto.io.bisq.protobuffer.OfferPayload, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -3092,7 +3204,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.io.bisq.protobuffer.PersistableEnvelope = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.io.bisq.protobuffer.PersistableEnvelope.oneofGroups_);
+  jspb.Message.initialize(this, opt_data, 0, 500, null, proto.io.bisq.protobuffer.PersistableEnvelope.oneofGroups_);
 };
 goog.inherits(proto.io.bisq.protobuffer.PersistableEnvelope, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -3490,9 +3602,51 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.io.bisq.protobuffer.OpenOffer = function(opt_data) {
+proto.io.bisq.protobuffer.SignedOfferList = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.io.bisq.protobuffer.SignedOfferList.repeatedFields_, null);
+};
+goog.inherits(proto.io.bisq.protobuffer.SignedOfferList, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.bisq.protobuffer.SignedOfferList.displayName = 'proto.io.bisq.protobuffer.SignedOfferList';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.io.bisq.protobuffer.SignedOffer = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
+goog.inherits(proto.io.bisq.protobuffer.SignedOffer, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.bisq.protobuffer.SignedOffer.displayName = 'proto.io.bisq.protobuffer.SignedOffer';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.io.bisq.protobuffer.OpenOffer = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.io.bisq.protobuffer.OpenOffer.repeatedFields_, null);
+};
 goog.inherits(proto.io.bisq.protobuffer.OpenOffer, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
@@ -3512,7 +3666,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.io.bisq.protobuffer.Tradable = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.io.bisq.protobuffer.Tradable.oneofGroups_);
+  jspb.Message.initialize(this, opt_data, 0, 500, null, proto.io.bisq.protobuffer.Tradable.oneofGroups_);
 };
 goog.inherits(proto.io.bisq.protobuffer.Tradable, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -5316,7 +5470,7 @@ if (goog.DEBUG && !COMPILED) {
  * @private {!Array<!Array<number>>}
  * @const
  */
-proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_ = [[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,1001,1002,1003,1004,1005,1006,1007,1008]];
+proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_ = [[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013]];
 
 /**
  * @enum {number}
@@ -5375,14 +5529,19 @@ proto.io.bisq.protobuffer.NetworkEnvelope.MessageCase = {
   TRADER_SIGNED_WITNESS_MESSAGE: 51,
   GET_INVENTORY_REQUEST: 52,
   GET_INVENTORY_RESPONSE: 53,
-  INIT_TRADE_REQUEST: 1001,
-  MAKER_READY_TO_FUND_MULTISIG_REQUEST: 1002,
-  MAKER_READY_TO_FUND_MULTISIG_RESPONSE: 1003,
-  INIT_MULTISIG_MESSAGE: 1004,
-  UPDATE_MULTISIG_REQUEST: 1005,
-  UPDATE_MULTISIG_RESPONSE: 1006,
-  ARBITRATOR_PAYOUT_TX_REQUEST: 1007,
-  ARBITRATOR_PAYOUT_TX_RESPONSE: 1008
+  SIGN_OFFER_REQUEST: 1001,
+  SIGN_OFFER_RESPONSE: 1002,
+  INIT_TRADE_REQUEST: 1003,
+  INIT_MULTISIG_REQUEST: 1004,
+  SIGN_CONTRACT_REQUEST: 1005,
+  SIGN_CONTRACT_RESPONSE: 1006,
+  DEPOSIT_REQUEST: 1007,
+  DEPOSIT_RESPONSE: 1008,
+  PAYMENT_ACCOUNT_PAYLOAD_REQUEST: 1009,
+  UPDATE_MULTISIG_REQUEST: 1010,
+  UPDATE_MULTISIG_RESPONSE: 1011,
+  ARBITRATOR_PAYOUT_TX_REQUEST: 1012,
+  ARBITRATOR_PAYOUT_TX_RESPONSE: 1013
 };
 
 /**
@@ -5476,10 +5635,15 @@ proto.io.bisq.protobuffer.NetworkEnvelope.toObject = function(includeInstance, m
     traderSignedWitnessMessage: (f = msg.getTraderSignedWitnessMessage()) && proto.io.bisq.protobuffer.TraderSignedWitnessMessage.toObject(includeInstance, f),
     getInventoryRequest: (f = msg.getGetInventoryRequest()) && proto.io.bisq.protobuffer.GetInventoryRequest.toObject(includeInstance, f),
     getInventoryResponse: (f = msg.getGetInventoryResponse()) && proto.io.bisq.protobuffer.GetInventoryResponse.toObject(includeInstance, f),
+    signOfferRequest: (f = msg.getSignOfferRequest()) && proto.io.bisq.protobuffer.SignOfferRequest.toObject(includeInstance, f),
+    signOfferResponse: (f = msg.getSignOfferResponse()) && proto.io.bisq.protobuffer.SignOfferResponse.toObject(includeInstance, f),
     initTradeRequest: (f = msg.getInitTradeRequest()) && proto.io.bisq.protobuffer.InitTradeRequest.toObject(includeInstance, f),
-    makerReadyToFundMultisigRequest: (f = msg.getMakerReadyToFundMultisigRequest()) && proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.toObject(includeInstance, f),
-    makerReadyToFundMultisigResponse: (f = msg.getMakerReadyToFundMultisigResponse()) && proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.toObject(includeInstance, f),
-    initMultisigMessage: (f = msg.getInitMultisigMessage()) && proto.io.bisq.protobuffer.InitMultisigMessage.toObject(includeInstance, f),
+    initMultisigRequest: (f = msg.getInitMultisigRequest()) && proto.io.bisq.protobuffer.InitMultisigRequest.toObject(includeInstance, f),
+    signContractRequest: (f = msg.getSignContractRequest()) && proto.io.bisq.protobuffer.SignContractRequest.toObject(includeInstance, f),
+    signContractResponse: (f = msg.getSignContractResponse()) && proto.io.bisq.protobuffer.SignContractResponse.toObject(includeInstance, f),
+    depositRequest: (f = msg.getDepositRequest()) && proto.io.bisq.protobuffer.DepositRequest.toObject(includeInstance, f),
+    depositResponse: (f = msg.getDepositResponse()) && proto.io.bisq.protobuffer.DepositResponse.toObject(includeInstance, f),
+    paymentAccountPayloadRequest: (f = msg.getPaymentAccountPayloadRequest()) && proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.toObject(includeInstance, f),
     updateMultisigRequest: (f = msg.getUpdateMultisigRequest()) && proto.io.bisq.protobuffer.UpdateMultisigRequest.toObject(includeInstance, f),
     updateMultisigResponse: (f = msg.getUpdateMultisigResponse()) && proto.io.bisq.protobuffer.UpdateMultisigResponse.toObject(includeInstance, f),
     arbitratorPayoutTxRequest: (f = msg.getArbitratorPayoutTxRequest()) && proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest.toObject(includeInstance, f),
@@ -5785,41 +5949,66 @@ proto.io.bisq.protobuffer.NetworkEnvelope.deserializeBinaryFromReader = function
       msg.setGetInventoryResponse(value);
       break;
     case 1001:
+      var value = new proto.io.bisq.protobuffer.SignOfferRequest;
+      reader.readMessage(value,proto.io.bisq.protobuffer.SignOfferRequest.deserializeBinaryFromReader);
+      msg.setSignOfferRequest(value);
+      break;
+    case 1002:
+      var value = new proto.io.bisq.protobuffer.SignOfferResponse;
+      reader.readMessage(value,proto.io.bisq.protobuffer.SignOfferResponse.deserializeBinaryFromReader);
+      msg.setSignOfferResponse(value);
+      break;
+    case 1003:
       var value = new proto.io.bisq.protobuffer.InitTradeRequest;
       reader.readMessage(value,proto.io.bisq.protobuffer.InitTradeRequest.deserializeBinaryFromReader);
       msg.setInitTradeRequest(value);
       break;
-    case 1002:
-      var value = new proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest;
-      reader.readMessage(value,proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.deserializeBinaryFromReader);
-      msg.setMakerReadyToFundMultisigRequest(value);
-      break;
-    case 1003:
-      var value = new proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse;
-      reader.readMessage(value,proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.deserializeBinaryFromReader);
-      msg.setMakerReadyToFundMultisigResponse(value);
-      break;
     case 1004:
-      var value = new proto.io.bisq.protobuffer.InitMultisigMessage;
-      reader.readMessage(value,proto.io.bisq.protobuffer.InitMultisigMessage.deserializeBinaryFromReader);
-      msg.setInitMultisigMessage(value);
+      var value = new proto.io.bisq.protobuffer.InitMultisigRequest;
+      reader.readMessage(value,proto.io.bisq.protobuffer.InitMultisigRequest.deserializeBinaryFromReader);
+      msg.setInitMultisigRequest(value);
       break;
     case 1005:
+      var value = new proto.io.bisq.protobuffer.SignContractRequest;
+      reader.readMessage(value,proto.io.bisq.protobuffer.SignContractRequest.deserializeBinaryFromReader);
+      msg.setSignContractRequest(value);
+      break;
+    case 1006:
+      var value = new proto.io.bisq.protobuffer.SignContractResponse;
+      reader.readMessage(value,proto.io.bisq.protobuffer.SignContractResponse.deserializeBinaryFromReader);
+      msg.setSignContractResponse(value);
+      break;
+    case 1007:
+      var value = new proto.io.bisq.protobuffer.DepositRequest;
+      reader.readMessage(value,proto.io.bisq.protobuffer.DepositRequest.deserializeBinaryFromReader);
+      msg.setDepositRequest(value);
+      break;
+    case 1008:
+      var value = new proto.io.bisq.protobuffer.DepositResponse;
+      reader.readMessage(value,proto.io.bisq.protobuffer.DepositResponse.deserializeBinaryFromReader);
+      msg.setDepositResponse(value);
+      break;
+    case 1009:
+      var value = new proto.io.bisq.protobuffer.PaymentAccountPayloadRequest;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.deserializeBinaryFromReader);
+      msg.setPaymentAccountPayloadRequest(value);
+      break;
+    case 1010:
       var value = new proto.io.bisq.protobuffer.UpdateMultisigRequest;
       reader.readMessage(value,proto.io.bisq.protobuffer.UpdateMultisigRequest.deserializeBinaryFromReader);
       msg.setUpdateMultisigRequest(value);
       break;
-    case 1006:
+    case 1011:
       var value = new proto.io.bisq.protobuffer.UpdateMultisigResponse;
       reader.readMessage(value,proto.io.bisq.protobuffer.UpdateMultisigResponse.deserializeBinaryFromReader);
       msg.setUpdateMultisigResponse(value);
       break;
-    case 1007:
+    case 1012:
       var value = new proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest;
       reader.readMessage(value,proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest.deserializeBinaryFromReader);
       msg.setArbitratorPayoutTxRequest(value);
       break;
-    case 1008:
+    case 1013:
       var value = new proto.io.bisq.protobuffer.ArbitratorPayoutTxResponse;
       reader.readMessage(value,proto.io.bisq.protobuffer.ArbitratorPayoutTxResponse.deserializeBinaryFromReader);
       msg.setArbitratorPayoutTxResponse(value);
@@ -6276,42 +6465,82 @@ proto.io.bisq.protobuffer.NetworkEnvelope.serializeBinaryToWriter = function(mes
       proto.io.bisq.protobuffer.GetInventoryResponse.serializeBinaryToWriter
     );
   }
-  f = message.getInitTradeRequest();
+  f = message.getSignOfferRequest();
   if (f != null) {
     writer.writeMessage(
       1001,
       f,
-      proto.io.bisq.protobuffer.InitTradeRequest.serializeBinaryToWriter
+      proto.io.bisq.protobuffer.SignOfferRequest.serializeBinaryToWriter
     );
   }
-  f = message.getMakerReadyToFundMultisigRequest();
+  f = message.getSignOfferResponse();
   if (f != null) {
     writer.writeMessage(
       1002,
       f,
-      proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.serializeBinaryToWriter
+      proto.io.bisq.protobuffer.SignOfferResponse.serializeBinaryToWriter
     );
   }
-  f = message.getMakerReadyToFundMultisigResponse();
+  f = message.getInitTradeRequest();
   if (f != null) {
     writer.writeMessage(
       1003,
       f,
-      proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.serializeBinaryToWriter
+      proto.io.bisq.protobuffer.InitTradeRequest.serializeBinaryToWriter
     );
   }
-  f = message.getInitMultisigMessage();
+  f = message.getInitMultisigRequest();
   if (f != null) {
     writer.writeMessage(
       1004,
       f,
-      proto.io.bisq.protobuffer.InitMultisigMessage.serializeBinaryToWriter
+      proto.io.bisq.protobuffer.InitMultisigRequest.serializeBinaryToWriter
+    );
+  }
+  f = message.getSignContractRequest();
+  if (f != null) {
+    writer.writeMessage(
+      1005,
+      f,
+      proto.io.bisq.protobuffer.SignContractRequest.serializeBinaryToWriter
+    );
+  }
+  f = message.getSignContractResponse();
+  if (f != null) {
+    writer.writeMessage(
+      1006,
+      f,
+      proto.io.bisq.protobuffer.SignContractResponse.serializeBinaryToWriter
+    );
+  }
+  f = message.getDepositRequest();
+  if (f != null) {
+    writer.writeMessage(
+      1007,
+      f,
+      proto.io.bisq.protobuffer.DepositRequest.serializeBinaryToWriter
+    );
+  }
+  f = message.getDepositResponse();
+  if (f != null) {
+    writer.writeMessage(
+      1008,
+      f,
+      proto.io.bisq.protobuffer.DepositResponse.serializeBinaryToWriter
+    );
+  }
+  f = message.getPaymentAccountPayloadRequest();
+  if (f != null) {
+    writer.writeMessage(
+      1009,
+      f,
+      proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.serializeBinaryToWriter
     );
   }
   f = message.getUpdateMultisigRequest();
   if (f != null) {
     writer.writeMessage(
-      1005,
+      1010,
       f,
       proto.io.bisq.protobuffer.UpdateMultisigRequest.serializeBinaryToWriter
     );
@@ -6319,7 +6548,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.serializeBinaryToWriter = function(mes
   f = message.getUpdateMultisigResponse();
   if (f != null) {
     writer.writeMessage(
-      1006,
+      1011,
       f,
       proto.io.bisq.protobuffer.UpdateMultisigResponse.serializeBinaryToWriter
     );
@@ -6327,7 +6556,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.serializeBinaryToWriter = function(mes
   f = message.getArbitratorPayoutTxRequest();
   if (f != null) {
     writer.writeMessage(
-      1007,
+      1012,
       f,
       proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest.serializeBinaryToWriter
     );
@@ -6335,7 +6564,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.serializeBinaryToWriter = function(mes
   f = message.getArbitratorPayoutTxResponse();
   if (f != null) {
     writer.writeMessage(
-      1008,
+      1013,
       f,
       proto.io.bisq.protobuffer.ArbitratorPayoutTxResponse.serializeBinaryToWriter
     );
@@ -8286,12 +8515,86 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasGetInventoryResponse = fu
 
 
 /**
- * optional InitTradeRequest init_trade_request = 1001;
+ * optional SignOfferRequest sign_offer_request = 1001;
+ * @return {?proto.io.bisq.protobuffer.SignOfferRequest}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getSignOfferRequest = function() {
+  return /** @type{?proto.io.bisq.protobuffer.SignOfferRequest} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.SignOfferRequest, 1001));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.SignOfferRequest|undefined} value
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setSignOfferRequest = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1001, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearSignOfferRequest = function() {
+  return this.setSignOfferRequest(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasSignOfferRequest = function() {
+  return jspb.Message.getField(this, 1001) != null;
+};
+
+
+/**
+ * optional SignOfferResponse sign_offer_response = 1002;
+ * @return {?proto.io.bisq.protobuffer.SignOfferResponse}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getSignOfferResponse = function() {
+  return /** @type{?proto.io.bisq.protobuffer.SignOfferResponse} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.SignOfferResponse, 1002));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.SignOfferResponse|undefined} value
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setSignOfferResponse = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1002, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearSignOfferResponse = function() {
+  return this.setSignOfferResponse(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasSignOfferResponse = function() {
+  return jspb.Message.getField(this, 1002) != null;
+};
+
+
+/**
+ * optional InitTradeRequest init_trade_request = 1003;
  * @return {?proto.io.bisq.protobuffer.InitTradeRequest}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getInitTradeRequest = function() {
   return /** @type{?proto.io.bisq.protobuffer.InitTradeRequest} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.InitTradeRequest, 1001));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.InitTradeRequest, 1003));
 };
 
 
@@ -8300,7 +8603,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getInitTradeRequest = functi
  * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
 */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setInitTradeRequest = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1001, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 1003, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
 };
 
 
@@ -8318,99 +8621,25 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearInitTradeRequest = func
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasInitTradeRequest = function() {
-  return jspb.Message.getField(this, 1001) != null;
-};
-
-
-/**
- * optional MakerReadyToFundMultisigRequest maker_ready_to_fund_multisig_request = 1002;
- * @return {?proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest}
- */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getMakerReadyToFundMultisigRequest = function() {
-  return /** @type{?proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest, 1002));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest|undefined} value
- * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
-*/
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setMakerReadyToFundMultisigRequest = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1002, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
- */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearMakerReadyToFundMultisigRequest = function() {
-  return this.setMakerReadyToFundMultisigRequest(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasMakerReadyToFundMultisigRequest = function() {
-  return jspb.Message.getField(this, 1002) != null;
-};
-
-
-/**
- * optional MakerReadyToFundMultisigResponse maker_ready_to_fund_multisig_response = 1003;
- * @return {?proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse}
- */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getMakerReadyToFundMultisigResponse = function() {
-  return /** @type{?proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse, 1003));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse|undefined} value
- * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
-*/
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setMakerReadyToFundMultisigResponse = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1003, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
- */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearMakerReadyToFundMultisigResponse = function() {
-  return this.setMakerReadyToFundMultisigResponse(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasMakerReadyToFundMultisigResponse = function() {
   return jspb.Message.getField(this, 1003) != null;
 };
 
 
 /**
- * optional InitMultisigMessage init_multisig_message = 1004;
- * @return {?proto.io.bisq.protobuffer.InitMultisigMessage}
+ * optional InitMultisigRequest init_multisig_request = 1004;
+ * @return {?proto.io.bisq.protobuffer.InitMultisigRequest}
  */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getInitMultisigMessage = function() {
-  return /** @type{?proto.io.bisq.protobuffer.InitMultisigMessage} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.InitMultisigMessage, 1004));
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getInitMultisigRequest = function() {
+  return /** @type{?proto.io.bisq.protobuffer.InitMultisigRequest} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.InitMultisigRequest, 1004));
 };
 
 
 /**
- * @param {?proto.io.bisq.protobuffer.InitMultisigMessage|undefined} value
+ * @param {?proto.io.bisq.protobuffer.InitMultisigRequest|undefined} value
  * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
 */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setInitMultisigMessage = function(value) {
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setInitMultisigRequest = function(value) {
   return jspb.Message.setOneofWrapperField(this, 1004, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
 };
 
@@ -8419,8 +8648,8 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setInitMultisigMessage = fun
  * Clears the message field making it undefined.
  * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
  */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearInitMultisigMessage = function() {
-  return this.setInitMultisigMessage(undefined);
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearInitMultisigRequest = function() {
+  return this.setInitMultisigRequest(undefined);
 };
 
 
@@ -8428,18 +8657,203 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearInitMultisigMessage = f
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasInitMultisigMessage = function() {
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasInitMultisigRequest = function() {
   return jspb.Message.getField(this, 1004) != null;
 };
 
 
 /**
- * optional UpdateMultisigRequest update_multisig_request = 1005;
+ * optional SignContractRequest sign_contract_request = 1005;
+ * @return {?proto.io.bisq.protobuffer.SignContractRequest}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getSignContractRequest = function() {
+  return /** @type{?proto.io.bisq.protobuffer.SignContractRequest} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.SignContractRequest, 1005));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.SignContractRequest|undefined} value
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setSignContractRequest = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1005, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearSignContractRequest = function() {
+  return this.setSignContractRequest(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasSignContractRequest = function() {
+  return jspb.Message.getField(this, 1005) != null;
+};
+
+
+/**
+ * optional SignContractResponse sign_contract_response = 1006;
+ * @return {?proto.io.bisq.protobuffer.SignContractResponse}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getSignContractResponse = function() {
+  return /** @type{?proto.io.bisq.protobuffer.SignContractResponse} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.SignContractResponse, 1006));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.SignContractResponse|undefined} value
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setSignContractResponse = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1006, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearSignContractResponse = function() {
+  return this.setSignContractResponse(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasSignContractResponse = function() {
+  return jspb.Message.getField(this, 1006) != null;
+};
+
+
+/**
+ * optional DepositRequest deposit_request = 1007;
+ * @return {?proto.io.bisq.protobuffer.DepositRequest}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getDepositRequest = function() {
+  return /** @type{?proto.io.bisq.protobuffer.DepositRequest} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.DepositRequest, 1007));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.DepositRequest|undefined} value
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setDepositRequest = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1007, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearDepositRequest = function() {
+  return this.setDepositRequest(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasDepositRequest = function() {
+  return jspb.Message.getField(this, 1007) != null;
+};
+
+
+/**
+ * optional DepositResponse deposit_response = 1008;
+ * @return {?proto.io.bisq.protobuffer.DepositResponse}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getDepositResponse = function() {
+  return /** @type{?proto.io.bisq.protobuffer.DepositResponse} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.DepositResponse, 1008));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.DepositResponse|undefined} value
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setDepositResponse = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1008, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearDepositResponse = function() {
+  return this.setDepositResponse(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasDepositResponse = function() {
+  return jspb.Message.getField(this, 1008) != null;
+};
+
+
+/**
+ * optional PaymentAccountPayloadRequest payment_account_payload_request = 1009;
+ * @return {?proto.io.bisq.protobuffer.PaymentAccountPayloadRequest}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getPaymentAccountPayloadRequest = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayloadRequest, 1009));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PaymentAccountPayloadRequest|undefined} value
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setPaymentAccountPayloadRequest = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1009, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearPaymentAccountPayloadRequest = function() {
+  return this.setPaymentAccountPayloadRequest(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasPaymentAccountPayloadRequest = function() {
+  return jspb.Message.getField(this, 1009) != null;
+};
+
+
+/**
+ * optional UpdateMultisigRequest update_multisig_request = 1010;
  * @return {?proto.io.bisq.protobuffer.UpdateMultisigRequest}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getUpdateMultisigRequest = function() {
   return /** @type{?proto.io.bisq.protobuffer.UpdateMultisigRequest} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.UpdateMultisigRequest, 1005));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.UpdateMultisigRequest, 1010));
 };
 
 
@@ -8448,7 +8862,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getUpdateMultisigRequest = f
  * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
 */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setUpdateMultisigRequest = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1005, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 1010, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
 };
 
 
@@ -8466,17 +8880,17 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearUpdateMultisigRequest =
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasUpdateMultisigRequest = function() {
-  return jspb.Message.getField(this, 1005) != null;
+  return jspb.Message.getField(this, 1010) != null;
 };
 
 
 /**
- * optional UpdateMultisigResponse update_multisig_response = 1006;
+ * optional UpdateMultisigResponse update_multisig_response = 1011;
  * @return {?proto.io.bisq.protobuffer.UpdateMultisigResponse}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getUpdateMultisigResponse = function() {
   return /** @type{?proto.io.bisq.protobuffer.UpdateMultisigResponse} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.UpdateMultisigResponse, 1006));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.UpdateMultisigResponse, 1011));
 };
 
 
@@ -8485,7 +8899,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getUpdateMultisigResponse =
  * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
 */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setUpdateMultisigResponse = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1006, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 1011, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
 };
 
 
@@ -8503,17 +8917,17 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearUpdateMultisigResponse
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasUpdateMultisigResponse = function() {
-  return jspb.Message.getField(this, 1006) != null;
+  return jspb.Message.getField(this, 1011) != null;
 };
 
 
 /**
- * optional ArbitratorPayoutTxRequest arbitrator_payout_tx_request = 1007;
+ * optional ArbitratorPayoutTxRequest arbitrator_payout_tx_request = 1012;
  * @return {?proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getArbitratorPayoutTxRequest = function() {
   return /** @type{?proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest, 1007));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.ArbitratorPayoutTxRequest, 1012));
 };
 
 
@@ -8522,7 +8936,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getArbitratorPayoutTxRequest
  * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
 */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setArbitratorPayoutTxRequest = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1007, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 1012, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
 };
 
 
@@ -8540,17 +8954,17 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearArbitratorPayoutTxReque
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasArbitratorPayoutTxRequest = function() {
-  return jspb.Message.getField(this, 1007) != null;
+  return jspb.Message.getField(this, 1012) != null;
 };
 
 
 /**
- * optional ArbitratorPayoutTxResponse arbitrator_payout_tx_response = 1008;
+ * optional ArbitratorPayoutTxResponse arbitrator_payout_tx_response = 1013;
  * @return {?proto.io.bisq.protobuffer.ArbitratorPayoutTxResponse}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getArbitratorPayoutTxResponse = function() {
   return /** @type{?proto.io.bisq.protobuffer.ArbitratorPayoutTxResponse} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.ArbitratorPayoutTxResponse, 1008));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.ArbitratorPayoutTxResponse, 1013));
 };
 
 
@@ -8559,7 +8973,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.getArbitratorPayoutTxRespons
  * @return {!proto.io.bisq.protobuffer.NetworkEnvelope} returns this
 */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.setArbitratorPayoutTxResponse = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1008, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 1013, proto.io.bisq.protobuffer.NetworkEnvelope.oneofGroups_[0], value);
 };
 
 
@@ -8577,7 +8991,7 @@ proto.io.bisq.protobuffer.NetworkEnvelope.prototype.clearArbitratorPayoutTxRespo
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.NetworkEnvelope.prototype.hasArbitratorPayoutTxResponse = function() {
-  return jspb.Message.getField(this, 1008) != null;
+  return jspb.Message.getField(this, 1013) != null;
 };
 
 
@@ -10734,6 +11148,710 @@ proto.io.bisq.protobuffer.GetInventoryResponse.prototype.clearInventoryMap = fun
 
 
 
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.SignOfferRequest.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.SignOfferRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    offerId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
+    senderAccountId: jspb.Message.getFieldWithDefault(msg, 4, ""),
+    offerPayload: (f = msg.getOfferPayload()) && proto.io.bisq.protobuffer.OfferPayload.toObject(includeInstance, f),
+    uid: jspb.Message.getFieldWithDefault(msg, 6, ""),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 7, 0),
+    reserveTxHash: jspb.Message.getFieldWithDefault(msg, 8, ""),
+    reserveTxHex: jspb.Message.getFieldWithDefault(msg, 9, ""),
+    reserveTxKey: jspb.Message.getFieldWithDefault(msg, 10, ""),
+    payoutAddress: jspb.Message.getFieldWithDefault(msg, 11, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.SignOfferRequest;
+  return proto.io.bisq.protobuffer.SignOfferRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.SignOfferRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setOfferId(value);
+      break;
+    case 2:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setSenderNodeAddress(value);
+      break;
+    case 3:
+      var value = new proto.io.bisq.protobuffer.PubKeyRing;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
+      msg.setPubKeyRing(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setSenderAccountId(value);
+      break;
+    case 5:
+      var value = new proto.io.bisq.protobuffer.OfferPayload;
+      reader.readMessage(value,proto.io.bisq.protobuffer.OfferPayload.deserializeBinaryFromReader);
+      msg.setOfferPayload(value);
+      break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setUid(value);
+      break;
+    case 7:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setCurrentDate(value);
+      break;
+    case 8:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxHash(value);
+      break;
+    case 9:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxHex(value);
+      break;
+    case 10:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxKey(value);
+      break;
+    case 11:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPayoutAddress(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.SignOfferRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.SignOfferRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getOfferId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getSenderNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+    );
+  }
+  f = message.getPubKeyRing();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
+    );
+  }
+  f = message.getSenderAccountId();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+  f = message.getOfferPayload();
+  if (f != null) {
+    writer.writeMessage(
+      5,
+      f,
+      proto.io.bisq.protobuffer.OfferPayload.serializeBinaryToWriter
+    );
+  }
+  f = message.getUid();
+  if (f.length > 0) {
+    writer.writeString(
+      6,
+      f
+    );
+  }
+  f = message.getCurrentDate();
+  if (f !== 0) {
+    writer.writeInt64(
+      7,
+      f
+    );
+  }
+  f = message.getReserveTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      8,
+      f
+    );
+  }
+  f = message.getReserveTxHex();
+  if (f.length > 0) {
+    writer.writeString(
+      9,
+      f
+    );
+  }
+  f = message.getReserveTxKey();
+  if (f.length > 0) {
+    writer.writeString(
+      10,
+      f
+    );
+  }
+  f = message.getPayoutAddress();
+  if (f.length > 0) {
+    writer.writeString(
+      11,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string offer_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getOfferId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setOfferId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional NodeAddress sender_node_address = 2;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getSenderNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+*/
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setSenderNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.clearSenderNodeAddress = function() {
+  return this.setSenderNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.hasSenderNodeAddress = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional PubKeyRing pub_key_ring = 3;
+ * @return {?proto.io.bisq.protobuffer.PubKeyRing}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getPubKeyRing = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+*/
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setPubKeyRing = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.clearPubKeyRing = function() {
+  return this.setPubKeyRing(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.hasPubKeyRing = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional string sender_account_id = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getSenderAccountId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setSenderAccountId = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
+/**
+ * optional OfferPayload offer_payload = 5;
+ * @return {?proto.io.bisq.protobuffer.OfferPayload}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getOfferPayload = function() {
+  return /** @type{?proto.io.bisq.protobuffer.OfferPayload} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.OfferPayload, 5));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.OfferPayload|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+*/
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setOfferPayload = function(value) {
+  return jspb.Message.setWrapperField(this, 5, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.clearOfferPayload = function() {
+  return this.setOfferPayload(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.hasOfferPayload = function() {
+  return jspb.Message.getField(this, 5) != null;
+};
+
+
+/**
+ * optional string uid = 6;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getUid = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setUid = function(value) {
+  return jspb.Message.setProto3StringField(this, 6, value);
+};
+
+
+/**
+ * optional int64 current_date = 7;
+ * @return {number}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getCurrentDate = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setCurrentDate = function(value) {
+  return jspb.Message.setProto3IntField(this, 7, value);
+};
+
+
+/**
+ * optional string reserve_tx_hash = 8;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getReserveTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setReserveTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 8, value);
+};
+
+
+/**
+ * optional string reserve_tx_hex = 9;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getReserveTxHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setReserveTxHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 9, value);
+};
+
+
+/**
+ * optional string reserve_tx_key = 10;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getReserveTxKey = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setReserveTxKey = function(value) {
+  return jspb.Message.setProto3StringField(this, 10, value);
+};
+
+
+/**
+ * optional string payout_address = 11;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.getPayoutAddress = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferRequest.prototype.setPayoutAddress = function(value) {
+  return jspb.Message.setProto3StringField(this, 11, value);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.SignOfferResponse.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.SignOfferResponse} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    offerId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    uid: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    signedOfferPayload: (f = msg.getSignedOfferPayload()) && proto.io.bisq.protobuffer.OfferPayload.toObject(includeInstance, f)
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.SignOfferResponse}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.SignOfferResponse;
+  return proto.io.bisq.protobuffer.SignOfferResponse.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.SignOfferResponse} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.SignOfferResponse}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setOfferId(value);
+      break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setUid(value);
+      break;
+    case 3:
+      var value = new proto.io.bisq.protobuffer.OfferPayload;
+      reader.readMessage(value,proto.io.bisq.protobuffer.OfferPayload.deserializeBinaryFromReader);
+      msg.setSignedOfferPayload(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.SignOfferResponse.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.SignOfferResponse} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getOfferId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getUid();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getSignedOfferPayload();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.io.bisq.protobuffer.OfferPayload.serializeBinaryToWriter
+    );
+  }
+};
+
+
+/**
+ * optional string offer_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.getOfferId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.setOfferId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional string uid = 2;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.getUid = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.setUid = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
+/**
+ * optional OfferPayload signed_offer_payload = 3;
+ * @return {?proto.io.bisq.protobuffer.OfferPayload}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.getSignedOfferPayload = function() {
+  return /** @type{?proto.io.bisq.protobuffer.OfferPayload} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.OfferPayload, 3));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.OfferPayload|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignOfferResponse} returns this
+*/
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.setSignedOfferPayload = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignOfferResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.clearSignedOfferPayload = function() {
+  return this.setSignedOfferPayload(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignOfferResponse.prototype.hasSignedOfferPayload = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+
 /**
  * List of repeated fields within this message type.
  * @private {!Array<number>}
@@ -10777,7 +11895,8 @@ proto.io.bisq.protobuffer.OfferAvailabilityRequest.toObject = function(includeIn
     takersTradePrice: jspb.Message.getFieldWithDefault(msg, 3, 0),
     supportedCapabilitiesList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f,
     uid: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    isTakerApiUser: jspb.Message.getBooleanFieldWithDefault(msg, 6, false)
+    isTakerApiUser: jspb.Message.getBooleanFieldWithDefault(msg, 6, false),
+    tradeRequest: (f = msg.getTradeRequest()) && proto.io.bisq.protobuffer.InitTradeRequest.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -10841,6 +11960,11 @@ proto.io.bisq.protobuffer.OfferAvailabilityRequest.deserializeBinaryFromReader =
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setIsTakerApiUser(value);
       break;
+    case 7:
+      var value = new proto.io.bisq.protobuffer.InitTradeRequest;
+      reader.readMessage(value,proto.io.bisq.protobuffer.InitTradeRequest.deserializeBinaryFromReader);
+      msg.setTradeRequest(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -10913,6 +12037,14 @@ proto.io.bisq.protobuffer.OfferAvailabilityRequest.serializeBinaryToWriter = fun
       f
     );
   }
+  f = message.getTradeRequest();
+  if (f != null) {
+    writer.writeMessage(
+      7,
+      f,
+      proto.io.bisq.protobuffer.InitTradeRequest.serializeBinaryToWriter
+    );
+  }
 };
 
 
@@ -11062,6 +12194,43 @@ proto.io.bisq.protobuffer.OfferAvailabilityRequest.prototype.setIsTakerApiUser =
 };
 
 
+/**
+ * optional InitTradeRequest trade_request = 7;
+ * @return {?proto.io.bisq.protobuffer.InitTradeRequest}
+ */
+proto.io.bisq.protobuffer.OfferAvailabilityRequest.prototype.getTradeRequest = function() {
+  return /** @type{?proto.io.bisq.protobuffer.InitTradeRequest} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.InitTradeRequest, 7));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.InitTradeRequest|undefined} value
+ * @return {!proto.io.bisq.protobuffer.OfferAvailabilityRequest} returns this
+*/
+proto.io.bisq.protobuffer.OfferAvailabilityRequest.prototype.setTradeRequest = function(value) {
+  return jspb.Message.setWrapperField(this, 7, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.OfferAvailabilityRequest} returns this
+ */
+proto.io.bisq.protobuffer.OfferAvailabilityRequest.prototype.clearTradeRequest = function() {
+  return this.setTradeRequest(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.OfferAvailabilityRequest.prototype.hasTradeRequest = function() {
+  return jspb.Message.getField(this, 7) != null;
+};
+
+
 
 /**
  * List of repeated fields within this message type.
@@ -11105,9 +12274,8 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.toObject = function(includeI
     availabilityResult: jspb.Message.getFieldWithDefault(msg, 2, 0),
     supportedCapabilitiesList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? undefined : f,
     uid: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    arbitrator: (f = msg.getArbitrator()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    mediator: (f = msg.getMediator()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    refundAgent: (f = msg.getRefundAgent()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f)
+    makerSignature: jspb.Message.getFieldWithDefault(msg, 5, ""),
+    arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -11163,19 +12331,13 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.deserializeBinaryFromReader
       msg.setUid(value);
       break;
     case 5:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setArbitrator(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMakerSignature(value);
       break;
     case 6:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setMediator(value);
-      break;
-    case 7:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setRefundAgent(value);
+      msg.setArbitratorNodeAddress(value);
       break;
     default:
       reader.skipField();
@@ -11234,15 +12396,14 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.serializeBinaryToWriter = fu
       f
     );
   }
-  f = message.getArbitrator();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getMakerSignature();
+  if (f.length > 0) {
+    writer.writeString(
       5,
-      f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+      f
     );
   }
-  f = message.getMediator();
+  f = message.getArbitratorNodeAddress();
   if (f != null) {
     writer.writeMessage(
       6,
@@ -11250,14 +12411,6 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.serializeBinaryToWriter = fu
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
   }
-  f = message.getRefundAgent();
-  if (f != null) {
-    writer.writeMessage(
-      7,
-      f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
-    );
-  }
 };
 
 
@@ -11353,47 +12506,28 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.setUid = function(
 
 
 /**
- * optional NodeAddress arbitrator = 5;
- * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ * optional string maker_signature = 5;
+ * @return {string}
  */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.getArbitrator = function() {
-  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 5));
+proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.getMakerSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
 };
 
 
 /**
- * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
- * @return {!proto.io.bisq.protobuffer.OfferAvailabilityResponse} returns this
-*/
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.setArbitrator = function(value) {
-  return jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
+ * @param {string} value
  * @return {!proto.io.bisq.protobuffer.OfferAvailabilityResponse} returns this
  */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.clearArbitrator = function() {
-  return this.setArbitrator(undefined);
+proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.setMakerSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 5, value);
 };
 
 
 /**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.hasArbitrator = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-/**
- * optional NodeAddress mediator = 6;
+ * optional NodeAddress arbitrator_node_address = 6;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.getMediator = function() {
+proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.getArbitratorNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
     jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 6));
 };
@@ -11403,7 +12537,7 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.getMediator = func
  * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
  * @return {!proto.io.bisq.protobuffer.OfferAvailabilityResponse} returns this
 */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.setMediator = function(value) {
+proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.setArbitratorNodeAddress = function(value) {
   return jspb.Message.setWrapperField(this, 6, value);
 };
 
@@ -11412,8 +12546,8 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.setMediator = func
  * Clears the message field making it undefined.
  * @return {!proto.io.bisq.protobuffer.OfferAvailabilityResponse} returns this
  */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.clearMediator = function() {
-  return this.setMediator(undefined);
+proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.clearArbitratorNodeAddress = function() {
+  return this.setArbitratorNodeAddress(undefined);
 };
 
 
@@ -11421,48 +12555,11 @@ proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.clearMediator = fu
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.hasMediator = function() {
+proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.hasArbitratorNodeAddress = function() {
   return jspb.Message.getField(this, 6) != null;
 };
 
 
-/**
- * optional NodeAddress refund_agent = 7;
- * @return {?proto.io.bisq.protobuffer.NodeAddress}
- */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.getRefundAgent = function() {
-  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 7));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
- * @return {!proto.io.bisq.protobuffer.OfferAvailabilityResponse} returns this
-*/
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.setRefundAgent = function(value) {
-  return jspb.Message.setWrapperField(this, 7, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.OfferAvailabilityResponse} returns this
- */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.clearRefundAgent = function() {
-  return this.setRefundAgent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.OfferAvailabilityResponse.prototype.hasRefundAgent = function() {
-  return jspb.Message.getField(this, 7) != null;
-};
-
-
 
 
 
@@ -14960,18 +16057,21 @@ proto.io.bisq.protobuffer.InitTradeRequest.toObject = function(includeInstance,
     pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
     tradeAmount: jspb.Message.getFieldWithDefault(msg, 4, 0),
     tradePrice: jspb.Message.getFieldWithDefault(msg, 5, 0),
-    txFee: jspb.Message.getFieldWithDefault(msg, 6, 0),
-    tradeFee: jspb.Message.getFieldWithDefault(msg, 7, 0),
-    payoutAddressString: jspb.Message.getFieldWithDefault(msg, 8, ""),
-    paymentAccountPayload: (f = msg.getPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f),
-    accountId: jspb.Message.getFieldWithDefault(msg, 10, ""),
-    tradeFeeTxId: jspb.Message.getFieldWithDefault(msg, 11, ""),
-    uid: jspb.Message.getFieldWithDefault(msg, 12, ""),
+    tradeFee: jspb.Message.getFieldWithDefault(msg, 6, 0),
+    accountId: jspb.Message.getFieldWithDefault(msg, 7, ""),
+    paymentAccountId: jspb.Message.getFieldWithDefault(msg, 8, ""),
+    paymentMethodId: jspb.Message.getFieldWithDefault(msg, 9, ""),
+    uid: jspb.Message.getFieldWithDefault(msg, 10, ""),
     accountAgeWitnessSignatureOfOfferId: msg.getAccountAgeWitnessSignatureOfOfferId_asB64(),
-    currentDate: jspb.Message.getFieldWithDefault(msg, 14, 0),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 12, 0),
     makerNodeAddress: (f = msg.getMakerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     takerNodeAddress: (f = msg.getTakerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f)
+    arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    reserveTxHash: jspb.Message.getFieldWithDefault(msg, 16, ""),
+    reserveTxHex: jspb.Message.getFieldWithDefault(msg, 17, ""),
+    reserveTxKey: jspb.Message.getFieldWithDefault(msg, 18, ""),
+    payoutAddress: jspb.Message.getFieldWithDefault(msg, 19, ""),
+    makerSignature: jspb.Message.getFieldWithDefault(msg, 20, "")
   };
 
   if (includeInstance) {
@@ -15031,57 +16131,68 @@ proto.io.bisq.protobuffer.InitTradeRequest.deserializeBinaryFromReader = functio
       msg.setTradePrice(value);
       break;
     case 6:
-      var value = /** @type {number} */ (reader.readInt64());
-      msg.setTxFee(value);
-      break;
-    case 7:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setTradeFee(value);
       break;
-    case 8:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPayoutAddressString(value);
-      break;
-    case 9:
-      var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
-      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
-      msg.setPaymentAccountPayload(value);
-      break;
-    case 10:
+    case 7:
       var value = /** @type {string} */ (reader.readString());
       msg.setAccountId(value);
       break;
-    case 11:
+    case 8:
       var value = /** @type {string} */ (reader.readString());
-      msg.setTradeFeeTxId(value);
+      msg.setPaymentAccountId(value);
       break;
-    case 12:
+    case 9:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPaymentMethodId(value);
+      break;
+    case 10:
       var value = /** @type {string} */ (reader.readString());
       msg.setUid(value);
       break;
-    case 13:
+    case 11:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setAccountAgeWitnessSignatureOfOfferId(value);
       break;
-    case 14:
+    case 12:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setCurrentDate(value);
       break;
-    case 15:
+    case 13:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setMakerNodeAddress(value);
       break;
-    case 16:
+    case 14:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setTakerNodeAddress(value);
       break;
-    case 17:
+    case 15:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setArbitratorNodeAddress(value);
       break;
+    case 16:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxHash(value);
+      break;
+    case 17:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxHex(value);
+      break;
+    case 18:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxKey(value);
+      break;
+    case 19:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPayoutAddress(value);
+      break;
+    case 20:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMakerSignature(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -15148,74 +16259,59 @@ proto.io.bisq.protobuffer.InitTradeRequest.serializeBinaryToWriter = function(me
       f
     );
   }
-  f = message.getTxFee();
+  f = message.getTradeFee();
   if (f !== 0) {
     writer.writeInt64(
       6,
       f
     );
   }
-  f = message.getTradeFee();
-  if (f !== 0) {
-    writer.writeInt64(
+  f = message.getAccountId();
+  if (f.length > 0) {
+    writer.writeString(
       7,
       f
     );
   }
-  f = message.getPayoutAddressString();
+  f = message.getPaymentAccountId();
   if (f.length > 0) {
     writer.writeString(
       8,
       f
     );
   }
-  f = message.getPaymentAccountPayload();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getPaymentMethodId();
+  if (f.length > 0) {
+    writer.writeString(
       9,
-      f,
-      proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
-    );
-  }
-  f = message.getAccountId();
-  if (f.length > 0) {
-    writer.writeString(
-      10,
-      f
-    );
-  }
-  f = message.getTradeFeeTxId();
-  if (f.length > 0) {
-    writer.writeString(
-      11,
       f
     );
   }
   f = message.getUid();
   if (f.length > 0) {
     writer.writeString(
-      12,
+      10,
       f
     );
   }
   f = message.getAccountAgeWitnessSignatureOfOfferId_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      13,
+      11,
       f
     );
   }
   f = message.getCurrentDate();
   if (f !== 0) {
     writer.writeInt64(
-      14,
+      12,
       f
     );
   }
   f = message.getMakerNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      15,
+      13,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -15223,7 +16319,7 @@ proto.io.bisq.protobuffer.InitTradeRequest.serializeBinaryToWriter = function(me
   f = message.getTakerNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      16,
+      14,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -15231,11 +16327,46 @@ proto.io.bisq.protobuffer.InitTradeRequest.serializeBinaryToWriter = function(me
   f = message.getArbitratorNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      17,
+      15,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
   }
+  f = message.getReserveTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      16,
+      f
+    );
+  }
+  f = message.getReserveTxHex();
+  if (f.length > 0) {
+    writer.writeString(
+      17,
+      f
+    );
+  }
+  f = message.getReserveTxKey();
+  if (f.length > 0) {
+    writer.writeString(
+      18,
+      f
+    );
+  }
+  f = message.getPayoutAddress();
+  if (f.length > 0) {
+    writer.writeString(
+      19,
+      f
+    );
+  }
+  f = message.getMakerSignature();
+  if (f.length > 0) {
+    writer.writeString(
+      20,
+      f
+    );
+  }
 };
 
 
@@ -15368,10 +16499,10 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.setTradePrice = function(va
 
 
 /**
- * optional int64 tx_fee = 6;
+ * optional int64 trade_fee = 6;
  * @return {number}
  */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTxFee = function() {
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTradeFee = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
 };
 
@@ -15380,90 +16511,17 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTxFee = function() {
  * @param {number} value
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
  */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.setTxFee = function(value) {
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setTradeFee = function(value) {
   return jspb.Message.setProto3IntField(this, 6, value);
 };
 
 
 /**
- * optional int64 trade_fee = 7;
- * @return {number}
- */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTradeFee = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
-};
-
-
-/**
- * @param {number} value
- * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
- */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.setTradeFee = function(value) {
-  return jspb.Message.setProto3IntField(this, 7, value);
-};
-
-
-/**
- * optional string payout_address_string = 8;
- * @return {string}
- */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.getPayoutAddressString = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
- */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.setPayoutAddressString = function(value) {
-  return jspb.Message.setProto3StringField(this, 8, value);
-};
-
-
-/**
- * optional PaymentAccountPayload payment_account_payload = 9;
- * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
- */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.getPaymentAccountPayload = function() {
-  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 9));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.PaymentAccountPayload|undefined} value
- * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
-*/
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.setPaymentAccountPayload = function(value) {
-  return jspb.Message.setWrapperField(this, 9, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
- */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.clearPaymentAccountPayload = function() {
-  return this.setPaymentAccountPayload(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.hasPaymentAccountPayload = function() {
-  return jspb.Message.getField(this, 9) != null;
-};
-
-
-/**
- * optional string account_id = 10;
+ * optional string account_id = 7;
  * @return {string}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.getAccountId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
 };
 
 
@@ -15472,16 +16530,16 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getAccountId = function() {
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.setAccountId = function(value) {
-  return jspb.Message.setProto3StringField(this, 10, value);
+  return jspb.Message.setProto3StringField(this, 7, value);
 };
 
 
 /**
- * optional string trade_fee_tx_id = 11;
+ * optional string payment_account_id = 8;
  * @return {string}
  */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTradeFeeTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getPaymentAccountId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
 };
 
 
@@ -15489,17 +16547,35 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTradeFeeTxId = function(
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
  */
-proto.io.bisq.protobuffer.InitTradeRequest.prototype.setTradeFeeTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 11, value);
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setPaymentAccountId = function(value) {
+  return jspb.Message.setProto3StringField(this, 8, value);
 };
 
 
 /**
- * optional string uid = 12;
+ * optional string payment_method_id = 9;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getPaymentMethodId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setPaymentMethodId = function(value) {
+  return jspb.Message.setProto3StringField(this, 9, value);
+};
+
+
+/**
+ * optional string uid = 10;
  * @return {string}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.getUid = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
 };
 
 
@@ -15508,21 +16584,21 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getUid = function() {
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.setUid = function(value) {
-  return jspb.Message.setProto3StringField(this, 12, value);
+  return jspb.Message.setProto3StringField(this, 10, value);
 };
 
 
 /**
- * optional bytes account_age_witness_signature_of_offer_id = 13;
+ * optional bytes account_age_witness_signature_of_offer_id = 11;
  * @return {string}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.getAccountAgeWitnessSignatureOfOfferId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
 };
 
 
 /**
- * optional bytes account_age_witness_signature_of_offer_id = 13;
+ * optional bytes account_age_witness_signature_of_offer_id = 11;
  * This is a type-conversion wrapper around `getAccountAgeWitnessSignatureOfOfferId()`
  * @return {string}
  */
@@ -15533,7 +16609,7 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getAccountAgeWitnessSignatu
 
 
 /**
- * optional bytes account_age_witness_signature_of_offer_id = 13;
+ * optional bytes account_age_witness_signature_of_offer_id = 11;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getAccountAgeWitnessSignatureOfOfferId()`
@@ -15550,16 +16626,16 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getAccountAgeWitnessSignatu
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.setAccountAgeWitnessSignatureOfOfferId = function(value) {
-  return jspb.Message.setProto3BytesField(this, 13, value);
+  return jspb.Message.setProto3BytesField(this, 11, value);
 };
 
 
 /**
- * optional int64 current_date = 14;
+ * optional int64 current_date = 12;
  * @return {number}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.getCurrentDate = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 14, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 12, 0));
 };
 
 
@@ -15568,17 +16644,17 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getCurrentDate = function()
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.setCurrentDate = function(value) {
-  return jspb.Message.setProto3IntField(this, 14, value);
+  return jspb.Message.setProto3IntField(this, 12, value);
 };
 
 
 /**
- * optional NodeAddress maker_node_address = 15;
+ * optional NodeAddress maker_node_address = 13;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.getMakerNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 15));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 13));
 };
 
 
@@ -15587,7 +16663,7 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getMakerNodeAddress = funct
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
 */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.setMakerNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 15, value);
+  return jspb.Message.setWrapperField(this, 13, value);
 };
 
 
@@ -15605,17 +16681,17 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.clearMakerNodeAddress = fun
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.hasMakerNodeAddress = function() {
-  return jspb.Message.getField(this, 15) != null;
+  return jspb.Message.getField(this, 13) != null;
 };
 
 
 /**
- * optional NodeAddress taker_node_address = 16;
+ * optional NodeAddress taker_node_address = 14;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTakerNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 16));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 14));
 };
 
 
@@ -15624,7 +16700,7 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getTakerNodeAddress = funct
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
 */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.setTakerNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 16, value);
+  return jspb.Message.setWrapperField(this, 14, value);
 };
 
 
@@ -15642,17 +16718,17 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.clearTakerNodeAddress = fun
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.hasTakerNodeAddress = function() {
-  return jspb.Message.getField(this, 16) != null;
+  return jspb.Message.getField(this, 14) != null;
 };
 
 
 /**
- * optional NodeAddress arbitrator_node_address = 17;
+ * optional NodeAddress arbitrator_node_address = 15;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.getArbitratorNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 17));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 15));
 };
 
 
@@ -15661,7 +16737,7 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.getArbitratorNodeAddress =
  * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
 */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.setArbitratorNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 17, value);
+  return jspb.Message.setWrapperField(this, 15, value);
 };
 
 
@@ -15679,7 +16755,97 @@ proto.io.bisq.protobuffer.InitTradeRequest.prototype.clearArbitratorNodeAddress
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.InitTradeRequest.prototype.hasArbitratorNodeAddress = function() {
-  return jspb.Message.getField(this, 17) != null;
+  return jspb.Message.getField(this, 15) != null;
+};
+
+
+/**
+ * optional string reserve_tx_hash = 16;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getReserveTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setReserveTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 16, value);
+};
+
+
+/**
+ * optional string reserve_tx_hex = 17;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getReserveTxHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 17, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setReserveTxHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 17, value);
+};
+
+
+/**
+ * optional string reserve_tx_key = 18;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getReserveTxKey = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setReserveTxKey = function(value) {
+  return jspb.Message.setProto3StringField(this, 18, value);
+};
+
+
+/**
+ * optional string payout_address = 19;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getPayoutAddress = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 19, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setPayoutAddress = function(value) {
+  return jspb.Message.setProto3StringField(this, 19, value);
+};
+
+
+/**
+ * optional string maker_signature = 20;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.getMakerSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 20, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.InitTradeRequest} returns this
+ */
+proto.io.bisq.protobuffer.InitTradeRequest.prototype.setMakerSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 20, value);
 };
 
 
@@ -15699,8 +16865,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.toObject(opt_includeInstance, this);
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.InitMultisigRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -15709,664 +16875,11 @@ proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.toObject = f
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} msg The msg instance to transform.
+ * @param {!proto.io.bisq.protobuffer.InitMultisigRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
-    uid: jspb.Message.getFieldWithDefault(msg, 4, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest;
-  return proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setTradeId(value);
-      break;
-    case 2:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setSenderNodeAddress(value);
-      break;
-    case 3:
-      var value = new proto.io.bisq.protobuffer.PubKeyRing;
-      reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
-      msg.setPubKeyRing(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setUid(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getTradeId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getSenderNodeAddress();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
-    );
-  }
-  f = message.getPubKeyRing();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
-    );
-  }
-  f = message.getUid();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string trade_id = 1;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.getTradeId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.setTradeId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional NodeAddress sender_node_address = 2;
- * @return {?proto.io.bisq.protobuffer.NodeAddress}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.getSenderNodeAddress = function() {
-  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} returns this
-*/
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.setSenderNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.clearSenderNodeAddress = function() {
-  return this.setSenderNodeAddress(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.hasSenderNodeAddress = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional PubKeyRing pub_key_ring = 3;
- * @return {?proto.io.bisq.protobuffer.PubKeyRing}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.getPubKeyRing = function() {
-  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} returns this
-*/
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.setPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.clearPubKeyRing = function() {
-  return this.setPubKeyRing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.hasPubKeyRing = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * optional string uid = 4;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.getUid = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigRequest.prototype.setUid = function(value) {
-  return jspb.Message.setProto3StringField(this, 4, value);
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    uid: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    isMakerReadyToFundMultisig: jspb.Message.getBooleanFieldWithDefault(msg, 3, false),
-    makerContractAsJson: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    makerContractSignature: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    makerPayoutAddressString: jspb.Message.getFieldWithDefault(msg, 6, ""),
-    makerPaymentAccountPayload: (f = msg.getMakerPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f),
-    makerAccountId: jspb.Message.getFieldWithDefault(msg, 8, ""),
-    currentDate: jspb.Message.getFieldWithDefault(msg, 9, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse;
-  return proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setTradeId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setUid(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setIsMakerReadyToFundMultisig(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMakerContractAsJson(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMakerContractSignature(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMakerPayoutAddressString(value);
-      break;
-    case 7:
-      var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
-      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
-      msg.setMakerPaymentAccountPayload(value);
-      break;
-    case 8:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMakerAccountId(value);
-      break;
-    case 9:
-      var value = /** @type {number} */ (reader.readInt64());
-      msg.setCurrentDate(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getTradeId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getUid();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getIsMakerReadyToFundMultisig();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getMakerContractAsJson();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getMakerContractSignature();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = message.getMakerPayoutAddressString();
-  if (f.length > 0) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-  f = message.getMakerPaymentAccountPayload();
-  if (f != null) {
-    writer.writeMessage(
-      7,
-      f,
-      proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
-    );
-  }
-  f = message.getMakerAccountId();
-  if (f.length > 0) {
-    writer.writeString(
-      8,
-      f
-    );
-  }
-  f = message.getCurrentDate();
-  if (f !== 0) {
-    writer.writeInt64(
-      9,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string trade_id = 1;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getTradeId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setTradeId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string uid = 2;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getUid = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setUid = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
-/**
- * optional bool is_maker_ready_to_fund_multisig = 3;
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getIsMakerReadyToFundMultisig = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setIsMakerReadyToFundMultisig = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 3, value);
-};
-
-
-/**
- * optional string maker_contract_as_json = 4;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getMakerContractAsJson = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setMakerContractAsJson = function(value) {
-  return jspb.Message.setProto3StringField(this, 4, value);
-};
-
-
-/**
- * optional string maker_contract_signature = 5;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getMakerContractSignature = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setMakerContractSignature = function(value) {
-  return jspb.Message.setProto3StringField(this, 5, value);
-};
-
-
-/**
- * optional string maker_payout_address_string = 6;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getMakerPayoutAddressString = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setMakerPayoutAddressString = function(value) {
-  return jspb.Message.setProto3StringField(this, 6, value);
-};
-
-
-/**
- * optional PaymentAccountPayload maker_payment_account_payload = 7;
- * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getMakerPaymentAccountPayload = function() {
-  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 7));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.PaymentAccountPayload|undefined} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
-*/
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setMakerPaymentAccountPayload = function(value) {
-  return jspb.Message.setWrapperField(this, 7, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.clearMakerPaymentAccountPayload = function() {
-  return this.setMakerPaymentAccountPayload(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.hasMakerPaymentAccountPayload = function() {
-  return jspb.Message.getField(this, 7) != null;
-};
-
-
-/**
- * optional string maker_account_id = 8;
- * @return {string}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getMakerAccountId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setMakerAccountId = function(value) {
-  return jspb.Message.setProto3StringField(this, 8, value);
-};
-
-
-/**
- * optional int64 current_date = 9;
- * @return {number}
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.getCurrentDate = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 9, 0));
-};
-
-
-/**
- * @param {number} value
- * @return {!proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse} returns this
- */
-proto.io.bisq.protobuffer.MakerReadyToFundMultisigResponse.prototype.setCurrentDate = function(value) {
-  return jspb.Message.setProto3IntField(this, 9, value);
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.toObject = function(opt_includeInstance) {
-  return proto.io.bisq.protobuffer.InitMultisigMessage.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.io.bisq.protobuffer.InitMultisigMessage} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.io.bisq.protobuffer.InitMultisigMessage.toObject = function(includeInstance, msg) {
+proto.io.bisq.protobuffer.InitMultisigRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
     senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
@@ -16388,23 +16901,23 @@ proto.io.bisq.protobuffer.InitMultisigMessage.toObject = function(includeInstanc
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage}
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.deserializeBinary = function(bytes) {
+proto.io.bisq.protobuffer.InitMultisigRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.io.bisq.protobuffer.InitMultisigMessage;
-  return proto.io.bisq.protobuffer.InitMultisigMessage.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.io.bisq.protobuffer.InitMultisigRequest;
+  return proto.io.bisq.protobuffer.InitMultisigRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.io.bisq.protobuffer.InitMultisigMessage} msg The message object to deserialize into.
+ * @param {!proto.io.bisq.protobuffer.InitMultisigRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage}
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.deserializeBinaryFromReader = function(msg, reader) {
+proto.io.bisq.protobuffer.InitMultisigRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -16454,9 +16967,9 @@ proto.io.bisq.protobuffer.InitMultisigMessage.deserializeBinaryFromReader = func
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.serializeBinary = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.io.bisq.protobuffer.InitMultisigMessage.serializeBinaryToWriter(this, writer);
+  proto.io.bisq.protobuffer.InitMultisigRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -16464,11 +16977,11 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.serializeBinary = functi
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.io.bisq.protobuffer.InitMultisigMessage} message
+ * @param {!proto.io.bisq.protobuffer.InitMultisigRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.serializeBinaryToWriter = function(message, writer) {
+proto.io.bisq.protobuffer.InitMultisigRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getTradeId();
   if (f.length > 0) {
@@ -16528,16 +17041,16 @@ proto.io.bisq.protobuffer.InitMultisigMessage.serializeBinaryToWriter = function
  * optional string trade_id = 1;
  * @return {string}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getTradeId = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.getTradeId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setTradeId = function(value) {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.setTradeId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -16546,7 +17059,7 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setTradeId = function(va
  * optional NodeAddress sender_node_address = 2;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getSenderNodeAddress = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.getSenderNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
     jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
 };
@@ -16554,18 +17067,18 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getSenderNodeAddress = f
 
 /**
  * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
 */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setSenderNodeAddress = function(value) {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.setSenderNodeAddress = function(value) {
   return jspb.Message.setWrapperField(this, 2, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.clearSenderNodeAddress = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.clearSenderNodeAddress = function() {
   return this.setSenderNodeAddress(undefined);
 };
 
@@ -16574,7 +17087,7 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.clearSenderNodeAddress =
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.hasSenderNodeAddress = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.hasSenderNodeAddress = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -16583,7 +17096,7 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.hasSenderNodeAddress = f
  * optional PubKeyRing pub_key_ring = 3;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getPubKeyRing = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.getPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
     jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
 };
@@ -16591,18 +17104,18 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getPubKeyRing = function
 
 /**
  * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
 */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setPubKeyRing = function(value) {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.setPubKeyRing = function(value) {
   return jspb.Message.setWrapperField(this, 3, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.clearPubKeyRing = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.clearPubKeyRing = function() {
   return this.setPubKeyRing(undefined);
 };
 
@@ -16611,7 +17124,7 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.clearPubKeyRing = functi
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.hasPubKeyRing = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.hasPubKeyRing = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -16620,16 +17133,16 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.hasPubKeyRing = function
  * optional string uid = 4;
  * @return {string}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getUid = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.getUid = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setUid = function(value) {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.setUid = function(value) {
   return jspb.Message.setProto3StringField(this, 4, value);
 };
 
@@ -16638,16 +17151,16 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setUid = function(value)
  * optional int64 current_date = 5;
  * @return {number}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getCurrentDate = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.getCurrentDate = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
 };
 
 
 /**
  * @param {number} value
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setCurrentDate = function(value) {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.setCurrentDate = function(value) {
   return jspb.Message.setProto3IntField(this, 5, value);
 };
 
@@ -16656,16 +17169,16 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setCurrentDate = functio
  * optional string prepared_multisig_hex = 6;
  * @return {string}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getPreparedMultisigHex = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.getPreparedMultisigHex = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setPreparedMultisigHex = function(value) {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.setPreparedMultisigHex = function(value) {
   return jspb.Message.setProto3StringField(this, 6, value);
 };
 
@@ -16674,16 +17187,16 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setPreparedMultisigHex =
  * optional string made_multisig_hex = 7;
  * @return {string}
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.getMadeMultisigHex = function() {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.getMadeMultisigHex = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.io.bisq.protobuffer.InitMultisigMessage} returns this
+ * @return {!proto.io.bisq.protobuffer.InitMultisigRequest} returns this
  */
-proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setMadeMultisigHex = function(value) {
+proto.io.bisq.protobuffer.InitMultisigRequest.prototype.setMadeMultisigHex = function(value) {
   return jspb.Message.setProto3StringField(this, 7, value);
 };
 
@@ -16691,6 +17204,1781 @@ proto.io.bisq.protobuffer.InitMultisigMessage.prototype.setMadeMultisigHex = fun
 
 
 
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.SignContractRequest.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.SignContractRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignContractRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
+    uid: jspb.Message.getFieldWithDefault(msg, 4, ""),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 5, 0),
+    accountId: jspb.Message.getFieldWithDefault(msg, 6, ""),
+    paymentAccountPayloadHash: msg.getPaymentAccountPayloadHash_asB64(),
+    payoutAddress: jspb.Message.getFieldWithDefault(msg, 8, ""),
+    depositTxHash: jspb.Message.getFieldWithDefault(msg, 9, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.SignContractRequest;
+  return proto.io.bisq.protobuffer.SignContractRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.SignContractRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTradeId(value);
+      break;
+    case 2:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setSenderNodeAddress(value);
+      break;
+    case 3:
+      var value = new proto.io.bisq.protobuffer.PubKeyRing;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
+      msg.setPubKeyRing(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setUid(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setCurrentDate(value);
+      break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setAccountId(value);
+      break;
+    case 7:
+      var value = /** @type {!Uint8Array} */ (reader.readBytes());
+      msg.setPaymentAccountPayloadHash(value);
+      break;
+    case 8:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPayoutAddress(value);
+      break;
+    case 9:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDepositTxHash(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.SignContractRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.SignContractRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignContractRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getTradeId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getSenderNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+    );
+  }
+  f = message.getPubKeyRing();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
+    );
+  }
+  f = message.getUid();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+  f = message.getCurrentDate();
+  if (f !== 0) {
+    writer.writeInt64(
+      5,
+      f
+    );
+  }
+  f = message.getAccountId();
+  if (f.length > 0) {
+    writer.writeString(
+      6,
+      f
+    );
+  }
+  f = message.getPaymentAccountPayloadHash_asU8();
+  if (f.length > 0) {
+    writer.writeBytes(
+      7,
+      f
+    );
+  }
+  f = message.getPayoutAddress();
+  if (f.length > 0) {
+    writer.writeString(
+      8,
+      f
+    );
+  }
+  f = message.getDepositTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      9,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string trade_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getTradeId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setTradeId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional NodeAddress sender_node_address = 2;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getSenderNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+*/
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setSenderNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.clearSenderNodeAddress = function() {
+  return this.setSenderNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.hasSenderNodeAddress = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional PubKeyRing pub_key_ring = 3;
+ * @return {?proto.io.bisq.protobuffer.PubKeyRing}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getPubKeyRing = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+*/
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setPubKeyRing = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.clearPubKeyRing = function() {
+  return this.setPubKeyRing(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.hasPubKeyRing = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional string uid = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getUid = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setUid = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
+/**
+ * optional int64 current_date = 5;
+ * @return {number}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getCurrentDate = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setCurrentDate = function(value) {
+  return jspb.Message.setProto3IntField(this, 5, value);
+};
+
+
+/**
+ * optional string account_id = 6;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getAccountId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setAccountId = function(value) {
+  return jspb.Message.setProto3StringField(this, 6, value);
+};
+
+
+/**
+ * optional bytes payment_account_payload_hash = 7;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getPaymentAccountPayloadHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
+};
+
+
+/**
+ * optional bytes payment_account_payload_hash = 7;
+ * This is a type-conversion wrapper around `getPaymentAccountPayloadHash()`
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getPaymentAccountPayloadHash_asB64 = function() {
+  return /** @type {string} */ (jspb.Message.bytesAsB64(
+      this.getPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * optional bytes payment_account_payload_hash = 7;
+ * Note that Uint8Array is not supported on all browsers.
+ * @see http://caniuse.com/Uint8Array
+ * This is a type-conversion wrapper around `getPaymentAccountPayloadHash()`
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getPaymentAccountPayloadHash_asU8 = function() {
+  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
+      this.getPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * @param {!(string|Uint8Array)} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setPaymentAccountPayloadHash = function(value) {
+  return jspb.Message.setProto3BytesField(this, 7, value);
+};
+
+
+/**
+ * optional string payout_address = 8;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getPayoutAddress = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setPayoutAddress = function(value) {
+  return jspb.Message.setProto3StringField(this, 8, value);
+};
+
+
+/**
+ * optional string deposit_tx_hash = 9;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.getDepositTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractRequest} returns this
+ */
+proto.io.bisq.protobuffer.SignContractRequest.prototype.setDepositTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 9, value);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.SignContractResponse.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.SignContractResponse} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignContractResponse.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
+    uid: jspb.Message.getFieldWithDefault(msg, 4, ""),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 5, 0),
+    contractSignature: jspb.Message.getFieldWithDefault(msg, 6, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.SignContractResponse;
+  return proto.io.bisq.protobuffer.SignContractResponse.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.SignContractResponse} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTradeId(value);
+      break;
+    case 2:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setSenderNodeAddress(value);
+      break;
+    case 3:
+      var value = new proto.io.bisq.protobuffer.PubKeyRing;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
+      msg.setPubKeyRing(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setUid(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setCurrentDate(value);
+      break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setContractSignature(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.SignContractResponse.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.SignContractResponse} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignContractResponse.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getTradeId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getSenderNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+    );
+  }
+  f = message.getPubKeyRing();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
+    );
+  }
+  f = message.getUid();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+  f = message.getCurrentDate();
+  if (f !== 0) {
+    writer.writeInt64(
+      5,
+      f
+    );
+  }
+  f = message.getContractSignature();
+  if (f.length > 0) {
+    writer.writeString(
+      6,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string trade_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.getTradeId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.setTradeId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional NodeAddress sender_node_address = 2;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.getSenderNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+*/
+proto.io.bisq.protobuffer.SignContractResponse.prototype.setSenderNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.clearSenderNodeAddress = function() {
+  return this.setSenderNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.hasSenderNodeAddress = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional PubKeyRing pub_key_ring = 3;
+ * @return {?proto.io.bisq.protobuffer.PubKeyRing}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.getPubKeyRing = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+*/
+proto.io.bisq.protobuffer.SignContractResponse.prototype.setPubKeyRing = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.clearPubKeyRing = function() {
+  return this.setPubKeyRing(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.hasPubKeyRing = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional string uid = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.getUid = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.setUid = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
+/**
+ * optional int64 current_date = 5;
+ * @return {number}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.getCurrentDate = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.setCurrentDate = function(value) {
+  return jspb.Message.setProto3IntField(this, 5, value);
+};
+
+
+/**
+ * optional string contract_signature = 6;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.getContractSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignContractResponse} returns this
+ */
+proto.io.bisq.protobuffer.SignContractResponse.prototype.setContractSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 6, value);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.DepositRequest.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.DepositRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.DepositRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
+    uid: jspb.Message.getFieldWithDefault(msg, 4, ""),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 5, 0),
+    contractSignature: jspb.Message.getFieldWithDefault(msg, 6, ""),
+    depositTxHex: jspb.Message.getFieldWithDefault(msg, 7, ""),
+    depositTxKey: jspb.Message.getFieldWithDefault(msg, 8, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.DepositRequest}
+ */
+proto.io.bisq.protobuffer.DepositRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.DepositRequest;
+  return proto.io.bisq.protobuffer.DepositRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.DepositRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.DepositRequest}
+ */
+proto.io.bisq.protobuffer.DepositRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTradeId(value);
+      break;
+    case 2:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setSenderNodeAddress(value);
+      break;
+    case 3:
+      var value = new proto.io.bisq.protobuffer.PubKeyRing;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
+      msg.setPubKeyRing(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setUid(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setCurrentDate(value);
+      break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setContractSignature(value);
+      break;
+    case 7:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDepositTxHex(value);
+      break;
+    case 8:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDepositTxKey(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.DepositRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.DepositRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.DepositRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getTradeId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getSenderNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+    );
+  }
+  f = message.getPubKeyRing();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
+    );
+  }
+  f = message.getUid();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+  f = message.getCurrentDate();
+  if (f !== 0) {
+    writer.writeInt64(
+      5,
+      f
+    );
+  }
+  f = message.getContractSignature();
+  if (f.length > 0) {
+    writer.writeString(
+      6,
+      f
+    );
+  }
+  f = message.getDepositTxHex();
+  if (f.length > 0) {
+    writer.writeString(
+      7,
+      f
+    );
+  }
+  f = message.getDepositTxKey();
+  if (f.length > 0) {
+    writer.writeString(
+      8,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string trade_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getTradeId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.setTradeId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional NodeAddress sender_node_address = 2;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getSenderNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+*/
+proto.io.bisq.protobuffer.DepositRequest.prototype.setSenderNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.clearSenderNodeAddress = function() {
+  return this.setSenderNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.hasSenderNodeAddress = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional PubKeyRing pub_key_ring = 3;
+ * @return {?proto.io.bisq.protobuffer.PubKeyRing}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getPubKeyRing = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+*/
+proto.io.bisq.protobuffer.DepositRequest.prototype.setPubKeyRing = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.clearPubKeyRing = function() {
+  return this.setPubKeyRing(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.hasPubKeyRing = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional string uid = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getUid = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.setUid = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
+/**
+ * optional int64 current_date = 5;
+ * @return {number}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getCurrentDate = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.setCurrentDate = function(value) {
+  return jspb.Message.setProto3IntField(this, 5, value);
+};
+
+
+/**
+ * optional string contract_signature = 6;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getContractSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.setContractSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 6, value);
+};
+
+
+/**
+ * optional string deposit_tx_hex = 7;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getDepositTxHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.setDepositTxHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 7, value);
+};
+
+
+/**
+ * optional string deposit_tx_key = 8;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.getDepositTxKey = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.DepositRequest} returns this
+ */
+proto.io.bisq.protobuffer.DepositRequest.prototype.setDepositTxKey = function(value) {
+  return jspb.Message.setProto3StringField(this, 8, value);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.DepositResponse.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.DepositResponse} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.DepositResponse.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
+    uid: jspb.Message.getFieldWithDefault(msg, 4, ""),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 5, 0)
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.DepositResponse}
+ */
+proto.io.bisq.protobuffer.DepositResponse.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.DepositResponse;
+  return proto.io.bisq.protobuffer.DepositResponse.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.DepositResponse} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.DepositResponse}
+ */
+proto.io.bisq.protobuffer.DepositResponse.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTradeId(value);
+      break;
+    case 2:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setSenderNodeAddress(value);
+      break;
+    case 3:
+      var value = new proto.io.bisq.protobuffer.PubKeyRing;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
+      msg.setPubKeyRing(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setUid(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setCurrentDate(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.DepositResponse.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.DepositResponse} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.DepositResponse.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getTradeId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getSenderNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+    );
+  }
+  f = message.getPubKeyRing();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
+    );
+  }
+  f = message.getUid();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+  f = message.getCurrentDate();
+  if (f !== 0) {
+    writer.writeInt64(
+      5,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string trade_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.getTradeId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.DepositResponse} returns this
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.setTradeId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional NodeAddress sender_node_address = 2;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.getSenderNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.DepositResponse} returns this
+*/
+proto.io.bisq.protobuffer.DepositResponse.prototype.setSenderNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.DepositResponse} returns this
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.clearSenderNodeAddress = function() {
+  return this.setSenderNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.hasSenderNodeAddress = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional PubKeyRing pub_key_ring = 3;
+ * @return {?proto.io.bisq.protobuffer.PubKeyRing}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.getPubKeyRing = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
+ * @return {!proto.io.bisq.protobuffer.DepositResponse} returns this
+*/
+proto.io.bisq.protobuffer.DepositResponse.prototype.setPubKeyRing = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.DepositResponse} returns this
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.clearPubKeyRing = function() {
+  return this.setPubKeyRing(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.hasPubKeyRing = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional string uid = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.getUid = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.DepositResponse} returns this
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.setUid = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
+/**
+ * optional int64 current_date = 5;
+ * @return {number}
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.getCurrentDate = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.io.bisq.protobuffer.DepositResponse} returns this
+ */
+proto.io.bisq.protobuffer.DepositResponse.prototype.setCurrentDate = function(value) {
+  return jspb.Message.setProto3IntField(this, 5, value);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
+    uid: jspb.Message.getFieldWithDefault(msg, 4, ""),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 5, 0),
+    paymentAccountPayload: (f = msg.getPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f)
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.PaymentAccountPayloadRequest;
+  return proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTradeId(value);
+      break;
+    case 2:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setSenderNodeAddress(value);
+      break;
+    case 3:
+      var value = new proto.io.bisq.protobuffer.PubKeyRing;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
+      msg.setPubKeyRing(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setUid(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setCurrentDate(value);
+      break;
+    case 6:
+      var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
+      msg.setPaymentAccountPayload(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getTradeId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getSenderNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+    );
+  }
+  f = message.getPubKeyRing();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
+    );
+  }
+  f = message.getUid();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+  f = message.getCurrentDate();
+  if (f !== 0) {
+    writer.writeInt64(
+      5,
+      f
+    );
+  }
+  f = message.getPaymentAccountPayload();
+  if (f != null) {
+    writer.writeMessage(
+      6,
+      f,
+      proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
+    );
+  }
+};
+
+
+/**
+ * optional string trade_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.getTradeId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.setTradeId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional NodeAddress sender_node_address = 2;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.getSenderNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 2));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+*/
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.setSenderNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.clearSenderNodeAddress = function() {
+  return this.setSenderNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.hasSenderNodeAddress = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional PubKeyRing pub_key_ring = 3;
+ * @return {?proto.io.bisq.protobuffer.PubKeyRing}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.getPubKeyRing = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 3));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+*/
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.setPubKeyRing = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.clearPubKeyRing = function() {
+  return this.setPubKeyRing(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.hasPubKeyRing = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional string uid = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.getUid = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.setUid = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
+/**
+ * optional int64 current_date = 5;
+ * @return {number}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.getCurrentDate = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.setCurrentDate = function(value) {
+  return jspb.Message.setProto3IntField(this, 5, value);
+};
+
+
+/**
+ * optional PaymentAccountPayload payment_account_payload = 6;
+ * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.getPaymentAccountPayload = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 6));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PaymentAccountPayload|undefined} value
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+*/
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.setPaymentAccountPayload = function(value) {
+  return jspb.Message.setWrapperField(this, 6, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.PaymentAccountPayloadRequest} returns this
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.clearPaymentAccountPayload = function() {
+  return this.setPaymentAccountPayload(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.PaymentAccountPayloadRequest.prototype.hasPaymentAccountPayload = function() {
+  return jspb.Message.getField(this, 6) != null;
+};
+
+
+
+
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto.
@@ -34113,7 +36401,7 @@ proto.io.bisq.protobuffer.MailboxStoragePayload.prototype.clearExtraDataMap = fu
  * @private {!Array<number>}
  * @const
  */
-proto.io.bisq.protobuffer.OfferPayload.repeatedFields_ = [13,14,19,21];
+proto.io.bisq.protobuffer.OfferPayload.repeatedFields_ = [17,19];
 
 
 
@@ -34158,34 +36446,32 @@ proto.io.bisq.protobuffer.OfferPayload.toObject = function(includeInstance, msg)
     minAmount: jspb.Message.getFieldWithDefault(msg, 10, 0),
     baseCurrencyCode: jspb.Message.getFieldWithDefault(msg, 11, ""),
     counterCurrencyCode: jspb.Message.getFieldWithDefault(msg, 12, ""),
-    arbitratorNodeAddressesList: jspb.Message.toObjectList(msg.getArbitratorNodeAddressesList(),
-    proto.io.bisq.protobuffer.NodeAddress.toObject, includeInstance),
-    mediatorNodeAddressesList: jspb.Message.toObjectList(msg.getMediatorNodeAddressesList(),
-    proto.io.bisq.protobuffer.NodeAddress.toObject, includeInstance),
-    paymentMethodId: jspb.Message.getFieldWithDefault(msg, 15, ""),
-    makerPaymentAccountId: jspb.Message.getFieldWithDefault(msg, 16, ""),
-    offerFeePaymentTxId: jspb.Message.getFieldWithDefault(msg, 17, ""),
-    countryCode: jspb.Message.getFieldWithDefault(msg, 18, ""),
-    acceptedCountryCodesList: (f = jspb.Message.getRepeatedField(msg, 19)) == null ? undefined : f,
-    bankId: jspb.Message.getFieldWithDefault(msg, 20, ""),
-    acceptedBankIdsList: (f = jspb.Message.getRepeatedField(msg, 21)) == null ? undefined : f,
-    versionNr: jspb.Message.getFieldWithDefault(msg, 22, ""),
-    blockHeightAtOfferCreation: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    txFee: jspb.Message.getFieldWithDefault(msg, 24, 0),
-    makerFee: jspb.Message.getFieldWithDefault(msg, 25, 0),
-    isCurrencyForMakerFeeBtc: jspb.Message.getBooleanFieldWithDefault(msg, 26, false),
-    buyerSecurityDeposit: jspb.Message.getFieldWithDefault(msg, 27, 0),
-    sellerSecurityDeposit: jspb.Message.getFieldWithDefault(msg, 28, 0),
-    maxTradeLimit: jspb.Message.getFieldWithDefault(msg, 29, 0),
-    maxTradePeriod: jspb.Message.getFieldWithDefault(msg, 30, 0),
-    useAutoClose: jspb.Message.getBooleanFieldWithDefault(msg, 31, false),
-    useReOpenAfterAutoClose: jspb.Message.getBooleanFieldWithDefault(msg, 32, false),
-    lowerClosePrice: jspb.Message.getFieldWithDefault(msg, 33, 0),
-    upperClosePrice: jspb.Message.getFieldWithDefault(msg, 34, 0),
-    isPrivateOffer: jspb.Message.getBooleanFieldWithDefault(msg, 35, false),
-    hashOfChallenge: jspb.Message.getFieldWithDefault(msg, 36, ""),
+    paymentMethodId: jspb.Message.getFieldWithDefault(msg, 13, ""),
+    makerPaymentAccountId: jspb.Message.getFieldWithDefault(msg, 14, ""),
+    offerFeePaymentTxId: jspb.Message.getFieldWithDefault(msg, 15, ""),
+    countryCode: jspb.Message.getFieldWithDefault(msg, 16, ""),
+    acceptedCountryCodesList: (f = jspb.Message.getRepeatedField(msg, 17)) == null ? undefined : f,
+    bankId: jspb.Message.getFieldWithDefault(msg, 18, ""),
+    acceptedBankIdsList: (f = jspb.Message.getRepeatedField(msg, 19)) == null ? undefined : f,
+    versionNr: jspb.Message.getFieldWithDefault(msg, 20, ""),
+    blockHeightAtOfferCreation: jspb.Message.getFieldWithDefault(msg, 21, 0),
+    txFee: jspb.Message.getFieldWithDefault(msg, 22, 0),
+    makerFee: jspb.Message.getFieldWithDefault(msg, 23, 0),
+    isCurrencyForMakerFeeBtc: jspb.Message.getBooleanFieldWithDefault(msg, 24, false),
+    buyerSecurityDeposit: jspb.Message.getFieldWithDefault(msg, 25, 0),
+    sellerSecurityDeposit: jspb.Message.getFieldWithDefault(msg, 26, 0),
+    maxTradeLimit: jspb.Message.getFieldWithDefault(msg, 27, 0),
+    maxTradePeriod: jspb.Message.getFieldWithDefault(msg, 28, 0),
+    useAutoClose: jspb.Message.getBooleanFieldWithDefault(msg, 29, false),
+    useReOpenAfterAutoClose: jspb.Message.getBooleanFieldWithDefault(msg, 30, false),
+    lowerClosePrice: jspb.Message.getFieldWithDefault(msg, 31, 0),
+    upperClosePrice: jspb.Message.getFieldWithDefault(msg, 32, 0),
+    isPrivateOffer: jspb.Message.getBooleanFieldWithDefault(msg, 33, false),
+    hashOfChallenge: jspb.Message.getFieldWithDefault(msg, 34, ""),
     extraDataMap: (f = msg.getExtraDataMap()) ? f.toObject(includeInstance, undefined) : [],
-    protocolVersion: jspb.Message.getFieldWithDefault(msg, 38, 0)
+    protocolVersion: jspb.Message.getFieldWithDefault(msg, 36, 0),
+    arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
+    arbitratorSignature: jspb.Message.getFieldWithDefault(msg, 1002, "")
   };
 
   if (includeInstance) {
@@ -34273,113 +36559,112 @@ proto.io.bisq.protobuffer.OfferPayload.deserializeBinaryFromReader = function(ms
       msg.setCounterCurrencyCode(value);
       break;
     case 13:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.addArbitratorNodeAddresses(value);
-      break;
-    case 14:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.addMediatorNodeAddresses(value);
-      break;
-    case 15:
       var value = /** @type {string} */ (reader.readString());
       msg.setPaymentMethodId(value);
       break;
-    case 16:
+    case 14:
       var value = /** @type {string} */ (reader.readString());
       msg.setMakerPaymentAccountId(value);
       break;
-    case 17:
+    case 15:
       var value = /** @type {string} */ (reader.readString());
       msg.setOfferFeePaymentTxId(value);
       break;
-    case 18:
+    case 16:
       var value = /** @type {string} */ (reader.readString());
       msg.setCountryCode(value);
       break;
-    case 19:
+    case 17:
       var value = /** @type {string} */ (reader.readString());
       msg.addAcceptedCountryCodes(value);
       break;
-    case 20:
+    case 18:
       var value = /** @type {string} */ (reader.readString());
       msg.setBankId(value);
       break;
-    case 21:
+    case 19:
       var value = /** @type {string} */ (reader.readString());
       msg.addAcceptedBankIds(value);
       break;
-    case 22:
+    case 20:
       var value = /** @type {string} */ (reader.readString());
       msg.setVersionNr(value);
       break;
-    case 23:
+    case 21:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setBlockHeightAtOfferCreation(value);
       break;
-    case 24:
+    case 22:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setTxFee(value);
       break;
-    case 25:
+    case 23:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setMakerFee(value);
       break;
-    case 26:
+    case 24:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setIsCurrencyForMakerFeeBtc(value);
       break;
-    case 27:
+    case 25:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setBuyerSecurityDeposit(value);
       break;
-    case 28:
+    case 26:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setSellerSecurityDeposit(value);
       break;
-    case 29:
+    case 27:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setMaxTradeLimit(value);
       break;
-    case 30:
+    case 28:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setMaxTradePeriod(value);
       break;
-    case 31:
+    case 29:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setUseAutoClose(value);
       break;
-    case 32:
+    case 30:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setUseReOpenAfterAutoClose(value);
       break;
-    case 33:
+    case 31:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setLowerClosePrice(value);
       break;
-    case 34:
+    case 32:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setUpperClosePrice(value);
       break;
-    case 35:
+    case 33:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setIsPrivateOffer(value);
       break;
-    case 36:
+    case 34:
       var value = /** @type {string} */ (reader.readString());
       msg.setHashOfChallenge(value);
       break;
-    case 37:
+    case 35:
       var value = msg.getExtraDataMap();
       reader.readMessage(value, function(message, reader) {
         jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
          });
       break;
-    case 38:
+    case 36:
       var value = /** @type {number} */ (reader.readInt32());
       msg.setProtocolVersion(value);
       break;
+    case 1001:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setArbitratorNodeAddress(value);
+      break;
+    case 1002:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setArbitratorSignature(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -34495,184 +36780,183 @@ proto.io.bisq.protobuffer.OfferPayload.serializeBinaryToWriter = function(messag
       f
     );
   }
-  f = message.getArbitratorNodeAddressesList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      13,
-      f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediatorNodeAddressesList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      14,
-      f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
-    );
-  }
   f = message.getPaymentMethodId();
   if (f.length > 0) {
     writer.writeString(
-      15,
+      13,
       f
     );
   }
   f = message.getMakerPaymentAccountId();
   if (f.length > 0) {
     writer.writeString(
-      16,
+      14,
       f
     );
   }
   f = message.getOfferFeePaymentTxId();
   if (f.length > 0) {
     writer.writeString(
-      17,
+      15,
       f
     );
   }
   f = message.getCountryCode();
   if (f.length > 0) {
     writer.writeString(
-      18,
+      16,
       f
     );
   }
   f = message.getAcceptedCountryCodesList();
   if (f.length > 0) {
     writer.writeRepeatedString(
-      19,
+      17,
       f
     );
   }
   f = message.getBankId();
   if (f.length > 0) {
     writer.writeString(
-      20,
+      18,
       f
     );
   }
   f = message.getAcceptedBankIdsList();
   if (f.length > 0) {
     writer.writeRepeatedString(
-      21,
+      19,
       f
     );
   }
   f = message.getVersionNr();
   if (f.length > 0) {
     writer.writeString(
-      22,
+      20,
       f
     );
   }
   f = message.getBlockHeightAtOfferCreation();
   if (f !== 0) {
     writer.writeInt64(
-      23,
+      21,
       f
     );
   }
   f = message.getTxFee();
   if (f !== 0) {
     writer.writeInt64(
-      24,
+      22,
       f
     );
   }
   f = message.getMakerFee();
   if (f !== 0) {
     writer.writeInt64(
-      25,
+      23,
       f
     );
   }
   f = message.getIsCurrencyForMakerFeeBtc();
   if (f) {
     writer.writeBool(
-      26,
+      24,
       f
     );
   }
   f = message.getBuyerSecurityDeposit();
   if (f !== 0) {
     writer.writeInt64(
-      27,
+      25,
       f
     );
   }
   f = message.getSellerSecurityDeposit();
   if (f !== 0) {
     writer.writeInt64(
-      28,
+      26,
       f
     );
   }
   f = message.getMaxTradeLimit();
   if (f !== 0) {
     writer.writeInt64(
-      29,
+      27,
       f
     );
   }
   f = message.getMaxTradePeriod();
   if (f !== 0) {
     writer.writeInt64(
-      30,
+      28,
       f
     );
   }
   f = message.getUseAutoClose();
   if (f) {
     writer.writeBool(
-      31,
+      29,
       f
     );
   }
   f = message.getUseReOpenAfterAutoClose();
   if (f) {
     writer.writeBool(
-      32,
+      30,
       f
     );
   }
   f = message.getLowerClosePrice();
   if (f !== 0) {
     writer.writeInt64(
-      33,
+      31,
       f
     );
   }
   f = message.getUpperClosePrice();
   if (f !== 0) {
     writer.writeInt64(
-      34,
+      32,
       f
     );
   }
   f = message.getIsPrivateOffer();
   if (f) {
     writer.writeBool(
-      35,
+      33,
       f
     );
   }
   f = message.getHashOfChallenge();
   if (f.length > 0) {
     writer.writeString(
-      36,
+      34,
       f
     );
   }
   f = message.getExtraDataMap(true);
   if (f && f.getLength() > 0) {
-    f.serializeBinary(37, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
+    f.serializeBinary(35, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
   }
   f = message.getProtocolVersion();
   if (f !== 0) {
     writer.writeInt32(
-      38,
+      36,
+      f
+    );
+  }
+  f = message.getArbitratorNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      1001,
+      f,
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+    );
+  }
+  f = message.getArbitratorSignature();
+  if (f.length > 0) {
+    writer.writeString(
+      1002,
       f
     );
   }
@@ -34943,87 +37227,11 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.setCounterCurrencyCode = functi
 
 
 /**
- * repeated NodeAddress arbitrator_node_addresses = 13;
- * @return {!Array<!proto.io.bisq.protobuffer.NodeAddress>}
- */
-proto.io.bisq.protobuffer.OfferPayload.prototype.getArbitratorNodeAddressesList = function() {
-  return /** @type{!Array<!proto.io.bisq.protobuffer.NodeAddress>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 13));
-};
-
-
-/**
- * @param {!Array<!proto.io.bisq.protobuffer.NodeAddress>} value
- * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
-*/
-proto.io.bisq.protobuffer.OfferPayload.prototype.setArbitratorNodeAddressesList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 13, value);
-};
-
-
-/**
- * @param {!proto.io.bisq.protobuffer.NodeAddress=} opt_value
- * @param {number=} opt_index
- * @return {!proto.io.bisq.protobuffer.NodeAddress}
- */
-proto.io.bisq.protobuffer.OfferPayload.prototype.addArbitratorNodeAddresses = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 13, opt_value, proto.io.bisq.protobuffer.NodeAddress, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
- */
-proto.io.bisq.protobuffer.OfferPayload.prototype.clearArbitratorNodeAddressesList = function() {
-  return this.setArbitratorNodeAddressesList([]);
-};
-
-
-/**
- * repeated NodeAddress mediator_node_addresses = 14;
- * @return {!Array<!proto.io.bisq.protobuffer.NodeAddress>}
- */
-proto.io.bisq.protobuffer.OfferPayload.prototype.getMediatorNodeAddressesList = function() {
-  return /** @type{!Array<!proto.io.bisq.protobuffer.NodeAddress>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 14));
-};
-
-
-/**
- * @param {!Array<!proto.io.bisq.protobuffer.NodeAddress>} value
- * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
-*/
-proto.io.bisq.protobuffer.OfferPayload.prototype.setMediatorNodeAddressesList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 14, value);
-};
-
-
-/**
- * @param {!proto.io.bisq.protobuffer.NodeAddress=} opt_value
- * @param {number=} opt_index
- * @return {!proto.io.bisq.protobuffer.NodeAddress}
- */
-proto.io.bisq.protobuffer.OfferPayload.prototype.addMediatorNodeAddresses = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 14, opt_value, proto.io.bisq.protobuffer.NodeAddress, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
- */
-proto.io.bisq.protobuffer.OfferPayload.prototype.clearMediatorNodeAddressesList = function() {
-  return this.setMediatorNodeAddressesList([]);
-};
-
-
-/**
- * optional string payment_method_id = 15;
+ * optional string payment_method_id = 13;
  * @return {string}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getPaymentMethodId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, ""));
 };
 
 
@@ -35032,16 +37240,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getPaymentMethodId = function()
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setPaymentMethodId = function(value) {
-  return jspb.Message.setProto3StringField(this, 15, value);
+  return jspb.Message.setProto3StringField(this, 13, value);
 };
 
 
 /**
- * optional string maker_payment_account_id = 16;
+ * optional string maker_payment_account_id = 14;
  * @return {string}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getMakerPaymentAccountId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 14, ""));
 };
 
 
@@ -35050,16 +37258,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getMakerPaymentAccountId = func
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setMakerPaymentAccountId = function(value) {
-  return jspb.Message.setProto3StringField(this, 16, value);
+  return jspb.Message.setProto3StringField(this, 14, value);
 };
 
 
 /**
- * optional string offer_fee_payment_tx_id = 17;
+ * optional string offer_fee_payment_tx_id = 15;
  * @return {string}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getOfferFeePaymentTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 17, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
 };
 
 
@@ -35068,16 +37276,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getOfferFeePaymentTxId = functi
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setOfferFeePaymentTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 17, value);
+  return jspb.Message.setProto3StringField(this, 15, value);
 };
 
 
 /**
- * optional string country_code = 18;
+ * optional string country_code = 16;
  * @return {string}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getCountryCode = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
 };
 
 
@@ -35086,16 +37294,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getCountryCode = function() {
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setCountryCode = function(value) {
-  return jspb.Message.setProto3StringField(this, 18, value);
+  return jspb.Message.setProto3StringField(this, 16, value);
 };
 
 
 /**
- * repeated string accepted_country_codes = 19;
+ * repeated string accepted_country_codes = 17;
  * @return {!Array<string>}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getAcceptedCountryCodesList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 19));
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 17));
 };
 
 
@@ -35104,7 +37312,7 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getAcceptedCountryCodesList = f
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setAcceptedCountryCodesList = function(value) {
-  return jspb.Message.setField(this, 19, value || []);
+  return jspb.Message.setField(this, 17, value || []);
 };
 
 
@@ -35114,7 +37322,7 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.setAcceptedCountryCodesList = f
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.addAcceptedCountryCodes = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 19, value, opt_index);
+  return jspb.Message.addToRepeatedField(this, 17, value, opt_index);
 };
 
 
@@ -35128,11 +37336,11 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.clearAcceptedCountryCodesList =
 
 
 /**
- * optional string bank_id = 20;
+ * optional string bank_id = 18;
  * @return {string}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getBankId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 20, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, ""));
 };
 
 
@@ -35141,16 +37349,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getBankId = function() {
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setBankId = function(value) {
-  return jspb.Message.setProto3StringField(this, 20, value);
+  return jspb.Message.setProto3StringField(this, 18, value);
 };
 
 
 /**
- * repeated string accepted_bank_ids = 21;
+ * repeated string accepted_bank_ids = 19;
  * @return {!Array<string>}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getAcceptedBankIdsList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 21));
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 19));
 };
 
 
@@ -35159,7 +37367,7 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getAcceptedBankIdsList = functi
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setAcceptedBankIdsList = function(value) {
-  return jspb.Message.setField(this, 21, value || []);
+  return jspb.Message.setField(this, 19, value || []);
 };
 
 
@@ -35169,7 +37377,7 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.setAcceptedBankIdsList = functi
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.addAcceptedBankIds = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 21, value, opt_index);
+  return jspb.Message.addToRepeatedField(this, 19, value, opt_index);
 };
 
 
@@ -35183,11 +37391,11 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.clearAcceptedBankIdsList = func
 
 
 /**
- * optional string version_nr = 22;
+ * optional string version_nr = 20;
  * @return {string}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getVersionNr = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 22, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 20, ""));
 };
 
 
@@ -35196,16 +37404,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getVersionNr = function() {
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setVersionNr = function(value) {
-  return jspb.Message.setProto3StringField(this, 22, value);
+  return jspb.Message.setProto3StringField(this, 20, value);
 };
 
 
 /**
- * optional int64 block_height_at_offer_creation = 23;
+ * optional int64 block_height_at_offer_creation = 21;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getBlockHeightAtOfferCreation = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
 };
 
 
@@ -35214,16 +37422,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getBlockHeightAtOfferCreation =
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setBlockHeightAtOfferCreation = function(value) {
-  return jspb.Message.setProto3IntField(this, 23, value);
+  return jspb.Message.setProto3IntField(this, 21, value);
 };
 
 
 /**
- * optional int64 tx_fee = 24;
+ * optional int64 tx_fee = 22;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getTxFee = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
 };
 
 
@@ -35232,16 +37440,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getTxFee = function() {
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setTxFee = function(value) {
-  return jspb.Message.setProto3IntField(this, 24, value);
+  return jspb.Message.setProto3IntField(this, 22, value);
 };
 
 
 /**
- * optional int64 maker_fee = 25;
+ * optional int64 maker_fee = 23;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getMakerFee = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 25, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
 };
 
 
@@ -35250,16 +37458,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getMakerFee = function() {
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setMakerFee = function(value) {
-  return jspb.Message.setProto3IntField(this, 25, value);
+  return jspb.Message.setProto3IntField(this, 23, value);
 };
 
 
 /**
- * optional bool is_currency_for_maker_fee_btc = 26;
+ * optional bool is_currency_for_maker_fee_btc = 24;
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getIsCurrencyForMakerFeeBtc = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 26, false));
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 24, false));
 };
 
 
@@ -35268,16 +37476,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getIsCurrencyForMakerFeeBtc = f
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setIsCurrencyForMakerFeeBtc = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 26, value);
+  return jspb.Message.setProto3BooleanField(this, 24, value);
 };
 
 
 /**
- * optional int64 buyer_security_deposit = 27;
+ * optional int64 buyer_security_deposit = 25;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getBuyerSecurityDeposit = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 27, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 25, 0));
 };
 
 
@@ -35286,16 +37494,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getBuyerSecurityDeposit = funct
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setBuyerSecurityDeposit = function(value) {
-  return jspb.Message.setProto3IntField(this, 27, value);
+  return jspb.Message.setProto3IntField(this, 25, value);
 };
 
 
 /**
- * optional int64 seller_security_deposit = 28;
+ * optional int64 seller_security_deposit = 26;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getSellerSecurityDeposit = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 28, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 26, 0));
 };
 
 
@@ -35304,16 +37512,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getSellerSecurityDeposit = func
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setSellerSecurityDeposit = function(value) {
-  return jspb.Message.setProto3IntField(this, 28, value);
+  return jspb.Message.setProto3IntField(this, 26, value);
 };
 
 
 /**
- * optional int64 max_trade_limit = 29;
+ * optional int64 max_trade_limit = 27;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getMaxTradeLimit = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 29, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 27, 0));
 };
 
 
@@ -35322,16 +37530,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getMaxTradeLimit = function() {
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setMaxTradeLimit = function(value) {
-  return jspb.Message.setProto3IntField(this, 29, value);
+  return jspb.Message.setProto3IntField(this, 27, value);
 };
 
 
 /**
- * optional int64 max_trade_period = 30;
+ * optional int64 max_trade_period = 28;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getMaxTradePeriod = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 30, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 28, 0));
 };
 
 
@@ -35340,16 +37548,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getMaxTradePeriod = function()
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setMaxTradePeriod = function(value) {
-  return jspb.Message.setProto3IntField(this, 30, value);
+  return jspb.Message.setProto3IntField(this, 28, value);
 };
 
 
 /**
- * optional bool use_auto_close = 31;
+ * optional bool use_auto_close = 29;
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getUseAutoClose = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 31, false));
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 29, false));
 };
 
 
@@ -35358,16 +37566,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getUseAutoClose = function() {
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setUseAutoClose = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 31, value);
+  return jspb.Message.setProto3BooleanField(this, 29, value);
 };
 
 
 /**
- * optional bool use_re_open_after_auto_close = 32;
+ * optional bool use_re_open_after_auto_close = 30;
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getUseReOpenAfterAutoClose = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 32, false));
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 30, false));
 };
 
 
@@ -35376,16 +37584,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getUseReOpenAfterAutoClose = fu
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setUseReOpenAfterAutoClose = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 32, value);
+  return jspb.Message.setProto3BooleanField(this, 30, value);
 };
 
 
 /**
- * optional int64 lower_close_price = 33;
+ * optional int64 lower_close_price = 31;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getLowerClosePrice = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 33, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 31, 0));
 };
 
 
@@ -35394,16 +37602,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getLowerClosePrice = function()
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setLowerClosePrice = function(value) {
-  return jspb.Message.setProto3IntField(this, 33, value);
+  return jspb.Message.setProto3IntField(this, 31, value);
 };
 
 
 /**
- * optional int64 upper_close_price = 34;
+ * optional int64 upper_close_price = 32;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getUpperClosePrice = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 34, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 32, 0));
 };
 
 
@@ -35412,16 +37620,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getUpperClosePrice = function()
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setUpperClosePrice = function(value) {
-  return jspb.Message.setProto3IntField(this, 34, value);
+  return jspb.Message.setProto3IntField(this, 32, value);
 };
 
 
 /**
- * optional bool is_private_offer = 35;
+ * optional bool is_private_offer = 33;
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getIsPrivateOffer = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 35, false));
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 33, false));
 };
 
 
@@ -35430,16 +37638,16 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getIsPrivateOffer = function()
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setIsPrivateOffer = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 35, value);
+  return jspb.Message.setProto3BooleanField(this, 33, value);
 };
 
 
 /**
- * optional string hash_of_challenge = 36;
+ * optional string hash_of_challenge = 34;
  * @return {string}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getHashOfChallenge = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 36, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 34, ""));
 };
 
 
@@ -35448,19 +37656,19 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getHashOfChallenge = function()
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setHashOfChallenge = function(value) {
-  return jspb.Message.setProto3StringField(this, 36, value);
+  return jspb.Message.setProto3StringField(this, 34, value);
 };
 
 
 /**
- * map<string, string> extra_data = 37;
+ * map<string, string> extra_data = 35;
  * @param {boolean=} opt_noLazyCreate Do not create the map if
  * empty, instead returning `undefined`
  * @return {!jspb.Map<string,string>}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getExtraDataMap = function(opt_noLazyCreate) {
   return /** @type {!jspb.Map<string,string>} */ (
-      jspb.Message.getMapField(this, 37, opt_noLazyCreate,
+      jspb.Message.getMapField(this, 35, opt_noLazyCreate,
       null));
 };
 
@@ -35475,11 +37683,11 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.clearExtraDataMap = function()
 
 
 /**
- * optional int32 protocol_version = 38;
+ * optional int32 protocol_version = 36;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.getProtocolVersion = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 38, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 36, 0));
 };
 
 
@@ -35488,7 +37696,62 @@ proto.io.bisq.protobuffer.OfferPayload.prototype.getProtocolVersion = function()
  * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
  */
 proto.io.bisq.protobuffer.OfferPayload.prototype.setProtocolVersion = function(value) {
-  return jspb.Message.setProto3IntField(this, 38, value);
+  return jspb.Message.setProto3IntField(this, 36, value);
+};
+
+
+/**
+ * optional NodeAddress arbitrator_node_address = 1001;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.OfferPayload.prototype.getArbitratorNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 1001));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
+*/
+proto.io.bisq.protobuffer.OfferPayload.prototype.setArbitratorNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 1001, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
+ */
+proto.io.bisq.protobuffer.OfferPayload.prototype.clearArbitratorNodeAddress = function() {
+  return this.setArbitratorNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.OfferPayload.prototype.hasArbitratorNodeAddress = function() {
+  return jspb.Message.getField(this, 1001) != null;
+};
+
+
+/**
+ * optional string arbitrator_signature = 1002;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.OfferPayload.prototype.getArbitratorSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1002, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.OfferPayload} returns this
+ */
+proto.io.bisq.protobuffer.OfferPayload.prototype.setArbitratorSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 1002, value);
 };
 
 
@@ -36097,7 +38360,7 @@ proto.io.bisq.protobuffer.SignedWitness.prototype.setTradeAmount = function(valu
  * @private {!Array<number>}
  * @const
  */
-proto.io.bisq.protobuffer.Dispute.repeatedFields_ = [20];
+proto.io.bisq.protobuffer.Dispute.repeatedFields_ = [23];
 
 
 
@@ -36133,35 +38396,37 @@ proto.io.bisq.protobuffer.Dispute.toObject = function(includeInstance, msg) {
     tradeId: jspb.Message.getFieldWithDefault(msg, 1, ""),
     id: jspb.Message.getFieldWithDefault(msg, 2, ""),
     traderId: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    disputeOpenerIsBuyer: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
-    disputeOpenerIsMaker: jspb.Message.getBooleanFieldWithDefault(msg, 5, false),
-    openingDate: jspb.Message.getFieldWithDefault(msg, 6, 0),
+    isOpener: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
+    disputeOpenerIsBuyer: jspb.Message.getBooleanFieldWithDefault(msg, 5, false),
+    disputeOpenerIsMaker: jspb.Message.getBooleanFieldWithDefault(msg, 6, false),
+    openingDate: jspb.Message.getFieldWithDefault(msg, 7, 0),
     traderPubKeyRing: (f = msg.getTraderPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
-    tradeDate: jspb.Message.getFieldWithDefault(msg, 8, 0),
+    tradeDate: jspb.Message.getFieldWithDefault(msg, 9, 0),
     contract: (f = msg.getContract()) && proto.io.bisq.protobuffer.Contract.toObject(includeInstance, f),
     contractHash: msg.getContractHash_asB64(),
     depositTxSerialized: msg.getDepositTxSerialized_asB64(),
     payoutTxSerialized: msg.getPayoutTxSerialized_asB64(),
-    depositTxId: jspb.Message.getFieldWithDefault(msg, 13, ""),
-    payoutTxId: jspb.Message.getFieldWithDefault(msg, 14, ""),
-    contractAsJson: jspb.Message.getFieldWithDefault(msg, 15, ""),
-    makerContractSignature: jspb.Message.getFieldWithDefault(msg, 16, ""),
-    takerContractSignature: jspb.Message.getFieldWithDefault(msg, 17, ""),
+    depositTxId: jspb.Message.getFieldWithDefault(msg, 14, ""),
+    payoutTxId: jspb.Message.getFieldWithDefault(msg, 15, ""),
+    contractAsJson: jspb.Message.getFieldWithDefault(msg, 16, ""),
+    makerContractSignature: jspb.Message.getFieldWithDefault(msg, 17, ""),
+    takerContractSignature: jspb.Message.getFieldWithDefault(msg, 18, ""),
+    makerPaymentAccountPayload: (f = msg.getMakerPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f),
+    takerPaymentAccountPayload: (f = msg.getTakerPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f),
     agentPubKeyRing: (f = msg.getAgentPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
-    isSupportTicket: jspb.Message.getBooleanFieldWithDefault(msg, 19, false),
+    isSupportTicket: jspb.Message.getBooleanFieldWithDefault(msg, 22, false),
     chatMessageList: jspb.Message.toObjectList(msg.getChatMessageList(),
     proto.io.bisq.protobuffer.ChatMessage.toObject, includeInstance),
-    isClosed: jspb.Message.getBooleanFieldWithDefault(msg, 21, false),
+    isClosed: jspb.Message.getBooleanFieldWithDefault(msg, 24, false),
     disputeResult: (f = msg.getDisputeResult()) && proto.io.bisq.protobuffer.DisputeResult.toObject(includeInstance, f),
-    disputePayoutTxId: jspb.Message.getFieldWithDefault(msg, 23, ""),
-    supportType: jspb.Message.getFieldWithDefault(msg, 24, 0),
-    mediatorsDisputeResult: jspb.Message.getFieldWithDefault(msg, 25, ""),
-    delayedPayoutTxId: jspb.Message.getFieldWithDefault(msg, 26, ""),
-    donationAddressOfDelayedPayoutTx: jspb.Message.getFieldWithDefault(msg, 27, ""),
-    state: jspb.Message.getFieldWithDefault(msg, 28, 0),
-    tradePeriodEnd: jspb.Message.getFieldWithDefault(msg, 29, 0),
-    extraDataMap: (f = msg.getExtraDataMap()) ? f.toObject(includeInstance, undefined) : [],
-    isOpener: jspb.Message.getBooleanFieldWithDefault(msg, 100, false)
+    disputePayoutTxId: jspb.Message.getFieldWithDefault(msg, 26, ""),
+    supportType: jspb.Message.getFieldWithDefault(msg, 27, 0),
+    mediatorsDisputeResult: jspb.Message.getFieldWithDefault(msg, 28, ""),
+    delayedPayoutTxId: jspb.Message.getFieldWithDefault(msg, 29, ""),
+    donationAddressOfDelayedPayoutTx: jspb.Message.getFieldWithDefault(msg, 30, ""),
+    state: jspb.Message.getFieldWithDefault(msg, 31, 0),
+    tradePeriodEnd: jspb.Message.getFieldWithDefault(msg, 32, 0),
+    extraDataMap: (f = msg.getExtraDataMap()) ? f.toObject(includeInstance, undefined) : []
   };
 
   if (includeInstance) {
@@ -36212,123 +38477,133 @@ proto.io.bisq.protobuffer.Dispute.deserializeBinaryFromReader = function(msg, re
       break;
     case 4:
       var value = /** @type {boolean} */ (reader.readBool());
-      msg.setDisputeOpenerIsBuyer(value);
+      msg.setIsOpener(value);
       break;
     case 5:
       var value = /** @type {boolean} */ (reader.readBool());
-      msg.setDisputeOpenerIsMaker(value);
+      msg.setDisputeOpenerIsBuyer(value);
       break;
     case 6:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setDisputeOpenerIsMaker(value);
+      break;
+    case 7:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setOpeningDate(value);
       break;
-    case 7:
+    case 8:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setTraderPubKeyRing(value);
       break;
-    case 8:
+    case 9:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setTradeDate(value);
       break;
-    case 9:
+    case 10:
       var value = new proto.io.bisq.protobuffer.Contract;
       reader.readMessage(value,proto.io.bisq.protobuffer.Contract.deserializeBinaryFromReader);
       msg.setContract(value);
       break;
-    case 10:
+    case 11:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setContractHash(value);
       break;
-    case 11:
+    case 12:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setDepositTxSerialized(value);
       break;
-    case 12:
+    case 13:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setPayoutTxSerialized(value);
       break;
-    case 13:
+    case 14:
       var value = /** @type {string} */ (reader.readString());
       msg.setDepositTxId(value);
       break;
-    case 14:
+    case 15:
       var value = /** @type {string} */ (reader.readString());
       msg.setPayoutTxId(value);
       break;
-    case 15:
+    case 16:
       var value = /** @type {string} */ (reader.readString());
       msg.setContractAsJson(value);
       break;
-    case 16:
+    case 17:
       var value = /** @type {string} */ (reader.readString());
       msg.setMakerContractSignature(value);
       break;
-    case 17:
+    case 18:
       var value = /** @type {string} */ (reader.readString());
       msg.setTakerContractSignature(value);
       break;
-    case 18:
+    case 19:
+      var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
+      msg.setMakerPaymentAccountPayload(value);
+      break;
+    case 20:
+      var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
+      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
+      msg.setTakerPaymentAccountPayload(value);
+      break;
+    case 21:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setAgentPubKeyRing(value);
       break;
-    case 19:
+    case 22:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setIsSupportTicket(value);
       break;
-    case 20:
+    case 23:
       var value = new proto.io.bisq.protobuffer.ChatMessage;
       reader.readMessage(value,proto.io.bisq.protobuffer.ChatMessage.deserializeBinaryFromReader);
       msg.addChatMessage(value);
       break;
-    case 21:
+    case 24:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setIsClosed(value);
       break;
-    case 22:
+    case 25:
       var value = new proto.io.bisq.protobuffer.DisputeResult;
       reader.readMessage(value,proto.io.bisq.protobuffer.DisputeResult.deserializeBinaryFromReader);
       msg.setDisputeResult(value);
       break;
-    case 23:
+    case 26:
       var value = /** @type {string} */ (reader.readString());
       msg.setDisputePayoutTxId(value);
       break;
-    case 24:
+    case 27:
       var value = /** @type {!proto.io.bisq.protobuffer.SupportType} */ (reader.readEnum());
       msg.setSupportType(value);
       break;
-    case 25:
+    case 28:
       var value = /** @type {string} */ (reader.readString());
       msg.setMediatorsDisputeResult(value);
       break;
-    case 26:
+    case 29:
       var value = /** @type {string} */ (reader.readString());
       msg.setDelayedPayoutTxId(value);
       break;
-    case 27:
+    case 30:
       var value = /** @type {string} */ (reader.readString());
       msg.setDonationAddressOfDelayedPayoutTx(value);
       break;
-    case 28:
+    case 31:
       var value = /** @type {!proto.io.bisq.protobuffer.Dispute.State} */ (reader.readEnum());
       msg.setState(value);
       break;
-    case 29:
+    case 32:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setTradePeriodEnd(value);
       break;
-    case 30:
+    case 33:
       var value = msg.getExtraDataMap();
       reader.readMessage(value, function(message, reader) {
         jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
          });
       break;
-    case 100:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setIsOpener(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -36379,31 +38654,38 @@ proto.io.bisq.protobuffer.Dispute.serializeBinaryToWriter = function(message, wr
       f
     );
   }
-  f = message.getDisputeOpenerIsBuyer();
+  f = message.getIsOpener();
   if (f) {
     writer.writeBool(
       4,
       f
     );
   }
-  f = message.getDisputeOpenerIsMaker();
+  f = message.getDisputeOpenerIsBuyer();
   if (f) {
     writer.writeBool(
       5,
       f
     );
   }
+  f = message.getDisputeOpenerIsMaker();
+  if (f) {
+    writer.writeBool(
+      6,
+      f
+    );
+  }
   f = message.getOpeningDate();
   if (f !== 0) {
     writer.writeInt64(
-      6,
+      7,
       f
     );
   }
   f = message.getTraderPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      7,
+      8,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -36411,14 +38693,14 @@ proto.io.bisq.protobuffer.Dispute.serializeBinaryToWriter = function(message, wr
   f = message.getTradeDate();
   if (f !== 0) {
     writer.writeInt64(
-      8,
+      9,
       f
     );
   }
   f = message.getContract();
   if (f != null) {
     writer.writeMessage(
-      9,
+      10,
       f,
       proto.io.bisq.protobuffer.Contract.serializeBinaryToWriter
     );
@@ -36426,63 +38708,79 @@ proto.io.bisq.protobuffer.Dispute.serializeBinaryToWriter = function(message, wr
   f = message.getContractHash_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      10,
+      11,
       f
     );
   }
   f = message.getDepositTxSerialized_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      11,
+      12,
       f
     );
   }
   f = message.getPayoutTxSerialized_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      12,
+      13,
       f
     );
   }
   f = message.getDepositTxId();
   if (f.length > 0) {
     writer.writeString(
-      13,
+      14,
       f
     );
   }
   f = message.getPayoutTxId();
   if (f.length > 0) {
     writer.writeString(
-      14,
+      15,
       f
     );
   }
   f = message.getContractAsJson();
   if (f.length > 0) {
     writer.writeString(
-      15,
+      16,
       f
     );
   }
   f = message.getMakerContractSignature();
   if (f.length > 0) {
     writer.writeString(
-      16,
+      17,
       f
     );
   }
   f = message.getTakerContractSignature();
   if (f.length > 0) {
     writer.writeString(
-      17,
+      18,
       f
     );
   }
+  f = message.getMakerPaymentAccountPayload();
+  if (f != null) {
+    writer.writeMessage(
+      19,
+      f,
+      proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
+    );
+  }
+  f = message.getTakerPaymentAccountPayload();
+  if (f != null) {
+    writer.writeMessage(
+      20,
+      f,
+      proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
+    );
+  }
   f = message.getAgentPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      18,
+      21,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -36490,14 +38788,14 @@ proto.io.bisq.protobuffer.Dispute.serializeBinaryToWriter = function(message, wr
   f = message.getIsSupportTicket();
   if (f) {
     writer.writeBool(
-      19,
+      22,
       f
     );
   }
   f = message.getChatMessageList();
   if (f.length > 0) {
     writer.writeRepeatedMessage(
-      20,
+      23,
       f,
       proto.io.bisq.protobuffer.ChatMessage.serializeBinaryToWriter
     );
@@ -36505,14 +38803,14 @@ proto.io.bisq.protobuffer.Dispute.serializeBinaryToWriter = function(message, wr
   f = message.getIsClosed();
   if (f) {
     writer.writeBool(
-      21,
+      24,
       f
     );
   }
   f = message.getDisputeResult();
   if (f != null) {
     writer.writeMessage(
-      22,
+      25,
       f,
       proto.io.bisq.protobuffer.DisputeResult.serializeBinaryToWriter
     );
@@ -36520,62 +38818,55 @@ proto.io.bisq.protobuffer.Dispute.serializeBinaryToWriter = function(message, wr
   f = message.getDisputePayoutTxId();
   if (f.length > 0) {
     writer.writeString(
-      23,
+      26,
       f
     );
   }
   f = message.getSupportType();
   if (f !== 0.0) {
     writer.writeEnum(
-      24,
+      27,
       f
     );
   }
   f = message.getMediatorsDisputeResult();
   if (f.length > 0) {
     writer.writeString(
-      25,
+      28,
       f
     );
   }
   f = message.getDelayedPayoutTxId();
   if (f.length > 0) {
     writer.writeString(
-      26,
+      29,
       f
     );
   }
   f = message.getDonationAddressOfDelayedPayoutTx();
   if (f.length > 0) {
     writer.writeString(
-      27,
+      30,
       f
     );
   }
   f = message.getState();
   if (f !== 0.0) {
     writer.writeEnum(
-      28,
+      31,
       f
     );
   }
   f = message.getTradePeriodEnd();
   if (f !== 0) {
     writer.writeInt64(
-      29,
+      32,
       f
     );
   }
   f = message.getExtraDataMap(true);
   if (f && f.getLength() > 0) {
-    f.serializeBinary(30, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
-  }
-  f = message.getIsOpener();
-  if (f) {
-    writer.writeBool(
-      100,
-      f
-    );
+    f.serializeBinary(33, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
   }
 };
 
@@ -36646,10 +38937,10 @@ proto.io.bisq.protobuffer.Dispute.prototype.setTraderId = function(value) {
 
 
 /**
- * optional bool dispute_opener_is_buyer = 4;
+ * optional bool is_opener = 4;
  * @return {boolean}
  */
-proto.io.bisq.protobuffer.Dispute.prototype.getDisputeOpenerIsBuyer = function() {
+proto.io.bisq.protobuffer.Dispute.prototype.getIsOpener = function() {
   return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 4, false));
 };
 
@@ -36658,16 +38949,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.getDisputeOpenerIsBuyer = function()
  * @param {boolean} value
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
-proto.io.bisq.protobuffer.Dispute.prototype.setDisputeOpenerIsBuyer = function(value) {
+proto.io.bisq.protobuffer.Dispute.prototype.setIsOpener = function(value) {
   return jspb.Message.setProto3BooleanField(this, 4, value);
 };
 
 
 /**
- * optional bool dispute_opener_is_maker = 5;
+ * optional bool dispute_opener_is_buyer = 5;
  * @return {boolean}
  */
-proto.io.bisq.protobuffer.Dispute.prototype.getDisputeOpenerIsMaker = function() {
+proto.io.bisq.protobuffer.Dispute.prototype.getDisputeOpenerIsBuyer = function() {
   return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 5, false));
 };
 
@@ -36676,17 +38967,35 @@ proto.io.bisq.protobuffer.Dispute.prototype.getDisputeOpenerIsMaker = function()
  * @param {boolean} value
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
-proto.io.bisq.protobuffer.Dispute.prototype.setDisputeOpenerIsMaker = function(value) {
+proto.io.bisq.protobuffer.Dispute.prototype.setDisputeOpenerIsBuyer = function(value) {
   return jspb.Message.setProto3BooleanField(this, 5, value);
 };
 
 
 /**
- * optional int64 opening_date = 6;
+ * optional bool dispute_opener_is_maker = 6;
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.getDisputeOpenerIsMaker = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 6, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.setDisputeOpenerIsMaker = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 6, value);
+};
+
+
+/**
+ * optional int64 opening_date = 7;
  * @return {number}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getOpeningDate = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
 };
 
 
@@ -36695,17 +39004,17 @@ proto.io.bisq.protobuffer.Dispute.prototype.getOpeningDate = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setOpeningDate = function(value) {
-  return jspb.Message.setProto3IntField(this, 6, value);
+  return jspb.Message.setProto3IntField(this, 7, value);
 };
 
 
 /**
- * optional PubKeyRing trader_pub_key_ring = 7;
+ * optional PubKeyRing trader_pub_key_ring = 8;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getTraderPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 7));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 8));
 };
 
 
@@ -36714,7 +39023,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getTraderPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
 */
 proto.io.bisq.protobuffer.Dispute.prototype.setTraderPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 7, value);
+  return jspb.Message.setWrapperField(this, 8, value);
 };
 
 
@@ -36732,16 +39041,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.clearTraderPubKeyRing = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.hasTraderPubKeyRing = function() {
-  return jspb.Message.getField(this, 7) != null;
+  return jspb.Message.getField(this, 8) != null;
 };
 
 
 /**
- * optional int64 trade_date = 8;
+ * optional int64 trade_date = 9;
  * @return {number}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getTradeDate = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 8, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 9, 0));
 };
 
 
@@ -36750,17 +39059,17 @@ proto.io.bisq.protobuffer.Dispute.prototype.getTradeDate = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setTradeDate = function(value) {
-  return jspb.Message.setProto3IntField(this, 8, value);
+  return jspb.Message.setProto3IntField(this, 9, value);
 };
 
 
 /**
- * optional Contract contract = 9;
+ * optional Contract contract = 10;
  * @return {?proto.io.bisq.protobuffer.Contract}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getContract = function() {
   return /** @type{?proto.io.bisq.protobuffer.Contract} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.Contract, 9));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.Contract, 10));
 };
 
 
@@ -36769,7 +39078,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getContract = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
 */
 proto.io.bisq.protobuffer.Dispute.prototype.setContract = function(value) {
-  return jspb.Message.setWrapperField(this, 9, value);
+  return jspb.Message.setWrapperField(this, 10, value);
 };
 
 
@@ -36787,21 +39096,21 @@ proto.io.bisq.protobuffer.Dispute.prototype.clearContract = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.hasContract = function() {
-  return jspb.Message.getField(this, 9) != null;
+  return jspb.Message.getField(this, 10) != null;
 };
 
 
 /**
- * optional bytes contract_hash = 10;
+ * optional bytes contract_hash = 11;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getContractHash = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
 };
 
 
 /**
- * optional bytes contract_hash = 10;
+ * optional bytes contract_hash = 11;
  * This is a type-conversion wrapper around `getContractHash()`
  * @return {string}
  */
@@ -36812,7 +39121,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getContractHash_asB64 = function() {
 
 
 /**
- * optional bytes contract_hash = 10;
+ * optional bytes contract_hash = 11;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getContractHash()`
@@ -36829,21 +39138,21 @@ proto.io.bisq.protobuffer.Dispute.prototype.getContractHash_asU8 = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setContractHash = function(value) {
-  return jspb.Message.setProto3BytesField(this, 10, value);
+  return jspb.Message.setProto3BytesField(this, 11, value);
 };
 
 
 /**
- * optional bytes deposit_tx_serialized = 11;
+ * optional bytes deposit_tx_serialized = 12;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getDepositTxSerialized = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, ""));
 };
 
 
 /**
- * optional bytes deposit_tx_serialized = 11;
+ * optional bytes deposit_tx_serialized = 12;
  * This is a type-conversion wrapper around `getDepositTxSerialized()`
  * @return {string}
  */
@@ -36854,7 +39163,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getDepositTxSerialized_asB64 = funct
 
 
 /**
- * optional bytes deposit_tx_serialized = 11;
+ * optional bytes deposit_tx_serialized = 12;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getDepositTxSerialized()`
@@ -36871,21 +39180,21 @@ proto.io.bisq.protobuffer.Dispute.prototype.getDepositTxSerialized_asU8 = functi
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setDepositTxSerialized = function(value) {
-  return jspb.Message.setProto3BytesField(this, 11, value);
+  return jspb.Message.setProto3BytesField(this, 12, value);
 };
 
 
 /**
- * optional bytes payout_tx_serialized = 12;
+ * optional bytes payout_tx_serialized = 13;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getPayoutTxSerialized = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, ""));
 };
 
 
 /**
- * optional bytes payout_tx_serialized = 12;
+ * optional bytes payout_tx_serialized = 13;
  * This is a type-conversion wrapper around `getPayoutTxSerialized()`
  * @return {string}
  */
@@ -36896,7 +39205,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getPayoutTxSerialized_asB64 = functi
 
 
 /**
- * optional bytes payout_tx_serialized = 12;
+ * optional bytes payout_tx_serialized = 13;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getPayoutTxSerialized()`
@@ -36913,33 +39222,15 @@ proto.io.bisq.protobuffer.Dispute.prototype.getPayoutTxSerialized_asU8 = functio
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setPayoutTxSerialized = function(value) {
-  return jspb.Message.setProto3BytesField(this, 12, value);
+  return jspb.Message.setProto3BytesField(this, 13, value);
 };
 
 
 /**
- * optional string deposit_tx_id = 13;
+ * optional string deposit_tx_id = 14;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getDepositTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.Dispute} returns this
- */
-proto.io.bisq.protobuffer.Dispute.prototype.setDepositTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 13, value);
-};
-
-
-/**
- * optional string payout_tx_id = 14;
- * @return {string}
- */
-proto.io.bisq.protobuffer.Dispute.prototype.getPayoutTxId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 14, ""));
 };
 
@@ -36948,16 +39239,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.getPayoutTxId = function() {
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
-proto.io.bisq.protobuffer.Dispute.prototype.setPayoutTxId = function(value) {
+proto.io.bisq.protobuffer.Dispute.prototype.setDepositTxId = function(value) {
   return jspb.Message.setProto3StringField(this, 14, value);
 };
 
 
 /**
- * optional string contract_as_json = 15;
+ * optional string payout_tx_id = 15;
  * @return {string}
  */
-proto.io.bisq.protobuffer.Dispute.prototype.getContractAsJson = function() {
+proto.io.bisq.protobuffer.Dispute.prototype.getPayoutTxId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
 };
 
@@ -36966,16 +39257,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.getContractAsJson = function() {
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
-proto.io.bisq.protobuffer.Dispute.prototype.setContractAsJson = function(value) {
+proto.io.bisq.protobuffer.Dispute.prototype.setPayoutTxId = function(value) {
   return jspb.Message.setProto3StringField(this, 15, value);
 };
 
 
 /**
- * optional string maker_contract_signature = 16;
+ * optional string contract_as_json = 16;
  * @return {string}
  */
-proto.io.bisq.protobuffer.Dispute.prototype.getMakerContractSignature = function() {
+proto.io.bisq.protobuffer.Dispute.prototype.getContractAsJson = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
 };
 
@@ -36984,16 +39275,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.getMakerContractSignature = function
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
-proto.io.bisq.protobuffer.Dispute.prototype.setMakerContractSignature = function(value) {
+proto.io.bisq.protobuffer.Dispute.prototype.setContractAsJson = function(value) {
   return jspb.Message.setProto3StringField(this, 16, value);
 };
 
 
 /**
- * optional string taker_contract_signature = 17;
+ * optional string maker_contract_signature = 17;
  * @return {string}
  */
-proto.io.bisq.protobuffer.Dispute.prototype.getTakerContractSignature = function() {
+proto.io.bisq.protobuffer.Dispute.prototype.getMakerContractSignature = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 17, ""));
 };
 
@@ -37002,18 +39293,110 @@ proto.io.bisq.protobuffer.Dispute.prototype.getTakerContractSignature = function
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
-proto.io.bisq.protobuffer.Dispute.prototype.setTakerContractSignature = function(value) {
+proto.io.bisq.protobuffer.Dispute.prototype.setMakerContractSignature = function(value) {
   return jspb.Message.setProto3StringField(this, 17, value);
 };
 
 
 /**
- * optional PubKeyRing agent_pub_key_ring = 18;
+ * optional string taker_contract_signature = 18;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.getTakerContractSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.setTakerContractSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 18, value);
+};
+
+
+/**
+ * optional PaymentAccountPayload maker_payment_account_payload = 19;
+ * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.getMakerPaymentAccountPayload = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 19));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PaymentAccountPayload|undefined} value
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+*/
+proto.io.bisq.protobuffer.Dispute.prototype.setMakerPaymentAccountPayload = function(value) {
+  return jspb.Message.setWrapperField(this, 19, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.clearMakerPaymentAccountPayload = function() {
+  return this.setMakerPaymentAccountPayload(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.hasMakerPaymentAccountPayload = function() {
+  return jspb.Message.getField(this, 19) != null;
+};
+
+
+/**
+ * optional PaymentAccountPayload taker_payment_account_payload = 20;
+ * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.getTakerPaymentAccountPayload = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 20));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PaymentAccountPayload|undefined} value
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+*/
+proto.io.bisq.protobuffer.Dispute.prototype.setTakerPaymentAccountPayload = function(value) {
+  return jspb.Message.setWrapperField(this, 20, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.clearTakerPaymentAccountPayload = function() {
+  return this.setTakerPaymentAccountPayload(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.hasTakerPaymentAccountPayload = function() {
+  return jspb.Message.getField(this, 20) != null;
+};
+
+
+/**
+ * optional PubKeyRing agent_pub_key_ring = 21;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getAgentPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 18));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 21));
 };
 
 
@@ -37022,7 +39405,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getAgentPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
 */
 proto.io.bisq.protobuffer.Dispute.prototype.setAgentPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 18, value);
+  return jspb.Message.setWrapperField(this, 21, value);
 };
 
 
@@ -37040,16 +39423,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.clearAgentPubKeyRing = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.hasAgentPubKeyRing = function() {
-  return jspb.Message.getField(this, 18) != null;
+  return jspb.Message.getField(this, 21) != null;
 };
 
 
 /**
- * optional bool is_support_ticket = 19;
+ * optional bool is_support_ticket = 22;
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getIsSupportTicket = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 19, false));
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 22, false));
 };
 
 
@@ -37058,17 +39441,17 @@ proto.io.bisq.protobuffer.Dispute.prototype.getIsSupportTicket = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setIsSupportTicket = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 19, value);
+  return jspb.Message.setProto3BooleanField(this, 22, value);
 };
 
 
 /**
- * repeated ChatMessage chat_message = 20;
+ * repeated ChatMessage chat_message = 23;
  * @return {!Array<!proto.io.bisq.protobuffer.ChatMessage>}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getChatMessageList = function() {
   return /** @type{!Array<!proto.io.bisq.protobuffer.ChatMessage>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.ChatMessage, 20));
+    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.ChatMessage, 23));
 };
 
 
@@ -37077,7 +39460,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getChatMessageList = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
 */
 proto.io.bisq.protobuffer.Dispute.prototype.setChatMessageList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 20, value);
+  return jspb.Message.setRepeatedWrapperField(this, 23, value);
 };
 
 
@@ -37087,7 +39470,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.setChatMessageList = function(value)
  * @return {!proto.io.bisq.protobuffer.ChatMessage}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.addChatMessage = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.io.bisq.protobuffer.ChatMessage, opt_index);
+  return jspb.Message.addToRepeatedWrapperField(this, 23, opt_value, proto.io.bisq.protobuffer.ChatMessage, opt_index);
 };
 
 
@@ -37101,11 +39484,11 @@ proto.io.bisq.protobuffer.Dispute.prototype.clearChatMessageList = function() {
 
 
 /**
- * optional bool is_closed = 21;
+ * optional bool is_closed = 24;
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getIsClosed = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 21, false));
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 24, false));
 };
 
 
@@ -37114,17 +39497,17 @@ proto.io.bisq.protobuffer.Dispute.prototype.getIsClosed = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setIsClosed = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 21, value);
+  return jspb.Message.setProto3BooleanField(this, 24, value);
 };
 
 
 /**
- * optional DisputeResult dispute_result = 22;
+ * optional DisputeResult dispute_result = 25;
  * @return {?proto.io.bisq.protobuffer.DisputeResult}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getDisputeResult = function() {
   return /** @type{?proto.io.bisq.protobuffer.DisputeResult} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.DisputeResult, 22));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.DisputeResult, 25));
 };
 
 
@@ -37133,7 +39516,7 @@ proto.io.bisq.protobuffer.Dispute.prototype.getDisputeResult = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
 */
 proto.io.bisq.protobuffer.Dispute.prototype.setDisputeResult = function(value) {
-  return jspb.Message.setWrapperField(this, 22, value);
+  return jspb.Message.setWrapperField(this, 25, value);
 };
 
 
@@ -37151,69 +39534,15 @@ proto.io.bisq.protobuffer.Dispute.prototype.clearDisputeResult = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.hasDisputeResult = function() {
-  return jspb.Message.getField(this, 22) != null;
+  return jspb.Message.getField(this, 25) != null;
 };
 
 
 /**
- * optional string dispute_payout_tx_id = 23;
+ * optional string dispute_payout_tx_id = 26;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getDisputePayoutTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 23, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.Dispute} returns this
- */
-proto.io.bisq.protobuffer.Dispute.prototype.setDisputePayoutTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 23, value);
-};
-
-
-/**
- * optional SupportType support_type = 24;
- * @return {!proto.io.bisq.protobuffer.SupportType}
- */
-proto.io.bisq.protobuffer.Dispute.prototype.getSupportType = function() {
-  return /** @type {!proto.io.bisq.protobuffer.SupportType} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/**
- * @param {!proto.io.bisq.protobuffer.SupportType} value
- * @return {!proto.io.bisq.protobuffer.Dispute} returns this
- */
-proto.io.bisq.protobuffer.Dispute.prototype.setSupportType = function(value) {
-  return jspb.Message.setProto3EnumField(this, 24, value);
-};
-
-
-/**
- * optional string mediators_dispute_result = 25;
- * @return {string}
- */
-proto.io.bisq.protobuffer.Dispute.prototype.getMediatorsDisputeResult = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 25, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.Dispute} returns this
- */
-proto.io.bisq.protobuffer.Dispute.prototype.setMediatorsDisputeResult = function(value) {
-  return jspb.Message.setProto3StringField(this, 25, value);
-};
-
-
-/**
- * optional string delayed_payout_tx_id = 26;
- * @return {string}
- */
-proto.io.bisq.protobuffer.Dispute.prototype.getDelayedPayoutTxId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 26, ""));
 };
 
@@ -37222,17 +39551,71 @@ proto.io.bisq.protobuffer.Dispute.prototype.getDelayedPayoutTxId = function() {
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
-proto.io.bisq.protobuffer.Dispute.prototype.setDelayedPayoutTxId = function(value) {
+proto.io.bisq.protobuffer.Dispute.prototype.setDisputePayoutTxId = function(value) {
   return jspb.Message.setProto3StringField(this, 26, value);
 };
 
 
 /**
- * optional string donation_address_of_delayed_payout_tx = 27;
+ * optional SupportType support_type = 27;
+ * @return {!proto.io.bisq.protobuffer.SupportType}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.getSupportType = function() {
+  return /** @type {!proto.io.bisq.protobuffer.SupportType} */ (jspb.Message.getFieldWithDefault(this, 27, 0));
+};
+
+
+/**
+ * @param {!proto.io.bisq.protobuffer.SupportType} value
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.setSupportType = function(value) {
+  return jspb.Message.setProto3EnumField(this, 27, value);
+};
+
+
+/**
+ * optional string mediators_dispute_result = 28;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.getMediatorsDisputeResult = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 28, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.setMediatorsDisputeResult = function(value) {
+  return jspb.Message.setProto3StringField(this, 28, value);
+};
+
+
+/**
+ * optional string delayed_payout_tx_id = 29;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.getDelayedPayoutTxId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 29, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.Dispute} returns this
+ */
+proto.io.bisq.protobuffer.Dispute.prototype.setDelayedPayoutTxId = function(value) {
+  return jspb.Message.setProto3StringField(this, 29, value);
+};
+
+
+/**
+ * optional string donation_address_of_delayed_payout_tx = 30;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getDonationAddressOfDelayedPayoutTx = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 27, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 30, ""));
 };
 
 
@@ -37241,16 +39624,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.getDonationAddressOfDelayedPayoutTx
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setDonationAddressOfDelayedPayoutTx = function(value) {
-  return jspb.Message.setProto3StringField(this, 27, value);
+  return jspb.Message.setProto3StringField(this, 30, value);
 };
 
 
 /**
- * optional State state = 28;
+ * optional State state = 31;
  * @return {!proto.io.bisq.protobuffer.Dispute.State}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getState = function() {
-  return /** @type {!proto.io.bisq.protobuffer.Dispute.State} */ (jspb.Message.getFieldWithDefault(this, 28, 0));
+  return /** @type {!proto.io.bisq.protobuffer.Dispute.State} */ (jspb.Message.getFieldWithDefault(this, 31, 0));
 };
 
 
@@ -37259,16 +39642,16 @@ proto.io.bisq.protobuffer.Dispute.prototype.getState = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setState = function(value) {
-  return jspb.Message.setProto3EnumField(this, 28, value);
+  return jspb.Message.setProto3EnumField(this, 31, value);
 };
 
 
 /**
- * optional int64 trade_period_end = 29;
+ * optional int64 trade_period_end = 32;
  * @return {number}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getTradePeriodEnd = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 29, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 32, 0));
 };
 
 
@@ -37277,19 +39660,19 @@ proto.io.bisq.protobuffer.Dispute.prototype.getTradePeriodEnd = function() {
  * @return {!proto.io.bisq.protobuffer.Dispute} returns this
  */
 proto.io.bisq.protobuffer.Dispute.prototype.setTradePeriodEnd = function(value) {
-  return jspb.Message.setProto3IntField(this, 29, value);
+  return jspb.Message.setProto3IntField(this, 32, value);
 };
 
 
 /**
- * map<string, string> extra_data = 30;
+ * map<string, string> extra_data = 33;
  * @param {boolean=} opt_noLazyCreate Do not create the map if
  * empty, instead returning `undefined`
  * @return {!jspb.Map<string,string>}
  */
 proto.io.bisq.protobuffer.Dispute.prototype.getExtraDataMap = function(opt_noLazyCreate) {
   return /** @type {!jspb.Map<string,string>} */ (
-      jspb.Message.getMapField(this, 30, opt_noLazyCreate,
+      jspb.Message.getMapField(this, 33, opt_noLazyCreate,
       null));
 };
 
@@ -37303,24 +39686,6 @@ proto.io.bisq.protobuffer.Dispute.prototype.clearExtraDataMap = function() {
   return this;};
 
 
-/**
- * optional bool is_opener = 100;
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.Dispute.prototype.getIsOpener = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 100, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.io.bisq.protobuffer.Dispute} returns this
- */
-proto.io.bisq.protobuffer.Dispute.prototype.setIsOpener = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 100, value);
-};
-
-
 
 
 
@@ -38196,16 +40561,20 @@ proto.io.bisq.protobuffer.Contract.toObject = function(includeInstance, msg) {
     isBuyerMakerAndSellerTaker: jspb.Message.getBooleanFieldWithDefault(msg, 6, false),
     makerAccountId: jspb.Message.getFieldWithDefault(msg, 7, ""),
     takerAccountId: jspb.Message.getFieldWithDefault(msg, 8, ""),
-    makerPaymentAccountPayload: (f = msg.getMakerPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f),
-    takerPaymentAccountPayload: (f = msg.getTakerPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f),
+    makerPaymentMethodId: jspb.Message.getFieldWithDefault(msg, 9, ""),
+    takerPaymentMethodId: jspb.Message.getFieldWithDefault(msg, 10, ""),
+    makerPaymentAccountPayloadHash: msg.getMakerPaymentAccountPayloadHash_asB64(),
+    takerPaymentAccountPayloadHash: msg.getTakerPaymentAccountPayloadHash_asB64(),
     makerPubKeyRing: (f = msg.getMakerPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
     takerPubKeyRing: (f = msg.getTakerPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
     buyerNodeAddress: (f = msg.getBuyerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     sellerNodeAddress: (f = msg.getSellerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    makerPayoutAddressString: jspb.Message.getFieldWithDefault(msg, 15, ""),
-    takerPayoutAddressString: jspb.Message.getFieldWithDefault(msg, 16, ""),
+    makerPayoutAddressString: jspb.Message.getFieldWithDefault(msg, 17, ""),
+    takerPayoutAddressString: jspb.Message.getFieldWithDefault(msg, 18, ""),
     arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    lockTime: jspb.Message.getFieldWithDefault(msg, 18, 0)
+    lockTime: jspb.Message.getFieldWithDefault(msg, 20, 0),
+    makerDepositTxHash: jspb.Message.getFieldWithDefault(msg, 21, ""),
+    takerDepositTxHash: jspb.Message.getFieldWithDefault(msg, 22, "")
   };
 
   if (includeInstance) {
@@ -38268,52 +40637,66 @@ proto.io.bisq.protobuffer.Contract.deserializeBinaryFromReader = function(msg, r
       msg.setTakerAccountId(value);
       break;
     case 9:
-      var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
-      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
-      msg.setMakerPaymentAccountPayload(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMakerPaymentMethodId(value);
       break;
     case 10:
-      var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
-      reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
-      msg.setTakerPaymentAccountPayload(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTakerPaymentMethodId(value);
       break;
     case 11:
+      var value = /** @type {!Uint8Array} */ (reader.readBytes());
+      msg.setMakerPaymentAccountPayloadHash(value);
+      break;
+    case 12:
+      var value = /** @type {!Uint8Array} */ (reader.readBytes());
+      msg.setTakerPaymentAccountPayloadHash(value);
+      break;
+    case 13:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setMakerPubKeyRing(value);
       break;
-    case 12:
+    case 14:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setTakerPubKeyRing(value);
       break;
-    case 13:
+    case 15:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setBuyerNodeAddress(value);
       break;
-    case 14:
+    case 16:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setSellerNodeAddress(value);
       break;
-    case 15:
+    case 17:
       var value = /** @type {string} */ (reader.readString());
       msg.setMakerPayoutAddressString(value);
       break;
-    case 16:
+    case 18:
       var value = /** @type {string} */ (reader.readString());
       msg.setTakerPayoutAddressString(value);
       break;
-    case 17:
+    case 19:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setArbitratorNodeAddress(value);
       break;
-    case 18:
+    case 20:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setLockTime(value);
       break;
+    case 21:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMakerDepositTxHash(value);
+      break;
+    case 22:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTakerDepositTxHash(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -38386,26 +40769,38 @@ proto.io.bisq.protobuffer.Contract.serializeBinaryToWriter = function(message, w
       f
     );
   }
-  f = message.getMakerPaymentAccountPayload();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getMakerPaymentMethodId();
+  if (f.length > 0) {
+    writer.writeString(
       9,
-      f,
-      proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
+      f
     );
   }
-  f = message.getTakerPaymentAccountPayload();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getTakerPaymentMethodId();
+  if (f.length > 0) {
+    writer.writeString(
       10,
-      f,
-      proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
+      f
+    );
+  }
+  f = message.getMakerPaymentAccountPayloadHash_asU8();
+  if (f.length > 0) {
+    writer.writeBytes(
+      11,
+      f
+    );
+  }
+  f = message.getTakerPaymentAccountPayloadHash_asU8();
+  if (f.length > 0) {
+    writer.writeBytes(
+      12,
+      f
     );
   }
   f = message.getMakerPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      11,
+      13,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -38413,7 +40808,7 @@ proto.io.bisq.protobuffer.Contract.serializeBinaryToWriter = function(message, w
   f = message.getTakerPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      12,
+      14,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -38421,7 +40816,7 @@ proto.io.bisq.protobuffer.Contract.serializeBinaryToWriter = function(message, w
   f = message.getBuyerNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      13,
+      15,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -38429,7 +40824,7 @@ proto.io.bisq.protobuffer.Contract.serializeBinaryToWriter = function(message, w
   f = message.getSellerNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      14,
+      16,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -38437,21 +40832,21 @@ proto.io.bisq.protobuffer.Contract.serializeBinaryToWriter = function(message, w
   f = message.getMakerPayoutAddressString();
   if (f.length > 0) {
     writer.writeString(
-      15,
+      17,
       f
     );
   }
   f = message.getTakerPayoutAddressString();
   if (f.length > 0) {
     writer.writeString(
-      16,
+      18,
       f
     );
   }
   f = message.getArbitratorNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      17,
+      19,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -38459,7 +40854,21 @@ proto.io.bisq.protobuffer.Contract.serializeBinaryToWriter = function(message, w
   f = message.getLockTime();
   if (f !== 0) {
     writer.writeInt64(
-      18,
+      20,
+      f
+    );
+  }
+  f = message.getMakerDepositTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      21,
+      f
+    );
+  }
+  f = message.getTakerDepositTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      22,
       f
     );
   }
@@ -38594,86 +41003,132 @@ proto.io.bisq.protobuffer.Contract.prototype.setTakerAccountId = function(value)
 
 
 /**
- * optional PaymentAccountPayload maker_payment_account_payload = 9;
- * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
+ * optional string maker_payment_method_id = 9;
+ * @return {string}
  */
-proto.io.bisq.protobuffer.Contract.prototype.getMakerPaymentAccountPayload = function() {
-  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 9));
+proto.io.bisq.protobuffer.Contract.prototype.getMakerPaymentMethodId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
 };
 
 
 /**
- * @param {?proto.io.bisq.protobuffer.PaymentAccountPayload|undefined} value
- * @return {!proto.io.bisq.protobuffer.Contract} returns this
-*/
-proto.io.bisq.protobuffer.Contract.prototype.setMakerPaymentAccountPayload = function(value) {
-  return jspb.Message.setWrapperField(this, 9, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
+ * @param {string} value
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
  */
-proto.io.bisq.protobuffer.Contract.prototype.clearMakerPaymentAccountPayload = function() {
-  return this.setMakerPaymentAccountPayload(undefined);
+proto.io.bisq.protobuffer.Contract.prototype.setMakerPaymentMethodId = function(value) {
+  return jspb.Message.setProto3StringField(this, 9, value);
 };
 
 
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * optional string taker_payment_method_id = 10;
+ * @return {string}
  */
-proto.io.bisq.protobuffer.Contract.prototype.hasMakerPaymentAccountPayload = function() {
-  return jspb.Message.getField(this, 9) != null;
+proto.io.bisq.protobuffer.Contract.prototype.getTakerPaymentMethodId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
 };
 
 
 /**
- * optional PaymentAccountPayload taker_payment_account_payload = 10;
- * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
- */
-proto.io.bisq.protobuffer.Contract.prototype.getTakerPaymentAccountPayload = function() {
-  return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 10));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.PaymentAccountPayload|undefined} value
- * @return {!proto.io.bisq.protobuffer.Contract} returns this
-*/
-proto.io.bisq.protobuffer.Contract.prototype.setTakerPaymentAccountPayload = function(value) {
-  return jspb.Message.setWrapperField(this, 10, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
+ * @param {string} value
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
  */
-proto.io.bisq.protobuffer.Contract.prototype.clearTakerPaymentAccountPayload = function() {
-  return this.setTakerPaymentAccountPayload(undefined);
+proto.io.bisq.protobuffer.Contract.prototype.setTakerPaymentMethodId = function(value) {
+  return jspb.Message.setProto3StringField(this, 10, value);
 };
 
 
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * optional bytes maker_payment_account_payload_hash = 11;
+ * @return {string}
  */
-proto.io.bisq.protobuffer.Contract.prototype.hasTakerPaymentAccountPayload = function() {
-  return jspb.Message.getField(this, 10) != null;
+proto.io.bisq.protobuffer.Contract.prototype.getMakerPaymentAccountPayloadHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
 };
 
 
 /**
- * optional PubKeyRing maker_pub_key_ring = 11;
+ * optional bytes maker_payment_account_payload_hash = 11;
+ * This is a type-conversion wrapper around `getMakerPaymentAccountPayloadHash()`
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Contract.prototype.getMakerPaymentAccountPayloadHash_asB64 = function() {
+  return /** @type {string} */ (jspb.Message.bytesAsB64(
+      this.getMakerPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * optional bytes maker_payment_account_payload_hash = 11;
+ * Note that Uint8Array is not supported on all browsers.
+ * @see http://caniuse.com/Uint8Array
+ * This is a type-conversion wrapper around `getMakerPaymentAccountPayloadHash()`
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.Contract.prototype.getMakerPaymentAccountPayloadHash_asU8 = function() {
+  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
+      this.getMakerPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * @param {!(string|Uint8Array)} value
+ * @return {!proto.io.bisq.protobuffer.Contract} returns this
+ */
+proto.io.bisq.protobuffer.Contract.prototype.setMakerPaymentAccountPayloadHash = function(value) {
+  return jspb.Message.setProto3BytesField(this, 11, value);
+};
+
+
+/**
+ * optional bytes taker_payment_account_payload_hash = 12;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Contract.prototype.getTakerPaymentAccountPayloadHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, ""));
+};
+
+
+/**
+ * optional bytes taker_payment_account_payload_hash = 12;
+ * This is a type-conversion wrapper around `getTakerPaymentAccountPayloadHash()`
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Contract.prototype.getTakerPaymentAccountPayloadHash_asB64 = function() {
+  return /** @type {string} */ (jspb.Message.bytesAsB64(
+      this.getTakerPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * optional bytes taker_payment_account_payload_hash = 12;
+ * Note that Uint8Array is not supported on all browsers.
+ * @see http://caniuse.com/Uint8Array
+ * This is a type-conversion wrapper around `getTakerPaymentAccountPayloadHash()`
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.Contract.prototype.getTakerPaymentAccountPayloadHash_asU8 = function() {
+  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
+      this.getTakerPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * @param {!(string|Uint8Array)} value
+ * @return {!proto.io.bisq.protobuffer.Contract} returns this
+ */
+proto.io.bisq.protobuffer.Contract.prototype.setTakerPaymentAccountPayloadHash = function(value) {
+  return jspb.Message.setProto3BytesField(this, 12, value);
+};
+
+
+/**
+ * optional PubKeyRing maker_pub_key_ring = 13;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getMakerPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 11));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 13));
 };
 
 
@@ -38682,7 +41137,7 @@ proto.io.bisq.protobuffer.Contract.prototype.getMakerPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
 */
 proto.io.bisq.protobuffer.Contract.prototype.setMakerPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 11, value);
+  return jspb.Message.setWrapperField(this, 13, value);
 };
 
 
@@ -38700,17 +41155,17 @@ proto.io.bisq.protobuffer.Contract.prototype.clearMakerPubKeyRing = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Contract.prototype.hasMakerPubKeyRing = function() {
-  return jspb.Message.getField(this, 11) != null;
+  return jspb.Message.getField(this, 13) != null;
 };
 
 
 /**
- * optional PubKeyRing taker_pub_key_ring = 12;
+ * optional PubKeyRing taker_pub_key_ring = 14;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getTakerPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 12));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 14));
 };
 
 
@@ -38719,7 +41174,7 @@ proto.io.bisq.protobuffer.Contract.prototype.getTakerPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
 */
 proto.io.bisq.protobuffer.Contract.prototype.setTakerPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 12, value);
+  return jspb.Message.setWrapperField(this, 14, value);
 };
 
 
@@ -38737,17 +41192,17 @@ proto.io.bisq.protobuffer.Contract.prototype.clearTakerPubKeyRing = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Contract.prototype.hasTakerPubKeyRing = function() {
-  return jspb.Message.getField(this, 12) != null;
+  return jspb.Message.getField(this, 14) != null;
 };
 
 
 /**
- * optional NodeAddress buyer_node_address = 13;
+ * optional NodeAddress buyer_node_address = 15;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getBuyerNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 13));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 15));
 };
 
 
@@ -38756,7 +41211,7 @@ proto.io.bisq.protobuffer.Contract.prototype.getBuyerNodeAddress = function() {
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
 */
 proto.io.bisq.protobuffer.Contract.prototype.setBuyerNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 13, value);
+  return jspb.Message.setWrapperField(this, 15, value);
 };
 
 
@@ -38774,17 +41229,17 @@ proto.io.bisq.protobuffer.Contract.prototype.clearBuyerNodeAddress = function()
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Contract.prototype.hasBuyerNodeAddress = function() {
-  return jspb.Message.getField(this, 13) != null;
+  return jspb.Message.getField(this, 15) != null;
 };
 
 
 /**
- * optional NodeAddress seller_node_address = 14;
+ * optional NodeAddress seller_node_address = 16;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getSellerNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 14));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 16));
 };
 
 
@@ -38793,7 +41248,7 @@ proto.io.bisq.protobuffer.Contract.prototype.getSellerNodeAddress = function() {
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
 */
 proto.io.bisq.protobuffer.Contract.prototype.setSellerNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 14, value);
+  return jspb.Message.setWrapperField(this, 16, value);
 };
 
 
@@ -38811,16 +41266,16 @@ proto.io.bisq.protobuffer.Contract.prototype.clearSellerNodeAddress = function()
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Contract.prototype.hasSellerNodeAddress = function() {
-  return jspb.Message.getField(this, 14) != null;
+  return jspb.Message.getField(this, 16) != null;
 };
 
 
 /**
- * optional string maker_payout_address_string = 15;
+ * optional string maker_payout_address_string = 17;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getMakerPayoutAddressString = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 17, ""));
 };
 
 
@@ -38829,16 +41284,16 @@ proto.io.bisq.protobuffer.Contract.prototype.getMakerPayoutAddressString = funct
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
  */
 proto.io.bisq.protobuffer.Contract.prototype.setMakerPayoutAddressString = function(value) {
-  return jspb.Message.setProto3StringField(this, 15, value);
+  return jspb.Message.setProto3StringField(this, 17, value);
 };
 
 
 /**
- * optional string taker_payout_address_string = 16;
+ * optional string taker_payout_address_string = 18;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getTakerPayoutAddressString = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, ""));
 };
 
 
@@ -38847,17 +41302,17 @@ proto.io.bisq.protobuffer.Contract.prototype.getTakerPayoutAddressString = funct
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
  */
 proto.io.bisq.protobuffer.Contract.prototype.setTakerPayoutAddressString = function(value) {
-  return jspb.Message.setProto3StringField(this, 16, value);
+  return jspb.Message.setProto3StringField(this, 18, value);
 };
 
 
 /**
- * optional NodeAddress arbitrator_node_address = 17;
+ * optional NodeAddress arbitrator_node_address = 19;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getArbitratorNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 17));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 19));
 };
 
 
@@ -38866,7 +41321,7 @@ proto.io.bisq.protobuffer.Contract.prototype.getArbitratorNodeAddress = function
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
 */
 proto.io.bisq.protobuffer.Contract.prototype.setArbitratorNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 17, value);
+  return jspb.Message.setWrapperField(this, 19, value);
 };
 
 
@@ -38884,16 +41339,16 @@ proto.io.bisq.protobuffer.Contract.prototype.clearArbitratorNodeAddress = functi
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Contract.prototype.hasArbitratorNodeAddress = function() {
-  return jspb.Message.getField(this, 17) != null;
+  return jspb.Message.getField(this, 19) != null;
 };
 
 
 /**
- * optional int64 lock_time = 18;
+ * optional int64 lock_time = 20;
  * @return {number}
  */
 proto.io.bisq.protobuffer.Contract.prototype.getLockTime = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 18, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
 };
 
 
@@ -38902,7 +41357,43 @@ proto.io.bisq.protobuffer.Contract.prototype.getLockTime = function() {
  * @return {!proto.io.bisq.protobuffer.Contract} returns this
  */
 proto.io.bisq.protobuffer.Contract.prototype.setLockTime = function(value) {
-  return jspb.Message.setProto3IntField(this, 18, value);
+  return jspb.Message.setProto3IntField(this, 20, value);
+};
+
+
+/**
+ * optional string maker_deposit_tx_hash = 21;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Contract.prototype.getMakerDepositTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 21, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.Contract} returns this
+ */
+proto.io.bisq.protobuffer.Contract.prototype.setMakerDepositTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 21, value);
+};
+
+
+/**
+ * optional string taker_deposit_tx_hash = 22;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.Contract.prototype.getTakerDepositTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 22, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.Contract} returns this
+ */
+proto.io.bisq.protobuffer.Contract.prototype.setTakerDepositTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 22, value);
 };
 
 
@@ -47798,7 +50289,7 @@ proto.io.bisq.protobuffer.TransferwiseAccountPayload.prototype.setEmail = functi
  * @private {!Array<!Array<number>>}
  * @const
  */
-proto.io.bisq.protobuffer.PersistableEnvelope.oneofGroups_ = [[1,2,3,4,5,6,8,9,10,11,13,14,16,17,18,19,20,21,22,24,25,26,27,28,29,30,31,32,33,34,100]];
+proto.io.bisq.protobuffer.PersistableEnvelope.oneofGroups_ = [[1,2,3,4,5,6,8,9,10,11,13,14,16,17,18,19,20,21,22,24,25,26,27,28,29,30,31,32,33,34,1001,1002]];
 
 /**
  * @enum {number}
@@ -47835,7 +50326,8 @@ proto.io.bisq.protobuffer.PersistableEnvelope.MessageCase = {
   MAILBOX_MESSAGE_LIST: 32,
   IGNORED_MAILBOX_MAP: 33,
   REMOVED_PAYLOADS_MAP: 34,
-  XMR_ADDRESS_ENTRY_LIST: 100
+  XMR_ADDRESS_ENTRY_LIST: 1001,
+  SIGNED_OFFER_LIST: 1002
 };
 
 /**
@@ -47906,7 +50398,8 @@ proto.io.bisq.protobuffer.PersistableEnvelope.toObject = function(includeInstanc
     mailboxMessageList: (f = msg.getMailboxMessageList()) && proto.io.bisq.protobuffer.MailboxMessageList.toObject(includeInstance, f),
     ignoredMailboxMap: (f = msg.getIgnoredMailboxMap()) && proto.io.bisq.protobuffer.IgnoredMailboxMap.toObject(includeInstance, f),
     removedPayloadsMap: (f = msg.getRemovedPayloadsMap()) && proto.io.bisq.protobuffer.RemovedPayloadsMap.toObject(includeInstance, f),
-    xmrAddressEntryList: (f = msg.getXmrAddressEntryList()) && proto.io.bisq.protobuffer.XmrAddressEntryList.toObject(includeInstance, f)
+    xmrAddressEntryList: (f = msg.getXmrAddressEntryList()) && proto.io.bisq.protobuffer.XmrAddressEntryList.toObject(includeInstance, f),
+    signedOfferList: (f = msg.getSignedOfferList()) && proto.io.bisq.protobuffer.SignedOfferList.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -48093,11 +50586,16 @@ proto.io.bisq.protobuffer.PersistableEnvelope.deserializeBinaryFromReader = func
       reader.readMessage(value,proto.io.bisq.protobuffer.RemovedPayloadsMap.deserializeBinaryFromReader);
       msg.setRemovedPayloadsMap(value);
       break;
-    case 100:
+    case 1001:
       var value = new proto.io.bisq.protobuffer.XmrAddressEntryList;
       reader.readMessage(value,proto.io.bisq.protobuffer.XmrAddressEntryList.deserializeBinaryFromReader);
       msg.setXmrAddressEntryList(value);
       break;
+    case 1002:
+      var value = new proto.io.bisq.protobuffer.SignedOfferList;
+      reader.readMessage(value,proto.io.bisq.protobuffer.SignedOfferList.deserializeBinaryFromReader);
+      msg.setSignedOfferList(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -48370,11 +50868,19 @@ proto.io.bisq.protobuffer.PersistableEnvelope.serializeBinaryToWriter = function
   f = message.getXmrAddressEntryList();
   if (f != null) {
     writer.writeMessage(
-      100,
+      1001,
       f,
       proto.io.bisq.protobuffer.XmrAddressEntryList.serializeBinaryToWriter
     );
   }
+  f = message.getSignedOfferList();
+  if (f != null) {
+    writer.writeMessage(
+      1002,
+      f,
+      proto.io.bisq.protobuffer.SignedOfferList.serializeBinaryToWriter
+    );
+  }
 };
 
 
@@ -49489,12 +51995,12 @@ proto.io.bisq.protobuffer.PersistableEnvelope.prototype.hasRemovedPayloadsMap =
 
 
 /**
- * optional XmrAddressEntryList xmr_address_entry_list = 100;
+ * optional XmrAddressEntryList xmr_address_entry_list = 1001;
  * @return {?proto.io.bisq.protobuffer.XmrAddressEntryList}
  */
 proto.io.bisq.protobuffer.PersistableEnvelope.prototype.getXmrAddressEntryList = function() {
   return /** @type{?proto.io.bisq.protobuffer.XmrAddressEntryList} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.XmrAddressEntryList, 100));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.XmrAddressEntryList, 1001));
 };
 
 
@@ -49503,7 +52009,7 @@ proto.io.bisq.protobuffer.PersistableEnvelope.prototype.getXmrAddressEntryList =
  * @return {!proto.io.bisq.protobuffer.PersistableEnvelope} returns this
 */
 proto.io.bisq.protobuffer.PersistableEnvelope.prototype.setXmrAddressEntryList = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 100, proto.io.bisq.protobuffer.PersistableEnvelope.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 1001, proto.io.bisq.protobuffer.PersistableEnvelope.oneofGroups_[0], value);
 };
 
 
@@ -49521,7 +52027,44 @@ proto.io.bisq.protobuffer.PersistableEnvelope.prototype.clearXmrAddressEntryList
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.PersistableEnvelope.prototype.hasXmrAddressEntryList = function() {
-  return jspb.Message.getField(this, 100) != null;
+  return jspb.Message.getField(this, 1001) != null;
+};
+
+
+/**
+ * optional SignedOfferList signed_offer_list = 1002;
+ * @return {?proto.io.bisq.protobuffer.SignedOfferList}
+ */
+proto.io.bisq.protobuffer.PersistableEnvelope.prototype.getSignedOfferList = function() {
+  return /** @type{?proto.io.bisq.protobuffer.SignedOfferList} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.SignedOfferList, 1002));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.SignedOfferList|undefined} value
+ * @return {!proto.io.bisq.protobuffer.PersistableEnvelope} returns this
+*/
+proto.io.bisq.protobuffer.PersistableEnvelope.prototype.setSignedOfferList = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1002, proto.io.bisq.protobuffer.PersistableEnvelope.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.PersistableEnvelope} returns this
+ */
+proto.io.bisq.protobuffer.PersistableEnvelope.prototype.clearSignedOfferList = function() {
+  return this.setSignedOfferList(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.PersistableEnvelope.prototype.hasSignedOfferList = function() {
+  return jspb.Message.getField(this, 1002) != null;
 };
 
 
@@ -51827,7 +54370,7 @@ proto.io.bisq.protobuffer.XmrAddressEntry.prototype.toObject = function(opt_incl
  */
 proto.io.bisq.protobuffer.XmrAddressEntry.toObject = function(includeInstance, msg) {
   var f, obj = {
-    accountIndex: jspb.Message.getFieldWithDefault(msg, 7, 0),
+    subaddressIndex: jspb.Message.getFieldWithDefault(msg, 7, 0),
     addressString: jspb.Message.getFieldWithDefault(msg, 8, ""),
     offerId: jspb.Message.getFieldWithDefault(msg, 9, ""),
     context: jspb.Message.getFieldWithDefault(msg, 10, 0),
@@ -51870,7 +54413,7 @@ proto.io.bisq.protobuffer.XmrAddressEntry.deserializeBinaryFromReader = function
     switch (field) {
     case 7:
       var value = /** @type {number} */ (reader.readInt32());
-      msg.setAccountIndex(value);
+      msg.setSubaddressIndex(value);
       break;
     case 8:
       var value = /** @type {string} */ (reader.readString());
@@ -51917,7 +54460,7 @@ proto.io.bisq.protobuffer.XmrAddressEntry.prototype.serializeBinary = function()
  */
 proto.io.bisq.protobuffer.XmrAddressEntry.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getAccountIndex();
+  f = message.getSubaddressIndex();
   if (f !== 0) {
     writer.writeInt32(
       7,
@@ -51969,10 +54512,10 @@ proto.io.bisq.protobuffer.XmrAddressEntry.Context = {
 };
 
 /**
- * optional int32 account_index = 7;
+ * optional int32 subaddress_index = 7;
  * @return {number}
  */
-proto.io.bisq.protobuffer.XmrAddressEntry.prototype.getAccountIndex = function() {
+proto.io.bisq.protobuffer.XmrAddressEntry.prototype.getSubaddressIndex = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
 };
 
@@ -51981,7 +54524,7 @@ proto.io.bisq.protobuffer.XmrAddressEntry.prototype.getAccountIndex = function()
  * @param {number} value
  * @return {!proto.io.bisq.protobuffer.XmrAddressEntry} returns this
  */
-proto.io.bisq.protobuffer.XmrAddressEntry.prototype.setAccountIndex = function(value) {
+proto.io.bisq.protobuffer.XmrAddressEntry.prototype.setSubaddressIndex = function(value) {
   return jspb.Message.setProto3IntField(this, 7, value);
 };
 
@@ -52699,6 +55242,393 @@ proto.io.bisq.protobuffer.Offer.prototype.hasOfferPayload = function() {
 
 
 
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.io.bisq.protobuffer.SignedOfferList.repeatedFields_ = [1];
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.SignedOfferList.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.SignedOfferList.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.SignedOfferList} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignedOfferList.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    signedOfferList: jspb.Message.toObjectList(msg.getSignedOfferList(),
+    proto.io.bisq.protobuffer.SignedOffer.toObject, includeInstance)
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.SignedOfferList}
+ */
+proto.io.bisq.protobuffer.SignedOfferList.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.SignedOfferList;
+  return proto.io.bisq.protobuffer.SignedOfferList.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.SignedOfferList} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.SignedOfferList}
+ */
+proto.io.bisq.protobuffer.SignedOfferList.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = new proto.io.bisq.protobuffer.SignedOffer;
+      reader.readMessage(value,proto.io.bisq.protobuffer.SignedOffer.deserializeBinaryFromReader);
+      msg.addSignedOffer(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.SignedOfferList.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.SignedOfferList.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.SignedOfferList} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignedOfferList.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getSignedOfferList();
+  if (f.length > 0) {
+    writer.writeRepeatedMessage(
+      1,
+      f,
+      proto.io.bisq.protobuffer.SignedOffer.serializeBinaryToWriter
+    );
+  }
+};
+
+
+/**
+ * repeated SignedOffer signed_offer = 1;
+ * @return {!Array<!proto.io.bisq.protobuffer.SignedOffer>}
+ */
+proto.io.bisq.protobuffer.SignedOfferList.prototype.getSignedOfferList = function() {
+  return /** @type{!Array<!proto.io.bisq.protobuffer.SignedOffer>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.SignedOffer, 1));
+};
+
+
+/**
+ * @param {!Array<!proto.io.bisq.protobuffer.SignedOffer>} value
+ * @return {!proto.io.bisq.protobuffer.SignedOfferList} returns this
+*/
+proto.io.bisq.protobuffer.SignedOfferList.prototype.setSignedOfferList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 1, value);
+};
+
+
+/**
+ * @param {!proto.io.bisq.protobuffer.SignedOffer=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.io.bisq.protobuffer.SignedOffer}
+ */
+proto.io.bisq.protobuffer.SignedOfferList.prototype.addSignedOffer = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.io.bisq.protobuffer.SignedOffer, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.io.bisq.protobuffer.SignedOfferList} returns this
+ */
+proto.io.bisq.protobuffer.SignedOfferList.prototype.clearSignedOfferList = function() {
+  return this.setSignedOfferList([]);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.bisq.protobuffer.SignedOffer.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.io.bisq.protobuffer.SignedOffer} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignedOffer.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    offerId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    reserveTxHash: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    reserveTxHex: jspb.Message.getFieldWithDefault(msg, 3, ""),
+    arbitratorSignature: jspb.Message.getFieldWithDefault(msg, 4, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.io.bisq.protobuffer.SignedOffer}
+ */
+proto.io.bisq.protobuffer.SignedOffer.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.bisq.protobuffer.SignedOffer;
+  return proto.io.bisq.protobuffer.SignedOffer.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.bisq.protobuffer.SignedOffer} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.bisq.protobuffer.SignedOffer}
+ */
+proto.io.bisq.protobuffer.SignedOffer.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setOfferId(value);
+      break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxHash(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxHex(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setArbitratorSignature(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.bisq.protobuffer.SignedOffer.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.io.bisq.protobuffer.SignedOffer} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.bisq.protobuffer.SignedOffer.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getOfferId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getReserveTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getReserveTxHex();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
+    );
+  }
+  f = message.getArbitratorSignature();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string offer_id = 1;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.getOfferId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignedOffer} returns this
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.setOfferId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional string reserve_tx_hash = 2;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.getReserveTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignedOffer} returns this
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.setReserveTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
+/**
+ * optional string reserve_tx_hex = 3;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.getReserveTxHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignedOffer} returns this
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.setReserveTxHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
+};
+
+
+/**
+ * optional string arbitrator_signature = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.getArbitratorSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.SignedOffer} returns this
+ */
+proto.io.bisq.protobuffer.SignedOffer.prototype.setArbitratorSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
+
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.io.bisq.protobuffer.OpenOffer.repeatedFields_ = [5];
+
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -52733,9 +55663,8 @@ proto.io.bisq.protobuffer.OpenOffer.toObject = function(includeInstance, msg) {
     offer: (f = msg.getOffer()) && proto.io.bisq.protobuffer.Offer.toObject(includeInstance, f),
     state: jspb.Message.getFieldWithDefault(msg, 2, 0),
     arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    mediatorNodeAddress: (f = msg.getMediatorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    refundAgentNodeAddress: (f = msg.getRefundAgentNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    triggerPrice: jspb.Message.getFieldWithDefault(msg, 6, 0)
+    triggerPrice: jspb.Message.getFieldWithDefault(msg, 4, 0),
+    frozenKeyImagesList: (f = jspb.Message.getRepeatedField(msg, 5)) == null ? undefined : f
   };
 
   if (includeInstance) {
@@ -52787,19 +55716,13 @@ proto.io.bisq.protobuffer.OpenOffer.deserializeBinaryFromReader = function(msg,
       msg.setArbitratorNodeAddress(value);
       break;
     case 4:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setMediatorNodeAddress(value);
-      break;
-    case 5:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setRefundAgentNodeAddress(value);
-      break;
-    case 6:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setTriggerPrice(value);
       break;
+    case 5:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addFrozenKeyImages(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -52852,26 +55775,17 @@ proto.io.bisq.protobuffer.OpenOffer.serializeBinaryToWriter = function(message,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
   }
-  f = message.getMediatorNodeAddress();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
-    );
-  }
-  f = message.getRefundAgentNodeAddress();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
-    );
-  }
   f = message.getTriggerPrice();
   if (f !== 0) {
     writer.writeInt64(
-      6,
+      4,
+      f
+    );
+  }
+  f = message.getFrozenKeyImagesList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      5,
       f
     );
   }
@@ -52983,85 +55897,11 @@ proto.io.bisq.protobuffer.OpenOffer.prototype.hasArbitratorNodeAddress = functio
 
 
 /**
- * optional NodeAddress mediator_node_address = 4;
- * @return {?proto.io.bisq.protobuffer.NodeAddress}
- */
-proto.io.bisq.protobuffer.OpenOffer.prototype.getMediatorNodeAddress = function() {
-  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 4));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
- * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
-*/
-proto.io.bisq.protobuffer.OpenOffer.prototype.setMediatorNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
- */
-proto.io.bisq.protobuffer.OpenOffer.prototype.clearMediatorNodeAddress = function() {
-  return this.setMediatorNodeAddress(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.OpenOffer.prototype.hasMediatorNodeAddress = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
-/**
- * optional NodeAddress refund_agent_node_address = 5;
- * @return {?proto.io.bisq.protobuffer.NodeAddress}
- */
-proto.io.bisq.protobuffer.OpenOffer.prototype.getRefundAgentNodeAddress = function() {
-  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 5));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
- * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
-*/
-proto.io.bisq.protobuffer.OpenOffer.prototype.setRefundAgentNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
- */
-proto.io.bisq.protobuffer.OpenOffer.prototype.clearRefundAgentNodeAddress = function() {
-  return this.setRefundAgentNodeAddress(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.OpenOffer.prototype.hasRefundAgentNodeAddress = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-/**
- * optional int64 trigger_price = 6;
+ * optional int64 trigger_price = 4;
  * @return {number}
  */
 proto.io.bisq.protobuffer.OpenOffer.prototype.getTriggerPrice = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
 };
 
 
@@ -53070,7 +55910,44 @@ proto.io.bisq.protobuffer.OpenOffer.prototype.getTriggerPrice = function() {
  * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
  */
 proto.io.bisq.protobuffer.OpenOffer.prototype.setTriggerPrice = function(value) {
-  return jspb.Message.setProto3IntField(this, 6, value);
+  return jspb.Message.setProto3IntField(this, 4, value);
+};
+
+
+/**
+ * repeated string frozen_key_images = 5;
+ * @return {!Array<string>}
+ */
+proto.io.bisq.protobuffer.OpenOffer.prototype.getFrozenKeyImagesList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 5));
+};
+
+
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
+ */
+proto.io.bisq.protobuffer.OpenOffer.prototype.setFrozenKeyImagesList = function(value) {
+  return jspb.Message.setField(this, 5, value || []);
+};
+
+
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
+ */
+proto.io.bisq.protobuffer.OpenOffer.prototype.addFrozenKeyImages = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 5, value, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.io.bisq.protobuffer.OpenOffer} returns this
+ */
+proto.io.bisq.protobuffer.OpenOffer.prototype.clearFrozenKeyImagesList = function() {
+  return this.setFrozenKeyImagesList([]);
 };
 
 
@@ -53083,7 +55960,7 @@ proto.io.bisq.protobuffer.OpenOffer.prototype.setTriggerPrice = function(value)
  * @private {!Array<!Array<number>>}
  * @const
  */
-proto.io.bisq.protobuffer.Tradable.oneofGroups_ = [[1,2,3,4,5,6]];
+proto.io.bisq.protobuffer.Tradable.oneofGroups_ = [[1,2,3,4,5,6,1001]];
 
 /**
  * @enum {number}
@@ -53095,7 +55972,8 @@ proto.io.bisq.protobuffer.Tradable.MessageCase = {
   BUYER_AS_TAKER_TRADE: 3,
   SELLER_AS_MAKER_TRADE: 4,
   SELLER_AS_TAKER_TRADE: 5,
-  ARBITRATOR_TRADE: 6
+  ARBITRATOR_TRADE: 6,
+  SIGNED_OFFER: 1001
 };
 
 /**
@@ -53141,7 +56019,8 @@ proto.io.bisq.protobuffer.Tradable.toObject = function(includeInstance, msg) {
     buyerAsTakerTrade: (f = msg.getBuyerAsTakerTrade()) && proto.io.bisq.protobuffer.BuyerAsTakerTrade.toObject(includeInstance, f),
     sellerAsMakerTrade: (f = msg.getSellerAsMakerTrade()) && proto.io.bisq.protobuffer.SellerAsMakerTrade.toObject(includeInstance, f),
     sellerAsTakerTrade: (f = msg.getSellerAsTakerTrade()) && proto.io.bisq.protobuffer.SellerAsTakerTrade.toObject(includeInstance, f),
-    arbitratorTrade: (f = msg.getArbitratorTrade()) && proto.io.bisq.protobuffer.ArbitratorTrade.toObject(includeInstance, f)
+    arbitratorTrade: (f = msg.getArbitratorTrade()) && proto.io.bisq.protobuffer.ArbitratorTrade.toObject(includeInstance, f),
+    signedOffer: (f = msg.getSignedOffer()) && proto.io.bisq.protobuffer.SignedOffer.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -53208,6 +56087,11 @@ proto.io.bisq.protobuffer.Tradable.deserializeBinaryFromReader = function(msg, r
       reader.readMessage(value,proto.io.bisq.protobuffer.ArbitratorTrade.deserializeBinaryFromReader);
       msg.setArbitratorTrade(value);
       break;
+    case 1001:
+      var value = new proto.io.bisq.protobuffer.SignedOffer;
+      reader.readMessage(value,proto.io.bisq.protobuffer.SignedOffer.deserializeBinaryFromReader);
+      msg.setSignedOffer(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -53285,6 +56169,14 @@ proto.io.bisq.protobuffer.Tradable.serializeBinaryToWriter = function(message, w
       proto.io.bisq.protobuffer.ArbitratorTrade.serializeBinaryToWriter
     );
   }
+  f = message.getSignedOffer();
+  if (f != null) {
+    writer.writeMessage(
+      1001,
+      f,
+      proto.io.bisq.protobuffer.SignedOffer.serializeBinaryToWriter
+    );
+  }
 };
 
 
@@ -53510,13 +56402,50 @@ proto.io.bisq.protobuffer.Tradable.prototype.hasArbitratorTrade = function() {
 };
 
 
+/**
+ * optional SignedOffer signed_offer = 1001;
+ * @return {?proto.io.bisq.protobuffer.SignedOffer}
+ */
+proto.io.bisq.protobuffer.Tradable.prototype.getSignedOffer = function() {
+  return /** @type{?proto.io.bisq.protobuffer.SignedOffer} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.SignedOffer, 1001));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.SignedOffer|undefined} value
+ * @return {!proto.io.bisq.protobuffer.Tradable} returns this
+*/
+proto.io.bisq.protobuffer.Tradable.prototype.setSignedOffer = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1001, proto.io.bisq.protobuffer.Tradable.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.Tradable} returns this
+ */
+proto.io.bisq.protobuffer.Tradable.prototype.clearSignedOffer = function() {
+  return this.setSignedOffer(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.Tradable.prototype.hasSignedOffer = function() {
+  return jspb.Message.getField(this, 1001) != null;
+};
+
+
 
 /**
  * List of repeated fields within this message type.
  * @private {!Array<number>}
  * @const
  */
-proto.io.bisq.protobuffer.Trade.repeatedFields_ = [29];
+proto.io.bisq.protobuffer.Trade.repeatedFields_ = [27];
 
 
 
@@ -53565,34 +56494,30 @@ proto.io.bisq.protobuffer.Trade.toObject = function(includeInstance, msg) {
     contract: (f = msg.getContract()) && proto.io.bisq.protobuffer.Contract.toObject(includeInstance, f),
     contractAsJson: jspb.Message.getFieldWithDefault(msg, 17, ""),
     contractHash: msg.getContractHash_asB64(),
-    takerContractSignature: jspb.Message.getFieldWithDefault(msg, 19, ""),
-    makerContractSignature: jspb.Message.getFieldWithDefault(msg, 20, ""),
     arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     mediatorNodeAddress: (f = msg.getMediatorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     arbitratorBtcPubKey: msg.getArbitratorBtcPubKey_asB64(),
-    takerPaymentAccountId: jspb.Message.getFieldWithDefault(msg, 24, ""),
-    errorMessage: jspb.Message.getFieldWithDefault(msg, 25, ""),
+    takerPaymentAccountId: jspb.Message.getFieldWithDefault(msg, 22, ""),
+    errorMessage: jspb.Message.getFieldWithDefault(msg, 23, ""),
     arbitratorPubKeyRing: (f = msg.getArbitratorPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
     mediatorPubKeyRing: (f = msg.getMediatorPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
-    counterCurrencyTxId: jspb.Message.getFieldWithDefault(msg, 28, ""),
+    counterCurrencyTxId: jspb.Message.getFieldWithDefault(msg, 26, ""),
     chatMessageList: jspb.Message.toObjectList(msg.getChatMessageList(),
     proto.io.bisq.protobuffer.ChatMessage.toObject, includeInstance),
-    mediationResultState: jspb.Message.getFieldWithDefault(msg, 30, 0),
-    lockTime: jspb.Message.getFieldWithDefault(msg, 31, 0),
+    mediationResultState: jspb.Message.getFieldWithDefault(msg, 28, 0),
+    lockTime: jspb.Message.getFieldWithDefault(msg, 29, 0),
     delayedPayoutTxBytes: msg.getDelayedPayoutTxBytes_asB64(),
     refundAgentNodeAddress: (f = msg.getRefundAgentNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     refundAgentPubKeyRing: (f = msg.getRefundAgentPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
-    refundResultState: jspb.Message.getFieldWithDefault(msg, 35, 0),
-    lastRefreshRequestDate: jspb.Message.getFieldWithDefault(msg, 36, 0),
-    counterCurrencyExtraData: jspb.Message.getFieldWithDefault(msg, 37, ""),
-    assetTxProofResult: jspb.Message.getFieldWithDefault(msg, 38, ""),
-    uid: jspb.Message.getFieldWithDefault(msg, 39, ""),
+    refundResultState: jspb.Message.getFieldWithDefault(msg, 33, 0),
+    lastRefreshRequestDate: jspb.Message.getFieldWithDefault(msg, 34, 0),
+    counterCurrencyExtraData: jspb.Message.getFieldWithDefault(msg, 35, ""),
+    assetTxProofResult: jspb.Message.getFieldWithDefault(msg, 36, ""),
+    uid: jspb.Message.getFieldWithDefault(msg, 37, ""),
+    makerNodeAddress: (f = msg.getMakerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     takerNodeAddress: (f = msg.getTakerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     takerPubKeyRing: (f = msg.getTakerPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
-    takerDepositTxId: jspb.Message.getFieldWithDefault(msg, 102, ""),
-    makerNodeAddress: (f = msg.getMakerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    makerPubKeyRing: (f = msg.getMakerPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
-    makerDepositTxId: jspb.Message.getFieldWithDefault(msg, 105, "")
+    makerPubKeyRing: (f = msg.getMakerPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -53697,124 +56622,108 @@ proto.io.bisq.protobuffer.Trade.deserializeBinaryFromReader = function(msg, read
       msg.setContractHash(value);
       break;
     case 19:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setTakerContractSignature(value);
-      break;
-    case 20:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMakerContractSignature(value);
-      break;
-    case 21:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setArbitratorNodeAddress(value);
       break;
-    case 22:
+    case 20:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setMediatorNodeAddress(value);
       break;
-    case 23:
+    case 21:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setArbitratorBtcPubKey(value);
       break;
-    case 24:
+    case 22:
       var value = /** @type {string} */ (reader.readString());
       msg.setTakerPaymentAccountId(value);
       break;
-    case 25:
+    case 23:
       var value = /** @type {string} */ (reader.readString());
       msg.setErrorMessage(value);
       break;
-    case 26:
+    case 24:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setArbitratorPubKeyRing(value);
       break;
-    case 27:
+    case 25:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setMediatorPubKeyRing(value);
       break;
-    case 28:
+    case 26:
       var value = /** @type {string} */ (reader.readString());
       msg.setCounterCurrencyTxId(value);
       break;
-    case 29:
+    case 27:
       var value = new proto.io.bisq.protobuffer.ChatMessage;
       reader.readMessage(value,proto.io.bisq.protobuffer.ChatMessage.deserializeBinaryFromReader);
       msg.addChatMessage(value);
       break;
-    case 30:
+    case 28:
       var value = /** @type {!proto.io.bisq.protobuffer.MediationResultState} */ (reader.readEnum());
       msg.setMediationResultState(value);
       break;
-    case 31:
+    case 29:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setLockTime(value);
       break;
-    case 32:
+    case 30:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setDelayedPayoutTxBytes(value);
       break;
-    case 33:
+    case 31:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setRefundAgentNodeAddress(value);
       break;
-    case 34:
+    case 32:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setRefundAgentPubKeyRing(value);
       break;
-    case 35:
+    case 33:
       var value = /** @type {!proto.io.bisq.protobuffer.RefundResultState} */ (reader.readEnum());
       msg.setRefundResultState(value);
       break;
-    case 36:
+    case 34:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setLastRefreshRequestDate(value);
       break;
-    case 37:
+    case 35:
       var value = /** @type {string} */ (reader.readString());
       msg.setCounterCurrencyExtraData(value);
       break;
-    case 38:
+    case 36:
       var value = /** @type {string} */ (reader.readString());
       msg.setAssetTxProofResult(value);
       break;
-    case 39:
+    case 37:
       var value = /** @type {string} */ (reader.readString());
       msg.setUid(value);
       break;
     case 100:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setTakerNodeAddress(value);
+      msg.setMakerNodeAddress(value);
       break;
     case 101:
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setTakerNodeAddress(value);
+      break;
+    case 102:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setTakerPubKeyRing(value);
       break;
-    case 102:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setTakerDepositTxId(value);
-      break;
     case 103:
-      var value = new proto.io.bisq.protobuffer.NodeAddress;
-      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
-      msg.setMakerNodeAddress(value);
-      break;
-    case 104:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setMakerPubKeyRing(value);
       break;
-    case 105:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMakerDepositTxId(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -53959,24 +56868,10 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
       f
     );
   }
-  f = message.getTakerContractSignature();
-  if (f.length > 0) {
-    writer.writeString(
-      19,
-      f
-    );
-  }
-  f = message.getMakerContractSignature();
-  if (f.length > 0) {
-    writer.writeString(
-      20,
-      f
-    );
-  }
   f = message.getArbitratorNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      21,
+      19,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -53984,7 +56879,7 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
   f = message.getMediatorNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      22,
+      20,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -53992,28 +56887,28 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
   f = message.getArbitratorBtcPubKey_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      23,
+      21,
       f
     );
   }
   f = message.getTakerPaymentAccountId();
   if (f.length > 0) {
     writer.writeString(
-      24,
+      22,
       f
     );
   }
   f = message.getErrorMessage();
   if (f.length > 0) {
     writer.writeString(
-      25,
+      23,
       f
     );
   }
   f = message.getArbitratorPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      26,
+      24,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -54021,7 +56916,7 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
   f = message.getMediatorPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      27,
+      25,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -54029,14 +56924,14 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
   f = message.getCounterCurrencyTxId();
   if (f.length > 0) {
     writer.writeString(
-      28,
+      26,
       f
     );
   }
   f = message.getChatMessageList();
   if (f.length > 0) {
     writer.writeRepeatedMessage(
-      29,
+      27,
       f,
       proto.io.bisq.protobuffer.ChatMessage.serializeBinaryToWriter
     );
@@ -54044,28 +56939,28 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
   f = message.getMediationResultState();
   if (f !== 0.0) {
     writer.writeEnum(
-      30,
+      28,
       f
     );
   }
   f = message.getLockTime();
   if (f !== 0) {
     writer.writeInt64(
-      31,
+      29,
       f
     );
   }
   f = message.getDelayedPayoutTxBytes_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      32,
+      30,
       f
     );
   }
   f = message.getRefundAgentNodeAddress();
   if (f != null) {
     writer.writeMessage(
-      33,
+      31,
       f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
@@ -54073,7 +56968,7 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
   f = message.getRefundAgentPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      34,
+      32,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -54081,39 +56976,39 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
   f = message.getRefundResultState();
   if (f !== 0.0) {
     writer.writeEnum(
-      35,
+      33,
       f
     );
   }
   f = message.getLastRefreshRequestDate();
   if (f !== 0) {
     writer.writeInt64(
-      36,
+      34,
       f
     );
   }
   f = message.getCounterCurrencyExtraData();
   if (f.length > 0) {
     writer.writeString(
-      37,
+      35,
       f
     );
   }
   f = message.getAssetTxProofResult();
   if (f.length > 0) {
     writer.writeString(
-      38,
+      36,
       f
     );
   }
   f = message.getUid();
   if (f.length > 0) {
     writer.writeString(
-      39,
+      37,
       f
     );
   }
-  f = message.getTakerNodeAddress();
+  f = message.getMakerNodeAddress();
   if (f != null) {
     writer.writeMessage(
       100,
@@ -54121,44 +57016,30 @@ proto.io.bisq.protobuffer.Trade.serializeBinaryToWriter = function(message, writ
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
   }
-  f = message.getTakerPubKeyRing();
+  f = message.getTakerNodeAddress();
   if (f != null) {
     writer.writeMessage(
       101,
       f,
-      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
   }
-  f = message.getTakerDepositTxId();
-  if (f.length > 0) {
-    writer.writeString(
-      102,
-      f
-    );
-  }
-  f = message.getMakerNodeAddress();
+  f = message.getTakerPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      103,
+      102,
       f,
-      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
+      proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
   }
   f = message.getMakerPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      104,
+      103,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
   }
-  f = message.getMakerDepositTxId();
-  if (f.length > 0) {
-    writer.writeString(
-      105,
-      f
-    );
-  }
 };
 
 
@@ -54612,48 +57493,12 @@ proto.io.bisq.protobuffer.Trade.prototype.setContractHash = function(value) {
 
 
 /**
- * optional string taker_contract_signature = 19;
- * @return {string}
- */
-proto.io.bisq.protobuffer.Trade.prototype.getTakerContractSignature = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 19, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
- */
-proto.io.bisq.protobuffer.Trade.prototype.setTakerContractSignature = function(value) {
-  return jspb.Message.setProto3StringField(this, 19, value);
-};
-
-
-/**
- * optional string maker_contract_signature = 20;
- * @return {string}
- */
-proto.io.bisq.protobuffer.Trade.prototype.getMakerContractSignature = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 20, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
- */
-proto.io.bisq.protobuffer.Trade.prototype.setMakerContractSignature = function(value) {
-  return jspb.Message.setProto3StringField(this, 20, value);
-};
-
-
-/**
- * optional NodeAddress arbitrator_node_address = 21;
+ * optional NodeAddress arbitrator_node_address = 19;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getArbitratorNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 21));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 19));
 };
 
 
@@ -54662,7 +57507,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getArbitratorNodeAddress = function()
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setArbitratorNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 21, value);
+  return jspb.Message.setWrapperField(this, 19, value);
 };
 
 
@@ -54680,17 +57525,17 @@ proto.io.bisq.protobuffer.Trade.prototype.clearArbitratorNodeAddress = function(
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasArbitratorNodeAddress = function() {
-  return jspb.Message.getField(this, 21) != null;
+  return jspb.Message.getField(this, 19) != null;
 };
 
 
 /**
- * optional NodeAddress mediator_node_address = 22;
+ * optional NodeAddress mediator_node_address = 20;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getMediatorNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 22));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 20));
 };
 
 
@@ -54699,7 +57544,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getMediatorNodeAddress = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setMediatorNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 22, value);
+  return jspb.Message.setWrapperField(this, 20, value);
 };
 
 
@@ -54717,21 +57562,21 @@ proto.io.bisq.protobuffer.Trade.prototype.clearMediatorNodeAddress = function()
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasMediatorNodeAddress = function() {
-  return jspb.Message.getField(this, 22) != null;
+  return jspb.Message.getField(this, 20) != null;
 };
 
 
 /**
- * optional bytes arbitrator_btc_pub_key = 23;
+ * optional bytes arbitrator_btc_pub_key = 21;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getArbitratorBtcPubKey = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 23, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 21, ""));
 };
 
 
 /**
- * optional bytes arbitrator_btc_pub_key = 23;
+ * optional bytes arbitrator_btc_pub_key = 21;
  * This is a type-conversion wrapper around `getArbitratorBtcPubKey()`
  * @return {string}
  */
@@ -54742,7 +57587,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getArbitratorBtcPubKey_asB64 = functio
 
 
 /**
- * optional bytes arbitrator_btc_pub_key = 23;
+ * optional bytes arbitrator_btc_pub_key = 21;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getArbitratorBtcPubKey()`
@@ -54759,16 +57604,16 @@ proto.io.bisq.protobuffer.Trade.prototype.getArbitratorBtcPubKey_asU8 = function
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setArbitratorBtcPubKey = function(value) {
-  return jspb.Message.setProto3BytesField(this, 23, value);
+  return jspb.Message.setProto3BytesField(this, 21, value);
 };
 
 
 /**
- * optional string taker_payment_account_id = 24;
+ * optional string taker_payment_account_id = 22;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getTakerPaymentAccountId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 24, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 22, ""));
 };
 
 
@@ -54777,16 +57622,16 @@ proto.io.bisq.protobuffer.Trade.prototype.getTakerPaymentAccountId = function()
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setTakerPaymentAccountId = function(value) {
-  return jspb.Message.setProto3StringField(this, 24, value);
+  return jspb.Message.setProto3StringField(this, 22, value);
 };
 
 
 /**
- * optional string error_message = 25;
+ * optional string error_message = 23;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getErrorMessage = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 25, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 23, ""));
 };
 
 
@@ -54795,17 +57640,17 @@ proto.io.bisq.protobuffer.Trade.prototype.getErrorMessage = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setErrorMessage = function(value) {
-  return jspb.Message.setProto3StringField(this, 25, value);
+  return jspb.Message.setProto3StringField(this, 23, value);
 };
 
 
 /**
- * optional PubKeyRing arbitrator_pub_key_ring = 26;
+ * optional PubKeyRing arbitrator_pub_key_ring = 24;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getArbitratorPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 26));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 24));
 };
 
 
@@ -54814,7 +57659,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getArbitratorPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setArbitratorPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 26, value);
+  return jspb.Message.setWrapperField(this, 24, value);
 };
 
 
@@ -54832,17 +57677,17 @@ proto.io.bisq.protobuffer.Trade.prototype.clearArbitratorPubKeyRing = function()
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasArbitratorPubKeyRing = function() {
-  return jspb.Message.getField(this, 26) != null;
+  return jspb.Message.getField(this, 24) != null;
 };
 
 
 /**
- * optional PubKeyRing mediator_pub_key_ring = 27;
+ * optional PubKeyRing mediator_pub_key_ring = 25;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getMediatorPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 27));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 25));
 };
 
 
@@ -54851,7 +57696,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getMediatorPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setMediatorPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 27, value);
+  return jspb.Message.setWrapperField(this, 25, value);
 };
 
 
@@ -54869,16 +57714,16 @@ proto.io.bisq.protobuffer.Trade.prototype.clearMediatorPubKeyRing = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasMediatorPubKeyRing = function() {
-  return jspb.Message.getField(this, 27) != null;
+  return jspb.Message.getField(this, 25) != null;
 };
 
 
 /**
- * optional string counter_currency_tx_id = 28;
+ * optional string counter_currency_tx_id = 26;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getCounterCurrencyTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 28, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 26, ""));
 };
 
 
@@ -54887,17 +57732,17 @@ proto.io.bisq.protobuffer.Trade.prototype.getCounterCurrencyTxId = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setCounterCurrencyTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 28, value);
+  return jspb.Message.setProto3StringField(this, 26, value);
 };
 
 
 /**
- * repeated ChatMessage chat_message = 29;
+ * repeated ChatMessage chat_message = 27;
  * @return {!Array<!proto.io.bisq.protobuffer.ChatMessage>}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getChatMessageList = function() {
   return /** @type{!Array<!proto.io.bisq.protobuffer.ChatMessage>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.ChatMessage, 29));
+    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.ChatMessage, 27));
 };
 
 
@@ -54906,7 +57751,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getChatMessageList = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setChatMessageList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 29, value);
+  return jspb.Message.setRepeatedWrapperField(this, 27, value);
 };
 
 
@@ -54916,7 +57761,7 @@ proto.io.bisq.protobuffer.Trade.prototype.setChatMessageList = function(value) {
  * @return {!proto.io.bisq.protobuffer.ChatMessage}
  */
 proto.io.bisq.protobuffer.Trade.prototype.addChatMessage = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 29, opt_value, proto.io.bisq.protobuffer.ChatMessage, opt_index);
+  return jspb.Message.addToRepeatedWrapperField(this, 27, opt_value, proto.io.bisq.protobuffer.ChatMessage, opt_index);
 };
 
 
@@ -54930,11 +57775,11 @@ proto.io.bisq.protobuffer.Trade.prototype.clearChatMessageList = function() {
 
 
 /**
- * optional MediationResultState mediation_result_state = 30;
+ * optional MediationResultState mediation_result_state = 28;
  * @return {!proto.io.bisq.protobuffer.MediationResultState}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getMediationResultState = function() {
-  return /** @type {!proto.io.bisq.protobuffer.MediationResultState} */ (jspb.Message.getFieldWithDefault(this, 30, 0));
+  return /** @type {!proto.io.bisq.protobuffer.MediationResultState} */ (jspb.Message.getFieldWithDefault(this, 28, 0));
 };
 
 
@@ -54943,16 +57788,16 @@ proto.io.bisq.protobuffer.Trade.prototype.getMediationResultState = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setMediationResultState = function(value) {
-  return jspb.Message.setProto3EnumField(this, 30, value);
+  return jspb.Message.setProto3EnumField(this, 28, value);
 };
 
 
 /**
- * optional int64 lock_time = 31;
+ * optional int64 lock_time = 29;
  * @return {number}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getLockTime = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 31, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 29, 0));
 };
 
 
@@ -54961,21 +57806,21 @@ proto.io.bisq.protobuffer.Trade.prototype.getLockTime = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setLockTime = function(value) {
-  return jspb.Message.setProto3IntField(this, 31, value);
+  return jspb.Message.setProto3IntField(this, 29, value);
 };
 
 
 /**
- * optional bytes delayed_payout_tx_bytes = 32;
+ * optional bytes delayed_payout_tx_bytes = 30;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getDelayedPayoutTxBytes = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 32, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 30, ""));
 };
 
 
 /**
- * optional bytes delayed_payout_tx_bytes = 32;
+ * optional bytes delayed_payout_tx_bytes = 30;
  * This is a type-conversion wrapper around `getDelayedPayoutTxBytes()`
  * @return {string}
  */
@@ -54986,7 +57831,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getDelayedPayoutTxBytes_asB64 = functi
 
 
 /**
- * optional bytes delayed_payout_tx_bytes = 32;
+ * optional bytes delayed_payout_tx_bytes = 30;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getDelayedPayoutTxBytes()`
@@ -55003,17 +57848,17 @@ proto.io.bisq.protobuffer.Trade.prototype.getDelayedPayoutTxBytes_asU8 = functio
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setDelayedPayoutTxBytes = function(value) {
-  return jspb.Message.setProto3BytesField(this, 32, value);
+  return jspb.Message.setProto3BytesField(this, 30, value);
 };
 
 
 /**
- * optional NodeAddress refund_agent_node_address = 33;
+ * optional NodeAddress refund_agent_node_address = 31;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getRefundAgentNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 33));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 31));
 };
 
 
@@ -55022,7 +57867,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getRefundAgentNodeAddress = function()
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setRefundAgentNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 33, value);
+  return jspb.Message.setWrapperField(this, 31, value);
 };
 
 
@@ -55040,17 +57885,17 @@ proto.io.bisq.protobuffer.Trade.prototype.clearRefundAgentNodeAddress = function
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasRefundAgentNodeAddress = function() {
-  return jspb.Message.getField(this, 33) != null;
+  return jspb.Message.getField(this, 31) != null;
 };
 
 
 /**
- * optional PubKeyRing refund_agent_pub_key_ring = 34;
+ * optional PubKeyRing refund_agent_pub_key_ring = 32;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getRefundAgentPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 34));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 32));
 };
 
 
@@ -55059,7 +57904,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getRefundAgentPubKeyRing = function()
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setRefundAgentPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 34, value);
+  return jspb.Message.setWrapperField(this, 32, value);
 };
 
 
@@ -55077,16 +57922,16 @@ proto.io.bisq.protobuffer.Trade.prototype.clearRefundAgentPubKeyRing = function(
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasRefundAgentPubKeyRing = function() {
-  return jspb.Message.getField(this, 34) != null;
+  return jspb.Message.getField(this, 32) != null;
 };
 
 
 /**
- * optional RefundResultState refund_result_state = 35;
+ * optional RefundResultState refund_result_state = 33;
  * @return {!proto.io.bisq.protobuffer.RefundResultState}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getRefundResultState = function() {
-  return /** @type {!proto.io.bisq.protobuffer.RefundResultState} */ (jspb.Message.getFieldWithDefault(this, 35, 0));
+  return /** @type {!proto.io.bisq.protobuffer.RefundResultState} */ (jspb.Message.getFieldWithDefault(this, 33, 0));
 };
 
 
@@ -55095,16 +57940,16 @@ proto.io.bisq.protobuffer.Trade.prototype.getRefundResultState = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setRefundResultState = function(value) {
-  return jspb.Message.setProto3EnumField(this, 35, value);
+  return jspb.Message.setProto3EnumField(this, 33, value);
 };
 
 
 /**
- * optional int64 last_refresh_request_date = 36;
+ * optional int64 last_refresh_request_date = 34;
  * @return {number}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getLastRefreshRequestDate = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 36, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 34, 0));
 };
 
 
@@ -55113,16 +57958,16 @@ proto.io.bisq.protobuffer.Trade.prototype.getLastRefreshRequestDate = function()
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setLastRefreshRequestDate = function(value) {
-  return jspb.Message.setProto3IntField(this, 36, value);
+  return jspb.Message.setProto3IntField(this, 34, value);
 };
 
 
 /**
- * optional string counter_currency_extra_data = 37;
+ * optional string counter_currency_extra_data = 35;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getCounterCurrencyExtraData = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 37, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 35, ""));
 };
 
 
@@ -55131,16 +57976,16 @@ proto.io.bisq.protobuffer.Trade.prototype.getCounterCurrencyExtraData = function
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setCounterCurrencyExtraData = function(value) {
-  return jspb.Message.setProto3StringField(this, 37, value);
+  return jspb.Message.setProto3StringField(this, 35, value);
 };
 
 
 /**
- * optional string asset_tx_proof_result = 38;
+ * optional string asset_tx_proof_result = 36;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getAssetTxProofResult = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 38, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 36, ""));
 };
 
 
@@ -55149,16 +57994,16 @@ proto.io.bisq.protobuffer.Trade.prototype.getAssetTxProofResult = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setAssetTxProofResult = function(value) {
-  return jspb.Message.setProto3StringField(this, 38, value);
+  return jspb.Message.setProto3StringField(this, 36, value);
 };
 
 
 /**
- * optional string uid = 39;
+ * optional string uid = 37;
  * @return {string}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getUid = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 39, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 37, ""));
 };
 
 
@@ -55167,118 +58012,26 @@ proto.io.bisq.protobuffer.Trade.prototype.getUid = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
  */
 proto.io.bisq.protobuffer.Trade.prototype.setUid = function(value) {
-  return jspb.Message.setProto3StringField(this, 39, value);
+  return jspb.Message.setProto3StringField(this, 37, value);
 };
 
 
 /**
- * optional NodeAddress taker_node_address = 100;
+ * optional NodeAddress maker_node_address = 100;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
-proto.io.bisq.protobuffer.Trade.prototype.getTakerNodeAddress = function() {
+proto.io.bisq.protobuffer.Trade.prototype.getMakerNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
     jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 100));
 };
 
 
-/**
- * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
-*/
-proto.io.bisq.protobuffer.Trade.prototype.setTakerNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 100, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
- */
-proto.io.bisq.protobuffer.Trade.prototype.clearTakerNodeAddress = function() {
-  return this.setTakerNodeAddress(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.Trade.prototype.hasTakerNodeAddress = function() {
-  return jspb.Message.getField(this, 100) != null;
-};
-
-
-/**
- * optional PubKeyRing taker_pub_key_ring = 101;
- * @return {?proto.io.bisq.protobuffer.PubKeyRing}
- */
-proto.io.bisq.protobuffer.Trade.prototype.getTakerPubKeyRing = function() {
-  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 101));
-};
-
-
-/**
- * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
-*/
-proto.io.bisq.protobuffer.Trade.prototype.setTakerPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
- */
-proto.io.bisq.protobuffer.Trade.prototype.clearTakerPubKeyRing = function() {
-  return this.setTakerPubKeyRing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.Trade.prototype.hasTakerPubKeyRing = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional string taker_deposit_tx_id = 102;
- * @return {string}
- */
-proto.io.bisq.protobuffer.Trade.prototype.getTakerDepositTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 102, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
- */
-proto.io.bisq.protobuffer.Trade.prototype.setTakerDepositTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 102, value);
-};
-
-
-/**
- * optional NodeAddress maker_node_address = 103;
- * @return {?proto.io.bisq.protobuffer.NodeAddress}
- */
-proto.io.bisq.protobuffer.Trade.prototype.getMakerNodeAddress = function() {
-  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 103));
-};
-
-
 /**
  * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setMakerNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 103, value);
+  return jspb.Message.setWrapperField(this, 100, value);
 };
 
 
@@ -55296,17 +58049,91 @@ proto.io.bisq.protobuffer.Trade.prototype.clearMakerNodeAddress = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasMakerNodeAddress = function() {
-  return jspb.Message.getField(this, 103) != null;
+  return jspb.Message.getField(this, 100) != null;
 };
 
 
 /**
- * optional PubKeyRing maker_pub_key_ring = 104;
+ * optional NodeAddress taker_node_address = 101;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.Trade.prototype.getTakerNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 101));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.Trade} returns this
+*/
+proto.io.bisq.protobuffer.Trade.prototype.setTakerNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 101, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.Trade} returns this
+ */
+proto.io.bisq.protobuffer.Trade.prototype.clearTakerNodeAddress = function() {
+  return this.setTakerNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.Trade.prototype.hasTakerNodeAddress = function() {
+  return jspb.Message.getField(this, 101) != null;
+};
+
+
+/**
+ * optional PubKeyRing taker_pub_key_ring = 102;
+ * @return {?proto.io.bisq.protobuffer.PubKeyRing}
+ */
+proto.io.bisq.protobuffer.Trade.prototype.getTakerPubKeyRing = function() {
+  return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 102));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.PubKeyRing|undefined} value
+ * @return {!proto.io.bisq.protobuffer.Trade} returns this
+*/
+proto.io.bisq.protobuffer.Trade.prototype.setTakerPubKeyRing = function(value) {
+  return jspb.Message.setWrapperField(this, 102, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.Trade} returns this
+ */
+proto.io.bisq.protobuffer.Trade.prototype.clearTakerPubKeyRing = function() {
+  return this.setTakerPubKeyRing(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.Trade.prototype.hasTakerPubKeyRing = function() {
+  return jspb.Message.getField(this, 102) != null;
+};
+
+
+/**
+ * optional PubKeyRing maker_pub_key_ring = 103;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.Trade.prototype.getMakerPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 104));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 103));
 };
 
 
@@ -55315,7 +58142,7 @@ proto.io.bisq.protobuffer.Trade.prototype.getMakerPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.Trade} returns this
 */
 proto.io.bisq.protobuffer.Trade.prototype.setMakerPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 104, value);
+  return jspb.Message.setWrapperField(this, 103, value);
 };
 
 
@@ -55333,25 +58160,7 @@ proto.io.bisq.protobuffer.Trade.prototype.clearMakerPubKeyRing = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.Trade.prototype.hasMakerPubKeyRing = function() {
-  return jspb.Message.getField(this, 104) != null;
-};
-
-
-/**
- * optional string maker_deposit_tx_id = 105;
- * @return {string}
- */
-proto.io.bisq.protobuffer.Trade.prototype.getMakerDepositTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 105, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.Trade} returns this
- */
-proto.io.bisq.protobuffer.Trade.prototype.setMakerDepositTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 105, value);
+  return jspb.Message.getField(this, 103) != null;
 };
 
 
@@ -56116,7 +58925,7 @@ proto.io.bisq.protobuffer.ArbitratorTrade.prototype.hasTrade = function() {
  * @private {!Array<number>}
  * @const
  */
-proto.io.bisq.protobuffer.ProcessModel.repeatedFields_ = [10];
+proto.io.bisq.protobuffer.ProcessModel.repeatedFields_ = [10,1008];
 
 
 
@@ -56165,17 +58974,19 @@ proto.io.bisq.protobuffer.ProcessModel.toObject = function(includeInstance, msg)
     mediatedPayoutTxSignature: msg.getMediatedPayoutTxSignature_asB64(),
     buyerPayoutAmountFromMediation: jspb.Message.getFieldWithDefault(msg, 19, 0),
     sellerPayoutAmountFromMediation: jspb.Message.getFieldWithDefault(msg, 20, 0),
+    makerSignature: jspb.Message.getFieldWithDefault(msg, 1001, ""),
+    arbitratorNodeAddress: (f = msg.getArbitratorNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
     maker: (f = msg.getMaker()) && proto.io.bisq.protobuffer.TradingPeer.toObject(includeInstance, f),
     taker: (f = msg.getTaker()) && proto.io.bisq.protobuffer.TradingPeer.toObject(includeInstance, f),
     arbitrator: (f = msg.getArbitrator()) && proto.io.bisq.protobuffer.TradingPeer.toObject(includeInstance, f),
     tempTradingPeerNodeAddress: (f = msg.getTempTradingPeerNodeAddress()) && proto.io.bisq.protobuffer.NodeAddress.toObject(includeInstance, f),
-    preparedMultisigHex: jspb.Message.getFieldWithDefault(msg, 1005, ""),
-    madeMultisigHex: jspb.Message.getFieldWithDefault(msg, 1006, ""),
-    multisigSetupComplete: jspb.Message.getBooleanFieldWithDefault(msg, 1007, false),
-    makerReadyToFundMultisig: jspb.Message.getBooleanFieldWithDefault(msg, 1008, false),
-    multisigDepositInitiated: jspb.Message.getBooleanFieldWithDefault(msg, 1009, false),
-    takerPreparedDepositTxId: jspb.Message.getFieldWithDefault(msg, 1010, ""),
-    makerPreparedDepositTxId: jspb.Message.getFieldWithDefault(msg, 1011, "")
+    reserveTxHash: jspb.Message.getFieldWithDefault(msg, 1007, ""),
+    frozenKeyImagesList: (f = jspb.Message.getRepeatedField(msg, 1008)) == null ? undefined : f,
+    preparedMultisigHex: jspb.Message.getFieldWithDefault(msg, 1009, ""),
+    madeMultisigHex: jspb.Message.getFieldWithDefault(msg, 1010, ""),
+    multisigSetupComplete: jspb.Message.getBooleanFieldWithDefault(msg, 1011, false),
+    makerReadyToFundMultisig: jspb.Message.getBooleanFieldWithDefault(msg, 1012, false),
+    multisigDepositInitiated: jspb.Message.getBooleanFieldWithDefault(msg, 1013, false)
   };
 
   if (includeInstance) {
@@ -56275,53 +59086,62 @@ proto.io.bisq.protobuffer.ProcessModel.deserializeBinaryFromReader = function(ms
       msg.setSellerPayoutAmountFromMediation(value);
       break;
     case 1001:
-      var value = new proto.io.bisq.protobuffer.TradingPeer;
-      reader.readMessage(value,proto.io.bisq.protobuffer.TradingPeer.deserializeBinaryFromReader);
-      msg.setMaker(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMakerSignature(value);
       break;
     case 1002:
-      var value = new proto.io.bisq.protobuffer.TradingPeer;
-      reader.readMessage(value,proto.io.bisq.protobuffer.TradingPeer.deserializeBinaryFromReader);
-      msg.setTaker(value);
+      var value = new proto.io.bisq.protobuffer.NodeAddress;
+      reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
+      msg.setArbitratorNodeAddress(value);
       break;
     case 1003:
       var value = new proto.io.bisq.protobuffer.TradingPeer;
       reader.readMessage(value,proto.io.bisq.protobuffer.TradingPeer.deserializeBinaryFromReader);
-      msg.setArbitrator(value);
+      msg.setMaker(value);
       break;
     case 1004:
+      var value = new proto.io.bisq.protobuffer.TradingPeer;
+      reader.readMessage(value,proto.io.bisq.protobuffer.TradingPeer.deserializeBinaryFromReader);
+      msg.setTaker(value);
+      break;
+    case 1005:
+      var value = new proto.io.bisq.protobuffer.TradingPeer;
+      reader.readMessage(value,proto.io.bisq.protobuffer.TradingPeer.deserializeBinaryFromReader);
+      msg.setArbitrator(value);
+      break;
+    case 1006:
       var value = new proto.io.bisq.protobuffer.NodeAddress;
       reader.readMessage(value,proto.io.bisq.protobuffer.NodeAddress.deserializeBinaryFromReader);
       msg.setTempTradingPeerNodeAddress(value);
       break;
-    case 1005:
+    case 1007:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxHash(value);
+      break;
+    case 1008:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addFrozenKeyImages(value);
+      break;
+    case 1009:
       var value = /** @type {string} */ (reader.readString());
       msg.setPreparedMultisigHex(value);
       break;
-    case 1006:
+    case 1010:
       var value = /** @type {string} */ (reader.readString());
       msg.setMadeMultisigHex(value);
       break;
-    case 1007:
+    case 1011:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setMultisigSetupComplete(value);
       break;
-    case 1008:
+    case 1012:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setMakerReadyToFundMultisig(value);
       break;
-    case 1009:
+    case 1013:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setMultisigDepositInitiated(value);
       break;
-    case 1010:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setTakerPreparedDepositTxId(value);
-      break;
-    case 1011:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMakerPreparedDepositTxId(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -56458,23 +59278,22 @@ proto.io.bisq.protobuffer.ProcessModel.serializeBinaryToWriter = function(messag
       f
     );
   }
-  f = message.getMaker();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getMakerSignature();
+  if (f.length > 0) {
+    writer.writeString(
       1001,
-      f,
-      proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter
+      f
     );
   }
-  f = message.getTaker();
+  f = message.getArbitratorNodeAddress();
   if (f != null) {
     writer.writeMessage(
       1002,
       f,
-      proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter
+      proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
   }
-  f = message.getArbitrator();
+  f = message.getMaker();
   if (f != null) {
     writer.writeMessage(
       1003,
@@ -56482,60 +59301,76 @@ proto.io.bisq.protobuffer.ProcessModel.serializeBinaryToWriter = function(messag
       proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter
     );
   }
-  f = message.getTempTradingPeerNodeAddress();
+  f = message.getTaker();
   if (f != null) {
     writer.writeMessage(
       1004,
       f,
+      proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter
+    );
+  }
+  f = message.getArbitrator();
+  if (f != null) {
+    writer.writeMessage(
+      1005,
+      f,
+      proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter
+    );
+  }
+  f = message.getTempTradingPeerNodeAddress();
+  if (f != null) {
+    writer.writeMessage(
+      1006,
+      f,
       proto.io.bisq.protobuffer.NodeAddress.serializeBinaryToWriter
     );
   }
+  f = message.getReserveTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      1007,
+      f
+    );
+  }
+  f = message.getFrozenKeyImagesList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      1008,
+      f
+    );
+  }
   f = message.getPreparedMultisigHex();
   if (f.length > 0) {
     writer.writeString(
-      1005,
+      1009,
       f
     );
   }
   f = message.getMadeMultisigHex();
   if (f.length > 0) {
     writer.writeString(
-      1006,
+      1010,
       f
     );
   }
   f = message.getMultisigSetupComplete();
   if (f) {
     writer.writeBool(
-      1007,
+      1011,
       f
     );
   }
   f = message.getMakerReadyToFundMultisig();
   if (f) {
     writer.writeBool(
-      1008,
+      1012,
       f
     );
   }
   f = message.getMultisigDepositInitiated();
   if (f) {
     writer.writeBool(
-      1009,
-      f
-    );
-  }
-  f = message.getTakerPreparedDepositTxId();
-  if (f.length > 0) {
-    writer.writeString(
-      1010,
-      f
-    );
-  }
-  f = message.getMakerPreparedDepositTxId();
-  if (f.length > 0) {
-    writer.writeString(
-      1011,
+      1013,
       f
     );
   }
@@ -56924,12 +59759,67 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.setSellerPayoutAmountFromMediat
 
 
 /**
- * optional TradingPeer maker = 1001;
+ * optional string maker_signature = 1001;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.getMakerSignature = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1001, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.setMakerSignature = function(value) {
+  return jspb.Message.setProto3StringField(this, 1001, value);
+};
+
+
+/**
+ * optional NodeAddress arbitrator_node_address = 1002;
+ * @return {?proto.io.bisq.protobuffer.NodeAddress}
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.getArbitratorNodeAddress = function() {
+  return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 1002));
+};
+
+
+/**
+ * @param {?proto.io.bisq.protobuffer.NodeAddress|undefined} value
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+*/
+proto.io.bisq.protobuffer.ProcessModel.prototype.setArbitratorNodeAddress = function(value) {
+  return jspb.Message.setWrapperField(this, 1002, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.clearArbitratorNodeAddress = function() {
+  return this.setArbitratorNodeAddress(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.hasArbitratorNodeAddress = function() {
+  return jspb.Message.getField(this, 1002) != null;
+};
+
+
+/**
+ * optional TradingPeer maker = 1003;
  * @return {?proto.io.bisq.protobuffer.TradingPeer}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.getMaker = function() {
   return /** @type{?proto.io.bisq.protobuffer.TradingPeer} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.TradingPeer, 1001));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.TradingPeer, 1003));
 };
 
 
@@ -56938,7 +59828,7 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.getMaker = function() {
  * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
 */
 proto.io.bisq.protobuffer.ProcessModel.prototype.setMaker = function(value) {
-  return jspb.Message.setWrapperField(this, 1001, value);
+  return jspb.Message.setWrapperField(this, 1003, value);
 };
 
 
@@ -56956,17 +59846,17 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.clearMaker = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.hasMaker = function() {
-  return jspb.Message.getField(this, 1001) != null;
+  return jspb.Message.getField(this, 1003) != null;
 };
 
 
 /**
- * optional TradingPeer taker = 1002;
+ * optional TradingPeer taker = 1004;
  * @return {?proto.io.bisq.protobuffer.TradingPeer}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.getTaker = function() {
   return /** @type{?proto.io.bisq.protobuffer.TradingPeer} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.TradingPeer, 1002));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.TradingPeer, 1004));
 };
 
 
@@ -56975,7 +59865,7 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.getTaker = function() {
  * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
 */
 proto.io.bisq.protobuffer.ProcessModel.prototype.setTaker = function(value) {
-  return jspb.Message.setWrapperField(this, 1002, value);
+  return jspb.Message.setWrapperField(this, 1004, value);
 };
 
 
@@ -56993,17 +59883,17 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.clearTaker = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.hasTaker = function() {
-  return jspb.Message.getField(this, 1002) != null;
+  return jspb.Message.getField(this, 1004) != null;
 };
 
 
 /**
- * optional TradingPeer arbitrator = 1003;
+ * optional TradingPeer arbitrator = 1005;
  * @return {?proto.io.bisq.protobuffer.TradingPeer}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.getArbitrator = function() {
   return /** @type{?proto.io.bisq.protobuffer.TradingPeer} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.TradingPeer, 1003));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.TradingPeer, 1005));
 };
 
 
@@ -57012,7 +59902,7 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.getArbitrator = function() {
  * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
 */
 proto.io.bisq.protobuffer.ProcessModel.prototype.setArbitrator = function(value) {
-  return jspb.Message.setWrapperField(this, 1003, value);
+  return jspb.Message.setWrapperField(this, 1005, value);
 };
 
 
@@ -57030,17 +59920,17 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.clearArbitrator = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.hasArbitrator = function() {
-  return jspb.Message.getField(this, 1003) != null;
+  return jspb.Message.getField(this, 1005) != null;
 };
 
 
 /**
- * optional NodeAddress temp_trading_peer_node_address = 1004;
+ * optional NodeAddress temp_trading_peer_node_address = 1006;
  * @return {?proto.io.bisq.protobuffer.NodeAddress}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.getTempTradingPeerNodeAddress = function() {
   return /** @type{?proto.io.bisq.protobuffer.NodeAddress} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 1004));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.NodeAddress, 1006));
 };
 
 
@@ -57049,7 +59939,7 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.getTempTradingPeerNodeAddress =
  * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
 */
 proto.io.bisq.protobuffer.ProcessModel.prototype.setTempTradingPeerNodeAddress = function(value) {
-  return jspb.Message.setWrapperField(this, 1004, value);
+  return jspb.Message.setWrapperField(this, 1006, value);
 };
 
 
@@ -57067,16 +59957,71 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.clearTempTradingPeerNodeAddress
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.hasTempTradingPeerNodeAddress = function() {
-  return jspb.Message.getField(this, 1004) != null;
+  return jspb.Message.getField(this, 1006) != null;
 };
 
 
 /**
- * optional string prepared_multisig_hex = 1005;
+ * optional string reserve_tx_hash = 1007;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.getReserveTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1007, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.setReserveTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 1007, value);
+};
+
+
+/**
+ * repeated string frozen_key_images = 1008;
+ * @return {!Array<string>}
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.getFrozenKeyImagesList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 1008));
+};
+
+
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.setFrozenKeyImagesList = function(value) {
+  return jspb.Message.setField(this, 1008, value || []);
+};
+
+
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.addFrozenKeyImages = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 1008, value, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.clearFrozenKeyImagesList = function() {
+  return this.setFrozenKeyImagesList([]);
+};
+
+
+/**
+ * optional string prepared_multisig_hex = 1009;
  * @return {string}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.getPreparedMultisigHex = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1005, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1009, ""));
 };
 
 
@@ -57085,87 +60030,15 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.getPreparedMultisigHex = functi
  * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.setPreparedMultisigHex = function(value) {
-  return jspb.Message.setProto3StringField(this, 1005, value);
+  return jspb.Message.setProto3StringField(this, 1009, value);
 };
 
 
 /**
- * optional string made_multisig_hex = 1006;
+ * optional string made_multisig_hex = 1010;
  * @return {string}
  */
 proto.io.bisq.protobuffer.ProcessModel.prototype.getMadeMultisigHex = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1006, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.setMadeMultisigHex = function(value) {
-  return jspb.Message.setProto3StringField(this, 1006, value);
-};
-
-
-/**
- * optional bool multisig_setup_complete = 1007;
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.getMultisigSetupComplete = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1007, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.setMultisigSetupComplete = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 1007, value);
-};
-
-
-/**
- * optional bool maker_ready_to_fund_multisig = 1008;
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.getMakerReadyToFundMultisig = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1008, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.setMakerReadyToFundMultisig = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 1008, value);
-};
-
-
-/**
- * optional bool multisig_deposit_initiated = 1009;
- * @return {boolean}
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.getMultisigDepositInitiated = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1009, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.setMultisigDepositInitiated = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 1009, value);
-};
-
-
-/**
- * optional string taker_prepared_deposit_tx_id = 1010;
- * @return {string}
- */
-proto.io.bisq.protobuffer.ProcessModel.prototype.getTakerPreparedDepositTxId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1010, ""));
 };
 
@@ -57174,26 +60047,62 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.getTakerPreparedDepositTxId = f
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
  */
-proto.io.bisq.protobuffer.ProcessModel.prototype.setTakerPreparedDepositTxId = function(value) {
+proto.io.bisq.protobuffer.ProcessModel.prototype.setMadeMultisigHex = function(value) {
   return jspb.Message.setProto3StringField(this, 1010, value);
 };
 
 
 /**
- * optional string maker_prepared_deposit_tx_id = 1011;
- * @return {string}
+ * optional bool multisig_setup_complete = 1011;
+ * @return {boolean}
  */
-proto.io.bisq.protobuffer.ProcessModel.prototype.getMakerPreparedDepositTxId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1011, ""));
+proto.io.bisq.protobuffer.ProcessModel.prototype.getMultisigSetupComplete = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1011, false));
 };
 
 
 /**
- * @param {string} value
+ * @param {boolean} value
  * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
  */
-proto.io.bisq.protobuffer.ProcessModel.prototype.setMakerPreparedDepositTxId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1011, value);
+proto.io.bisq.protobuffer.ProcessModel.prototype.setMultisigSetupComplete = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 1011, value);
+};
+
+
+/**
+ * optional bool maker_ready_to_fund_multisig = 1012;
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.getMakerReadyToFundMultisig = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1012, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.setMakerReadyToFundMultisig = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 1012, value);
+};
+
+
+/**
+ * optional bool multisig_deposit_initiated = 1013;
+ * @return {boolean}
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.getMultisigDepositInitiated = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1013, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.io.bisq.protobuffer.ProcessModel} returns this
+ */
+proto.io.bisq.protobuffer.ProcessModel.prototype.setMultisigDepositInitiated = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 1013, value);
 };
 
 
@@ -57203,7 +60112,7 @@ proto.io.bisq.protobuffer.ProcessModel.prototype.setMakerPreparedDepositTxId = f
  * @private {!Array<number>}
  * @const
  */
-proto.io.bisq.protobuffer.TradingPeer.repeatedFields_ = [9];
+proto.io.bisq.protobuffer.TradingPeer.repeatedFields_ = [12];
 
 
 
@@ -57237,24 +60146,33 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.toObject = function(opt_includeI
 proto.io.bisq.protobuffer.TradingPeer.toObject = function(includeInstance, msg) {
   var f, obj = {
     accountId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    paymentAccountId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    paymentMethodId: jspb.Message.getFieldWithDefault(msg, 3, ""),
+    paymentAccountPayloadHash: msg.getPaymentAccountPayloadHash_asB64(),
     paymentAccountPayload: (f = msg.getPaymentAccountPayload()) && proto.io.bisq.protobuffer.PaymentAccountPayload.toObject(includeInstance, f),
-    payoutAddressString: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    contractAsJson: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    contractSignature: jspb.Message.getFieldWithDefault(msg, 5, ""),
+    payoutAddressString: jspb.Message.getFieldWithDefault(msg, 6, ""),
+    contractAsJson: jspb.Message.getFieldWithDefault(msg, 7, ""),
+    contractSignature: jspb.Message.getFieldWithDefault(msg, 8, ""),
     signature: msg.getSignature_asB64(),
     pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.bisq.protobuffer.PubKeyRing.toObject(includeInstance, f),
     multiSigPubKey: msg.getMultiSigPubKey_asB64(),
     rawTransactionInputsList: jspb.Message.toObjectList(msg.getRawTransactionInputsList(),
     proto.io.bisq.protobuffer.RawTransactionInput.toObject, includeInstance),
-    changeOutputValue: jspb.Message.getFieldWithDefault(msg, 10, 0),
-    changeOutputAddress: jspb.Message.getFieldWithDefault(msg, 11, ""),
+    changeOutputValue: jspb.Message.getFieldWithDefault(msg, 13, 0),
+    changeOutputAddress: jspb.Message.getFieldWithDefault(msg, 14, ""),
     accountAgeWitnessNonce: msg.getAccountAgeWitnessNonce_asB64(),
     accountAgeWitnessSignature: msg.getAccountAgeWitnessSignature_asB64(),
-    currentDate: jspb.Message.getFieldWithDefault(msg, 14, 0),
+    currentDate: jspb.Message.getFieldWithDefault(msg, 17, 0),
     mediatedPayoutTxSignature: msg.getMediatedPayoutTxSignature_asB64(),
-    preparedMultisigHex: jspb.Message.getFieldWithDefault(msg, 1001, ""),
-    madeMultisigHex: jspb.Message.getFieldWithDefault(msg, 1002, ""),
-    signedPayoutTxHex: jspb.Message.getFieldWithDefault(msg, 1003, "")
+    reserveTxHash: jspb.Message.getFieldWithDefault(msg, 1001, ""),
+    reserveTxHex: jspb.Message.getFieldWithDefault(msg, 1002, ""),
+    reserveTxKey: jspb.Message.getFieldWithDefault(msg, 1003, ""),
+    preparedMultisigHex: jspb.Message.getFieldWithDefault(msg, 1004, ""),
+    madeMultisigHex: jspb.Message.getFieldWithDefault(msg, 1005, ""),
+    signedPayoutTxHex: jspb.Message.getFieldWithDefault(msg, 1006, ""),
+    depositTxHash: jspb.Message.getFieldWithDefault(msg, 1007, ""),
+    depositTxHex: jspb.Message.getFieldWithDefault(msg, 1008, ""),
+    depositTxKey: jspb.Message.getFieldWithDefault(msg, 1009, "")
   };
 
   if (includeInstance) {
@@ -57296,76 +60214,112 @@ proto.io.bisq.protobuffer.TradingPeer.deserializeBinaryFromReader = function(msg
       msg.setAccountId(value);
       break;
     case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPaymentAccountId(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPaymentMethodId(value);
+      break;
+    case 4:
+      var value = /** @type {!Uint8Array} */ (reader.readBytes());
+      msg.setPaymentAccountPayloadHash(value);
+      break;
+    case 5:
       var value = new proto.io.bisq.protobuffer.PaymentAccountPayload;
       reader.readMessage(value,proto.io.bisq.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader);
       msg.setPaymentAccountPayload(value);
       break;
-    case 3:
+    case 6:
       var value = /** @type {string} */ (reader.readString());
       msg.setPayoutAddressString(value);
       break;
-    case 4:
+    case 7:
       var value = /** @type {string} */ (reader.readString());
       msg.setContractAsJson(value);
       break;
-    case 5:
+    case 8:
       var value = /** @type {string} */ (reader.readString());
       msg.setContractSignature(value);
       break;
-    case 6:
+    case 9:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setSignature(value);
       break;
-    case 7:
+    case 10:
       var value = new proto.io.bisq.protobuffer.PubKeyRing;
       reader.readMessage(value,proto.io.bisq.protobuffer.PubKeyRing.deserializeBinaryFromReader);
       msg.setPubKeyRing(value);
       break;
-    case 8:
+    case 11:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setMultiSigPubKey(value);
       break;
-    case 9:
+    case 12:
       var value = new proto.io.bisq.protobuffer.RawTransactionInput;
       reader.readMessage(value,proto.io.bisq.protobuffer.RawTransactionInput.deserializeBinaryFromReader);
       msg.addRawTransactionInputs(value);
       break;
-    case 10:
+    case 13:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setChangeOutputValue(value);
       break;
-    case 11:
+    case 14:
       var value = /** @type {string} */ (reader.readString());
       msg.setChangeOutputAddress(value);
       break;
-    case 12:
+    case 15:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setAccountAgeWitnessNonce(value);
       break;
-    case 13:
+    case 16:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setAccountAgeWitnessSignature(value);
       break;
-    case 14:
+    case 17:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setCurrentDate(value);
       break;
-    case 15:
+    case 18:
       var value = /** @type {!Uint8Array} */ (reader.readBytes());
       msg.setMediatedPayoutTxSignature(value);
       break;
     case 1001:
       var value = /** @type {string} */ (reader.readString());
-      msg.setPreparedMultisigHex(value);
+      msg.setReserveTxHash(value);
       break;
     case 1002:
       var value = /** @type {string} */ (reader.readString());
-      msg.setMadeMultisigHex(value);
+      msg.setReserveTxHex(value);
       break;
     case 1003:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReserveTxKey(value);
+      break;
+    case 1004:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPreparedMultisigHex(value);
+      break;
+    case 1005:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMadeMultisigHex(value);
+      break;
+    case 1006:
       var value = /** @type {string} */ (reader.readString());
       msg.setSignedPayoutTxHex(value);
       break;
+    case 1007:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDepositTxHash(value);
+      break;
+    case 1008:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDepositTxHex(value);
+      break;
+    case 1009:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDepositTxKey(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -57402,10 +60356,31 @@ proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter = function(message
       f
     );
   }
+  f = message.getPaymentAccountId();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getPaymentMethodId();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
+    );
+  }
+  f = message.getPaymentAccountPayloadHash_asU8();
+  if (f.length > 0) {
+    writer.writeBytes(
+      4,
+      f
+    );
+  }
   f = message.getPaymentAccountPayload();
   if (f != null) {
     writer.writeMessage(
-      2,
+      5,
       f,
       proto.io.bisq.protobuffer.PaymentAccountPayload.serializeBinaryToWriter
     );
@@ -57413,35 +60388,35 @@ proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter = function(message
   f = message.getPayoutAddressString();
   if (f.length > 0) {
     writer.writeString(
-      3,
+      6,
       f
     );
   }
   f = message.getContractAsJson();
   if (f.length > 0) {
     writer.writeString(
-      4,
+      7,
       f
     );
   }
   f = message.getContractSignature();
   if (f.length > 0) {
     writer.writeString(
-      5,
+      8,
       f
     );
   }
   f = message.getSignature_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      6,
+      9,
       f
     );
   }
   f = message.getPubKeyRing();
   if (f != null) {
     writer.writeMessage(
-      7,
+      10,
       f,
       proto.io.bisq.protobuffer.PubKeyRing.serializeBinaryToWriter
     );
@@ -57449,14 +60424,14 @@ proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter = function(message
   f = message.getMultiSigPubKey_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      8,
+      11,
       f
     );
   }
   f = message.getRawTransactionInputsList();
   if (f.length > 0) {
     writer.writeRepeatedMessage(
-      9,
+      12,
       f,
       proto.io.bisq.protobuffer.RawTransactionInput.serializeBinaryToWriter
     );
@@ -57464,66 +60439,108 @@ proto.io.bisq.protobuffer.TradingPeer.serializeBinaryToWriter = function(message
   f = message.getChangeOutputValue();
   if (f !== 0) {
     writer.writeInt64(
-      10,
+      13,
       f
     );
   }
   f = message.getChangeOutputAddress();
   if (f.length > 0) {
     writer.writeString(
-      11,
+      14,
       f
     );
   }
   f = message.getAccountAgeWitnessNonce_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      12,
+      15,
       f
     );
   }
   f = message.getAccountAgeWitnessSignature_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      13,
+      16,
       f
     );
   }
   f = message.getCurrentDate();
   if (f !== 0) {
     writer.writeInt64(
-      14,
+      17,
       f
     );
   }
   f = message.getMediatedPayoutTxSignature_asU8();
   if (f.length > 0) {
     writer.writeBytes(
-      15,
+      18,
       f
     );
   }
-  f = message.getPreparedMultisigHex();
+  f = message.getReserveTxHash();
   if (f.length > 0) {
     writer.writeString(
       1001,
       f
     );
   }
-  f = message.getMadeMultisigHex();
+  f = message.getReserveTxHex();
   if (f.length > 0) {
     writer.writeString(
       1002,
       f
     );
   }
-  f = message.getSignedPayoutTxHex();
+  f = message.getReserveTxKey();
   if (f.length > 0) {
     writer.writeString(
       1003,
       f
     );
   }
+  f = message.getPreparedMultisigHex();
+  if (f.length > 0) {
+    writer.writeString(
+      1004,
+      f
+    );
+  }
+  f = message.getMadeMultisigHex();
+  if (f.length > 0) {
+    writer.writeString(
+      1005,
+      f
+    );
+  }
+  f = message.getSignedPayoutTxHex();
+  if (f.length > 0) {
+    writer.writeString(
+      1006,
+      f
+    );
+  }
+  f = message.getDepositTxHash();
+  if (f.length > 0) {
+    writer.writeString(
+      1007,
+      f
+    );
+  }
+  f = message.getDepositTxHex();
+  if (f.length > 0) {
+    writer.writeString(
+      1008,
+      f
+    );
+  }
+  f = message.getDepositTxKey();
+  if (f.length > 0) {
+    writer.writeString(
+      1009,
+      f
+    );
+  }
 };
 
 
@@ -57546,12 +60563,90 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.setAccountId = function(value) {
 
 
 /**
- * optional PaymentAccountPayload payment_account_payload = 2;
+ * optional string payment_account_id = 2;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getPaymentAccountId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setPaymentAccountId = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
+/**
+ * optional string payment_method_id = 3;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getPaymentMethodId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setPaymentMethodId = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
+};
+
+
+/**
+ * optional bytes payment_account_payload_hash = 4;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getPaymentAccountPayloadHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * optional bytes payment_account_payload_hash = 4;
+ * This is a type-conversion wrapper around `getPaymentAccountPayloadHash()`
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getPaymentAccountPayloadHash_asB64 = function() {
+  return /** @type {string} */ (jspb.Message.bytesAsB64(
+      this.getPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * optional bytes payment_account_payload_hash = 4;
+ * Note that Uint8Array is not supported on all browsers.
+ * @see http://caniuse.com/Uint8Array
+ * This is a type-conversion wrapper around `getPaymentAccountPayloadHash()`
+ * @return {!Uint8Array}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getPaymentAccountPayloadHash_asU8 = function() {
+  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
+      this.getPaymentAccountPayloadHash()));
+};
+
+
+/**
+ * @param {!(string|Uint8Array)} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setPaymentAccountPayloadHash = function(value) {
+  return jspb.Message.setProto3BytesField(this, 4, value);
+};
+
+
+/**
+ * optional PaymentAccountPayload payment_account_payload = 5;
  * @return {?proto.io.bisq.protobuffer.PaymentAccountPayload}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getPaymentAccountPayload = function() {
   return /** @type{?proto.io.bisq.protobuffer.PaymentAccountPayload} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 2));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PaymentAccountPayload, 5));
 };
 
 
@@ -57560,7 +60655,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getPaymentAccountPayload = funct
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
 */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setPaymentAccountPayload = function(value) {
-  return jspb.Message.setWrapperField(this, 2, value);
+  return jspb.Message.setWrapperField(this, 5, value);
 };
 
 
@@ -57578,16 +60673,16 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.clearPaymentAccountPayload = fun
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.hasPaymentAccountPayload = function() {
-  return jspb.Message.getField(this, 2) != null;
+  return jspb.Message.getField(this, 5) != null;
 };
 
 
 /**
- * optional string payout_address_string = 3;
+ * optional string payout_address_string = 6;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getPayoutAddressString = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 
 
@@ -57596,16 +60691,16 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getPayoutAddressString = functio
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setPayoutAddressString = function(value) {
-  return jspb.Message.setProto3StringField(this, 3, value);
+  return jspb.Message.setProto3StringField(this, 6, value);
 };
 
 
 /**
- * optional string contract_as_json = 4;
+ * optional string contract_as_json = 7;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getContractAsJson = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
 };
 
 
@@ -57614,16 +60709,16 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getContractAsJson = function() {
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setContractAsJson = function(value) {
-  return jspb.Message.setProto3StringField(this, 4, value);
+  return jspb.Message.setProto3StringField(this, 7, value);
 };
 
 
 /**
- * optional string contract_signature = 5;
+ * optional string contract_signature = 8;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getContractSignature = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
 };
 
 
@@ -57632,21 +60727,21 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getContractSignature = function(
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setContractSignature = function(value) {
-  return jspb.Message.setProto3StringField(this, 5, value);
+  return jspb.Message.setProto3StringField(this, 8, value);
 };
 
 
 /**
- * optional bytes signature = 6;
+ * optional bytes signature = 9;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getSignature = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
 };
 
 
 /**
- * optional bytes signature = 6;
+ * optional bytes signature = 9;
  * This is a type-conversion wrapper around `getSignature()`
  * @return {string}
  */
@@ -57657,7 +60752,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getSignature_asB64 = function()
 
 
 /**
- * optional bytes signature = 6;
+ * optional bytes signature = 9;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getSignature()`
@@ -57674,17 +60769,17 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getSignature_asU8 = function() {
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setSignature = function(value) {
-  return jspb.Message.setProto3BytesField(this, 6, value);
+  return jspb.Message.setProto3BytesField(this, 9, value);
 };
 
 
 /**
- * optional PubKeyRing pub_key_ring = 7;
+ * optional PubKeyRing pub_key_ring = 10;
  * @return {?proto.io.bisq.protobuffer.PubKeyRing}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getPubKeyRing = function() {
   return /** @type{?proto.io.bisq.protobuffer.PubKeyRing} */ (
-    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 7));
+    jspb.Message.getWrapperField(this, proto.io.bisq.protobuffer.PubKeyRing, 10));
 };
 
 
@@ -57693,7 +60788,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getPubKeyRing = function() {
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
 */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setPubKeyRing = function(value) {
-  return jspb.Message.setWrapperField(this, 7, value);
+  return jspb.Message.setWrapperField(this, 10, value);
 };
 
 
@@ -57711,21 +60806,21 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.clearPubKeyRing = function() {
  * @return {boolean}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.hasPubKeyRing = function() {
-  return jspb.Message.getField(this, 7) != null;
+  return jspb.Message.getField(this, 10) != null;
 };
 
 
 /**
- * optional bytes multi_sig_pub_key = 8;
+ * optional bytes multi_sig_pub_key = 11;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getMultiSigPubKey = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
 };
 
 
 /**
- * optional bytes multi_sig_pub_key = 8;
+ * optional bytes multi_sig_pub_key = 11;
  * This is a type-conversion wrapper around `getMultiSigPubKey()`
  * @return {string}
  */
@@ -57736,7 +60831,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getMultiSigPubKey_asB64 = functi
 
 
 /**
- * optional bytes multi_sig_pub_key = 8;
+ * optional bytes multi_sig_pub_key = 11;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getMultiSigPubKey()`
@@ -57753,17 +60848,17 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getMultiSigPubKey_asU8 = functio
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setMultiSigPubKey = function(value) {
-  return jspb.Message.setProto3BytesField(this, 8, value);
+  return jspb.Message.setProto3BytesField(this, 11, value);
 };
 
 
 /**
- * repeated RawTransactionInput raw_transaction_inputs = 9;
+ * repeated RawTransactionInput raw_transaction_inputs = 12;
  * @return {!Array<!proto.io.bisq.protobuffer.RawTransactionInput>}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getRawTransactionInputsList = function() {
   return /** @type{!Array<!proto.io.bisq.protobuffer.RawTransactionInput>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.RawTransactionInput, 9));
+    jspb.Message.getRepeatedWrapperField(this, proto.io.bisq.protobuffer.RawTransactionInput, 12));
 };
 
 
@@ -57772,7 +60867,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getRawTransactionInputsList = fu
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
 */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setRawTransactionInputsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 9, value);
+  return jspb.Message.setRepeatedWrapperField(this, 12, value);
 };
 
 
@@ -57782,7 +60877,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.setRawTransactionInputsList = fu
  * @return {!proto.io.bisq.protobuffer.RawTransactionInput}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.addRawTransactionInputs = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 9, opt_value, proto.io.bisq.protobuffer.RawTransactionInput, opt_index);
+  return jspb.Message.addToRepeatedWrapperField(this, 12, opt_value, proto.io.bisq.protobuffer.RawTransactionInput, opt_index);
 };
 
 
@@ -57796,11 +60891,11 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.clearRawTransactionInputsList =
 
 
 /**
- * optional int64 change_output_value = 10;
+ * optional int64 change_output_value = 13;
  * @return {number}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getChangeOutputValue = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 10, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 13, 0));
 };
 
 
@@ -57809,16 +60904,16 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getChangeOutputValue = function(
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setChangeOutputValue = function(value) {
-  return jspb.Message.setProto3IntField(this, 10, value);
+  return jspb.Message.setProto3IntField(this, 13, value);
 };
 
 
 /**
- * optional string change_output_address = 11;
+ * optional string change_output_address = 14;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getChangeOutputAddress = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 14, ""));
 };
 
 
@@ -57827,21 +60922,21 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getChangeOutputAddress = functio
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setChangeOutputAddress = function(value) {
-  return jspb.Message.setProto3StringField(this, 11, value);
+  return jspb.Message.setProto3StringField(this, 14, value);
 };
 
 
 /**
- * optional bytes account_age_witness_nonce = 12;
+ * optional bytes account_age_witness_nonce = 15;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getAccountAgeWitnessNonce = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
 };
 
 
 /**
- * optional bytes account_age_witness_nonce = 12;
+ * optional bytes account_age_witness_nonce = 15;
  * This is a type-conversion wrapper around `getAccountAgeWitnessNonce()`
  * @return {string}
  */
@@ -57852,7 +60947,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getAccountAgeWitnessNonce_asB64
 
 
 /**
- * optional bytes account_age_witness_nonce = 12;
+ * optional bytes account_age_witness_nonce = 15;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getAccountAgeWitnessNonce()`
@@ -57869,21 +60964,21 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getAccountAgeWitnessNonce_asU8 =
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setAccountAgeWitnessNonce = function(value) {
-  return jspb.Message.setProto3BytesField(this, 12, value);
+  return jspb.Message.setProto3BytesField(this, 15, value);
 };
 
 
 /**
- * optional bytes account_age_witness_signature = 13;
+ * optional bytes account_age_witness_signature = 16;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getAccountAgeWitnessSignature = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
 };
 
 
 /**
- * optional bytes account_age_witness_signature = 13;
+ * optional bytes account_age_witness_signature = 16;
  * This is a type-conversion wrapper around `getAccountAgeWitnessSignature()`
  * @return {string}
  */
@@ -57894,7 +60989,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getAccountAgeWitnessSignature_as
 
 
 /**
- * optional bytes account_age_witness_signature = 13;
+ * optional bytes account_age_witness_signature = 16;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getAccountAgeWitnessSignature()`
@@ -57911,16 +61006,16 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getAccountAgeWitnessSignature_as
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setAccountAgeWitnessSignature = function(value) {
-  return jspb.Message.setProto3BytesField(this, 13, value);
+  return jspb.Message.setProto3BytesField(this, 16, value);
 };
 
 
 /**
- * optional int64 current_date = 14;
+ * optional int64 current_date = 17;
  * @return {number}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getCurrentDate = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 14, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 17, 0));
 };
 
 
@@ -57929,21 +61024,21 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getCurrentDate = function() {
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setCurrentDate = function(value) {
-  return jspb.Message.setProto3IntField(this, 14, value);
+  return jspb.Message.setProto3IntField(this, 17, value);
 };
 
 
 /**
- * optional bytes mediated_payout_tx_signature = 15;
+ * optional bytes mediated_payout_tx_signature = 18;
  * @return {string}
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.getMediatedPayoutTxSignature = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, ""));
 };
 
 
 /**
- * optional bytes mediated_payout_tx_signature = 15;
+ * optional bytes mediated_payout_tx_signature = 18;
  * This is a type-conversion wrapper around `getMediatedPayoutTxSignature()`
  * @return {string}
  */
@@ -57954,7 +61049,7 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getMediatedPayoutTxSignature_asB
 
 
 /**
- * optional bytes mediated_payout_tx_signature = 15;
+ * optional bytes mediated_payout_tx_signature = 18;
  * Note that Uint8Array is not supported on all browsers.
  * @see http://caniuse.com/Uint8Array
  * This is a type-conversion wrapper around `getMediatedPayoutTxSignature()`
@@ -57971,15 +61066,15 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getMediatedPayoutTxSignature_asU
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
 proto.io.bisq.protobuffer.TradingPeer.prototype.setMediatedPayoutTxSignature = function(value) {
-  return jspb.Message.setProto3BytesField(this, 15, value);
+  return jspb.Message.setProto3BytesField(this, 18, value);
 };
 
 
 /**
- * optional string prepared_multisig_hex = 1001;
+ * optional string reserve_tx_hash = 1001;
  * @return {string}
  */
-proto.io.bisq.protobuffer.TradingPeer.prototype.getPreparedMultisigHex = function() {
+proto.io.bisq.protobuffer.TradingPeer.prototype.getReserveTxHash = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1001, ""));
 };
 
@@ -57988,16 +61083,16 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getPreparedMultisigHex = functio
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
-proto.io.bisq.protobuffer.TradingPeer.prototype.setPreparedMultisigHex = function(value) {
+proto.io.bisq.protobuffer.TradingPeer.prototype.setReserveTxHash = function(value) {
   return jspb.Message.setProto3StringField(this, 1001, value);
 };
 
 
 /**
- * optional string made_multisig_hex = 1002;
+ * optional string reserve_tx_hex = 1002;
  * @return {string}
  */
-proto.io.bisq.protobuffer.TradingPeer.prototype.getMadeMultisigHex = function() {
+proto.io.bisq.protobuffer.TradingPeer.prototype.getReserveTxHex = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1002, ""));
 };
 
@@ -58006,16 +61101,16 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getMadeMultisigHex = function()
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
-proto.io.bisq.protobuffer.TradingPeer.prototype.setMadeMultisigHex = function(value) {
+proto.io.bisq.protobuffer.TradingPeer.prototype.setReserveTxHex = function(value) {
   return jspb.Message.setProto3StringField(this, 1002, value);
 };
 
 
 /**
- * optional string signed_payout_tx_hex = 1003;
+ * optional string reserve_tx_key = 1003;
  * @return {string}
  */
-proto.io.bisq.protobuffer.TradingPeer.prototype.getSignedPayoutTxHex = function() {
+proto.io.bisq.protobuffer.TradingPeer.prototype.getReserveTxKey = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1003, ""));
 };
 
@@ -58024,11 +61119,119 @@ proto.io.bisq.protobuffer.TradingPeer.prototype.getSignedPayoutTxHex = function(
  * @param {string} value
  * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
  */
-proto.io.bisq.protobuffer.TradingPeer.prototype.setSignedPayoutTxHex = function(value) {
+proto.io.bisq.protobuffer.TradingPeer.prototype.setReserveTxKey = function(value) {
   return jspb.Message.setProto3StringField(this, 1003, value);
 };
 
 
+/**
+ * optional string prepared_multisig_hex = 1004;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getPreparedMultisigHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1004, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setPreparedMultisigHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 1004, value);
+};
+
+
+/**
+ * optional string made_multisig_hex = 1005;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getMadeMultisigHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1005, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setMadeMultisigHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 1005, value);
+};
+
+
+/**
+ * optional string signed_payout_tx_hex = 1006;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getSignedPayoutTxHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1006, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setSignedPayoutTxHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 1006, value);
+};
+
+
+/**
+ * optional string deposit_tx_hash = 1007;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getDepositTxHash = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1007, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setDepositTxHash = function(value) {
+  return jspb.Message.setProto3StringField(this, 1007, value);
+};
+
+
+/**
+ * optional string deposit_tx_hex = 1008;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getDepositTxHex = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1008, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setDepositTxHex = function(value) {
+  return jspb.Message.setProto3StringField(this, 1008, value);
+};
+
+
+/**
+ * optional string deposit_tx_key = 1009;
+ * @return {string}
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.getDepositTxKey = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1009, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.bisq.protobuffer.TradingPeer} returns this
+ */
+proto.io.bisq.protobuffer.TradingPeer.prototype.setDepositTxKey = function(value) {
+  return jspb.Message.setProto3StringField(this, 1009, value);
+};
+
+
 
 /**
  * List of repeated fields within this message type.
@@ -77200,7 +80403,8 @@ proto.io.bisq.protobuffer.AvailabilityResult = {
   NO_REFUND_AGENTS: 10,
   UNCONF_TX_LIMIT_HIT: 11,
   MAKER_DENIED_API_USER: 12,
-  PRICE_CHECK_FAILED: 13
+  PRICE_CHECK_FAILED: 13,
+  MAKER_DENIED_TAKER: 14
 };
 
 /**