Provide more offer & contract detail to CLI

apitest/scripts/trade-simulation-utils.sh

@@ -238,65 +238,35 @@ gettradedetail() {
 
 istradedepositpublished() {
     TRADE_DETAIL="$1"
-    MAKER_OR_TAKER="$2"
-    if [ "$MAKER_OR_TAKER" = "MAKER" ]
-    then
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $9}')
-    else
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $10}')
-    fi
+    ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $10}')
     commandalert $? "Could not parse istradedepositpublished from trade detail."
     echo "$ANSWER"
 }
 
 istradedepositconfirmed() {
     TRADE_DETAIL="$1"
-    MAKER_OR_TAKER="$2"
-    if [ "$MAKER_OR_TAKER" = "MAKER" ]
-    then
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $10}')
-    else
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $11}')
-    fi
+    ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $11}')
     commandalert $? "Could not parse istradedepositconfirmed from trade detail."
     echo "$ANSWER"
 }
 
 istradepaymentsent() {
     TRADE_DETAIL="$1"
-    MAKER_OR_TAKER="$2"
-    if [ "$MAKER_OR_TAKER" = "MAKER" ]
-    then
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $12}')
-    else
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $13}')
-    fi
+    ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $13}')
     commandalert $? "Could not parse istradepaymentsent from trade detail."
     echo "$ANSWER"
 }
 
 istradepaymentreceived() {
     TRADE_DETAIL="$1"
-    MAKER_OR_TAKER="$2"
-    if [ "$MAKER_OR_TAKER" = "MAKER" ]
-    then
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $13}')
-    else
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $14}')
-    fi
+    ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $14}')
     commandalert $? "Could not parse istradepaymentreceived from trade detail."
     echo "$ANSWER"
 }
 
 istradepayoutpublished() {
     TRADE_DETAIL="$1"
-    MAKER_OR_TAKER="$2"
-    if [ "$MAKER_OR_TAKER" = "MAKER" ]
-    then
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $14}')
-    else
-        ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $15}')
-    fi
+    ANSWER=$(echo "$TRADE_DETAIL" | awk '{print $15}')
     commandalert $? "Could not parse istradepayoutpublished from trade detail."
     echo "$ANSWER"
 }
