update dist

dist/HavenoClient.d.ts

@@ -2,6 +2,25 @@ import type * as grpcWeb from "grpc-web";
 import { GetTradeStatisticsClient, GetVersionClient, AccountClient, XmrConnectionsClient, DisputesClient, DisputeAgentsClient, NotificationsClient, WalletsClient, PriceClient, OffersClient, PaymentAccountsClient, TradesClient, ShutdownServerClient, XmrNodeClient } from './protobuf/GrpcServiceClientPb';
 import { MarketPriceInfo, MarketDepthInfo, XmrBalanceInfo, OfferInfo, TradeInfo, XmrTx, XmrDestination, NotificationMessage, UrlConnection } from "./protobuf/grpc_pb";
 import { TradeStatistics3, OfferDirection, PaymentMethod, PaymentAccountForm, PaymentAccountFormField, PaymentAccount, PaymentAccountPayload, Attachment, DisputeResult, Dispute, ChatMessage, XmrNodeSettings } from "./protobuf/pb_pb";
+/**
+ * Configuration to post, clone, or edit an offer.
+ */
+export interface OfferConfig {
+    direction?: OfferDirection;
+    amount?: bigint;
+    minAmount?: bigint;
+    assetCode?: string;
+    paymentAccountId?: string;
+    securityDepositPct?: number;
+    price?: number;
+    marketPriceMarginPct?: number;
+    triggerPrice?: number;
+    reserveExactAmount?: boolean;
+    isPrivateOffer?: boolean;
+    buyerAsTakerWithoutDeposit?: boolean;
+    extraInfo?: string;
+    sourceOfferId?: string;
+}
 /**
  * Haveno daemon client.
  */
