update dist

This commit is contained in:
woodser 2024-12-20 18:13:28 -05:00
parent efae74fee6
commit af192b342e
9 changed files with 441 additions and 55 deletions

View File

@ -398,7 +398,7 @@ export default class HavenoClient {
/**
* Delete a payment account.
*
* @param paymentAccountId {string} the id of the payment account to delete
* @param {string} paymentAccountId the id of the payment account to delete
*/
deletePaymentAccount(paymentAccountId: string): Promise<void>;
/**
@ -437,9 +437,11 @@ export default class HavenoClient {
* @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)
* @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): Promise<OfferInfo>;
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>;
/**
* Remove a posted offer, releasing its reserved funds.
*
@ -452,9 +454,10 @@ export default class HavenoClient {
* @param {string} offerId - id of the offer to take
* @param {string} paymentAccountId - id of the payment account
* @param {bigint|undefined} amount - amount the taker chooses to buy or sell within the offer range (default is max offer amount)
* @param {string|undefined} challenge - the challenge to use for the private offer
* @return {TradeInfo} the initialized trade
*/
takeOffer(offerId: string, paymentAccountId: string, amount?: bigint): Promise<TradeInfo>;
takeOffer(offerId: string, paymentAccountId: string, amount?: bigint, challenge?: string): Promise<TradeInfo>;
/**
* Get a trade by id.
*

21
dist/HavenoClient.js vendored
View File

@ -950,7 +950,7 @@ class HavenoClient {
/**
* Delete a payment account.
*
* @param paymentAccountId {string} the id of the payment account to delete
* @param {string} paymentAccountId the id of the payment account to delete
*/
async deletePaymentAccount(paymentAccountId) {
try {
@ -1024,9 +1024,11 @@ class HavenoClient {
* @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)
* @return {OfferInfo} the posted offer
*/
async postOffer(direction, amount, assetCode, paymentAccountId, securityDepositPct, price, marketPriceMarginPct, triggerPrice, minAmount, reserveExactAmount) {
async postOffer(direction, amount, assetCode, paymentAccountId, securityDepositPct, price, marketPriceMarginPct, triggerPrice, minAmount, reserveExactAmount, isPrivateOffer, buyerAsTakerWithoutDeposit) {
console_1.default.log("Posting offer with security deposit %: " + securityDepositPct);
try {
const request = new grpc_pb_1.PostOfferRequest()
@ -1034,7 +1036,7 @@ class HavenoClient {
.setAmount(amount.toString())
.setCurrencyCode(assetCode)
.setPaymentAccountId(paymentAccountId)
.setBuyerSecurityDepositPct(securityDepositPct)
.setSecurityDepositPct(securityDepositPct)
.setUseMarketBasedPrice(price === undefined)
.setMinAmount(minAmount ? minAmount.toString() : amount.toString());
if (price)
@ -1044,7 +1046,11 @@ class HavenoClient {
if (triggerPrice)
request.setTriggerPrice(triggerPrice.toString());
if (reserveExactAmount)
request.setReserveExactAmount(reserveExactAmount);
request.setReserveExactAmount(true);
if (isPrivateOffer)
request.setIsPrivateOffer(true);
if (buyerAsTakerWithoutDeposit)
request.setBuyerAsTakerWithoutDeposit(true);
return (await this._offersClient.postOffer(request, { password: this._password })).getOffer();
}
catch (e) {
@ -1070,15 +1076,18 @@ class HavenoClient {
* @param {string} offerId - id of the offer to take
* @param {string} paymentAccountId - id of the payment account
* @param {bigint|undefined} amount - amount the taker chooses to buy or sell within the offer range (default is max offer amount)
* @param {string|undefined} challenge - the challenge to use for the private offer
* @return {TradeInfo} the initialized trade
*/
async takeOffer(offerId, paymentAccountId, amount) {
async takeOffer(offerId, paymentAccountId, amount, challenge) {
try {
const request = new grpc_pb_1.TakeOfferRequest()
.setOfferId(offerId)
.setPaymentAccountId(paymentAccountId);
if (amount)
request.setAmount(amount.toString());
if (challenge)
request.setChallenge(challenge);
const resp = await this._tradesClient.takeOffer(request, { password: this._password });
if (resp.getTrade())
return resp.getTrade();
@ -1293,7 +1302,7 @@ class HavenoClient {
await this.disconnect();
await this._shutdownServerClient.stop(new grpc_pb_1.StopRequest(), { password: this._password }); // process receives 'exit' event
if (this._process)
return HavenoUtils_1.default.kill(this._process);
await HavenoUtils_1.default.kill(this._process);
}
catch (e) {
throw new HavenoError_1.default(e.message, e.code);

File diff suppressed because one or more lines are too long

View File

@ -1525,8 +1525,8 @@ export class PostOfferRequest extends jspb.Message {
getMinAmount(): string;
setMinAmount(value: string): PostOfferRequest;
getBuyerSecurityDepositPct(): number;
setBuyerSecurityDepositPct(value: number): PostOfferRequest;
getSecurityDepositPct(): number;
setSecurityDepositPct(value: number): PostOfferRequest;
getTriggerPrice(): string;
setTriggerPrice(value: string): PostOfferRequest;
@ -1537,6 +1537,12 @@ export class PostOfferRequest extends jspb.Message {
getPaymentAccountId(): string;
setPaymentAccountId(value: string): PostOfferRequest;
getIsPrivateOffer(): boolean;
setIsPrivateOffer(value: boolean): PostOfferRequest;
getBuyerAsTakerWithoutDeposit(): boolean;
setBuyerAsTakerWithoutDeposit(value: boolean): PostOfferRequest;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): PostOfferRequest.AsObject;
static toObject(includeInstance: boolean, msg: PostOfferRequest): PostOfferRequest.AsObject;
@ -1554,10 +1560,12 @@ export namespace PostOfferRequest {
marketPriceMarginPct: number,
amount: string,
minAmount: string,
buyerSecurityDepositPct: number,
securityDepositPct: number,
triggerPrice: string,
reserveExactAmount: boolean,
paymentAccountId: string,
isPrivateOffer: boolean,
buyerAsTakerWithoutDeposit: boolean,
}
}
@ -1707,6 +1715,12 @@ export class OfferInfo extends jspb.Message {
getSplitOutputTxFee(): string;
setSplitOutputTxFee(value: string): OfferInfo;
getIsPrivateOffer(): boolean;
setIsPrivateOffer(value: boolean): OfferInfo;
getChallenge(): string;
setChallenge(value: string): OfferInfo;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): OfferInfo.AsObject;
static toObject(includeInstance: boolean, msg: OfferInfo): OfferInfo.AsObject;
@ -1748,6 +1762,8 @@ export namespace OfferInfo {
arbitratorSigner: string,
splitOutputTxHash: string,
splitOutputTxFee: string,
isPrivateOffer: boolean,
challenge: string,
}
}
@ -2367,6 +2383,9 @@ export class TakeOfferRequest extends jspb.Message {
getAmount(): string;
setAmount(value: string): TakeOfferRequest;
getChallenge(): string;
setChallenge(value: string): TakeOfferRequest;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): TakeOfferRequest.AsObject;
static toObject(includeInstance: boolean, msg: TakeOfferRequest): TakeOfferRequest.AsObject;
@ -2380,6 +2399,7 @@ export namespace TakeOfferRequest {
offerId: string,
paymentAccountId: string,
amount: string,
challenge: string,
}
}

View File

@ -14827,10 +14827,12 @@ proto.io.haveno.protobuffer.PostOfferRequest.toObject = function(includeInstance
marketPriceMarginPct: jspb.Message.getFloatingPointFieldWithDefault(msg, 5, 0.0),
amount: jspb.Message.getFieldWithDefault(msg, 6, "0"),
minAmount: jspb.Message.getFieldWithDefault(msg, 7, "0"),
buyerSecurityDepositPct: jspb.Message.getFloatingPointFieldWithDefault(msg, 8, 0.0),
securityDepositPct: jspb.Message.getFloatingPointFieldWithDefault(msg, 8, 0.0),
triggerPrice: jspb.Message.getFieldWithDefault(msg, 9, ""),
reserveExactAmount: jspb.Message.getBooleanFieldWithDefault(msg, 10, false),
paymentAccountId: jspb.Message.getFieldWithDefault(msg, 11, "")
paymentAccountId: jspb.Message.getFieldWithDefault(msg, 11, ""),
isPrivateOffer: jspb.Message.getBooleanFieldWithDefault(msg, 12, false),
buyerAsTakerWithoutDeposit: jspb.Message.getBooleanFieldWithDefault(msg, 13, false)
};
if (includeInstance) {
@ -14897,7 +14899,7 @@ proto.io.haveno.protobuffer.PostOfferRequest.deserializeBinaryFromReader = funct
break;
case 8:
var value = /** @type {number} */ (reader.readDouble());
msg.setBuyerSecurityDepositPct(value);
msg.setSecurityDepositPct(value);
break;
case 9:
var value = /** @type {string} */ (reader.readString());
@ -14911,6 +14913,14 @@ proto.io.haveno.protobuffer.PostOfferRequest.deserializeBinaryFromReader = funct
var value = /** @type {string} */ (reader.readString());
msg.setPaymentAccountId(value);
break;
case 12:
var value = /** @type {boolean} */ (reader.readBool());
msg.setIsPrivateOffer(value);
break;
case 13:
var value = /** @type {boolean} */ (reader.readBool());
msg.setBuyerAsTakerWithoutDeposit(value);
break;
default:
reader.skipField();
break;
@ -14989,7 +14999,7 @@ proto.io.haveno.protobuffer.PostOfferRequest.serializeBinaryToWriter = function(
f
);
}
f = message.getBuyerSecurityDepositPct();
f = message.getSecurityDepositPct();
if (f !== 0.0) {
writer.writeDouble(
8,
@ -15017,6 +15027,20 @@ proto.io.haveno.protobuffer.PostOfferRequest.serializeBinaryToWriter = function(
f
);
}
f = message.getIsPrivateOffer();
if (f) {
writer.writeBool(
12,
f
);
}
f = message.getBuyerAsTakerWithoutDeposit();
if (f) {
writer.writeBool(
13,
f
);
}
};
@ -15147,10 +15171,10 @@ proto.io.haveno.protobuffer.PostOfferRequest.prototype.setMinAmount = function(v
/**
* optional double buyer_security_deposit_pct = 8;
* optional double security_deposit_pct = 8;
* @return {number}
*/
proto.io.haveno.protobuffer.PostOfferRequest.prototype.getBuyerSecurityDepositPct = function() {
proto.io.haveno.protobuffer.PostOfferRequest.prototype.getSecurityDepositPct = function() {
return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 8, 0.0));
};
@ -15159,7 +15183,7 @@ proto.io.haveno.protobuffer.PostOfferRequest.prototype.getBuyerSecurityDepositPc
* @param {number} value
* @return {!proto.io.haveno.protobuffer.PostOfferRequest} returns this
*/
proto.io.haveno.protobuffer.PostOfferRequest.prototype.setBuyerSecurityDepositPct = function(value) {
proto.io.haveno.protobuffer.PostOfferRequest.prototype.setSecurityDepositPct = function(value) {
return jspb.Message.setProto3FloatField(this, 8, value);
};
@ -15218,6 +15242,42 @@ proto.io.haveno.protobuffer.PostOfferRequest.prototype.setPaymentAccountId = fun
};
/**
* optional bool is_private_offer = 12;
* @return {boolean}
*/
proto.io.haveno.protobuffer.PostOfferRequest.prototype.getIsPrivateOffer = function() {
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 12, false));
};
/**
* @param {boolean} value
* @return {!proto.io.haveno.protobuffer.PostOfferRequest} returns this
*/
proto.io.haveno.protobuffer.PostOfferRequest.prototype.setIsPrivateOffer = function(value) {
return jspb.Message.setProto3BooleanField(this, 12, value);
};
/**
* optional bool buyer_as_taker_without_deposit = 13;
* @return {boolean}
*/
proto.io.haveno.protobuffer.PostOfferRequest.prototype.getBuyerAsTakerWithoutDeposit = function() {
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 13, false));
};
/**
* @param {boolean} value
* @return {!proto.io.haveno.protobuffer.PostOfferRequest} returns this
*/
proto.io.haveno.protobuffer.PostOfferRequest.prototype.setBuyerAsTakerWithoutDeposit = function(value) {
return jspb.Message.setProto3BooleanField(this, 13, value);
};
@ -15662,7 +15722,9 @@ proto.io.haveno.protobuffer.OfferInfo.toObject = function(includeInstance, msg)
protocolVersion: jspb.Message.getFieldWithDefault(msg, 28, 0),
arbitratorSigner: jspb.Message.getFieldWithDefault(msg, 29, ""),
splitOutputTxHash: jspb.Message.getFieldWithDefault(msg, 30, ""),
splitOutputTxFee: jspb.Message.getFieldWithDefault(msg, 31, "0")
splitOutputTxFee: jspb.Message.getFieldWithDefault(msg, 31, "0"),
isPrivateOffer: jspb.Message.getBooleanFieldWithDefault(msg, 32, false),
challenge: jspb.Message.getFieldWithDefault(msg, 33, "")
};
if (includeInstance) {
@ -15823,6 +15885,14 @@ proto.io.haveno.protobuffer.OfferInfo.deserializeBinaryFromReader = function(msg
var value = /** @type {string} */ (reader.readUint64String());
msg.setSplitOutputTxFee(value);
break;
case 32:
var value = /** @type {boolean} */ (reader.readBool());
msg.setIsPrivateOffer(value);
break;
case 33:
var value = /** @type {string} */ (reader.readString());
msg.setChallenge(value);
break;
default:
reader.skipField();
break;
@ -16069,6 +16139,20 @@ proto.io.haveno.protobuffer.OfferInfo.serializeBinaryToWriter = function(message
f
);
}
f = message.getIsPrivateOffer();
if (f) {
writer.writeBool(
32,
f
);
}
f = message.getChallenge();
if (f.length > 0) {
writer.writeString(
33,
f
);
}
};
@ -16630,6 +16714,42 @@ proto.io.haveno.protobuffer.OfferInfo.prototype.setSplitOutputTxFee = function(v
};
/**
* optional bool is_private_offer = 32;
* @return {boolean}
*/
proto.io.haveno.protobuffer.OfferInfo.prototype.getIsPrivateOffer = function() {
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 32, false));
};
/**
* @param {boolean} value
* @return {!proto.io.haveno.protobuffer.OfferInfo} returns this
*/
proto.io.haveno.protobuffer.OfferInfo.prototype.setIsPrivateOffer = function(value) {
return jspb.Message.setProto3BooleanField(this, 32, value);
};
/**
* optional string challenge = 33;
* @return {string}
*/
proto.io.haveno.protobuffer.OfferInfo.prototype.getChallenge = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 33, ""));
};
/**
* @param {string} value
* @return {!proto.io.haveno.protobuffer.OfferInfo} returns this
*/
proto.io.haveno.protobuffer.OfferInfo.prototype.setChallenge = function(value) {
return jspb.Message.setProto3StringField(this, 33, value);
};
@ -21211,7 +21331,8 @@ proto.io.haveno.protobuffer.TakeOfferRequest.toObject = function(includeInstance
var f, obj = {
offerId: jspb.Message.getFieldWithDefault(msg, 1, ""),
paymentAccountId: jspb.Message.getFieldWithDefault(msg, 2, ""),
amount: jspb.Message.getFieldWithDefault(msg, 3, "0")
amount: jspb.Message.getFieldWithDefault(msg, 3, "0"),
challenge: jspb.Message.getFieldWithDefault(msg, 4, "")
};
if (includeInstance) {
@ -21260,6 +21381,10 @@ proto.io.haveno.protobuffer.TakeOfferRequest.deserializeBinaryFromReader = funct
var value = /** @type {string} */ (reader.readUint64String());
msg.setAmount(value);
break;
case 4:
var value = /** @type {string} */ (reader.readString());
msg.setChallenge(value);
break;
default:
reader.skipField();
break;
@ -21310,6 +21435,13 @@ proto.io.haveno.protobuffer.TakeOfferRequest.serializeBinaryToWriter = function(
f
);
}
f = message.getChallenge();
if (f.length > 0) {
writer.writeString(
4,
f
);
}
};
@ -21367,6 +21499,24 @@ proto.io.haveno.protobuffer.TakeOfferRequest.prototype.setAmount = function(valu
};
/**
* optional string challenge = 4;
* @return {string}
*/
proto.io.haveno.protobuffer.TakeOfferRequest.prototype.getChallenge = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
};
/**
* @param {string} value
* @return {!proto.io.haveno.protobuffer.TakeOfferRequest} returns this
*/
proto.io.haveno.protobuffer.TakeOfferRequest.prototype.setChallenge = function(value) {
return jspb.Message.setProto3StringField(this, 4, value);
};