@@ -321,7 +291,7 @@ waitfortradedepositpublished() {
         TRADE_DETAIL=$(gettradedetail "$GETTRADE_CMD_OUTPUT")
         exitoncommandalert $?
 
-        IS_TRADE_DEPOSIT_PUBLISHED=$(istradedepositpublished "$TRADE_DETAIL" "TAKER")
+        IS_TRADE_DEPOSIT_PUBLISHED=$(istradedepositpublished "$TRADE_DETAIL")
         exitoncommandalert $?
 
         printdate "BOB $BOB_ROLE:  Has taker's trade deposit been published?  $IS_TRADE_DEPOSIT_PUBLISHED"
@@ -356,7 +326,7 @@ waitfortradedepositconfirmed() {
         TRADE_DETAIL=$(gettradedetail "$GETTRADE_CMD_OUTPUT")
         exitoncommandalert $?
 
-        IS_TRADE_DEPOSIT_CONFIRMED=$(istradedepositconfirmed "$TRADE_DETAIL" "TAKER")
+        IS_TRADE_DEPOSIT_CONFIRMED=$(istradedepositconfirmed "$TRADE_DETAIL")
         exitoncommandalert $?
         printdate "BOB $BOB_ROLE:  Has taker's trade deposit been confirmed?  $IS_TRADE_DEPOSIT_CONFIRMED"
         printbreak
@@ -379,7 +349,6 @@ waitfortradepaymentsent() {
     PORT="$1"
     SELLER="$2"
     OFFER_ID="$3"
-    MAKER_OR_TAKER="$4"
     DONE=0
     while : ; do
         if [ "$DONE" -ne 0 ]; then
@@ -397,7 +366,7 @@ waitfortradepaymentsent() {
         TRADE_DETAIL=$(gettradedetail "$GETTRADE_CMD_OUTPUT")
         exitoncommandalert $?
 
-        IS_TRADE_PAYMENT_SENT=$(istradepaymentsent "$TRADE_DETAIL" "$MAKER_OR_TAKER")
+        IS_TRADE_PAYMENT_SENT=$(istradepaymentsent "$TRADE_DETAIL")
         exitoncommandalert $?
         printdate "$SELLER:  Has buyer's fiat payment been initiated?  $IS_TRADE_PAYMENT_SENT"
         if [ "$IS_TRADE_PAYMENT_SENT" = "YES" ]
@@ -416,7 +385,6 @@ waitfortradepaymentreceived() {
     PORT="$1"
     SELLER="$2"
     OFFER_ID="$3"
-    MAKER_OR_TAKER="$4"
     DONE=0
     while : ; do
         if [ "$DONE" -ne 0 ]; then
@@ -437,7 +405,7 @@ waitfortradepaymentreceived() {
         # When the seller receives a 'payment sent' message, it is assumed funds (fiat) have already been deposited.
         # In a real trade, there is usually a delay between receipt of a 'payment sent' message, and the funds deposit,
         # but we do not need to simulate that in this regtest script.
-        IS_TRADE_PAYMENT_SENT=$(istradepaymentreceived "$TRADE_DETAIL" "$MAKER_OR_TAKER")
+        IS_TRADE_PAYMENT_SENT=$(istradepaymentreceived "$TRADE_DETAIL")
         exitoncommandalert $?
         printdate "$SELLER:  Has buyer's payment been transferred to seller's fiat account?  $IS_TRADE_PAYMENT_SENT"
         if [ "$IS_TRADE_PAYMENT_SENT" = "YES" ]
@@ -544,10 +512,10 @@ executetrade() {
     if [ "$DIRECTION" = "BUY" ]
     then
         # Bob waits for payment, polling status in taker specific trade detail.
-        waitfortradepaymentsent "$PAYEE_PORT" "$PAYEE" "$OFFER_ID" "TAKER"
+        waitfortradepaymentsent "$PAYEE_PORT" "$PAYEE" "$OFFER_ID"
     else
         # Alice waits for payment, polling status in maker specific trade detail.
-        waitfortradepaymentsent "$PAYEE_PORT" "$PAYEE" "$OFFER_ID" "MAKER"
+        waitfortradepaymentsent "$PAYEE_PORT" "$PAYEE" "$OFFER_ID"
     fi
 
 
@@ -557,10 +525,10 @@ executetrade() {
     if [ "$DIRECTION" = "BUY" ]
     then
         # Alice waits for payment rcvd confirm from Bob, polling status in maker specific trade detail.
-        waitfortradepaymentreceived "$PAYER_PORT" "$PAYER" "$OFFER_ID" "MAKER"
+        waitfortradepaymentreceived "$PAYER_PORT" "$PAYER" "$OFFER_ID"
     else
         # Bob waits for payment rcvd confirm from Alice, polling status in taker specific trade detail.
-        waitfortradepaymentreceived "$PAYER_PORT" "$PAYER" "$OFFER_ID" "TAKER"
+        waitfortradepaymentreceived "$PAYER_PORT" "$PAYER" "$OFFER_ID"
     fi
 
     # Generate some btc blocks

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

@@ -56,6 +56,7 @@
 
 import bisq.cli.opts.ArgumentList;
 import bisq.cli.opts.CancelOfferOptionParser;
+import bisq.cli.opts.CreateCryptoCurrencyPaymentAcctOptionParser;
 import bisq.cli.opts.CreateOfferOptionParser;
 import bisq.cli.opts.CreatePaymentAcctOptionParser;
 import bisq.cli.opts.GetAddressBalanceOptionParser;
@@ -517,6 +518,24 @@ public static void run(String[] args) {
                     out.println(formatPaymentAcctTbl(singletonList(paymentAccount)));
                     return;
                 }
+                case createcryptopaymentacct: {
+                    var opts = new CreateCryptoCurrencyPaymentAcctOptionParser(args).parse();
+                    if (opts.isForHelp()) {
+                        out.println(client.getMethodHelp(method));
+                        return;
+                    }
+                    var accountName = opts.getAccountName();
+                    var currencyCode = opts.getCurrencyCode();
+                    var address = opts.getAddress();
+                    var isTradeInstant = opts.getIsTradeInstant();
+                    var paymentAccount = client.createCryptoCurrencyPaymentAccount(accountName,
+                            currencyCode,
+                            address,
+                            isTradeInstant);
+                    out.println("payment account saved");
+                    out.println(formatPaymentAcctTbl(singletonList(paymentAccount)));
+                    return;
+                }
                 case getpaymentaccts: {
                     if (new SimpleMethodOptionParser(args).parse().isForHelp()) {
                         out.println(client.getMethodHelp(method));
@@ -676,7 +695,7 @@ private static void printHelp(OptionParser parser, @SuppressWarnings("SameParame
             stream.println();
             parser.printHelpOn(stream);
             stream.println();
-            String rowFormat = "%-24s%-52s%s%n";
+            String rowFormat = "%-25s%-52s%s%n";
             stream.format(rowFormat, "Method", "Params", "Description");
             stream.format(rowFormat, "------", "------", "------------");
             stream.format(rowFormat, getversion.name(), "", "Get server version");
@@ -727,7 +746,9 @@ private static void printHelp(OptionParser parser, @SuppressWarnings("SameParame
             stream.format(rowFormat, getmyoffers.name(), "--direction=<buy|sell> \\", "Get my current offers");
             stream.format(rowFormat, "", "--currency-code=<currency-code>", "");
             stream.println();
-            stream.format(rowFormat, takeoffer.name(), "--offer-id=<offer-id> [--fee-currency=<btc|bsq>]", "Take offer with id");
+            stream.format(rowFormat, takeoffer.name(), "--offer-id=<offer-id> \\", "Take offer with id");
+            stream.format(rowFormat, "", "--payment-account=<payment-account-id>", "");
+            stream.format(rowFormat, "", "[--fee-currency=<btc|bsq>]", "");
             stream.println();
             stream.format(rowFormat, gettrade.name(), "--trade-id=<trade-id> \\", "Get trade summary or full contract");
             stream.format(rowFormat, "", "[--show-contract=<true|false>]", "");
@@ -748,6 +769,11 @@ private static void printHelp(OptionParser parser, @SuppressWarnings("SameParame
             stream.println();
             stream.format(rowFormat, createpaymentacct.name(), "--payment-account-form=<path>", "Create a new payment account");
             stream.println();
+            stream.format(rowFormat, createcryptopaymentacct.name(), "--account-name=<name> \\", "Create a new cryptocurrency payment account");
+            stream.format(rowFormat, "", "--currency-code=<bsq> \\", "");
+            stream.format(rowFormat, "", "--address=<bsq-address>", "");
+            stream.format(rowFormat, "", "--trade-instant=<true|false>", "");
+            stream.println();
             stream.format(rowFormat, getpaymentaccts.name(), "", "Get user payment accounts");
             stream.println();
             stream.format(rowFormat, lockwallet.name(), "", "Remove wallet password from memory, locking the wallet");

cli/src/main/java/bisq/cli/ColumnHeaderConstants.java

@@ -30,7 +30,7 @@ class ColumnHeaderConstants {
     // expected max data string length is accounted for.  In others, column header
     // lengths are expected to be greater than any column value length.
     static final String COL_HEADER_ADDRESS = padEnd("%-3s Address", 52, ' ');
-    static final String COL_HEADER_AMOUNT = padEnd("BTC(min - max)", 24, ' ');
+    static final String COL_HEADER_AMOUNT = "BTC(min - max)";
     static final String COL_HEADER_AVAILABLE_BALANCE = "Available Balance";
     static final String COL_HEADER_AVAILABLE_CONFIRMED_BALANCE = "Available Confirmed Balance";
     static final String COL_HEADER_UNCONFIRMED_CHANGE_BALANCE = "Unconfirmed Change Balance";
@@ -49,7 +49,9 @@ class ColumnHeaderConstants {
     static final String COL_HEADER_NAME = "Name";
     static final String COL_HEADER_PAYMENT_METHOD = "Payment Method";
     static final String COL_HEADER_PRICE = "Price in %-3s for 1 BTC";
+    static final String COL_HEADER_PRICE_OF_ALTCOIN = "Price in BTC for 1 %-3s";
     static final String COL_HEADER_TRADE_AMOUNT = padStart("Amount(%-3s)", 12, ' ');
+    static final String COL_HEADER_TRADE_BSQ_BUYER_ADDRESS = "BSQ Buyer Address";
     static final String COL_HEADER_TRADE_BUYER_COST = padEnd("Buyer Cost(%-3s)", 15, ' ');
     static final String COL_HEADER_TRADE_DEPOSIT_CONFIRMED = "Deposit Confirmed";
     static final String COL_HEADER_TRADE_DEPOSIT_PUBLISHED = "Deposit Published";
@@ -59,8 +61,9 @@ class ColumnHeaderConstants {
     static final String COL_HEADER_TRADE_WITHDRAWN = "Withdrawn";
     static final String COL_HEADER_TRADE_ROLE = "My Role";
     static final String COL_HEADER_TRADE_SHORT_ID = "ID";
-    static final String COL_HEADER_TRADE_TX_FEE = "Tx Fee(%-3s)";
-    static final String COL_HEADER_TRADE_TAKER_FEE = "Taker Fee(%-3s)";
+    static final String COL_HEADER_TRADE_TX_FEE = padEnd("Tx Fee(BTC)", 12, ' ');
+    static final String COL_HEADER_TRADE_MAKER_FEE = padEnd("Maker Fee(%-3s)", 12, ' '); // "Maker Fee(%-3s)";
+    static final String COL_HEADER_TRADE_TAKER_FEE = padEnd("Taker Fee(%-3s)", 12, ' '); // "Taker Fee(%-3s)";
 
     static final String COL_HEADER_TX_ID = "Tx ID";
     static final String COL_HEADER_TX_INPUT_SUM = "Tx Inputs (BTC)";
@@ -71,5 +74,6 @@ class ColumnHeaderConstants {
     static final String COL_HEADER_TX_MEMO = "Memo";
 
     static final String COL_HEADER_VOLUME = padEnd("%-3s(min - max)", 15, ' ');
+
     static final String COL_HEADER_UUID = padEnd("ID", 52, ' ');
 }

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

@@ -25,23 +25,25 @@
 import java.text.NumberFormat;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 
 import java.util.Locale;
 
 import static java.lang.String.format;
+import static java.math.RoundingMode.HALF_UP;
+import static java.math.RoundingMode.UNNECESSARY;
 
 @VisibleForTesting
 public class CurrencyFormat {
 
     private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(Locale.US);
 
-    static final BigDecimal SATOSHI_DIVISOR = new BigDecimal(100000000);
+    static final BigDecimal SATOSHI_DIVISOR = new BigDecimal(100_000_000);
     static final DecimalFormat BTC_FORMAT = new DecimalFormat("###,##0.00000000");
     static final DecimalFormat BTC_TX_FEE_FORMAT = new DecimalFormat("###,###,##0");
 
     static final BigDecimal BSQ_SATOSHI_DIVISOR = new BigDecimal(100);
     static final DecimalFormat BSQ_FORMAT = new DecimalFormat("###,###,###,##0.00");
+    static final DecimalFormat SEND_BSQ_FORMAT = new DecimalFormat("###########0.00");
 
     static final BigDecimal SECURITY_DEPOSIT_MULTIPLICAND = new BigDecimal("0.01");
 
@@ -55,6 +57,14 @@ public static String formatBsq(long sats) {
         return BSQ_FORMAT.format(BigDecimal.valueOf(sats).divide(BSQ_SATOSHI_DIVISOR));
     }
 
+    public static String formatBsqAmount(long bsqSats) {
+        // BSQ sats = trade.getOffer().getVolume()
+        NUMBER_FORMAT.setMinimumFractionDigits(2);
+        NUMBER_FORMAT.setMaximumFractionDigits(2);
+        NUMBER_FORMAT.setRoundingMode(HALF_UP);
+        return SEND_BSQ_FORMAT.format((double) bsqSats / SATOSHI_DIVISOR.doubleValue());
+    }
+
     public static String formatTxFeeRateInfo(TxFeeRateInfo txFeeRateInfo) {
         if (txFeeRateInfo.getUseCustomTxFeeRate())
             return format("custom tx fee rate: %s sats/byte, network rate: %s sats/byte",
@@ -77,22 +87,44 @@ public static String formatVolumeRange(long minVolume, long volume) {
                 : formatOfferVolume(volume);
     }
 
+    public static String formatCryptoCurrencyVolumeRange(long minVolume, long volume) {
+        return minVolume != volume
+                ? formatCryptoCurrencyOfferVolume(minVolume) + " - " + formatCryptoCurrencyOfferVolume(volume)
+                : formatCryptoCurrencyOfferVolume(volume);
+    }
+
     public static String formatMarketPrice(double price) {
         NUMBER_FORMAT.setMinimumFractionDigits(4);
+        NUMBER_FORMAT.setMaximumFractionDigits(4);
         return NUMBER_FORMAT.format(price);
     }
 
-    public static String formatOfferPrice(long price) {
-        NUMBER_FORMAT.setMaximumFractionDigits(4);
+    public static String formatPrice(long price) {
         NUMBER_FORMAT.setMinimumFractionDigits(4);
-        NUMBER_FORMAT.setRoundingMode(RoundingMode.UNNECESSARY);
-        return NUMBER_FORMAT.format((double) price / 10000);
+        NUMBER_FORMAT.setMaximumFractionDigits(4);
+        NUMBER_FORMAT.setRoundingMode(UNNECESSARY);
+        return NUMBER_FORMAT.format((double) price / 10_000);
+    }
+
+    public static String formatCryptoCurrencyPrice(long price) {
+        NUMBER_FORMAT.setMinimumFractionDigits(8);
+        NUMBER_FORMAT.setMaximumFractionDigits(8);
+        NUMBER_FORMAT.setRoundingMode(UNNECESSARY);
+        return NUMBER_FORMAT.format((double) price / SATOSHI_DIVISOR.doubleValue());
     }
 
     public static String formatOfferVolume(long volume) {
+        NUMBER_FORMAT.setMinimumFractionDigits(0);
         NUMBER_FORMAT.setMaximumFractionDigits(0);
-        NUMBER_FORMAT.setRoundingMode(RoundingMode.UNNECESSARY);
-        return NUMBER_FORMAT.format((double) volume / 10000);
+        NUMBER_FORMAT.setRoundingMode(HALF_UP);
+        return NUMBER_FORMAT.format((double) volume / 10_000);
+    }
+
+    public static String formatCryptoCurrencyOfferVolume(long volume) {
+        NUMBER_FORMAT.setMinimumFractionDigits(2);
+        NUMBER_FORMAT.setMaximumFractionDigits(2);
+        NUMBER_FORMAT.setRoundingMode(HALF_UP);
+        return NUMBER_FORMAT.format((double) volume / SATOSHI_DIVISOR.doubleValue());
     }
 
     public static long toSatoshis(String btc) {