@@ -425,23 +444,26 @@ export default class HavenoClient {
      */
     getMyOffer(offerId: string): Promise<OfferInfo>;
     /**
-     * Post an offer.
+     * Post or clone an offer.
      *
-     * @param {OfferDirection} direction - "buy" or "sell" XMR
-     * @param {bigint} amount - amount of XMR to trade
-     * @param {string} assetCode - asset code to trade for XMR
-     * @param {string} paymentAccountId - payment account id
-     * @param {number} securityDepositPct - security deposit as % of trade amount for buyer and seller
-     * @param {number} price - trade price (optional, default to market price)
-     * @param {number} marketPriceMarginPct - if using market price, % from market price to accept (optional, default 0%)
-     * @param {number} triggerPrice - price to remove offer (optional)
-     * @param {bigint} minAmount - minimum amount to trade (optional, default to fixed amount)
-     * @param {number} reserveExactAmount - reserve exact amount needed for offer, incurring on-chain transaction and 10 confirmations before the offer goes live (default = false)
-     * @param {boolean} isPrivateOffer - whether the offer is private (default = false)
-     * @param {boolean} buyerAsTakerWithoutDeposit - waive buyer as taker deposit and fee (default false)
+     * @param {OfferConfig} config - configures the offer to post or clone
+     * @param {OfferDirection} [config.direction] - specifies to buy or sell xmr (default buy)
+     * @param {bigint} [config.amount] - amount of XMR to trade
+     * @param {string} [config.assetCode] - asset code to trade for XMR
+     * @param {string} [config.paymentAccountId] - payment account id
+     * @param {number} [config.securityDepositPct] - security deposit as % of trade amount for buyer and seller
+     * @param {number} [config.price] - trade price (optional, default to market price)
+     * @param {number} [config.marketPriceMarginPct] - if using market price, % from market price to accept (optional, default 0%)
+     * @param {number} [config.triggerPrice] - price to remove offer (optional)
+     * @param {bigint} [config.minAmount] - minimum amount to trade (optional, default to fixed amount)
+     * @param {number} [config.reserveExactAmount] - reserve exact amount needed for offer, incurring on-chain transaction and 10 confirmations before the offer goes live (default = false)
+     * @param {boolean} [config.isPrivateOffer] - whether the offer is private (default = false)
+     * @param {boolean} [config.buyerAsTakerWithoutDeposit] - waive buyer as taker deposit and fee (default false)
+     * @param {string} [config.extraInfo] - extra information to include with the offer (optional)
+     * @param {string} [config.sourceOfferId] - create a clone of a source offer which shares the same reserved funds. overrides other fields which are immutable or unspecified (optional)
      * @return {OfferInfo} the posted offer
      */
-    postOffer(direction: OfferDirection, amount: bigint, assetCode: string, paymentAccountId: string, securityDepositPct: number, price?: number, marketPriceMarginPct?: number, triggerPrice?: number, minAmount?: bigint, reserveExactAmount?: boolean, isPrivateOffer?: boolean, buyerAsTakerWithoutDeposit?: boolean): Promise<OfferInfo>;
+    postOffer(config: OfferConfig): Promise<OfferInfo>;
     /**
      * Remove a posted offer, releasing its reserved funds.
      *

dist/HavenoClient.js

@@ -1014,45 +1014,57 @@ class HavenoClient {
         }
     }
     /**
-     * Post an offer.
+     * Post or clone an offer.
      *
-     * @param {OfferDirection} direction - "buy" or "sell" XMR
-     * @param {bigint} amount - amount of XMR to trade
-     * @param {string} assetCode - asset code to trade for XMR
-     * @param {string} paymentAccountId - payment account id
-     * @param {number} securityDepositPct - security deposit as % of trade amount for buyer and seller
-     * @param {number} price - trade price (optional, default to market price)
-     * @param {number} marketPriceMarginPct - if using market price, % from market price to accept (optional, default 0%)
-     * @param {number} triggerPrice - price to remove offer (optional)
-     * @param {bigint} minAmount - minimum amount to trade (optional, default to fixed amount)
-     * @param {number} reserveExactAmount - reserve exact amount needed for offer, incurring on-chain transaction and 10 confirmations before the offer goes live (default = false)
-     * @param {boolean} isPrivateOffer - whether the offer is private (default = false)
-     * @param {boolean} buyerAsTakerWithoutDeposit - waive buyer as taker deposit and fee (default false)
+     * @param {OfferConfig} config - configures the offer to post or clone
+     * @param {OfferDirection} [config.direction] - specifies to buy or sell xmr (default buy)
+     * @param {bigint} [config.amount] - amount of XMR to trade
+     * @param {string} [config.assetCode] - asset code to trade for XMR
+     * @param {string} [config.paymentAccountId] - payment account id
+     * @param {number} [config.securityDepositPct] - security deposit as % of trade amount for buyer and seller
+     * @param {number} [config.price] - trade price (optional, default to market price)
+     * @param {number} [config.marketPriceMarginPct] - if using market price, % from market price to accept (optional, default 0%)
+     * @param {number} [config.triggerPrice] - price to remove offer (optional)
+     * @param {bigint} [config.minAmount] - minimum amount to trade (optional, default to fixed amount)
+     * @param {number} [config.reserveExactAmount] - reserve exact amount needed for offer, incurring on-chain transaction and 10 confirmations before the offer goes live (default = false)
+     * @param {boolean} [config.isPrivateOffer] - whether the offer is private (default = false)
+     * @param {boolean} [config.buyerAsTakerWithoutDeposit] - waive buyer as taker deposit and fee (default false)
+     * @param {string} [config.extraInfo] - extra information to include with the offer (optional)
+     * @param {string} [config.sourceOfferId] - create a clone of a source offer which shares the same reserved funds. overrides other fields which are immutable or unspecified (optional)
      * @return {OfferInfo} the posted offer
      */
-    async postOffer(direction, amount, assetCode, paymentAccountId, securityDepositPct, price, marketPriceMarginPct, triggerPrice, minAmount, reserveExactAmount, isPrivateOffer, buyerAsTakerWithoutDeposit) {
-        console_1.default.log("Posting offer with security deposit %: " + securityDepositPct);
+    async postOffer(config) {
+        console_1.default.log("Posting offer with security deposit %: " + config.securityDepositPct);
         try {
-            const request = new grpc_pb_1.PostOfferRequest()
-                .setDirection(direction === pb_pb_1.OfferDirection.BUY ? "buy" : "sell")
-                .setAmount(amount.toString())
-                .setCurrencyCode(assetCode)
-                .setPaymentAccountId(paymentAccountId)
-                .setSecurityDepositPct(securityDepositPct)
-                .setUseMarketBasedPrice(price === undefined)
-                .setMinAmount(minAmount ? minAmount.toString() : amount.toString());
-            if (price)
-                request.setPrice(price.toString());
-            if (marketPriceMarginPct)
-                request.setMarketPriceMarginPct(marketPriceMarginPct);
-            if (triggerPrice)
-                request.setTriggerPrice(triggerPrice.toString());
-            if (reserveExactAmount)
+            const request = new grpc_pb_1.PostOfferRequest();
+            if (config.direction)
+                request.setDirection(config.direction === pb_pb_1.OfferDirection.BUY ? "buy" : "sell");
+            if (config.amount)
+                request.setAmount(config.amount.toString());
+            request.setMinAmount(config.minAmount ? config.minAmount.toString() : config.amount.toString());
+            if (config.assetCode)
+                request.setCurrencyCode(config.assetCode);
+            if (config.paymentAccountId)
+                request.setPaymentAccountId(config.paymentAccountId);
+            if (config.securityDepositPct)
+                request.setSecurityDepositPct(config.securityDepositPct);
+            request.setUseMarketBasedPrice(config.price === undefined);
+            if (config.price)
+                request.setPrice(config.price?.toString());
+            if (config.marketPriceMarginPct)
+                request.setMarketPriceMarginPct(config.marketPriceMarginPct);
+            if (config.triggerPrice)
+                request.setTriggerPrice(config.triggerPrice.toString());
+            if (config.reserveExactAmount)
                 request.setReserveExactAmount(true);
-            if (isPrivateOffer)
+            if (config.isPrivateOffer)
                 request.setIsPrivateOffer(true);
-            if (buyerAsTakerWithoutDeposit)
+            if (config.buyerAsTakerWithoutDeposit)
                 request.setBuyerAsTakerWithoutDeposit(true);
+            if (config.extraInfo)
+                request.setExtraInfo(config.extraInfo);
+            if (config.sourceOfferId)
+                request.setSourceOfferId(config.sourceOfferId);
             return (await this._offersClient.postOffer(request, { password: this._password })).getOffer();
         }
         catch (e) {

dist/protobuf/grpc_pb.d.ts

@@ -1543,6 +1543,12 @@ export class PostOfferRequest extends jspb.Message {
   getBuyerAsTakerWithoutDeposit(): boolean;
   setBuyerAsTakerWithoutDeposit(value: boolean): PostOfferRequest;
 
+  getExtraInfo(): string;
+  setExtraInfo(value: string): PostOfferRequest;
+
+  getSourceOfferId(): string;
+  setSourceOfferId(value: string): PostOfferRequest;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): PostOfferRequest.AsObject;
   static toObject(includeInstance: boolean, msg: PostOfferRequest): PostOfferRequest.AsObject;
@@ -1566,6 +1572,8 @@ export namespace PostOfferRequest {
     paymentAccountId: string,
     isPrivateOffer: boolean,
     buyerAsTakerWithoutDeposit: boolean,
+    extraInfo: string,
+    sourceOfferId: string,
   }
 }
 
@@ -1721,6 +1729,9 @@ export class OfferInfo extends jspb.Message {
   getChallenge(): string;
   setChallenge(value: string): OfferInfo;
 
+  getExtraInfo(): string;
+  setExtraInfo(value: string): OfferInfo;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): OfferInfo.AsObject;
   static toObject(includeInstance: boolean, msg: OfferInfo): OfferInfo.AsObject;
@@ -1764,6 +1775,7 @@ export namespace OfferInfo {
     splitOutputTxFee: string,
     isPrivateOffer: boolean,
     challenge: string,
+    extraInfo: string,
   }
 }
 

dist/protobuf/grpc_pb.js

@@ -14838,7 +14838,9 @@ triggerPrice: jspb.Message.getFieldWithDefault(msg, 9, ""),
 reserveExactAmount: jspb.Message.getBooleanFieldWithDefault(msg, 10, false),
 paymentAccountId: jspb.Message.getFieldWithDefault(msg, 11, ""),
 isPrivateOffer: jspb.Message.getBooleanFieldWithDefault(msg, 12, false),
-buyerAsTakerWithoutDeposit: jspb.Message.getBooleanFieldWithDefault(msg, 13, false)
+buyerAsTakerWithoutDeposit: jspb.Message.getBooleanFieldWithDefault(msg, 13, false),
+extraInfo: jspb.Message.getFieldWithDefault(msg, 14, ""),
+sourceOfferId: jspb.Message.getFieldWithDefault(msg, 15, "")
   };
 
   if (includeInstance) {
@@ -14927,6 +14929,14 @@ proto.io.haveno.protobuffer.PostOfferRequest.deserializeBinaryFromReader = funct
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setBuyerAsTakerWithoutDeposit(value);
       break;
+    case 14:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setExtraInfo(value);
+      break;
+    case 15:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setSourceOfferId(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -15047,6 +15057,20 @@ proto.io.haveno.protobuffer.PostOfferRequest.serializeBinaryToWriter = function(
       f
     );
   }
+  f = message.getExtraInfo();
+  if (f.length > 0) {
+    writer.writeString(
+      14,
+      f
+    );
+  }
+  f = message.getSourceOfferId();
+  if (f.length > 0) {
+    writer.writeString(
+      15,
+      f
+    );
+  }
 };
 
 
@@ -15284,6 +15308,42 @@ proto.io.haveno.protobuffer.PostOfferRequest.prototype.setBuyerAsTakerWithoutDep
 };
 
 
