diff --git a/dist/protobuf/pb_pb.d.ts b/dist/protobuf/pb_pb.d.ts
index dd3a305a..9d175e26 100644
--- a/dist/protobuf/pb_pb.d.ts
+++ b/dist/protobuf/pb_pb.d.ts
@@ -2504,10 +2504,10 @@ export class Filter extends jspb.Message {
   getPreventPublicBtcNetwork(): boolean;
   setPreventPublicBtcNetwork(value: boolean): Filter;
 
-  getBtcNodesList(): Array<string>;
-  setBtcNodesList(value: Array<string>): Filter;
-  clearBtcNodesList(): Filter;
-  addBtcNodes(value: string, index?: number): Filter;
+  getXmrNodesList(): Array<string>;
+  setXmrNodesList(value: Array<string>): Filter;
+  clearXmrNodesList(): Filter;
+  addXmrNodes(value: string, index?: number): Filter;
 
   getDisableTradeBelowVersion(): string;
   setDisableTradeBelowVersion(value: string): Filter;
@@ -2584,7 +2584,7 @@ export namespace Filter {
     seedNodesList: Array<string>,
     priceRelayNodesList: Array<string>,
     preventPublicBtcNetwork: boolean,
-    btcNodesList: Array<string>,
+    xmrNodesList: Array<string>,
     disableTradeBelowVersion: string,
     mediatorsList: Array<string>,
     refundagentsList: Array<string>,
@@ -3575,10 +3575,10 @@ export class PaymentAccountPayload extends jspb.Message {
   hasVerseAccountPayload(): boolean;
   clearVerseAccountPayload(): PaymentAccountPayload;
 
-  getCashByAtmAccountPayload(): CashByAtmAccountPayload | undefined;
-  setCashByAtmAccountPayload(value?: CashByAtmAccountPayload): PaymentAccountPayload;
-  hasCashByAtmAccountPayload(): boolean;
-  clearCashByAtmAccountPayload(): PaymentAccountPayload;
+  getCashAtAtmAccountPayload(): CashAtAtmAccountPayload | undefined;
+  setCashAtAtmAccountPayload(value?: CashAtAtmAccountPayload): PaymentAccountPayload;
+  hasCashAtAtmAccountPayload(): boolean;
+  clearCashAtAtmAccountPayload(): PaymentAccountPayload;
 
   getMessageCase(): PaymentAccountPayload.MessageCase;
 
@@ -3631,7 +3631,7 @@ export namespace PaymentAccountPayload {
     celPayAccountPayload?: CelPayAccountPayload.AsObject,
     moneseAccountPayload?: MoneseAccountPayload.AsObject,
     verseAccountPayload?: VerseAccountPayload.AsObject,
-    cashByAtmAccountPayload?: CashByAtmAccountPayload.AsObject,
+    cashAtAtmAccountPayload?: CashAtAtmAccountPayload.AsObject,
   }
 
   export enum MessageCase { 
@@ -3671,7 +3671,7 @@ export namespace PaymentAccountPayload {
     CEL_PAY_ACCOUNT_PAYLOAD = 37,
     MONESE_ACCOUNT_PAYLOAD = 38,
     VERSE_ACCOUNT_PAYLOAD = 39,
-    CASH_BY_ATM_ACCOUNT_PAYLOAD = 40,
+    CASH_AT_ATM_ACCOUNT_PAYLOAD = 40,
   }
 }
 
@@ -4832,19 +4832,19 @@ export namespace PayByMailAccountPayload {
   }
 }
 
-export class CashByAtmAccountPayload extends jspb.Message {
+export class CashAtAtmAccountPayload extends jspb.Message {
   getExtraInfo(): string;
-  setExtraInfo(value: string): CashByAtmAccountPayload;
+  setExtraInfo(value: string): CashAtAtmAccountPayload;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): CashByAtmAccountPayload.AsObject;
-  static toObject(includeInstance: boolean, msg: CashByAtmAccountPayload): CashByAtmAccountPayload.AsObject;
-  static serializeBinaryToWriter(message: CashByAtmAccountPayload, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): CashByAtmAccountPayload;
-  static deserializeBinaryFromReader(message: CashByAtmAccountPayload, reader: jspb.BinaryReader): CashByAtmAccountPayload;
+  toObject(includeInstance?: boolean): CashAtAtmAccountPayload.AsObject;
+  static toObject(includeInstance: boolean, msg: CashAtAtmAccountPayload): CashAtAtmAccountPayload.AsObject;
+  static serializeBinaryToWriter(message: CashAtAtmAccountPayload, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): CashAtAtmAccountPayload;
+  static deserializeBinaryFromReader(message: CashAtAtmAccountPayload, reader: jspb.BinaryReader): CashAtAtmAccountPayload;
 }
 
-export namespace CashByAtmAccountPayload {
+export namespace CashAtAtmAccountPayload {
   export type AsObject = {
     extraInfo: string,
   }
@@ -5693,6 +5693,7 @@ export namespace XmrAddressEntry {
     RESERVED_FOR_TRADE = 4,
     MULTI_SIG = 5,
     TRADE_PAYOUT = 6,
+    BASE_ADDRESS = 7,
   }
 }
 
@@ -6769,8 +6770,8 @@ export class PreferencesPayload extends jspb.Message {
   getTacAccepted(): boolean;
   setTacAccepted(value: boolean): PreferencesPayload;
 
-  getUseTorForBitcoinJ(): boolean;
-  setUseTorForBitcoinJ(value: boolean): PreferencesPayload;
+  getUseTorForMonero(): boolean;
+  setUseTorForMonero(value: boolean): PreferencesPayload;
 
   getShowOwnOffersInOfferBook(): boolean;
   setShowOwnOffersInOfferBook(value: boolean): PreferencesPayload;
@@ -6816,8 +6817,8 @@ export class PreferencesPayload extends jspb.Message {
   getPeerTagMapMap(): jspb.Map<string, string>;
   clearPeerTagMapMap(): PreferencesPayload;
 
-  getBitcoinNodes(): string;
-  setBitcoinNodes(value: string): PreferencesPayload;
+  getMoneroNodes(): string;
+  setMoneroNodes(value: string): PreferencesPayload;
 
   getIgnoreTradersListList(): Array<string>;
   setIgnoreTradersListList(value: Array<string>): PreferencesPayload;
@@ -6849,8 +6850,8 @@ export class PreferencesPayload extends jspb.Message {
   getCustomBridges(): string;
   setCustomBridges(value: string): PreferencesPayload;
 
-  getBitcoinNodesOptionOrdinal(): number;
-  setBitcoinNodesOptionOrdinal(value: number): PreferencesPayload;
+  getMoneroNodesOptionOrdinal(): number;
+  setMoneroNodesOptionOrdinal(value: number): PreferencesPayload;
 
   getReferralId(): string;
   setReferralId(value: string): PreferencesPayload;
@@ -6954,7 +6955,7 @@ export namespace PreferencesPayload {
     autoSelectArbitrators: boolean,
     dontShowAgainMapMap: Array<[string, boolean]>,
     tacAccepted: boolean,
-    useTorForBitcoinJ: boolean,
+    useTorForMonero: boolean,
     showOwnOffersInOfferBook: boolean,
     preferredTradeCurrency?: TradeCurrency.AsObject,
     withdrawalTxFeeInVbytes: number,
@@ -6969,7 +6970,7 @@ export namespace PreferencesPayload {
     sortMarketCurrenciesNumerically: boolean,
     usePercentageBasedPrice: boolean,
     peerTagMapMap: Array<[string, string]>,
-    bitcoinNodes: string,
+    moneroNodes: string,
     ignoreTradersListList: Array<string>,
     directoryChooserPath: string,
     useAnimations: boolean,
@@ -6978,7 +6979,7 @@ export namespace PreferencesPayload {
     bridgeOptionOrdinal: number,
     torTransportOrdinal: number,
     customBridges: string,
-    bitcoinNodesOptionOrdinal: number,
+    moneroNodesOptionOrdinal: number,
     referralId: string,
     phoneKeyAndToken: string,
     useSoundForMobileNotifications: boolean,
diff --git a/dist/protobuf/pb_pb.js b/dist/protobuf/pb_pb.js
index f3ab8aff..ea511448 100644
--- a/dist/protobuf/pb_pb.js
+++ b/dist/protobuf/pb_pb.js
@@ -45,7 +45,7 @@ goog.exportSymbol('proto.io.haveno.protobuffer.BuyerAsTakerTrade', null, global)
 goog.exportSymbol('proto.io.haveno.protobuffer.ByteArray', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.CapitualAccountPayload', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.CashAppAccountPayload', null, global);
-goog.exportSymbol('proto.io.haveno.protobuffer.CashByAtmAccountPayload', null, global);
+goog.exportSymbol('proto.io.haveno.protobuffer.CashAtAtmAccountPayload', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.CashDepositAccountPayload', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.CelPayAccountPayload', null, global);
 goog.exportSymbol('proto.io.haveno.protobuffer.ChaseQuickPayAccountPayload', null, global);
@@ -2614,16 +2614,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload = function(opt_data) {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.io.haveno.protobuffer.CashByAtmAccountPayload, jspb.Message);
+goog.inherits(proto.io.haveno.protobuffer.CashAtAtmAccountPayload, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.io.haveno.protobuffer.CashByAtmAccountPayload.displayName = 'proto.io.haveno.protobuffer.CashByAtmAccountPayload';
+  proto.io.haveno.protobuffer.CashAtAtmAccountPayload.displayName = 'proto.io.haveno.protobuffer.CashAtAtmAccountPayload';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -23004,7 +23004,7 @@ proto.io.haveno.protobuffer.Filter.toObject = function(includeInstance, msg) {
     seedNodesList: (f = jspb.Message.getRepeatedField(msg, 10)) == null ? undefined : f,
     priceRelayNodesList: (f = jspb.Message.getRepeatedField(msg, 11)) == null ? undefined : f,
     preventPublicBtcNetwork: jspb.Message.getBooleanFieldWithDefault(msg, 12, false),
-    btcNodesList: (f = jspb.Message.getRepeatedField(msg, 13)) == null ? undefined : f,
+    xmrNodesList: (f = jspb.Message.getRepeatedField(msg, 13)) == null ? undefined : f,
     disableTradeBelowVersion: jspb.Message.getFieldWithDefault(msg, 14, ""),
     mediatorsList: (f = jspb.Message.getRepeatedField(msg, 15)) == null ? undefined : f,
     refundagentsList: (f = jspb.Message.getRepeatedField(msg, 16)) == null ? undefined : f,
@@ -23107,7 +23107,7 @@ proto.io.haveno.protobuffer.Filter.deserializeBinaryFromReader = function(msg, r
       break;
     case 13:
       var value = /** @type {string} */ (reader.readString());
-      msg.addBtcNodes(value);
+      msg.addXmrNodes(value);
       break;
     case 14:
       var value = /** @type {string} */ (reader.readString());
@@ -23272,7 +23272,7 @@ proto.io.haveno.protobuffer.Filter.serializeBinaryToWriter = function(message, w
       f
     );
   }
-  f = message.getBtcNodesList();
+  f = message.getXmrNodesList();
   if (f.length > 0) {
     writer.writeRepeatedString(
       13,
@@ -23771,10 +23771,10 @@ proto.io.haveno.protobuffer.Filter.prototype.setPreventPublicBtcNetwork = functi
 
 
 /**
- * repeated string btc_nodes = 13;
+ * repeated string xmr_nodes = 13;
  * @return {!Array<string>}
  */
-proto.io.haveno.protobuffer.Filter.prototype.getBtcNodesList = function() {
+proto.io.haveno.protobuffer.Filter.prototype.getXmrNodesList = function() {
   return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 13));
 };
 
@@ -23783,7 +23783,7 @@ proto.io.haveno.protobuffer.Filter.prototype.getBtcNodesList = function() {
  * @param {!Array<string>} value
  * @return {!proto.io.haveno.protobuffer.Filter} returns this
  */
-proto.io.haveno.protobuffer.Filter.prototype.setBtcNodesList = function(value) {
+proto.io.haveno.protobuffer.Filter.prototype.setXmrNodesList = function(value) {
   return jspb.Message.setField(this, 13, value || []);
 };
 
@@ -23793,7 +23793,7 @@ proto.io.haveno.protobuffer.Filter.prototype.setBtcNodesList = function(value) {
  * @param {number=} opt_index
  * @return {!proto.io.haveno.protobuffer.Filter} returns this
  */
-proto.io.haveno.protobuffer.Filter.prototype.addBtcNodes = function(value, opt_index) {
+proto.io.haveno.protobuffer.Filter.prototype.addXmrNodes = function(value, opt_index) {
   return jspb.Message.addToRepeatedField(this, 13, value, opt_index);
 };
 
@@ -23802,8 +23802,8 @@ proto.io.haveno.protobuffer.Filter.prototype.addBtcNodes = function(value, opt_i
  * Clears the list making it empty but non-null.
  * @return {!proto.io.haveno.protobuffer.Filter} returns this
  */
-proto.io.haveno.protobuffer.Filter.prototype.clearBtcNodesList = function() {
-  return this.setBtcNodesList([]);
+proto.io.haveno.protobuffer.Filter.prototype.clearXmrNodesList = function() {
+  return this.setXmrNodesList([]);
 };
 
 
@@ -30176,7 +30176,7 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.MessageCase = {
   CEL_PAY_ACCOUNT_PAYLOAD: 37,
   MONESE_ACCOUNT_PAYLOAD: 38,
   VERSE_ACCOUNT_PAYLOAD: 39,
-  CASH_BY_ATM_ACCOUNT_PAYLOAD: 40
+  CASH_AT_ATM_ACCOUNT_PAYLOAD: 40
 };
 
 /**
@@ -30256,7 +30256,7 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.toObject = function(includeIns
     celPayAccountPayload: (f = msg.getCelPayAccountPayload()) && proto.io.haveno.protobuffer.CelPayAccountPayload.toObject(includeInstance, f),
     moneseAccountPayload: (f = msg.getMoneseAccountPayload()) && proto.io.haveno.protobuffer.MoneseAccountPayload.toObject(includeInstance, f),
     verseAccountPayload: (f = msg.getVerseAccountPayload()) && proto.io.haveno.protobuffer.VerseAccountPayload.toObject(includeInstance, f),
-    cashByAtmAccountPayload: (f = msg.getCashByAtmAccountPayload()) && proto.io.haveno.protobuffer.CashByAtmAccountPayload.toObject(includeInstance, f)
+    cashAtAtmAccountPayload: (f = msg.getCashAtAtmAccountPayload()) && proto.io.haveno.protobuffer.CashAtAtmAccountPayload.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -30487,9 +30487,9 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.deserializeBinaryFromReader =
       msg.setVerseAccountPayload(value);
       break;
     case 40:
-      var value = new proto.io.haveno.protobuffer.CashByAtmAccountPayload;
-      reader.readMessage(value,proto.io.haveno.protobuffer.CashByAtmAccountPayload.deserializeBinaryFromReader);
-      msg.setCashByAtmAccountPayload(value);
+      var value = new proto.io.haveno.protobuffer.CashAtAtmAccountPayload;
+      reader.readMessage(value,proto.io.haveno.protobuffer.CashAtAtmAccountPayload.deserializeBinaryFromReader);
+      msg.setCashAtAtmAccountPayload(value);
       break;
     default:
       reader.skipField();
@@ -30825,12 +30825,12 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.serializeBinaryToWriter = func
       proto.io.haveno.protobuffer.VerseAccountPayload.serializeBinaryToWriter
     );
   }
-  f = message.getCashByAtmAccountPayload();
+  f = message.getCashAtAtmAccountPayload();
   if (f != null) {
     writer.writeMessage(
       40,
       f,
-      proto.io.haveno.protobuffer.CashByAtmAccountPayload.serializeBinaryToWriter
+      proto.io.haveno.protobuffer.CashAtAtmAccountPayload.serializeBinaryToWriter
     );
   }
 };
@@ -32208,20 +32208,20 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.hasVerseAccountPaylo
 
 
 /**
- * optional CashByAtmAccountPayload cash_by_atm_account_payload = 40;
- * @return {?proto.io.haveno.protobuffer.CashByAtmAccountPayload}
+ * optional CashAtAtmAccountPayload cash_at_atm_account_payload = 40;
+ * @return {?proto.io.haveno.protobuffer.CashAtAtmAccountPayload}
  */
-proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.getCashByAtmAccountPayload = function() {
-  return /** @type{?proto.io.haveno.protobuffer.CashByAtmAccountPayload} */ (
-    jspb.Message.getWrapperField(this, proto.io.haveno.protobuffer.CashByAtmAccountPayload, 40));
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.getCashAtAtmAccountPayload = function() {
+  return /** @type{?proto.io.haveno.protobuffer.CashAtAtmAccountPayload} */ (
+    jspb.Message.getWrapperField(this, proto.io.haveno.protobuffer.CashAtAtmAccountPayload, 40));
 };
 
 
 /**
- * @param {?proto.io.haveno.protobuffer.CashByAtmAccountPayload|undefined} value
+ * @param {?proto.io.haveno.protobuffer.CashAtAtmAccountPayload|undefined} value
  * @return {!proto.io.haveno.protobuffer.PaymentAccountPayload} returns this
 */
-proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.setCashByAtmAccountPayload = function(value) {
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.setCashAtAtmAccountPayload = function(value) {
   return jspb.Message.setOneofWrapperField(this, 40, proto.io.haveno.protobuffer.PaymentAccountPayload.oneofGroups_[0], value);
 };
 
@@ -32230,8 +32230,8 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.setCashByAtmAccountP
  * Clears the message field making it undefined.
  * @return {!proto.io.haveno.protobuffer.PaymentAccountPayload} returns this
  */
-proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.clearCashByAtmAccountPayload = function() {
-  return this.setCashByAtmAccountPayload(undefined);
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.clearCashAtAtmAccountPayload = function() {
+  return this.setCashAtAtmAccountPayload(undefined);
 };
 
 
@@ -32239,7 +32239,7 @@ proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.clearCashByAtmAccoun
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.hasCashByAtmAccountPayload = function() {
+proto.io.haveno.protobuffer.PaymentAccountPayload.prototype.hasCashAtAtmAccountPayload = function() {
   return jspb.Message.getField(this, 40) != null;
 };
 
@@ -40679,8 +40679,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.prototype.toObject = function(opt_includeInstance) {
-  return proto.io.haveno.protobuffer.CashByAtmAccountPayload.toObject(opt_includeInstance, this);
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.prototype.toObject = function(opt_includeInstance) {
+  return proto.io.haveno.protobuffer.CashAtAtmAccountPayload.toObject(opt_includeInstance, this);
 };
 
 
@@ -40689,11 +40689,11 @@ proto.io.haveno.protobuffer.CashByAtmAccountPayload.prototype.toObject = functio
  * @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.CashByAtmAccountPayload} msg The msg instance to transform.
+ * @param {!proto.io.haveno.protobuffer.CashAtAtmAccountPayload} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.toObject = function(includeInstance, msg) {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.toObject = function(includeInstance, msg) {
   var f, obj = {
     extraInfo: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
@@ -40709,23 +40709,23 @@ proto.io.haveno.protobuffer.CashByAtmAccountPayload.toObject = function(includeI
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.io.haveno.protobuffer.CashByAtmAccountPayload}
+ * @return {!proto.io.haveno.protobuffer.CashAtAtmAccountPayload}
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.deserializeBinary = function(bytes) {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.io.haveno.protobuffer.CashByAtmAccountPayload;
-  return proto.io.haveno.protobuffer.CashByAtmAccountPayload.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.io.haveno.protobuffer.CashAtAtmAccountPayload;
+  return proto.io.haveno.protobuffer.CashAtAtmAccountPayload.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.io.haveno.protobuffer.CashByAtmAccountPayload} msg The message object to deserialize into.
+ * @param {!proto.io.haveno.protobuffer.CashAtAtmAccountPayload} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.io.haveno.protobuffer.CashByAtmAccountPayload}
+ * @return {!proto.io.haveno.protobuffer.CashAtAtmAccountPayload}
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.deserializeBinaryFromReader = function(msg, reader) {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -40749,9 +40749,9 @@ proto.io.haveno.protobuffer.CashByAtmAccountPayload.deserializeBinaryFromReader
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.prototype.serializeBinary = function() {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.io.haveno.protobuffer.CashByAtmAccountPayload.serializeBinaryToWriter(this, writer);
+  proto.io.haveno.protobuffer.CashAtAtmAccountPayload.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -40759,11 +40759,11 @@ proto.io.haveno.protobuffer.CashByAtmAccountPayload.prototype.serializeBinary =
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.io.haveno.protobuffer.CashByAtmAccountPayload} message
+ * @param {!proto.io.haveno.protobuffer.CashAtAtmAccountPayload} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.serializeBinaryToWriter = function(message, writer) {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getExtraInfo();
   if (f.length > 0) {
@@ -40779,16 +40779,16 @@ proto.io.haveno.protobuffer.CashByAtmAccountPayload.serializeBinaryToWriter = fu
  * optional string extra_info = 1;
  * @return {string}
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.prototype.getExtraInfo = function() {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.prototype.getExtraInfo = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.io.haveno.protobuffer.CashByAtmAccountPayload} returns this
+ * @return {!proto.io.haveno.protobuffer.CashAtAtmAccountPayload} returns this
  */
-proto.io.haveno.protobuffer.CashByAtmAccountPayload.prototype.setExtraInfo = function(value) {
+proto.io.haveno.protobuffer.CashAtAtmAccountPayload.prototype.setExtraInfo = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -46884,7 +46884,8 @@ proto.io.haveno.protobuffer.XmrAddressEntry.Context = {
   OFFER_FUNDING: 3,
   RESERVED_FOR_TRADE: 4,
   MULTI_SIG: 5,
-  TRADE_PAYOUT: 6
+  TRADE_PAYOUT: 6,
+  BASE_ADDRESS: 7
 };
 
 /**
@@ -54491,7 +54492,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.toObject = function(includeInstan
     autoSelectArbitrators: jspb.Message.getBooleanFieldWithDefault(msg, 8, false),
     dontShowAgainMapMap: (f = msg.getDontShowAgainMapMap()) ? f.toObject(includeInstance, undefined) : [],
     tacAccepted: jspb.Message.getBooleanFieldWithDefault(msg, 10, false),
-    useTorForBitcoinJ: jspb.Message.getBooleanFieldWithDefault(msg, 11, false),
+    useTorForMonero: jspb.Message.getBooleanFieldWithDefault(msg, 11, false),
     showOwnOffersInOfferBook: jspb.Message.getBooleanFieldWithDefault(msg, 12, false),
     preferredTradeCurrency: (f = msg.getPreferredTradeCurrency()) && proto.io.haveno.protobuffer.TradeCurrency.toObject(includeInstance, f),
     withdrawalTxFeeInVbytes: jspb.Message.getFieldWithDefault(msg, 14, 0),
@@ -54506,7 +54507,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.toObject = function(includeInstan
     sortMarketCurrenciesNumerically: jspb.Message.getBooleanFieldWithDefault(msg, 23, false),
     usePercentageBasedPrice: jspb.Message.getBooleanFieldWithDefault(msg, 24, false),
     peerTagMapMap: (f = msg.getPeerTagMapMap()) ? f.toObject(includeInstance, undefined) : [],
-    bitcoinNodes: jspb.Message.getFieldWithDefault(msg, 26, ""),
+    moneroNodes: jspb.Message.getFieldWithDefault(msg, 26, ""),
     ignoreTradersListList: (f = jspb.Message.getRepeatedField(msg, 27)) == null ? undefined : f,
     directoryChooserPath: jspb.Message.getFieldWithDefault(msg, 28, ""),
     useAnimations: jspb.Message.getBooleanFieldWithDefault(msg, 29, false),
@@ -54515,7 +54516,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.toObject = function(includeInstan
     bridgeOptionOrdinal: jspb.Message.getFieldWithDefault(msg, 32, 0),
     torTransportOrdinal: jspb.Message.getFieldWithDefault(msg, 33, 0),
     customBridges: jspb.Message.getFieldWithDefault(msg, 34, ""),
-    bitcoinNodesOptionOrdinal: jspb.Message.getFieldWithDefault(msg, 35, 0),
+    moneroNodesOptionOrdinal: jspb.Message.getFieldWithDefault(msg, 35, 0),
     referralId: jspb.Message.getFieldWithDefault(msg, 36, ""),
     phoneKeyAndToken: jspb.Message.getFieldWithDefault(msg, 37, ""),
     useSoundForMobileNotifications: jspb.Message.getBooleanFieldWithDefault(msg, 38, false),
@@ -54628,7 +54629,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.deserializeBinaryFromReader = fun
       break;
     case 11:
       var value = /** @type {boolean} */ (reader.readBool());
-      msg.setUseTorForBitcoinJ(value);
+      msg.setUseTorForMonero(value);
       break;
     case 12:
       var value = /** @type {boolean} */ (reader.readBool());
@@ -54691,7 +54692,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.deserializeBinaryFromReader = fun
       break;
     case 26:
       var value = /** @type {string} */ (reader.readString());
-      msg.setBitcoinNodes(value);
+      msg.setMoneroNodes(value);
       break;
     case 27:
       var value = /** @type {string} */ (reader.readString());
@@ -54728,7 +54729,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.deserializeBinaryFromReader = fun
       break;
     case 35:
       var value = /** @type {number} */ (reader.readInt32());
-      msg.setBitcoinNodesOptionOrdinal(value);
+      msg.setMoneroNodesOptionOrdinal(value);
       break;
     case 36:
       var value = /** @type {string} */ (reader.readString());
@@ -54937,7 +54938,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.serializeBinaryToWriter = functio
       f
     );
   }
-  f = message.getUseTorForBitcoinJ();
+  f = message.getUseTorForMonero();
   if (f) {
     writer.writeBool(
       11,
@@ -55040,7 +55041,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.serializeBinaryToWriter = functio
   if (f && f.getLength() > 0) {
     f.serializeBinary(25, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
   }
-  f = message.getBitcoinNodes();
+  f = message.getMoneroNodes();
   if (f.length > 0) {
     writer.writeString(
       26,
@@ -55104,7 +55105,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.serializeBinaryToWriter = functio
       f
     );
   }
-  f = message.getBitcoinNodesOptionOrdinal();
+  f = message.getMoneroNodesOptionOrdinal();
   if (f !== 0) {
     writer.writeInt32(
       35,
@@ -55580,10 +55581,10 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.setTacAccepted = functi
 
 
 /**
- * optional bool use_tor_for_bitcoin_j = 11;
+ * optional bool use_tor_for_monero = 11;
  * @return {boolean}
  */
-proto.io.haveno.protobuffer.PreferencesPayload.prototype.getUseTorForBitcoinJ = function() {
+proto.io.haveno.protobuffer.PreferencesPayload.prototype.getUseTorForMonero = function() {
   return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 11, false));
 };
 
@@ -55592,7 +55593,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.getUseTorForBitcoinJ =
  * @param {boolean} value
  * @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
  */
-proto.io.haveno.protobuffer.PreferencesPayload.prototype.setUseTorForBitcoinJ = function(value) {
+proto.io.haveno.protobuffer.PreferencesPayload.prototype.setUseTorForMonero = function(value) {
   return jspb.Message.setProto3BooleanField(this, 11, value);
 };
 
@@ -55797,7 +55798,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.setTradeStatisticsTickU
 
 
 /**
- * optional bool resync_Spv_requested = 22;
+ * optional bool resync_spv_requested = 22;
  * @return {boolean}
  */
 proto.io.haveno.protobuffer.PreferencesPayload.prototype.getResyncSpvRequested = function() {
@@ -55873,10 +55874,10 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.clearPeerTagMapMap = fu
 
 
 /**
- * optional string bitcoin_nodes = 26;
+ * optional string monero_nodes = 26;
  * @return {string}
  */
-proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBitcoinNodes = function() {
+proto.io.haveno.protobuffer.PreferencesPayload.prototype.getMoneroNodes = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 26, ""));
 };
 
@@ -55885,7 +55886,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBitcoinNodes = funct
  * @param {string} value
  * @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
  */
-proto.io.haveno.protobuffer.PreferencesPayload.prototype.setBitcoinNodes = function(value) {
+proto.io.haveno.protobuffer.PreferencesPayload.prototype.setMoneroNodes = function(value) {
   return jspb.Message.setProto3StringField(this, 26, value);
 };
 
@@ -56092,10 +56093,10 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.setCustomBridges = func
 
 
 /**
- * optional int32 bitcoin_nodes_option_ordinal = 35;
+ * optional int32 monero_nodes_option_ordinal = 35;
  * @return {number}
  */
-proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBitcoinNodesOptionOrdinal = function() {
+proto.io.haveno.protobuffer.PreferencesPayload.prototype.getMoneroNodesOptionOrdinal = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 35, 0));
 };
 
@@ -56104,7 +56105,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBitcoinNodesOptionOr
  * @param {number} value
  * @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
  */
-proto.io.haveno.protobuffer.PreferencesPayload.prototype.setBitcoinNodesOptionOrdinal = function(value) {
+proto.io.haveno.protobuffer.PreferencesPayload.prototype.setMoneroNodesOptionOrdinal = function(value) {
   return jspb.Message.setProto3IntField(this, 35, value);
 };