Add api trade simulation scripts

apitest/scripts/limit-order-simulation.sh

@@ -93,8 +93,9 @@ while : ; do
         break
     fi
 
-    CURRENT_PRICE=$(getcurrentprice "${CURRENCY_CODE}")
-    printdate "Current Price: ${CURRENT_PRICE} ${CURRENCY_CODE}"
+    CURRENT_PRICE=$(getcurrentprice "$ALICE_PORT" "$CURRENCY_CODE")
+    exitoncommandalert $?
+    printdate "Current Market Price: $CURRENT_PRICE"
 
     if [ "$DIRECTION" = "BUY" ] && [ "$CURRENT_PRICE" -le "$LIMIT_PRICE" ]; then
         printdate "Limit price reached."
@@ -129,7 +130,17 @@ OFFER_ID=$(createoffer "${CMD}")
 exitoncommandalert $?
 printdate "ALICE: Created offer with id: ${OFFER_ID}."
 printbreak
-sleeptraced 10
+sleeptraced 3
+
+# Show Alice's new offer.
+printdate "ALICE:  Looking at her new ${DIRECTION} ${CURRENCY_CODE} offer."
+CMD="$CLI_BASE --port=${ALICE_PORT} getmyoffer --offer-id=${OFFER_ID}"
+printdate "ALICE CLI: ${CMD}"
+OFFER=$($CMD)
+exitoncommandalert $?
+echo "${OFFER}"
+printbreak
+sleeptraced 7
 
 # Generate some btc blocks.
 printdate "Generating btc blocks after publishing Alice's offer."

apitest/scripts/trade-simulation-utils.sh

@@ -166,9 +166,14 @@ createoffer() {
 }
 
 getcurrentprice() {
-    CURRENCY_CODE="$1"
-    CMD="python3 ${APITEST_SCRIPTS_HOME}/getmktprice.py ${CURRENCY_CODE}"
-    PRICE=$($CMD)
-    echo "${PRICE}"
+    PORT="$1"
+    CURRENCY_CODE="$2"
+    CMD="$CLI_BASE --port=$PORT getbtcprice --currency-code=$CURRENCY_CODE"
+    CMD_OUTPUT=$($CMD)
+    commandalert $? "Could not get current market $CURRENCY_CODE price."
+    FLOOR=$(echo $CMD_OUTPUT| cut -d'.' -f 1)
+    commandalert $? "Could not get the floor of the current market $CURRENCY_CODE price."
+    INTEGER=$(echo $FLOOR | tr -cd '[[:digit:]]')
+    commandalert $? "Could not convert the current market $CURRENCY_CODE price string to an integer."
+    echo "$INTEGER"
 }
-

apitest/scripts/trade-simulation.sh

@@ -97,8 +97,9 @@ printdate "ALICE F2F payment-account-id = ${ALICE_ACCT_ID}, currency-code = ${AL
 printbreak
 
 printdate "ALICE ${ALICE_ROLE}:  Creating ${DIRECTION} ${ALICE_ACCT_CURRENCY_CODE} offer with payment acct ${ALICE_ACCT_ID}."
-CURRENT_PRICE=$(getcurrentprice "$ALICE_ACCT_CURRENCY_CODE")
-printdate "Current Market Price: $CURRENT_PRICE $ALICE_ACCT_CURRENCY_CODE"
+CURRENT_PRICE=$(getcurrentprice "$ALICE_PORT" "$ALICE_ACCT_CURRENCY_CODE")
+exitoncommandalert $?
+printdate "Current Market Price: $CURRENT_PRICE"
 CMD="$CLI_BASE --port=${ALICE_PORT} createoffer"
 CMD+=" --payment-account=${ALICE_ACCT_ID}"
 CMD+=" --direction=${DIRECTION}"
@@ -116,7 +117,17 @@ OFFER_ID=$(createoffer "${CMD}")
 exitoncommandalert $?
 printdate "ALICE ${ALICE_ROLE}:  Created offer with id: ${OFFER_ID}."
 printbreak
-sleeptraced 10
+sleeptraced 3
+
+# Show Alice's new offer.
+printdate "ALICE ${ALICE_ROLE}:  Looking at her new ${DIRECTION} ${CURRENCY_CODE} offer."
+CMD="$CLI_BASE --port=${ALICE_PORT} getmyoffer --offer-id=${OFFER_ID}"
+printdate "ALICE CLI: ${CMD}"
+OFFER=$($CMD)
+exitoncommandalert $?
+echo "${OFFER}"
+printbreak
+sleeptraced 7
 
 # Generate some btc blocks.
 printdate "Generating btc blocks after publishing Alice's offer."

cli/src/main/java/bisq/cli/CliMain.java

@@ -40,6 +40,7 @@
 import bisq.proto.grpc.GetVersionRequest;
 import bisq.proto.grpc.KeepFundsRequest;
 import bisq.proto.grpc.LockWalletRequest;
+import bisq.proto.grpc.MarketPriceRequest;
 import bisq.proto.grpc.OfferInfo;
 import bisq.proto.grpc.RegisterDisputeAgentRequest;
 import bisq.proto.grpc.RemoveWalletPasswordRequest;
@@ -75,6 +76,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import static bisq.cli.CurrencyFormat.formatMarketPrice;
 import static bisq.cli.CurrencyFormat.formatTxFeeRateInfo;
 import static bisq.cli.CurrencyFormat.toSatoshis;
 import static bisq.cli.CurrencyFormat.toSecurityDepositAsPct;