+/**
+ * optional string extra_info = 14;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.PostOfferRequest.prototype.getExtraInfo = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 14, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.PostOfferRequest} returns this
+ */
+proto.io.haveno.protobuffer.PostOfferRequest.prototype.setExtraInfo = function(value) {
+  return jspb.Message.setProto3StringField(this, 14, value);
+};
+
+
+/**
+ * optional string source_offer_id = 15;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.PostOfferRequest.prototype.getSourceOfferId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.PostOfferRequest} returns this
+ */
+proto.io.haveno.protobuffer.PostOfferRequest.prototype.setSourceOfferId = function(value) {
+  return jspb.Message.setProto3StringField(this, 15, value);
+};
+
+
 
 
 
@@ -15730,7 +15790,8 @@ arbitratorSigner: jspb.Message.getFieldWithDefault(msg, 29, ""),
 splitOutputTxHash: jspb.Message.getFieldWithDefault(msg, 30, ""),
 splitOutputTxFee: jspb.Message.getFieldWithDefault(msg, 31, "0"),
 isPrivateOffer: jspb.Message.getBooleanFieldWithDefault(msg, 32, false),
-challenge: jspb.Message.getFieldWithDefault(msg, 33, "")
+challenge: jspb.Message.getFieldWithDefault(msg, 33, ""),
+extraInfo: jspb.Message.getFieldWithDefault(msg, 34, "")
   };
 
   if (includeInstance) {
@@ -15899,6 +15960,10 @@ proto.io.haveno.protobuffer.OfferInfo.deserializeBinaryFromReader = function(msg
       var value = /** @type {string} */ (reader.readString());
       msg.setChallenge(value);
       break;
+    case 34:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setExtraInfo(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -16159,6 +16224,13 @@ proto.io.haveno.protobuffer.OfferInfo.serializeBinaryToWriter = function(message
       f
     );
   }
+  f = message.getExtraInfo();
+  if (f.length > 0) {
+    writer.writeString(
+      34,
+      f
+    );
+  }
 };
 
 
@@ -16756,6 +16828,24 @@ proto.io.haveno.protobuffer.OfferInfo.prototype.setChallenge = function(value) {
 };
 
 
+/**
+ * optional string extra_info = 34;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.OfferInfo.prototype.getExtraInfo = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 34, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.OfferInfo} returns this
+ */
+proto.io.haveno.protobuffer.OfferInfo.prototype.setExtraInfo = function(value) {
+  return jspb.Message.setProto3StringField(this, 34, value);
+};
+
+
 
 
 

dist/protobuf/pb_pb.d.ts

@@ -1677,8 +1677,8 @@ export class DisputeOpenedMessage extends jspb.Message {
   getType(): SupportType;
   setType(value: SupportType): DisputeOpenedMessage;
 
-  getUpdatedMultisigHex(): string;
-  setUpdatedMultisigHex(value: string): DisputeOpenedMessage;
+  getOpenerUpdatedMultisigHex(): string;
+  setOpenerUpdatedMultisigHex(value: string): DisputeOpenedMessage;
 
   getPaymentSentMessage(): PaymentSentMessage | undefined;
   setPaymentSentMessage(value?: PaymentSentMessage): DisputeOpenedMessage;
@@ -1699,7 +1699,7 @@ export namespace DisputeOpenedMessage {
     senderNodeAddress?: NodeAddress.AsObject,
     uid: string,
     type: SupportType,
-    updatedMultisigHex: string,
+    openerUpdatedMultisigHex: string,
     paymentSentMessage?: PaymentSentMessage.AsObject,
   }
 }
@@ -2883,6 +2883,9 @@ export class OfferPayload extends jspb.Message {
   clearReserveTxKeyImagesList(): OfferPayload;
   addReserveTxKeyImages(value: string, index?: number): OfferPayload;
 
+  getExtraInfo(): string;
+  setExtraInfo(value: string): OfferPayload;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): OfferPayload.AsObject;
   static toObject(includeInstance: boolean, msg: OfferPayload): OfferPayload.AsObject;
@@ -2931,6 +2934,7 @@ export namespace OfferPayload {
     arbitratorSigner?: NodeAddress.AsObject,
     arbitratorSignature: Uint8Array | string,
     reserveTxKeyImagesList: Array<string>,
+    extraInfo: string,
   }
 }
 
