diff --git a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBsq.java b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBsq.java index e7079ce..f28cfa3 100644 --- a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBsq.java +++ b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBsq.java @@ -307,12 +307,19 @@ public class TakeBestPricedOfferToBuyBsq extends AbstractBot { } void printCriteriaSummary() { - log.info("Looking for offers to {}, with a fixed-price at or greater than" - + " {}% {} the 30-day average BSQ trade price of {} BTC.", - MARKET_DESCRIPTION, - minMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". - aboveOrBelowMarketPrice.apply(minMarketPriceMargin), - avgBsqPrice); + if (isZero.test(minMarketPriceMargin)) { + log.info("Looking for offers to {}, with a fixed-price at or greater than" + + " the 30-day average BSQ trade price of {} BTC.", + MARKET_DESCRIPTION, + avgBsqPrice); + } else { + log.info("Looking for offers to {}, with a fixed-price at or greater than" + + " {}% {} the 30-day average BSQ trade price of {} BTC.", + MARKET_DESCRIPTION, + minMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". + aboveOrBelowMarketPrice.apply(minMarketPriceMargin), + avgBsqPrice); + } } void printOffersAgainstCriteria(List offers) { diff --git a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBtc.java b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBtc.java index db81b77..31b2f93 100644 --- a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBtc.java +++ b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToBuyBtc.java @@ -382,12 +382,19 @@ public class TakeBestPricedOfferToBuyBtc extends AbstractBot { } void printCriteriaSummary() { - log.info("Looking for offers to {}, priced at or more than {}% {} the current market price {} {}.", - marketDescription.get(), - minMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". - aboveOrBelowMarketPrice.apply(minMarketPriceMargin), - currentMarketPrice, - isXmr.test(currencyCode) ? "BTC" : currencyCode); + if (isZero.test(minMarketPriceMargin)) { + log.info("Looking for offers to {}, priced at or higher than the current market price {} {}.", + marketDescription.get(), + currentMarketPrice, + isXmr.test(currencyCode) ? "BTC" : currencyCode); + } else { + log.info("Looking for offers to {}, priced at or more than {}% {} from the current market price {} {}.", + marketDescription.get(), + minMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". + aboveOrBelowMarketPrice.apply(minMarketPriceMargin), + currentMarketPrice, + isXmr.test(currencyCode) ? "BTC" : currencyCode); + } } void printOffersAgainstCriteria(List offers) { diff --git a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBsq.java b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBsq.java index 2919d7e..15a8ec7 100644 --- a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBsq.java +++ b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBsq.java @@ -308,15 +308,21 @@ public class TakeBestPricedOfferToSellBsq extends AbstractBot { } void printCriteriaSummary() { - log.info("Looking for offers to {}, with a fixed-price at or less than" - + " {}% {} the 30-day average BSQ trade price of {} BTC.", - MARKET_DESCRIPTION, - maxMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". - aboveOrBelowMarketPrice.apply(maxMarketPriceMargin), - avgBsqPrice); + if (isZero.test(maxMarketPriceMargin)) { + log.info("Looking for offers to {}, with a fixed-price at or less than" + + " the 30-day average BSQ trade price of {} BTC.", + MARKET_DESCRIPTION, + avgBsqPrice); + } else { + log.info("Looking for offers to {}, with a fixed-price at or less than" + + " {}% {} the 30-day average BSQ trade price of {} BTC.", + MARKET_DESCRIPTION, + maxMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". + aboveOrBelowMarketPrice.apply(maxMarketPriceMargin), + avgBsqPrice); + } } - void printOffersAgainstCriteria(List offers) { log.info("Currently available {} offers -- want to take BSQ swap offer with fixed-price <= {} BTC.", MARKET_DESCRIPTION, diff --git a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBtc.java b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBtc.java index 20c235b..48e2454 100644 --- a/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBtc.java +++ b/java-examples/src/main/java/bisq/bots/TakeBestPricedOfferToSellBtc.java @@ -382,12 +382,19 @@ public class TakeBestPricedOfferToSellBtc extends AbstractBot { } void printCriteriaSummary() { - log.info("Looking for offers to {}, priced at or less than {}% {} the current market price {} {}.", - marketDescription.get(), - maxMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". - aboveOrBelowMarketPrice.apply(maxMarketPriceMargin), - currentMarketPrice, - isXmr.test(currencyCode) ? "BTC" : currencyCode); + if (isZero.test(maxMarketPriceMargin)) { + log.info("Looking for offers to {}, priced at or lower than the current market price {} {}.", + marketDescription.get(), + currentMarketPrice, + isXmr.test(currencyCode) ? "BTC" : currencyCode); + } else { + log.info("Looking for offers to {}, priced at or less than {}% {} from the current market price {} {}.", + marketDescription.get(), + maxMarketPriceMargin.abs(), // Hide the sign, text explains target price % "above or below". + aboveOrBelowMarketPrice.apply(maxMarketPriceMargin), + currentMarketPrice, + isXmr.test(currencyCode) ? "BTC" : currencyCode); + } } void printOffersAgainstCriteria(List offers) { diff --git a/java-examples/src/main/resources/TakeBestPricedOfferToBuyBtc.properties b/java-examples/src/main/resources/TakeBestPricedOfferToBuyBtc.properties index 0f92400..8a7c941 100644 --- a/java-examples/src/main/resources/TakeBestPricedOfferToBuyBtc.properties +++ b/java-examples/src/main/resources/TakeBestPricedOfferToBuyBtc.properties @@ -1,13 +1,13 @@ # # Maximum # of offers to take during one bot session. When reached, bot will shut down API daemon then itself. -maxTakeOffers=10 +maxTakeOffers=1 # # Taker bot's payment account id. Only BUY BTC offers using the same payment method will be considered for taking. -paymentAccountId=9ad3cc7a-7d32-453c-b9db-a3714b5b8f61 +paymentAccountId=28030c83-f07d-4f0b-b824-019529279630 # # Taker bot's min market price margin. A candidate BUY BTC offer's price margin must be >= minMarketPriceMargin. # -minMarketPriceMargin=1.00 +minMarketPriceMargin=0 # # Taker bot's min BTC amount to sell. The candidate BUY offer's amount must be >= minAmount BTC. minAmount=0.01