Adjust API 'editoffer' to PR 5651 (include extraData field when editing offer)

apitest/docs/api-beta-test-guide.md

@@ -432,14 +432,14 @@ To disable an offer:
 ```
 ./bisq-cli --password=xyz --port=9998 editoffer \
     --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \
-    --enabled=false
+    --enable=false
 ```
 
 To enable an offer:
 ```
 ./bisq-cli --password=xyz --port=9998 editoffer \
     --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \
-    --enabled=true
+    --enable=true
 ```
 
 #### Change Offer Pricing Model

apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java

@@ -58,7 +58,7 @@ public abstract class AbstractOfferTest extends MethodTest {
     @BeforeAll
     public static void setUp() {
         startSupportingApps(true,
-                true,
+                false,
                 bitcoind,
                 seednode,
                 arbdaemon,

apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java

@@ -39,6 +39,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static protobuf.OfferPayload.Direction.BUY;
 import static protobuf.OfferPayload.Direction.SELL;
 
@@ -70,6 +71,9 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
                 alicesBsqAcct.getId(),
                 MAKER_FEE_CURRENCY_CODE);
         log.info("Sell BSQ (Buy BTC) OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(BUY.name(), newOffer.getDirection());
@@ -86,6 +90,8 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
         genBtcBlockAndWaitForOfferPreparation();
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(BUY.name(), newOffer.getDirection());
         assertFalse(newOffer.getUseMarketBasedPrice());
@@ -112,6 +118,9 @@ public void testCreateSell1BTCFor20KBSQOffer() {
                 alicesBsqAcct.getId(),
                 MAKER_FEE_CURRENCY_CODE);
         log.info("SELL 20K BSQ OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(SELL.name(), newOffer.getDirection());
@@ -128,6 +137,8 @@ public void testCreateSell1BTCFor20KBSQOffer() {
         genBtcBlockAndWaitForOfferPreparation();
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(SELL.name(), newOffer.getDirection());
         assertFalse(newOffer.getUseMarketBasedPrice());
@@ -154,6 +165,9 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
                 alicesBsqAcct.getId(),
                 MAKER_FEE_CURRENCY_CODE);
         log.info("BUY 1-2K BSQ OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(BUY.name(), newOffer.getDirection());
@@ -170,6 +184,8 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
         genBtcBlockAndWaitForOfferPreparation();
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(BUY.name(), newOffer.getDirection());
         assertFalse(newOffer.getUseMarketBasedPrice());
@@ -196,6 +212,9 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
                 alicesBsqAcct.getId(),
                 MAKER_FEE_CURRENCY_CODE);
         log.info("SELL 5-10K BSQ OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(SELL.name(), newOffer.getDirection());
@@ -212,6 +231,8 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
         genBtcBlockAndWaitForOfferPreparation();
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(SELL.name(), newOffer.getDirection());
         assertFalse(newOffer.getUseMarketBasedPrice());

apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java

@@ -35,6 +35,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static protobuf.OfferPayload.Direction.BUY;
 import static protobuf.OfferPayload.Direction.SELL;
 
@@ -58,6 +59,9 @@ public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
                 audAccount.getId(),
                 MAKER_FEE_CURRENCY_CODE);
         log.info("OFFER #1:\n{}", formatOfferTable(singletonList(newOffer), "AUD"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(BUY.name(), newOffer.getDirection());
@@ -72,6 +76,8 @@ public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
         assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(BUY.name(), newOffer.getDirection());
         assertFalse(newOffer.getUseMarketBasedPrice());
@@ -98,6 +104,9 @@ public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
                 usdAccount.getId(),
                 MAKER_FEE_CURRENCY_CODE);
         log.info("OFFER #2:\n{}", formatOfferTable(singletonList(newOffer), "USD"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(BUY.name(), newOffer.getDirection());
@@ -112,6 +121,8 @@ public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
         assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(BUY.name(), newOffer.getDirection());
         assertFalse(newOffer.getUseMarketBasedPrice());
@@ -138,6 +149,9 @@ public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
                 eurAccount.getId(),
                 MAKER_FEE_CURRENCY_CODE);
         log.info("OFFER #3:\n{}", formatOfferTable(singletonList(newOffer), "EUR"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(SELL.name(), newOffer.getDirection());
@@ -152,6 +166,8 @@ public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
         assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(SELL.name(), newOffer.getDirection());
         assertFalse(newOffer.getUseMarketBasedPrice());

apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java

@@ -49,6 +49,7 @@
 import static java.math.RoundingMode.HALF_UP;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static protobuf.OfferPayload.Direction.BUY;
@@ -81,6 +82,9 @@ public void testCreateUSDBTCBuyOffer5PctPriceMargin() {
                 MAKER_FEE_CURRENCY_CODE,
                 NO_TRIGGER_PRICE);
         log.info("OFFER #1:\n{}", formatOfferTable(singletonList(newOffer), "usd"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(BUY.name(), newOffer.getDirection());
@@ -94,6 +98,8 @@ public void testCreateUSDBTCBuyOffer5PctPriceMargin() {
         assertTrue(newOffer.getIsCurrencyForMakerFeeBtc());
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(BUY.name(), newOffer.getDirection());
         assertTrue(newOffer.getUseMarketBasedPrice());
@@ -123,6 +129,9 @@ public void testCreateNZDBTCBuyOfferMinus2PctPriceMargin() {
                 MAKER_FEE_CURRENCY_CODE,
                 NO_TRIGGER_PRICE);
         log.info("OFFER #2:\n{}", formatOfferTable(singletonList(newOffer), "nzd"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(BUY.name(), newOffer.getDirection());
@@ -136,6 +145,8 @@ public void testCreateNZDBTCBuyOfferMinus2PctPriceMargin() {
         assertTrue(newOffer.getIsCurrencyForMakerFeeBtc());
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(BUY.name(), newOffer.getDirection());
         assertTrue(newOffer.getUseMarketBasedPrice());
@@ -165,6 +176,9 @@ public void testCreateGBPBTCSellOfferMinus1Point5PctPriceMargin() {
                 MAKER_FEE_CURRENCY_CODE,
                 NO_TRIGGER_PRICE);
         log.info("OFFER #3:\n{}", formatOfferTable(singletonList(newOffer), "gbp"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(SELL.name(), newOffer.getDirection());
@@ -178,6 +192,8 @@ public void testCreateGBPBTCSellOfferMinus1Point5PctPriceMargin() {
         assertTrue(newOffer.getIsCurrencyForMakerFeeBtc());
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(SELL.name(), newOffer.getDirection());
         assertTrue(newOffer.getUseMarketBasedPrice());
@@ -207,6 +223,9 @@ public void testCreateBRLBTCSellOffer6Point55PctPriceMargin() {
                 MAKER_FEE_CURRENCY_CODE,
                 NO_TRIGGER_PRICE);
         log.info("OFFER #4:\n{}", formatOfferTable(singletonList(newOffer), "brl"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         String newOfferId = newOffer.getId();
         assertNotEquals("", newOfferId);
         assertEquals(SELL.name(), newOffer.getDirection());
@@ -220,6 +239,8 @@ public void testCreateBRLBTCSellOffer6Point55PctPriceMargin() {
         assertTrue(newOffer.getIsCurrencyForMakerFeeBtc());
 
         newOffer = aliceClient.getMyOffer(newOfferId);
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(newOfferId, newOffer.getId());
         assertEquals(SELL.name(), newOffer.getDirection());
         assertTrue(newOffer.getUseMarketBasedPrice());
@@ -252,9 +273,14 @@ public void testCreateUSDBTCBuyOfferWithTriggerPrice() {
                 usdAccount.getId(),
                 MAKER_FEE_CURRENCY_CODE,
                 triggerPriceAsLong);
+        assertTrue(newOffer.getIsMyOffer());
+        assertTrue(newOffer.getIsMyPendingOffer());
+
         genBtcBlocksThenWait(1, 4000); // give time to add to offer book
         newOffer = aliceClient.getMyOffer(newOffer.getId());
         log.info("OFFER #5:\n{}", formatOfferTable(singletonList(newOffer), "usd"));
+        assertTrue(newOffer.getIsMyOffer());
+        assertFalse(newOffer.getIsMyPendingOffer());
         assertEquals(triggerPriceAsLong, newOffer.getTriggerPrice());
     }
 

apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java

@@ -103,7 +103,8 @@ public void testTakeAlicesBuyOffer(final TestInfo testInfo) {
                     0.00,
                     getDefaultBuyerSecurityDepositAsPercent(),
                     alicesPaymentAccount.getId(),
-                    TRADE_FEE_CURRENCY_CODE);
+                    TRADE_FEE_CURRENCY_CODE,
+                    NO_TRIGGER_PRICE);
             var offerId = alicesOffer.getId();
             assertFalse(alicesOffer.getIsCurrencyForMakerFeeBtc());
 

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

@@ -509,7 +509,7 @@ public static void run(String[] args) {
                     }
                     var tradeId = opts.getTradeId();
                     var address = opts.getAddress();
-                    // Multi-word memos must be double quoted.
+                    // Multi-word memos must be double-quoted.
                     var memo = opts.getMemo();
                     client.withdrawFunds(tradeId, address, memo);
                     out.printf("trade %s funds sent to btc address %s%n", tradeId, address);

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

@@ -22,6 +22,7 @@
 import com.google.common.annotations.VisibleForTesting;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 
 import java.math.BigDecimal;
@@ -35,19 +36,22 @@
 @VisibleForTesting
 public class CurrencyFormat {
 
+    // Use the US locale for all DecimalFormat objects.
+    private static final DecimalFormatSymbols DECIMAL_FORMAT_SYMBOLS = DecimalFormatSymbols.getInstance(Locale.US);
+
     // Formats numbers in US locale, human friendly style.
     private static final NumberFormat FRIENDLY_NUMBER_FORMAT = NumberFormat.getInstance(Locale.US);
 
     // Formats numbers for internal use, i.e., grpc request parameters.
     private static final DecimalFormat INTERNAL_FIAT_DECIMAL_FORMAT = new DecimalFormat("##############0.0000");
 
     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 DecimalFormat BTC_FORMAT = new DecimalFormat("###,##0.00000000", DECIMAL_FORMAT_SYMBOLS);
+    static final DecimalFormat BTC_TX_FEE_FORMAT = new DecimalFormat("###,###,##0", DECIMAL_FORMAT_SYMBOLS);
 
     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 DecimalFormat BSQ_FORMAT = new DecimalFormat("###,###,###,##0.00", DECIMAL_FORMAT_SYMBOLS);
+    static final DecimalFormat SEND_BSQ_FORMAT = new DecimalFormat("###########0.00", DECIMAL_FORMAT_SYMBOLS);
 
     static final BigDecimal SECURITY_DEPOSIT_MULTIPLICAND = new BigDecimal("0.01");
 
@@ -62,7 +66,6 @@ public static String formatBsq(long sats) {
     }
 
     public static String formatBsqAmount(long bsqSats) {
-        // BSQ sats = trade.getOffer().getVolume()
         FRIENDLY_NUMBER_FORMAT.setMinimumFractionDigits(2);
         FRIENDLY_NUMBER_FORMAT.setMaximumFractionDigits(2);
         FRIENDLY_NUMBER_FORMAT.setRoundingMode(HALF_UP);

cli/src/main/java/bisq/cli/TableFormat.java

@@ -202,7 +202,7 @@ private static String formattedFiatOfferTable(List<OfferInfo> offers,
             return headerLine
                     + offers.stream()
                     .map(o -> format(colDataFormat,
-                            o.getIsActivated() ? "YES" : "NO",
+                            formatEnabled(o),
                             o.getDirection(),
                             formatPrice(o.getPrice()),
                             formatAmountRange(o.getMinAmount(), o.getAmount()),
@@ -300,7 +300,7 @@ private static String formatCryptoCurrencyOfferTable(List<OfferInfo> offers,
             return headerLine
                     + offers.stream()
                     .map(o -> format(colDataFormat,
-                            o.getIsActivated() ? "YES" : "NO",
+                            formatEnabled(o),
                             directionFormat.apply(o),
                             formatCryptoCurrencyPrice(o.getPrice()),
                             formatAmountRange(o.getMinAmount(), o.getAmount()),
@@ -324,6 +324,14 @@ private static String formatCryptoCurrencyOfferTable(List<OfferInfo> offers,
         }
     }
 
+
+    private static String formatEnabled(OfferInfo offerInfo) {
+        if (offerInfo.getIsMyOffer() && offerInfo.getIsMyPendingOffer())
+            return "PENDING";
+        else
+            return offerInfo.getIsActivated() ? "YES" : "NO";
+    }
+
     private static int getLongestPaymentMethodColWidth(List<OfferInfo> offers) {
         return getLongestColumnSize(
                 COL_HEADER_PAYMENT_METHOD.length(),

core/src/main/java/bisq/core/api/CoreOffersService.java

@@ -327,7 +327,8 @@ private OfferPayload getMergedOfferPayload(OpenOffer openOffer,
                 offer.getOfferPayload().getCountryCode(),
                 offer.getOfferPayload().getAcceptedCountryCodes(),
                 offer.getOfferPayload().getBankId(),
-                offer.getOfferPayload().getAcceptedBankIds());
+                offer.getOfferPayload().getAcceptedBankIds(),
+                offer.getOfferPayload().getExtraDataMap());
         log.info("Merging OfferPayload with {}", mutableOfferPayloadFields);
         return offerUtil.getMergedOfferPayload(openOffer, mutableOfferPayloadFields);
     }