@@ -3650,6 +3654,11 @@ export class PaymentAccountPayload extends jspb.Message {
   hasPaypalAccountPayload(): boolean;
   clearPaypalAccountPayload(): PaymentAccountPayload;
 
+  getPaysafeAccountPayload(): PaysafeAccountPayload | undefined;
+  setPaysafeAccountPayload(value?: PaysafeAccountPayload): PaymentAccountPayload;
+  hasPaysafeAccountPayload(): boolean;
+  clearPaysafeAccountPayload(): PaymentAccountPayload;
+
   getMessageCase(): PaymentAccountPayload.MessageCase;
 
   serializeBinary(): Uint8Array;
@@ -3703,6 +3712,7 @@ export namespace PaymentAccountPayload {
     verseAccountPayload?: VerseAccountPayload.AsObject,
     cashAtAtmAccountPayload?: CashAtAtmAccountPayload.AsObject,
     paypalAccountPayload?: PayPalAccountPayload.AsObject,
+    paysafeAccountPayload?: PaysafeAccountPayload.AsObject,
   }
 
   export enum MessageCase { 
@@ -3744,6 +3754,7 @@ export namespace PaymentAccountPayload {
     VERSE_ACCOUNT_PAYLOAD = 39,
     CASH_AT_ATM_ACCOUNT_PAYLOAD = 40,
     PAYPAL_ACCOUNT_PAYLOAD = 41,
+    PAYSAFE_ACCOUNT_PAYLOAD = 42,
   }
 }
 
@@ -5326,6 +5337,24 @@ export namespace SwiftAccountPayload {
   }
 }
 