@@ -98,6 +100,7 @@
 import bisq.cli.opts.CreateOfferOptionParser;
 import bisq.cli.opts.CreatePaymentAcctOptionParser;
 import bisq.cli.opts.GetAddressBalanceOptionParser;
+import bisq.cli.opts.GetBTCMarketPriceOptionParser;
 import bisq.cli.opts.GetBalanceOptionParser;
 import bisq.cli.opts.GetOfferOptionParser;
 import bisq.cli.opts.GetOffersOptionParser;
@@ -189,6 +192,7 @@ public static void run(String[] args) {
         var helpService = grpcStubs.helpService;
         var offersService = grpcStubs.offersService;
         var paymentAccountsService = grpcStubs.paymentAccountsService;
+        var priceService = grpcStubs.priceService;
         var tradesService = grpcStubs.tradesService;
         var versionService = grpcStubs.versionService;
         var walletsService = grpcStubs.walletsService;
@@ -243,6 +247,20 @@ public static void run(String[] args) {
                     out.println(formatAddressBalanceTbl(singletonList(reply.getAddressBalanceInfo())));
                     return;
                 }
+                case getbtcprice: {
+                    var opts = new GetBTCMarketPriceOptionParser(args).parse();
+                    if (opts.isForHelp()) {
+                        out.println(getMethodHelp(helpService, method));
+                        return;
+                    }
+                    var currencyCode = opts.getCurrencyCode();
+                    var request = MarketPriceRequest.newBuilder()
+                            .setCurrencyCode(currencyCode)
+                            .build();
+                    var reply = priceService.getMarketPrice(request);
+                    out.println(formatMarketPrice(reply.getPrice()));
+                    return;
+                }
                 case getfundingaddresses: {
                     if (new SimpleMethodOptionParser(args).parse().isForHelp()) {
                         out.println(getMethodHelp(helpService, method));
@@ -802,6 +820,8 @@ private static void printHelp(OptionParser parser, @SuppressWarnings("SameParame
             stream.println();
             stream.format(rowFormat, getaddressbalance.name(), "--address=<btc-address>", "Get server wallet address balance");
             stream.println();
+            stream.format(rowFormat, getbtcprice.name(), "--currency-code=<currency-code>", "Get current market btc price");
+            stream.println();
             stream.format(rowFormat, getfundingaddresses.name(), "", "Get BTC funding addresses");
             stream.println();
             stream.format(rowFormat, getunusedbsqaddress.name(), "", "Get unused BSQ address");

cli/src/main/java/bisq/cli/CurrencyFormat.java

@@ -77,6 +77,11 @@ static String formatVolumeRange(long minVolume, long volume) {
                 : formatOfferVolume(volume);
     }
 
+    static String formatMarketPrice(double price) {
+        NUMBER_FORMAT.setMinimumFractionDigits(4);
+        return NUMBER_FORMAT.format(price);
+    }
+
     static String formatOfferPrice(long price) {
         NUMBER_FORMAT.setMaximumFractionDigits(4);
         NUMBER_FORMAT.setMinimumFractionDigits(4);

cli/src/main/java/bisq/cli/Method.java

@@ -28,6 +28,7 @@ public enum Method {
     createpaymentacct,
     getaddressbalance,
     getbalance,
+    getbtcprice,
     getfundingaddresses,
     getmyoffer,
     getmyoffers,

cli/src/main/java/bisq/cli/opts/GetBTCMarketPriceOptionParser.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.cli.opts;
+
+
+import joptsimple.OptionSpec;
+
+import static bisq.cli.opts.OptLabel.OPT_CURRENCY_CODE;
+import static joptsimple.internal.Strings.EMPTY;
+
+public class GetBTCMarketPriceOptionParser extends AbstractMethodOptionParser implements MethodOpts {
+
+    final OptionSpec<String> currencyCodeOpt = parser.accepts(OPT_CURRENCY_CODE, "currency-code")
+            .withRequiredArg()
+            .defaultsTo(EMPTY);
+
+    public GetBTCMarketPriceOptionParser(String[] args) {
+        super(args);
+    }
+
+    public GetBTCMarketPriceOptionParser parse() {
+        super.parse();
+
+        // Short circuit opt validation if user just wants help.
+        if (options.has(helpOpt))
+            return this;
+
+        if (!options.has(currencyCodeOpt))
+            throw new IllegalArgumentException("no currency code specified");
+
+        return this;
+    }
+
+    public String getCurrencyCode() {
+        return options.valueOf(currencyCodeOpt);
+    }
+}

core/src/main/resources/help/getbtcprice-help.txt

@@ -0,0 +1,30 @@
+getbtcprice
+
+NAME
+----
+getbtcprice - get current btc market price
+
+SYNOPSIS
+--------
+getbtcprice
+		--currency-code=<eur|usd>
+
+DESCRIPTION
+-----------
+Returns the current market BTC price for the given currency-code.
+
+OPTIONS
+-------
+
+--currency-code
+		The three letter code for the fiat currency code, e.g., EUR, USD, BRL, ...
+
+EXAMPLES
+--------
+Get the current BTC market price in Euros:
+$ ./bisq-cli --password=xyz --port=9998 getbtcprice --currency-code=eur
+
+Get the current BTC market price in Brazilian Reais:
+$ ./bisq-cli --password=xyz --port=9998 getbtcprice --currency-code=brl
+
+