File diff suppressed because one or more lines are too long

View File

@ -1081,6 +1081,9 @@ export class InitTradeRequest extends jspb.Message {
getPayoutAddress(): string;
setPayoutAddress(value: string): InitTradeRequest;
getChallenge(): string;
setChallenge(value: string): InitTradeRequest;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): InitTradeRequest.AsObject;
static toObject(includeInstance: boolean, msg: InitTradeRequest): InitTradeRequest.AsObject;
@ -1111,6 +1114,7 @@ export namespace InitTradeRequest {
reserveTxHex: string,
reserveTxKey: string,
payoutAddress: string,
challenge: string,
}
}
@ -2855,8 +2859,8 @@ export class OfferPayload extends jspb.Message {
getIsPrivateOffer(): boolean;
setIsPrivateOffer(value: boolean): OfferPayload;
getHashOfChallenge(): string;
setHashOfChallenge(value: string): OfferPayload;
getChallengeHash(): string;
setChallengeHash(value: string): OfferPayload;
getExtraDataMap(): jspb.Map<string, string>;
clearExtraDataMap(): OfferPayload;
@ -2921,7 +2925,7 @@ export namespace OfferPayload {
lowerClosePrice: number,
upperClosePrice: number,
isPrivateOffer: boolean,
hashOfChallenge: string,
challengeHash: string,
extraDataMap: Array<[string, string]>,
protocolVersion: number,
arbitratorSigner?: NodeAddress.AsObject,
@ -5992,6 +5996,9 @@ export class OpenOffer extends jspb.Message {
getReserveTxKey(): string;
setReserveTxKey(value: string): OpenOffer;
getChallenge(): string;
setChallenge(value: string): OpenOffer;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): OpenOffer.AsObject;
static toObject(includeInstance: boolean, msg: OpenOffer): OpenOffer.AsObject;
@ -6013,6 +6020,7 @@ export namespace OpenOffer {
reserveTxHash: string,
reserveTxHex: string,
reserveTxKey: string,
challenge: string,
}
export enum State {
@ -6196,6 +6204,9 @@ export class Trade extends jspb.Message {
getIsCompleted(): boolean;
setIsCompleted(value: boolean): Trade;
getChallenge(): string;
setChallenge(value: string): Trade;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Trade.AsObject;
static toObject(includeInstance: boolean, msg: Trade): Trade.AsObject;
@ -6234,6 +6245,7 @@ export namespace Trade {
counterCurrencyExtraData: string,
uid: string,
isCompleted: boolean,
challenge: string,
}
export enum State {
@ -6998,14 +7010,14 @@ export class PreferencesPayload extends jspb.Message {
getTakeOfferSelectedPaymentAccountId(): string;
setTakeOfferSelectedPaymentAccountId(value: string): PreferencesPayload;
getBuyerSecurityDepositAsPercent(): number;
setBuyerSecurityDepositAsPercent(value: number): PreferencesPayload;
getSecurityDepositAsPercent(): number;
setSecurityDepositAsPercent(value: number): PreferencesPayload;
getIgnoreDustThreshold(): number;
setIgnoreDustThreshold(value: number): PreferencesPayload;
getBuyerSecurityDepositAsPercentForCrypto(): number;
setBuyerSecurityDepositAsPercentForCrypto(value: number): PreferencesPayload;
getSecurityDepositAsPercentForCrypto(): number;
setSecurityDepositAsPercentForCrypto(value: number): PreferencesPayload;
getBlockNotifyPort(): number;
setBlockNotifyPort(value: number): PreferencesPayload;
@ -7059,6 +7071,15 @@ export class PreferencesPayload extends jspb.Message {
getUseSoundForNotificationsInitialized(): boolean;
setUseSoundForNotificationsInitialized(value: boolean): PreferencesPayload;
getBuyScreenOtherCurrencyCode(): string;
setBuyScreenOtherCurrencyCode(value: string): PreferencesPayload;
getSellScreenOtherCurrencyCode(): string;
setSellScreenOtherCurrencyCode(value: string): PreferencesPayload;
getShowPrivateOffers(): boolean;
setShowPrivateOffers(value: boolean): PreferencesPayload;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): PreferencesPayload.AsObject;
static toObject(includeInstance: boolean, msg: PreferencesPayload): PreferencesPayload.AsObject;
@ -7114,9 +7135,9 @@ export namespace PreferencesPayload {
rpcUser: string,
rpcPw: string,
takeOfferSelectedPaymentAccountId: string,
buyerSecurityDepositAsPercent: number,
securityDepositAsPercent: number,
ignoreDustThreshold: number,
buyerSecurityDepositAsPercentForCrypto: number,
securityDepositAsPercentForCrypto: number,
blockNotifyPort: number,
cssTheme: number,
tacAcceptedV120: boolean,
@ -7133,6 +7154,9 @@ export namespace PreferencesPayload {
splitOfferOutput: boolean,
useSoundForNotifications: boolean,
useSoundForNotificationsInitialized: boolean,
buyScreenOtherCurrencyCode: string,
sellScreenOtherCurrencyCode: string,
showPrivateOffers: boolean,
}
}

224
dist/protobuf/pb_pb.js vendored
View File

@ -11944,7 +11944,8 @@ proto.io.haveno.protobuffer.InitTradeRequest.toObject = function(includeInstance
reserveTxHash: jspb.Message.getFieldWithDefault(msg, 17, ""),
reserveTxHex: jspb.Message.getFieldWithDefault(msg, 18, ""),
reserveTxKey: jspb.Message.getFieldWithDefault(msg, 19, ""),
payoutAddress: jspb.Message.getFieldWithDefault(msg, 20, "")
payoutAddress: jspb.Message.getFieldWithDefault(msg, 20, ""),
challenge: jspb.Message.getFieldWithDefault(msg, 21, "")
};
if (includeInstance) {
@ -12065,6 +12066,10 @@ proto.io.haveno.protobuffer.InitTradeRequest.deserializeBinaryFromReader = funct
var value = /** @type {string} */ (reader.readString());
msg.setPayoutAddress(value);
break;
case 21:
var value = /** @type {string} */ (reader.readString());
msg.setChallenge(value);
break;
default:
reader.skipField();
break;
@ -12238,6 +12243,13 @@ proto.io.haveno.protobuffer.InitTradeRequest.serializeBinaryToWriter = function(
f
);
}
f = message.getChallenge();
if (f.length > 0) {
writer.writeString(
21,
f
);
}
};
@ -12701,6 +12713,24 @@ proto.io.haveno.protobuffer.InitTradeRequest.prototype.setPayoutAddress = functi
};
/**
* optional string challenge = 21;
* @return {string}
*/
proto.io.haveno.protobuffer.InitTradeRequest.prototype.getChallenge = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 21, ""));
};
/**
* @param {string} value
* @return {!proto.io.haveno.protobuffer.InitTradeRequest} returns this
*/
proto.io.haveno.protobuffer.InitTradeRequest.prototype.setChallenge = function(value) {
return jspb.Message.setProto3StringField(this, 21, value);
};
@ -25432,7 +25462,7 @@ proto.io.haveno.protobuffer.OfferPayload.toObject = function(includeInstance, ms
lowerClosePrice: jspb.Message.getFieldWithDefault(msg, 30, 0),
upperClosePrice: jspb.Message.getFieldWithDefault(msg, 31, 0),
isPrivateOffer: jspb.Message.getBooleanFieldWithDefault(msg, 32, false),
hashOfChallenge: jspb.Message.getFieldWithDefault(msg, 33, ""),
challengeHash: jspb.Message.getFieldWithDefault(msg, 33, ""),
extraDataMap: (f = msg.getExtraDataMap()) ? f.toObject(includeInstance, undefined) : [],
protocolVersion: jspb.Message.getFieldWithDefault(msg, 35, 0),
arbitratorSigner: (f = msg.getArbitratorSigner()) && proto.io.haveno.protobuffer.NodeAddress.toObject(includeInstance, f),
@ -25606,7 +25636,7 @@ proto.io.haveno.protobuffer.OfferPayload.deserializeBinaryFromReader = function(
break;
case 33:
var value = /** @type {string} */ (reader.readString());
msg.setHashOfChallenge(value);
msg.setChallengeHash(value);
break;
case 34:
var value = msg.getExtraDataMap();
@ -25886,7 +25916,7 @@ proto.io.haveno.protobuffer.OfferPayload.serializeBinaryToWriter = function(mess
f
);
}
f = message.getHashOfChallenge();
f = message.getChallengeHash();
if (f.length > 0) {
writer.writeString(
33,
@ -26582,10 +26612,10 @@ proto.io.haveno.protobuffer.OfferPayload.prototype.setIsPrivateOffer = function(
/**
* optional string hash_of_challenge = 33;
* optional string challenge_hash = 33;
* @return {string}
*/
proto.io.haveno.protobuffer.OfferPayload.prototype.getHashOfChallenge = function() {
proto.io.haveno.protobuffer.OfferPayload.prototype.getChallengeHash = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 33, ""));
};
@ -26594,7 +26624,7 @@ proto.io.haveno.protobuffer.OfferPayload.prototype.getHashOfChallenge = function
* @param {string} value
* @return {!proto.io.haveno.protobuffer.OfferPayload} returns this
*/
proto.io.haveno.protobuffer.OfferPayload.prototype.setHashOfChallenge = function(value) {
proto.io.haveno.protobuffer.OfferPayload.prototype.setChallengeHash = function(value) {
return jspb.Message.setProto3StringField(this, 33, value);
};
@ -48941,7 +48971,8 @@ proto.io.haveno.protobuffer.OpenOffer.toObject = function(includeInstance, msg)
scheduledAmount: jspb.Message.getFieldWithDefault(msg, 8, ""),
reserveTxHash: jspb.Message.getFieldWithDefault(msg, 9, ""),
reserveTxHex: jspb.Message.getFieldWithDefault(msg, 10, ""),
reserveTxKey: jspb.Message.getFieldWithDefault(msg, 11, "")
reserveTxKey: jspb.Message.getFieldWithDefault(msg, 11, ""),
challenge: jspb.Message.getFieldWithDefault(msg, 12, "")
};
if (includeInstance) {
@ -49023,6 +49054,10 @@ proto.io.haveno.protobuffer.OpenOffer.deserializeBinaryFromReader = function(msg
var value = /** @type {string} */ (reader.readString());
msg.setReserveTxKey(value);
break;
case 12:
var value = /** @type {string} */ (reader.readString());
msg.setChallenge(value);
break;
default:
reader.skipField();
break;
@ -49130,6 +49165,13 @@ proto.io.haveno.protobuffer.OpenOffer.serializeBinaryToWriter = function(message
f
);
}
f = message.getChallenge();
if (f.length > 0) {
writer.writeString(
12,
f
);
}
};
@ -49382,6 +49424,24 @@ proto.io.haveno.protobuffer.OpenOffer.prototype.setReserveTxKey = function(value
};
/**
* optional string challenge = 12;
* @return {string}
*/
proto.io.haveno.protobuffer.OpenOffer.prototype.getChallenge = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, ""));
};
/**
* @param {string} value
* @return {!proto.io.haveno.protobuffer.OpenOffer} returns this
*/
proto.io.haveno.protobuffer.OpenOffer.prototype.setChallenge = function(value) {
return jspb.Message.setProto3StringField(this, 12, value);
};
/**
* Oneof group definitions for this message. Each group defines the field
@ -49937,7 +49997,8 @@ proto.io.haveno.protobuffer.Trade.toObject = function(includeInstance, msg) {
refundResultState: jspb.Message.getFieldWithDefault(msg, 25, 0),
counterCurrencyExtraData: jspb.Message.getFieldWithDefault(msg, 26, ""),
uid: jspb.Message.getFieldWithDefault(msg, 27, ""),
isCompleted: jspb.Message.getBooleanFieldWithDefault(msg, 28, false)
isCompleted: jspb.Message.getBooleanFieldWithDefault(msg, 28, false),
challenge: jspb.Message.getFieldWithDefault(msg, 29, "")
};
if (includeInstance) {
@ -50093,6 +50154,10 @@ proto.io.haveno.protobuffer.Trade.deserializeBinaryFromReader = function(msg, re
var value = /** @type {boolean} */ (reader.readBool());
msg.setIsCompleted(value);
break;
case 29:
var value = /** @type {string} */ (reader.readString());
msg.setChallenge(value);
break;
default:
reader.skipField();
break;
@ -50325,6 +50390,13 @@ proto.io.haveno.protobuffer.Trade.serializeBinaryToWriter = function(message, wr
f
);
}
f = message.getChallenge();
if (f.length > 0) {
writer.writeString(
29,
f
);
}
};
@ -51078,6 +51150,24 @@ proto.io.haveno.protobuffer.Trade.prototype.setIsCompleted = function(value) {
};
/**
* optional string challenge = 29;
* @return {string}
*/
proto.io.haveno.protobuffer.Trade.prototype.getChallenge = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 29, ""));
};
/**
* @param {string} value
* @return {!proto.io.haveno.protobuffer.Trade} returns this
*/
proto.io.haveno.protobuffer.Trade.prototype.setChallenge = function(value) {
return jspb.Message.setProto3StringField(this, 29, value);
};
@ -55399,9 +55489,9 @@ proto.io.haveno.protobuffer.PreferencesPayload.toObject = function(includeInstan
rpcUser: jspb.Message.getFieldWithDefault(msg, 43, ""),
rpcPw: jspb.Message.getFieldWithDefault(msg, 44, ""),
takeOfferSelectedPaymentAccountId: jspb.Message.getFieldWithDefault(msg, 45, ""),
buyerSecurityDepositAsPercent: jspb.Message.getFloatingPointFieldWithDefault(msg, 46, 0.0),
securityDepositAsPercent: jspb.Message.getFloatingPointFieldWithDefault(msg, 46, 0.0),
ignoreDustThreshold: jspb.Message.getFieldWithDefault(msg, 47, 0),
buyerSecurityDepositAsPercentForCrypto: jspb.Message.getFloatingPointFieldWithDefault(msg, 48, 0.0),
securityDepositAsPercentForCrypto: jspb.Message.getFloatingPointFieldWithDefault(msg, 48, 0.0),
blockNotifyPort: jspb.Message.getFieldWithDefault(msg, 49, 0),
cssTheme: jspb.Message.getFieldWithDefault(msg, 50, 0),
tacAcceptedV120: jspb.Message.getBooleanFieldWithDefault(msg, 51, false),
@ -55418,7 +55508,10 @@ proto.io.haveno.protobuffer.PreferencesPayload.toObject = function(includeInstan
sellScreenCryptoCurrencyCode: jspb.Message.getFieldWithDefault(msg, 61, ""),
splitOfferOutput: jspb.Message.getBooleanFieldWithDefault(msg, 62, false),
useSoundForNotifications: jspb.Message.getBooleanFieldWithDefault(msg, 63, false),
useSoundForNotificationsInitialized: jspb.Message.getBooleanFieldWithDefault(msg, 64, false)
useSoundForNotificationsInitialized: jspb.Message.getBooleanFieldWithDefault(msg, 64, false),
buyScreenOtherCurrencyCode: jspb.Message.getFieldWithDefault(msg, 65, ""),
sellScreenOtherCurrencyCode: jspb.Message.getFieldWithDefault(msg, 66, ""),
showPrivateOffers: jspb.Message.getBooleanFieldWithDefault(msg, 67, false)
};
if (includeInstance) {
@ -55648,7 +55741,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.deserializeBinaryFromReader = fun
break;
case 46:
var value = /** @type {number} */ (reader.readDouble());
msg.setBuyerSecurityDepositAsPercent(value);
msg.setSecurityDepositAsPercent(value);
break;
case 47:
var value = /** @type {number} */ (reader.readInt32());
@ -55656,7 +55749,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.deserializeBinaryFromReader = fun
break;
case 48:
var value = /** @type {number} */ (reader.readDouble());
msg.setBuyerSecurityDepositAsPercentForCrypto(value);
msg.setSecurityDepositAsPercentForCrypto(value);
break;
case 49:
var value = /** @type {number} */ (reader.readInt32());
@ -55724,6 +55817,18 @@ proto.io.haveno.protobuffer.PreferencesPayload.deserializeBinaryFromReader = fun
var value = /** @type {boolean} */ (reader.readBool());
msg.setUseSoundForNotificationsInitialized(value);
break;
case 65:
var value = /** @type {string} */ (reader.readString());
msg.setBuyScreenOtherCurrencyCode(value);
break;
case 66:
var value = /** @type {string} */ (reader.readString());
msg.setSellScreenOtherCurrencyCode(value);
break;
case 67:
var value = /** @type {boolean} */ (reader.readBool());
msg.setShowPrivateOffers(value);
break;
default:
reader.skipField();
break;
@ -56069,7 +56174,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.serializeBinaryToWriter = functio
f
);
}
f = message.getBuyerSecurityDepositAsPercent();
f = message.getSecurityDepositAsPercent();
if (f !== 0.0) {
writer.writeDouble(
46,
@ -56083,7 +56188,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.serializeBinaryToWriter = functio
f
);
}
f = message.getBuyerSecurityDepositAsPercentForCrypto();
f = message.getSecurityDepositAsPercentForCrypto();
if (f !== 0.0) {
writer.writeDouble(
48,
@ -56204,6 +56309,27 @@ proto.io.haveno.protobuffer.PreferencesPayload.serializeBinaryToWriter = functio
f
);
}
f = message.getBuyScreenOtherCurrencyCode();
if (f.length > 0) {
writer.writeString(
65,
f
);
}
f = message.getSellScreenOtherCurrencyCode();
if (f.length > 0) {
writer.writeString(
66,
f
);
}
f = message.getShowPrivateOffers();
if (f) {
writer.writeBool(
67,
f
);
}
};
@ -57199,10 +57325,10 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.setTakeOfferSelectedPay
/**
* optional double buyer_security_deposit_as_percent = 46;
* optional double security_deposit_as_percent = 46;
* @return {number}
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBuyerSecurityDepositAsPercent = function() {
proto.io.haveno.protobuffer.PreferencesPayload.prototype.getSecurityDepositAsPercent = function() {
return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 46, 0.0));
};
@ -57211,7 +57337,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBuyerSecurityDeposit
* @param {number} value
* @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.setBuyerSecurityDepositAsPercent = function(value) {
proto.io.haveno.protobuffer.PreferencesPayload.prototype.setSecurityDepositAsPercent = function(value) {
return jspb.Message.setProto3FloatField(this, 46, value);
};
@ -57235,10 +57361,10 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.setIgnoreDustThreshold
/**
* optional double buyer_security_deposit_as_percent_for_crypto = 48;
* optional double security_deposit_as_percent_for_crypto = 48;
* @return {number}
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBuyerSecurityDepositAsPercentForCrypto = function() {
proto.io.haveno.protobuffer.PreferencesPayload.prototype.getSecurityDepositAsPercentForCrypto = function() {
return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 48, 0.0));
};
@ -57247,7 +57373,7 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBuyerSecurityDeposit
* @param {number} value
* @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.setBuyerSecurityDepositAsPercentForCrypto = function(value) {
proto.io.haveno.protobuffer.PreferencesPayload.prototype.setSecurityDepositAsPercentForCrypto = function(value) {
return jspb.Message.setProto3FloatField(this, 48, value);
};
@ -57579,6 +57705,60 @@ proto.io.haveno.protobuffer.PreferencesPayload.prototype.setUseSoundForNotificat
};
/**
* optional string buy_screen_other_currency_code = 65;
* @return {string}
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.getBuyScreenOtherCurrencyCode = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 65, ""));
};
/**
* @param {string} value
* @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.setBuyScreenOtherCurrencyCode = function(value) {
return jspb.Message.setProto3StringField(this, 65, value);
};
/**
* optional string sell_screen_other_currency_code = 66;
* @return {string}
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.getSellScreenOtherCurrencyCode = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 66, ""));
};
/**
* @param {string} value
* @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.setSellScreenOtherCurrencyCode = function(value) {
return jspb.Message.setProto3StringField(this, 66, value);
};
/**
* optional bool show_private_offers = 67;
* @return {boolean}
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.getShowPrivateOffers = function() {
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 67, false));
};
/**
* @param {boolean} value
* @return {!proto.io.haveno.protobuffer.PreferencesPayload} returns this
*/
proto.io.haveno.protobuffer.PreferencesPayload.prototype.setShowPrivateOffers = function(value) {
return jspb.Message.setProto3BooleanField(this, 67, value);
};
/**
* List of repeated fields within this message type.

File diff suppressed because one or more lines are too long