+export class PaysafeAccountPayload extends jspb.Message {
+  getEmail(): string;
+  setEmail(value: string): PaysafeAccountPayload;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): PaysafeAccountPayload.AsObject;
+  static toObject(includeInstance: boolean, msg: PaysafeAccountPayload): PaysafeAccountPayload.AsObject;
+  static serializeBinaryToWriter(message: PaysafeAccountPayload, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): PaysafeAccountPayload;
+  static deserializeBinaryFromReader(message: PaysafeAccountPayload, reader: jspb.BinaryReader): PaysafeAccountPayload;
+}
+
+export namespace PaysafeAccountPayload {
+  export type AsObject = {
+    email: string,
+  }
+}
+
 export class PersistableEnvelope extends jspb.Message {
   getSequenceNumberMap(): SequenceNumberMap | undefined;
   setSequenceNumberMap(value?: SequenceNumberMap): PersistableEnvelope;
@@ -5999,6 +6028,12 @@ export class OpenOffer extends jspb.Message {
   getChallenge(): string;
   setChallenge(value: string): OpenOffer;
 
+  getDeactivatedByTrigger(): boolean;
+  setDeactivatedByTrigger(value: boolean): OpenOffer;
+
+  getGroupId(): string;
+  setGroupId(value: string): OpenOffer;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): OpenOffer.AsObject;
   static toObject(includeInstance: boolean, msg: OpenOffer): OpenOffer.AsObject;
@@ -6021,6 +6056,8 @@ export namespace OpenOffer {
     reserveTxHex: string,
     reserveTxKey: string,
     challenge: string,
+    deactivatedByTrigger: boolean,
+    groupId: string,
   }
 
   export enum State { 
@@ -6276,6 +6313,7 @@ export namespace Trade {
     SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG = 24,
     SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG = 25,
     SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG = 26,
+    BUYER_RECEIVED_PAYMENT_RECEIVED_MSG = 27,
   }
 
   export enum Phase { 
@@ -6445,8 +6483,8 @@ export class ProcessModel extends jspb.Message {
   getFundsNeededForTrade(): number;
   setFundsNeededForTrade(value: number): ProcessModel;
 
-  getPaymentSentMessageState(): string;
-  setPaymentSentMessageState(value: string): ProcessModel;
+  getPaymentSentMessageStateSeller(): string;
+  setPaymentSentMessageStateSeller(value: string): ProcessModel;
 
   getPaymentSentMessageStateArbitrator(): string;
   setPaymentSentMessageStateArbitrator(value: string): ProcessModel;
@@ -6496,6 +6534,9 @@ export class ProcessModel extends jspb.Message {
   getTradeFeeAddress(): string;
   setTradeFeeAddress(value: string): ProcessModel;
 
+  getImportMultisigHexScheduled(): boolean;
+  setImportMultisigHexScheduled(value: boolean): ProcessModel;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): ProcessModel.AsObject;
   static toObject(includeInstance: boolean, msg: ProcessModel): ProcessModel.AsObject;
@@ -6512,7 +6553,7 @@ export namespace ProcessModel {
     payoutTxSignature: Uint8Array | string,
     useSavingsWallet: boolean,
     fundsNeededForTrade: number,
-    paymentSentMessageState: string,
+    paymentSentMessageStateSeller: string,
     paymentSentMessageStateArbitrator: string,
     makerSignature: Uint8Array | string,
     maker?: TradePeer.AsObject,
@@ -6525,6 +6566,7 @@ export namespace ProcessModel {
     sellerPayoutAmountFromMediation: number,
     tradeProtocolErrorHeight: number,
     tradeFeeAddress: string,
+    importMultisigHexScheduled: boolean,
   }
 }
 
@@ -6670,6 +6712,15 @@ export class TradePeer extends jspb.Message {
   getPayoutAmount(): number;
   setPayoutAmount(value: number): TradePeer;
 
+  getDepositsConfirmedMessageState(): string;
+  setDepositsConfirmedMessageState(value: string): TradePeer;
+
+  getPaymentSentMessageState(): string;
+  setPaymentSentMessageState(value: string): TradePeer;
+
+  getPaymentReceivedMessageState(): string;
+  setPaymentReceivedMessageState(value: string): TradePeer;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): TradePeer.AsObject;
   static toObject(includeInstance: boolean, msg: TradePeer): TradePeer.AsObject;
@@ -6717,6 +6768,9 @@ export namespace TradePeer {
     unsignedPayoutTxHex: string,
     payoutTxFee: number,
     payoutAmount: number,
+    depositsConfirmedMessageState: string,
+    paymentSentMessageState: string,
+    paymentReceivedMessageState: string,
   }
 }
 
@@ -7737,6 +7791,7 @@ export namespace PaymentAccountForm {
     CASH_APP = 16,
     PAYPAL = 17,
     VENMO = 18,
+    PAYSAFE = 19,
   }
 }
 

dist/protobuf/pb_pb.js

@@ -147,6 +147,7 @@ goog.exportSymbol('proto.io.haveno.protobuffer.PaymentAccountPayload.MessageCase
 goog.exportSymbol('proto.io.haveno.protobuffer.PaymentMethod', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.PaymentReceivedMessage', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.PaymentSentMessage', null, global);
+goog.exportSymbol('proto.io.haveno.protobuffer.PaysafeAccountPayload', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.PayseraAccountPayload', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.PaytmAccountPayload', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.Peer', null, global);
@@ -3034,6 +3035,27 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.io.haveno.protobuffer.SwiftAccountPayload.displayName = 'proto.io.haveno.protobuffer.SwiftAccountPayload';
 }
+/**
+ * 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.haveno.protobuffer.PaysafeAccountPayload = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.io.haveno.protobuffer.PaysafeAccountPayload, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.io.haveno.protobuffer.PaysafeAccountPayload.displayName = 'proto.io.haveno.protobuffer.PaysafeAccountPayload';
+}
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -16973,7 +16995,7 @@ dispute: (f = msg.getDispute()) && proto.io.haveno.protobuffer.Dispute.toObject(
 senderNodeAddress: (f = msg.getSenderNodeAddress()) && proto.io.haveno.protobuffer.NodeAddress.toObject(includeInstance, f),
 uid: jspb.Message.getFieldWithDefault(msg, 3, ""),
 type: jspb.Message.getFieldWithDefault(msg, 4, 0),
-updatedMultisigHex: jspb.Message.getFieldWithDefault(msg, 5, ""),
+openerUpdatedMultisigHex: jspb.Message.getFieldWithDefault(msg, 5, ""),
 paymentSentMessage: (f = msg.getPaymentSentMessage()) && proto.io.haveno.protobuffer.PaymentSentMessage.toObject(includeInstance, f)
   };
 
@@ -17031,7 +17053,7 @@ proto.io.haveno.protobuffer.DisputeOpenedMessage.deserializeBinaryFromReader = f
       break;
     case 5:
       var value = /** @type {string} */ (reader.readString());
-      msg.setUpdatedMultisigHex(value);
+      msg.setOpenerUpdatedMultisigHex(value);
       break;
     case 6:
       var value = new proto.io.haveno.protobuffer.PaymentSentMessage;
@@ -17097,7 +17119,7 @@ proto.io.haveno.protobuffer.DisputeOpenedMessage.serializeBinaryToWriter = funct
       f
     );
   }
-  f = message.getUpdatedMultisigHex();
+  f = message.getOpenerUpdatedMultisigHex();
   if (f.length > 0) {
     writer.writeString(
       5,
@@ -17226,10 +17248,10 @@ proto.io.haveno.protobuffer.DisputeOpenedMessage.prototype.setType = function(va
 
 
 /**
- * optional string updated_multisig_hex = 5;
+ * optional string opener_updated_multisig_hex = 5;
  * @return {string}
  */
-proto.io.haveno.protobuffer.DisputeOpenedMessage.prototype.getUpdatedMultisigHex = function() {
+proto.io.haveno.protobuffer.DisputeOpenedMessage.prototype.getOpenerUpdatedMultisigHex = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
 };
 
@@ -17238,7 +17260,7 @@ proto.io.haveno.protobuffer.DisputeOpenedMessage.prototype.getUpdatedMultisigHex
  * @param {string} value
  * @return {!proto.io.haveno.protobuffer.DisputeOpenedMessage} returns this
  */
-proto.io.haveno.protobuffer.DisputeOpenedMessage.prototype.setUpdatedMultisigHex = function(value) {
+proto.io.haveno.protobuffer.DisputeOpenedMessage.prototype.setOpenerUpdatedMultisigHex = function(value) {
   return jspb.Message.setProto3StringField(this, 5, value);
 };
 
@@ -25483,7 +25505,8 @@ extraDataMap: (f = msg.getExtraDataMap()) ? f.toObject(includeInstance, undefine
 protocolVersion: jspb.Message.getFieldWithDefault(msg, 35, 0),
 arbitratorSigner: (f = msg.getArbitratorSigner()) && proto.io.haveno.protobuffer.NodeAddress.toObject(includeInstance, f),
 arbitratorSignature: msg.getArbitratorSignature_asB64(),
-reserveTxKeyImagesList: (f = jspb.Message.getRepeatedField(msg, 38)) == null ? undefined : f
+reserveTxKeyImagesList: (f = jspb.Message.getRepeatedField(msg, 38)) == null ? undefined : f,
+extraInfo: jspb.Message.getFieldWithDefault(msg, 39, "")
   };
 
   if (includeInstance) {
@@ -25677,6 +25700,10 @@ proto.io.haveno.protobuffer.OfferPayload.deserializeBinaryFromReader = function(
       var value = /** @type {string} */ (reader.readString());
       msg.addReserveTxKeyImages(value);
       break;
+    case 39:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setExtraInfo(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -25972,6 +25999,13 @@ proto.io.haveno.protobuffer.OfferPayload.serializeBinaryToWriter = function(mess
       f
     );
   }
+  f = message.getExtraInfo();
+  if (f.length > 0) {
+    writer.writeString(
+      39,
+      f
+    );
+  }
 };
 
 
@@ -26802,6 +26836,24 @@ proto.io.haveno.protobuffer.OfferPayload.prototype.clearReserveTxKeyImagesList =
 };
 
 
+/**
+ * optional string extra_info = 39;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.OfferPayload.prototype.getExtraInfo = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 39, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.OfferPayload} returns this
+ */
+proto.io.haveno.protobuffer.OfferPayload.prototype.setExtraInfo = function(value) {
+  return jspb.Message.setProto3StringField(this, 39, value);
+};
+
+
 
 
 
@@ -30635,7 +30687,7 @@ proto.io.haveno.protobuffer.RawTransactionInput.prototype.setValue = function(va
  * @private {!Array<!Array<number>>}
  * @const
  */
-proto.io.haveno.protobuffer.PaymentAccountPayload.oneofGroups_ = [[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]];
+proto.io.haveno.protobuffer.PaymentAccountPayload.oneofGroups_ = [[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]];
 
 /**
  * @enum {number}
@@ -30678,7 +30730,8 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.MessageCase = {
   MONESE_ACCOUNT_PAYLOAD: 38,
   VERSE_ACCOUNT_PAYLOAD: 39,
   CASH_AT_ATM_ACCOUNT_PAYLOAD: 40,
-  PAYPAL_ACCOUNT_PAYLOAD: 41
+  PAYPAL_ACCOUNT_PAYLOAD: 41,
+  PAYSAFE_ACCOUNT_PAYLOAD: 42
 };
 
 /**
@@ -30759,7 +30812,8 @@ celPayAccountPayload: (f = msg.getCelPayAccountPayload()) && proto.io.haveno.pro
 moneseAccountPayload: (f = msg.getMoneseAccountPayload()) && proto.io.haveno.protobuffer.MoneseAccountPayload.toObject(includeInstance, f),
 verseAccountPayload: (f = msg.getVerseAccountPayload()) && proto.io.haveno.protobuffer.VerseAccountPayload.toObject(includeInstance, f),
 cashAtAtmAccountPayload: (f = msg.getCashAtAtmAccountPayload()) && proto.io.haveno.protobuffer.CashAtAtmAccountPayload.toObject(includeInstance, f),
-paypalAccountPayload: (f = msg.getPaypalAccountPayload()) && proto.io.haveno.protobuffer.PayPalAccountPayload.toObject(includeInstance, f)
+paypalAccountPayload: (f = msg.getPaypalAccountPayload()) && proto.io.haveno.protobuffer.PayPalAccountPayload.toObject(includeInstance, f),
+paysafeAccountPayload: (f = msg.getPaysafeAccountPayload()) && proto.io.haveno.protobuffer.PaysafeAccountPayload.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -30999,6 +31053,11 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader =
       reader.readMessage(value,proto.io.haveno.protobuffer.PayPalAccountPayload.deserializeBinaryFromReader);
       msg.setPaypalAccountPayload(value);
       break;
+    case 42:
+      var value = new proto.io.haveno.protobuffer.PaysafeAccountPayload;
+      reader.readMessage(value,proto.io.haveno.protobuffer.PaysafeAccountPayload.deserializeBinaryFromReader);
+      msg.setPaysafeAccountPayload(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -31349,6 +31408,14 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.serializeBinaryToWriter = func
       proto.io.haveno.protobuffer.PayPalAccountPayload.serializeBinaryToWriter
     );
   }
+  f = message.getPaysafeAccountPayload();
+  if (f != null) {
+    writer.writeMessage(
+      42,
+      f,
+      proto.io.haveno.protobuffer.PaysafeAccountPayload.serializeBinaryToWriter
+    );
+  }
 };
 
 
@@ -32540,7 +32607,7 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.hasPayseraAccountPay
 
 
 /**
- * optional PaxumAccountPayload Paxum_account_payload = 35;
+ * optional PaxumAccountPayload paxum_account_payload = 35;
  * @return {?proto.io.haveno.protobuffer.PaxumAccountPayload}
  */
 proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.getPaxumAccountPayload = function() {
@@ -32798,6 +32865,43 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.hasPaypalAccountPayl
 };
 
 
+/**
+ * optional PaysafeAccountPayload paysafe_account_payload = 42;
+ * @return {?proto.io.haveno.protobuffer.PaysafeAccountPayload}
+ */
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.getPaysafeAccountPayload = function() {
+  return /** @type{?proto.io.haveno.protobuffer.PaysafeAccountPayload} */ (
+    jspb.Message.getWrapperField(this, proto.io.haveno.protobuffer.PaysafeAccountPayload, 42));
+};
+
+
+/**
+ * @param {?proto.io.haveno.protobuffer.PaysafeAccountPayload|undefined} value
+ * @return {!proto.io.haveno.protobuffer.PaymentAccountPayload} returns this
+*/
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.setPaysafeAccountPayload = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 42, proto.io.haveno.protobuffer.PaymentAccountPayload.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.io.haveno.protobuffer.PaymentAccountPayload} returns this
+ */
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.clearPaysafeAccountPayload = function() {
+  return this.setPaysafeAccountPayload(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.hasPaysafeAccountPayload = function() {
+  return jspb.Message.getField(this, 42) != null;
+};
+
+
 
 
 
@@ -44288,6 +44392,136 @@ proto.io.haveno.protobuffer.SwiftAccountPayload.prototype.setIntermediaryAddress
 
 
 
+
+
+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.haveno.protobuffer.PaysafeAccountPayload.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.haveno.protobuffer.PaysafeAccountPayload.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.haveno.protobuffer.PaysafeAccountPayload} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.haveno.protobuffer.PaysafeAccountPayload.toObject = function(includeInstance, msg) {
+  var f, obj = {
+email: jspb.Message.getFieldWithDefault(msg, 1, "")
+  };
+
+  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.haveno.protobuffer.PaysafeAccountPayload}
+ */
+proto.io.haveno.protobuffer.PaysafeAccountPayload.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.io.haveno.protobuffer.PaysafeAccountPayload;
+  return proto.io.haveno.protobuffer.PaysafeAccountPayload.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.io.haveno.protobuffer.PaysafeAccountPayload} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.io.haveno.protobuffer.PaysafeAccountPayload}
+ */
+proto.io.haveno.protobuffer.PaysafeAccountPayload.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.setEmail(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.io.haveno.protobuffer.PaysafeAccountPayload.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.io.haveno.protobuffer.PaysafeAccountPayload.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.haveno.protobuffer.PaysafeAccountPayload} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.io.haveno.protobuffer.PaysafeAccountPayload.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getEmail();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string email = 1;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.PaysafeAccountPayload.prototype.getEmail = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.PaysafeAccountPayload} returns this
+ */
+proto.io.haveno.protobuffer.PaysafeAccountPayload.prototype.setEmail = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+
 /**
  * Oneof group definitions for this message. Each group defines the field
  * numbers belonging to that group. When of these fields' value is set, all
@@ -48991,7 +49225,9 @@ scheduledAmount: jspb.Message.getFieldWithDefault(msg, 8, ""),
 reserveTxHash: jspb.Message.getFieldWithDefault(msg, 9, ""),
 reserveTxHex: jspb.Message.getFieldWithDefault(msg, 10, ""),
 reserveTxKey: jspb.Message.getFieldWithDefault(msg, 11, ""),
-challenge: jspb.Message.getFieldWithDefault(msg, 12, "")
+challenge: jspb.Message.getFieldWithDefault(msg, 12, ""),
+deactivatedByTrigger: jspb.Message.getBooleanFieldWithDefault(msg, 13, false),
+groupId: jspb.Message.getFieldWithDefault(msg, 14, "")
   };
 
   if (includeInstance) {
@@ -49077,6 +49313,14 @@ proto.io.haveno.protobuffer.OpenOffer.deserializeBinaryFromReader = function(msg
       var value = /** @type {string} */ (reader.readString());
       msg.setChallenge(value);
       break;
+    case 13:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setDeactivatedByTrigger(value);
+      break;
+    case 14:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setGroupId(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -49191,6 +49435,20 @@ proto.io.haveno.protobuffer.OpenOffer.serializeBinaryToWriter = function(message
       f
     );
   }
+  f = message.getDeactivatedByTrigger();
+  if (f) {
+    writer.writeBool(
+      13,
+      f
+    );
+  }
+  f = message.getGroupId();
+  if (f.length > 0) {
+    writer.writeString(
+      14,
+      f
+    );
+  }
 };
 
 
@@ -49461,6 +49719,42 @@ proto.io.haveno.protobuffer.OpenOffer.prototype.setChallenge = function(value) {
 };
 
 
+/**
+ * optional bool deactivated_by_trigger = 13;
+ * @return {boolean}
+ */
+proto.io.haveno.protobuffer.OpenOffer.prototype.getDeactivatedByTrigger = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 13, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.io.haveno.protobuffer.OpenOffer} returns this
+ */
+proto.io.haveno.protobuffer.OpenOffer.prototype.setDeactivatedByTrigger = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 13, value);
+};
+
+
+/**
+ * optional string group_id = 14;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.OpenOffer.prototype.getGroupId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 14, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.OpenOffer} returns this
+ */
+proto.io.haveno.protobuffer.OpenOffer.prototype.setGroupId = function(value) {
+  return jspb.Message.setProto3StringField(this, 14, value);
+};
+
+
 
 /**
  * Oneof group definitions for this message. Each group defines the field
@@ -50449,7 +50743,8 @@ proto.io.haveno.protobuffer.Trade.State = {
   SELLER_SENT_PAYMENT_RECEIVED_MSG: 23,
   SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG: 24,
   SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG: 25,
-  SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG: 26
+  SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG: 26,
+  BUYER_RECEIVED_PAYMENT_RECEIVED_MSG: 27
 };
 
 /**
@@ -51980,7 +52275,7 @@ pubKeyRing: (f = msg.getPubKeyRing()) && proto.io.haveno.protobuffer.PubKeyRing.
 payoutTxSignature: msg.getPayoutTxSignature_asB64(),
 useSavingsWallet: jspb.Message.getBooleanFieldWithDefault(msg, 5, false),
 fundsNeededForTrade: jspb.Message.getFieldWithDefault(msg, 6, 0),
-paymentSentMessageState: jspb.Message.getFieldWithDefault(msg, 7, ""),
+paymentSentMessageStateSeller: jspb.Message.getFieldWithDefault(msg, 7, ""),
 paymentSentMessageStateArbitrator: jspb.Message.getFieldWithDefault(msg, 8, ""),
 makerSignature: msg.getMakerSignature_asB64(),
 maker: (f = msg.getMaker()) && proto.io.haveno.protobuffer.TradePeer.toObject(includeInstance, f),
@@ -51992,7 +52287,8 @@ mediatedPayoutTxSignature: msg.getMediatedPayoutTxSignature_asB64(),
 buyerPayoutAmountFromMediation: jspb.Message.getFieldWithDefault(msg, 16, 0),
 sellerPayoutAmountFromMediation: jspb.Message.getFieldWithDefault(msg, 17, 0),
 tradeProtocolErrorHeight: jspb.Message.getFieldWithDefault(msg, 18, 0),
-tradeFeeAddress: jspb.Message.getFieldWithDefault(msg, 19, "")
+tradeFeeAddress: jspb.Message.getFieldWithDefault(msg, 19, ""),
+importMultisigHexScheduled: jspb.Message.getBooleanFieldWithDefault(msg, 20, false)
   };
 
   if (includeInstance) {
@@ -52056,7 +52352,7 @@ proto.io.haveno.protobuffer.ProcessModel.deserializeBinaryFromReader = function(
       break;
     case 7:
       var value = /** @type {string} */ (reader.readString());
