nik/bisq-api-reference
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq-api-reference.git synced 2026-05-01 09:10:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'is margin price >= target price' filter, and some typos

Browse Source
This commit is contained in:
ghubstan 2022-06-25 12:25:50 -03:00
parent 25f12c8232
commit bf876a9771
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java-examples/src/main/java/bisq/bots/BotUtils.java
View File

@ -72,7 +72,7 @@ public class BotUtils {
public static BigDecimal calcTargetPrice(BigDecimal targetMarketPriceMargin, public static BigDecimal calcTargetPrice(BigDecimal targetMarketPriceMargin,
BigDecimal currentMarketPrice, BigDecimal currentMarketPrice,
String currencyCode) { String currencyCode) {
if (!isZero.test(targetMarketPriceMargin) && targetMarketPriceMargin.precision() <= 2) if (!isZero.test(targetMarketPriceMargin) && targetMarketPriceMargin.precision() < 2)
throw new IllegalArgumentException( throw new IllegalArgumentException(
format("Price margin percent literal argument %s is invalid;" format("Price margin percent literal argument %s is invalid;"
+ " it must have a precision of at least 2 decimal places.", + " it must have a precision of at least 2 decimal places.",
@ -133,12 +133,13 @@ public class BotUtils {
return diff.subtract(factor); return diff.subtract(factor);
}; };
/** /**
* Return true if the margin price based offer's market price margin (%) >= minMarketPriceMargin (%). * Return true if the offer's margin based price >= target price.
*/ */
public static final BiPredicate<OfferInfo, BigDecimal> isMarginGEMinMarketPriceMargin = public static final BiPredicate<OfferInfo, BigDecimal> isMarginBasedPriceGETargetPrice =
(offer, minMarketPriceMargin) -> offer.getUseMarketBasedPrice() (offer, targetPrice) -> offer.getUseMarketBasedPrice()
&& offer.getMarketPriceMarginPct() >= minMarketPriceMargin.doubleValue(); && new BigDecimal(offer.getPrice()).compareTo(targetPrice) >= 0;
/** /**
* Return true if the margin price based offer's market price margin (%) <= maxMarketPriceMargin (%). * Return true if the margin price based offer's market price margin (%) <= maxMarketPriceMargin (%).

16
java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBtc.java
View File

@ -37,7 +37,7 @@ import static protobuf.OfferDirection.SELL;
/** /**
* The TakeBestPricedOfferToBuyBtc bot waits for attractively priced BUY BTC offers to appear, takes the offers * The TakeBestPricedOfferToBuyBtc bot waits for attractively priced BUY BTC offers to appear, takes the offers
* (up to a maximum of configured {@link #maxTakeOffers}, then shuts down both the API daemon and itself (the bot), * (up to a maximum of configured {@link #maxTakeOffers}), then shuts down both the API daemon and itself (the bot),
* to allow the user to start the desktop UI application and complete the trades. * to allow the user to start the desktop UI application and complete the trades.
* <p> * <p>
* The benefit this bot provides is freeing up the user time spent watching the offer book in the UI, waiting for the * The benefit this bot provides is freeing up the user time spent watching the offer book in the UI, waiting for the
@ -368,14 +368,14 @@ public class TakeBestPricedOfferToBuyBtc extends AbstractBot {
return offers.stream() return offers.stream()
.filter(o -> usesSamePaymentMethod.test(o, getPaymentAccount())) .filter(o -> usesSamePaymentMethod.test(o, getPaymentAccount()))
.filter(isMakerPreferredTradingPeer) .filter(isMakerPreferredTradingPeer)
.filter(o -> isMarginGEMinMarketPriceMargin.test(o, minMarketPriceMargin) .filter(o -> isMarginBasedPriceGETargetPrice.test(o, targetPrice)
|| isFixedPriceGEMinMarketPriceMargin.test(o, currentMarketPrice)) || isFixedPriceGEMinMarketPriceMargin.test(o, currentMarketPrice))
.filter(isWithinBTCAmountBounds) .filter(isWithinBTCAmountBounds)
.findFirst(); .findFirst();
else else
return offers.stream() return offers.stream()
.filter(o -> usesSamePaymentMethod.test(o, getPaymentAccount())) .filter(o -> usesSamePaymentMethod.test(o, getPaymentAccount()))
.filter(o -> isMarginGEMinMarketPriceMargin.test(o, minMarketPriceMargin) .filter(o -> isMarginBasedPriceGETargetPrice.test(o, targetPrice)
|| isFixedPriceGEMinMarketPriceMargin.test(o, currentMarketPrice)) || isFixedPriceGEMinMarketPriceMargin.test(o, currentMarketPrice))
.filter(isWithinBTCAmountBounds) .filter(isWithinBTCAmountBounds)
.findFirst(); .findFirst();
@ -388,7 +388,7 @@ public class TakeBestPricedOfferToBuyBtc extends AbstractBot {
currentMarketPrice, currentMarketPrice,
isXmr.test(currencyCode) ? "BTC" : currencyCode); isXmr.test(currencyCode) ? "BTC" : currencyCode);
} else { } else {
log.info("Looking for offers to {}, priced at or more than {}% {} from the current market price {} {}.", log.info("Looking for offers to {}, priced at or more than {}% {} the current market price {} {}.",
marketDescription.get(), marketDescription.get(),
minMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". minMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below".
aboveOrBelowMarketPrice.apply(minMarketPriceMargin), aboveOrBelowMarketPrice.apply(minMarketPriceMargin),
@ -419,12 +419,12 @@ public class TakeBestPricedOfferToBuyBtc extends AbstractBot {
iHavePreferredTradingPeers.get() iHavePreferredTradingPeers.get()
? isMakerPreferredTradingPeer.test(offer) ? "YES" : "NO" ? isMakerPreferredTradingPeer.test(offer) ? "YES" : "NO"
: "N/A"); : "N/A");
var marginPriceLabel = format("Is offer's price margin (%s%%) >= bot's min market price margin (%s%%)?", var marginPriceLabel = format("Is offer's margin based price (%s) >= bot's target price (%s)?",
offer.getMarketPriceMarginPct(), offer.getUseMarketBasedPrice() ? offer.getPrice() : "N/A",
minMarketPriceMargin); offer.getUseMarketBasedPrice() ? targetPrice : "N/A");
filterResultsByLabel.put(marginPriceLabel, filterResultsByLabel.put(marginPriceLabel,
offer.getUseMarketBasedPrice() offer.getUseMarketBasedPrice()
? isMarginGEMinMarketPriceMargin.test(offer, minMarketPriceMargin) ? isMarginBasedPriceGETargetPrice.test(offer, targetPrice)
: "N/A"); : "N/A");
var fixedPriceLabel = format("Is offer's fixed-price (%s) >= bot's target price (%s)?", var fixedPriceLabel = format("Is offer's fixed-price (%s) >= bot's target price (%s)?",
offer.getUseMarketBasedPrice() ? "N/A" : offer.getPrice() + " " + currencyCode, offer.getUseMarketBasedPrice() ? "N/A" : offer.getPrice() + " " + currencyCode,

4
java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBtc.java
View File

@ -37,7 +37,7 @@ import static protobuf.OfferDirection.SELL;
/** /**
* The TakeBestPricedOfferToSellBtc bot waits for attractively priced SELL BTC offers to appear, takes the offers * The TakeBestPricedOfferToSellBtc bot waits for attractively priced SELL BTC offers to appear, takes the offers
* (up to a maximum of configured {@link #maxTakeOffers}, then shuts down both the API daemon and itself (the bot), * (up to a maximum of configured {@link #maxTakeOffers}), then shuts down both the API daemon and itself (the bot),
* to allow the user to start the desktop UI application and complete the trades. * to allow the user to start the desktop UI application and complete the trades.
* <p> * <p>
* The benefit this bot provides is freeing up the user time spent watching the offer book in the UI, waiting for the * The benefit this bot provides is freeing up the user time spent watching the offer book in the UI, waiting for the
@ -388,7 +388,7 @@ public class TakeBestPricedOfferToSellBtc extends AbstractBot {
currentMarketPrice, currentMarketPrice,
isXmr.test(currencyCode) ? "BTC" : currencyCode); isXmr.test(currencyCode) ? "BTC" : currencyCode);
} else { } else {
log.info("Looking for offers to {}, priced at or less than {}% {} from the current market price {} {}.", log.info("Looking for offers to {}, priced at or less than {}% {} the current market price {} {}.",
marketDescription.get(), marketDescription.get(),
maxMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". maxMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below".
aboveOrBelowMarketPrice.apply(maxMarketPriceMargin), aboveOrBelowMarketPrice.apply(maxMarketPriceMargin),