-      msg.setPaymentSentMessageState(value);
+      msg.setPaymentSentMessageStateSeller(value);
       break;
     case 8:
       var value = /** @type {string} */ (reader.readString());
@@ -52110,6 +52406,10 @@ proto.io.haveno.protobuffer.ProcessModel.deserializeBinaryFromReader = function(
       var value = /** @type {string} */ (reader.readString());
       msg.setTradeFeeAddress(value);
       break;
+    case 20:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setImportMultisigHexScheduled(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -52182,7 +52482,7 @@ proto.io.haveno.protobuffer.ProcessModel.serializeBinaryToWriter = function(mess
       f
     );
   }
-  f = message.getPaymentSentMessageState();
+  f = message.getPaymentSentMessageStateSeller();
   if (f.length > 0) {
     writer.writeString(
       7,
@@ -52277,6 +52577,13 @@ proto.io.haveno.protobuffer.ProcessModel.serializeBinaryToWriter = function(mess
       f
     );
   }
+  f = message.getImportMultisigHexScheduled();
+  if (f) {
+    writer.writeBool(
+      20,
+      f
+    );
+  }
 };
 
 
@@ -52432,10 +52739,10 @@ proto.io.haveno.protobuffer.ProcessModel.prototype.setFundsNeededForTrade = func
 
 
 /**
- * optional string payment_sent_message_state = 7;
+ * optional string payment_sent_message_state_seller = 7;
  * @return {string}
  */
-proto.io.haveno.protobuffer.ProcessModel.prototype.getPaymentSentMessageState = function() {
+proto.io.haveno.protobuffer.ProcessModel.prototype.getPaymentSentMessageStateSeller = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
 };
 
@@ -52444,7 +52751,7 @@ proto.io.haveno.protobuffer.ProcessModel.prototype.getPaymentSentMessageState =
  * @param {string} value
  * @return {!proto.io.haveno.protobuffer.ProcessModel} returns this
  */
-proto.io.haveno.protobuffer.ProcessModel.prototype.setPaymentSentMessageState = function(value) {
+proto.io.haveno.protobuffer.ProcessModel.prototype.setPaymentSentMessageStateSeller = function(value) {
   return jspb.Message.setProto3StringField(this, 7, value);
 };
 
@@ -52789,6 +53096,24 @@ proto.io.haveno.protobuffer.ProcessModel.prototype.setTradeFeeAddress = function
 };
 
 
+/**
+ * optional bool import_multisig_hex_scheduled = 20;
+ * @return {boolean}
+ */
+proto.io.haveno.protobuffer.ProcessModel.prototype.getImportMultisigHexScheduled = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 20, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.io.haveno.protobuffer.ProcessModel} returns this
+ */
+proto.io.haveno.protobuffer.ProcessModel.prototype.setImportMultisigHexScheduled = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 20, value);
+};
+
+
 
 /**
  * List of repeated fields within this message type.
@@ -52864,7 +53189,10 @@ depositTxFee: jspb.Message.getFieldWithDefault(msg, 38, 0),
 securityDeposit: jspb.Message.getFieldWithDefault(msg, 39, 0),
 unsignedPayoutTxHex: jspb.Message.getFieldWithDefault(msg, 40, ""),
 payoutTxFee: jspb.Message.getFieldWithDefault(msg, 41, 0),
-payoutAmount: jspb.Message.getFieldWithDefault(msg, 42, 0)
+payoutAmount: jspb.Message.getFieldWithDefault(msg, 42, 0),
+depositsConfirmedMessageState: jspb.Message.getFieldWithDefault(msg, 43, ""),
+paymentSentMessageState: jspb.Message.getFieldWithDefault(msg, 44, ""),
+paymentReceivedMessageState: jspb.Message.getFieldWithDefault(msg, 45, "")
   };
 
   if (includeInstance) {
@@ -53056,6 +53384,18 @@ proto.io.haveno.protobuffer.TradePeer.deserializeBinaryFromReader = function(msg
       var value = /** @type {number} */ (reader.readInt64());
       msg.setPayoutAmount(value);
       break;
+    case 43:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDepositsConfirmedMessageState(value);
+      break;
+    case 44:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPaymentSentMessageState(value);
+      break;
+    case 45:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPaymentReceivedMessageState(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -53351,6 +53691,27 @@ proto.io.haveno.protobuffer.TradePeer.serializeBinaryToWriter = function(message
       f
     );
   }
+  f = message.getDepositsConfirmedMessageState();
+  if (f.length > 0) {
+    writer.writeString(
+      43,
+      f
+    );
+  }
+  f = message.getPaymentSentMessageState();
+  if (f.length > 0) {
+    writer.writeString(
+      44,
+      f
+    );
+  }
+  f = message.getPaymentReceivedMessageState();
+  if (f.length > 0) {
+    writer.writeString(
+      45,
+      f
+    );
+  }
 };
 
 
@@ -54340,6 +54701,60 @@ proto.io.haveno.protobuffer.TradePeer.prototype.setPayoutAmount = function(value
 };
 
 
+/**
+ * optional string deposits_confirmed_message_state = 43;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.TradePeer.prototype.getDepositsConfirmedMessageState = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 43, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.TradePeer} returns this
+ */
+proto.io.haveno.protobuffer.TradePeer.prototype.setDepositsConfirmedMessageState = function(value) {
+  return jspb.Message.setProto3StringField(this, 43, value);
+};
+
+
+/**
+ * optional string payment_sent_message_state = 44;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.TradePeer.prototype.getPaymentSentMessageState = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 44, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.TradePeer} returns this
+ */
+proto.io.haveno.protobuffer.TradePeer.prototype.setPaymentSentMessageState = function(value) {
+  return jspb.Message.setProto3StringField(this, 44, value);
+};
+
+
+/**
+ * optional string payment_received_message_state = 45;
+ * @return {string}
+ */
+proto.io.haveno.protobuffer.TradePeer.prototype.getPaymentReceivedMessageState = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 45, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.io.haveno.protobuffer.TradePeer} returns this
+ */
+proto.io.haveno.protobuffer.TradePeer.prototype.setPaymentReceivedMessageState = function(value) {
+  return jspb.Message.setProto3StringField(this, 45, value);
+};
+
+
 
 
 
@@ -62038,7 +62453,8 @@ proto.io.haveno.protobuffer.PaymentAccountForm.FormId = {
   AUSTRALIA_PAYID: 15,
   CASH_APP: 16,
   PAYPAL: 17,
-  VENMO: 18
+  VENMO: 18,
+  PAYSAFE: 19
 };
 
 /**