Implement api methods 'keepfunds', 'withdrawfunds'

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

@@ -28,5 +28,4 @@ protected final void verifyExpectedTradeStateAndPhase(TradeInfo trade,
         assertEquals(expectedState.name(), trade.getState());
         assertEquals(expectedPhase.name(), trade.getPhase());
     }
-
 }

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

@@ -31,6 +31,7 @@
 
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
 import static bisq.apitest.config.BisqAppConfig.bobdaemon;
+import static bisq.cli.TradeFormat.format;
 import static bisq.core.trade.Trade.Phase.DEPOSIT_CONFIRMED;
 import static bisq.core.trade.Trade.Phase.DEPOSIT_PUBLISHED;
 import static bisq.core.trade.Trade.Phase.FIAT_SENT;
@@ -39,6 +40,7 @@
 import static bisq.core.trade.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
 import static bisq.core.trade.Trade.State.SELLER_PUBLISHED_DEPOSIT_TX;
 import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static java.lang.System.out;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -85,10 +87,12 @@ public void testTakeAlicesBuyOffer() {
 
             trade = getTrade(bobdaemon, trade.getTradeId());
             verifyExpectedTradeStateAndPhase(trade, SELLER_PUBLISHED_DEPOSIT_TX, DEPOSIT_PUBLISHED);
+            out.println(format(trade));
 
             genBtcBlocksThenWait(1, 2250);
             trade = getTrade(bobdaemon, trade.getTradeId());
             verifyExpectedTradeStateAndPhase(trade, DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN, DEPOSIT_CONFIRMED);
+            out.println(format(trade));
         } catch (StatusRuntimeException e) {
             fail(e);
         }
@@ -107,6 +111,7 @@ public void testAlicesConfirmPaymentStarted() {
             trade = getTrade(alicedaemon, tradeId);
             assertEquals(OFFER_FEE_PAID.name(), trade.getOffer().getState());
             verifyExpectedTradeStateAndPhase(trade, BUYER_SAW_ARRIVED_FIAT_PAYMENT_INITIATED_MSG, FIAT_SENT);
+            out.println(format(trade));
         } catch (StatusRuntimeException e) {
             fail(e);
         }
@@ -125,5 +130,6 @@ public void testBobsConfirmPaymentReceived() {
         // TODO is this a bug?  Why is offer.state == available?
         assertEquals(AVAILABLE.name(), trade.getOffer().getState());
         verifyExpectedTradeStateAndPhase(trade, SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG, PAYOUT_PUBLISHED);
+        out.println(format(trade));
     }
 }

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

@@ -31,6 +31,7 @@
 
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
 import static bisq.apitest.config.BisqAppConfig.bobdaemon;
+import static bisq.cli.TradeFormat.format;
 import static bisq.core.trade.Trade.Phase.DEPOSIT_CONFIRMED;
 import static bisq.core.trade.Trade.Phase.DEPOSIT_PUBLISHED;
 import static bisq.core.trade.Trade.Phase.FIAT_SENT;
@@ -39,6 +40,7 @@
 import static bisq.core.trade.Trade.State.BUYER_SAW_ARRIVED_FIAT_PAYMENT_INITIATED_MSG;
 import static bisq.core.trade.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
 import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static java.lang.System.out;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -86,10 +88,12 @@ public void testTakeAlicesSellOffer() {
 
             trade = getTrade(bobdaemon, trade.getTradeId());
             verifyExpectedTradeStateAndPhase(trade, BUYER_RECEIVED_DEPOSIT_TX_PUBLISHED_MSG, DEPOSIT_PUBLISHED);
+            out.println(format(trade));
 
             genBtcBlocksThenWait(1, 2250);
             trade = getTrade(bobdaemon, trade.getTradeId());
             verifyExpectedTradeStateAndPhase(trade, DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN, DEPOSIT_CONFIRMED);
+            out.println(format(trade));
 
         } catch (StatusRuntimeException e) {
             fail(e);
@@ -110,6 +114,8 @@ public void testBobsConfirmPaymentStarted() {
             // TODO is this a bug?  Why is offer.state == available?
             assertEquals(AVAILABLE.name(), trade.getOffer().getState());
             verifyExpectedTradeStateAndPhase(trade, BUYER_SAW_ARRIVED_FIAT_PAYMENT_INITIATED_MSG, FIAT_SENT);
+
+            out.println(format(trade));
         } catch (StatusRuntimeException e) {
             fail(e);
         }
@@ -127,5 +133,6 @@ public void testAlicesConfirmPaymentReceived() {
         trade = getTrade(alicedaemon, tradeId);
         assertEquals(OFFER_FEE_PAID.name(), trade.getOffer().getState());
         verifyExpectedTradeStateAndPhase(trade, SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG, PAYOUT_PUBLISHED);
+        out.println(format(trade));
     }
 }

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

@@ -27,13 +27,16 @@
 import bisq.proto.grpc.GetOfferRequest;
 import bisq.proto.grpc.GetOffersRequest;
 import bisq.proto.grpc.GetPaymentAccountsRequest;
+import bisq.proto.grpc.GetTradeRequest;
 import bisq.proto.grpc.GetVersionRequest;
+import bisq.proto.grpc.KeepFundsRequest;
 import bisq.proto.grpc.LockWalletRequest;
 import bisq.proto.grpc.RegisterDisputeAgentRequest;
 import bisq.proto.grpc.RemoveWalletPasswordRequest;
 import bisq.proto.grpc.SetWalletPasswordRequest;
 import bisq.proto.grpc.TakeOfferRequest;
 import bisq.proto.grpc.UnlockWalletRequest;
+import bisq.proto.grpc.WithdrawFundsRequest;
 
 import io.grpc.StatusRuntimeException;
 
@@ -74,8 +77,11 @@ private enum Method {
         getoffer,
         getoffers,
         takeoffer,
+        gettrade,
         confirmpaymentstarted,
         confirmpaymentreceived,
+        keepfunds,
+        withdrawfunds,
         createpaymentacct,
         getpaymentaccts,
         getversion,
@@ -275,6 +281,25 @@ public static void run(String[] args) {
                     out.printf("trade '%s' successfully taken", reply.getTrade().getShortId());
                     return;
                 }
+                case gettrade: {
+                    if (nonOptionArgs.size() < 2)
+                        throw new IllegalArgumentException("incorrect parameter count, expecting trade id, [,showcontract = true|false]");
+
+                    var tradeId = nonOptionArgs.get(1);
+                    var showContract = false;
+                    if (nonOptionArgs.size() == 3)
+                        showContract = Boolean.getBoolean(nonOptionArgs.get(2));
+
+                    var request = GetTradeRequest.newBuilder()
+                            .setTradeId(tradeId)
+                            .build();
+                    var reply = tradesService.getTrade(request);
+                    if (showContract)
+                        out.println(reply.getTrade().getContractAsJson());
+                    else
+                        out.println(TradeFormat.format(reply.getTrade()));
+                    return;
+                }
                 case confirmpaymentstarted: {
                     if (nonOptionArgs.size() < 2)
                         throw new IllegalArgumentException("incorrect parameter count, expecting trade id");
@@ -299,6 +324,32 @@ public static void run(String[] args) {
                     out.printf("trade '%s' payment received message sent", tradeId);
                     return;
                 }
+                case keepfunds: {
+                    if (nonOptionArgs.size() < 2)
+                        throw new IllegalArgumentException("incorrect parameter count, expecting trade id");
+
+                    var tradeId = nonOptionArgs.get(1);
+                    var request = KeepFundsRequest.newBuilder()
+                            .setTradeId(tradeId)
+                            .build();
+                    tradesService.keepFunds(request);
+                    out.printf("funds from trade '%s' saved in bisq wallet", tradeId);
+                    return;
+                }
+                case withdrawfunds: {
+                    if (nonOptionArgs.size() < 3)
+                        throw new IllegalArgumentException("incorrect parameter count, expecting trade id, bitcoin wallet address");
+
+                    var tradeId = nonOptionArgs.get(1);
+                    var address = nonOptionArgs.get(2);
+                    var request = WithdrawFundsRequest.newBuilder()
+                            .setTradeId(tradeId)
+                            .setAddress(address)
+                            .build();
+                    tradesService.withdrawFunds(request);
+                    out.printf("funds from trade '%s' sent to btc address '%s'", tradeId, address);
+                    return;
+                }
                 case createpaymentacct: {
                     if (nonOptionArgs.size() < 5)
                         throw new IllegalArgumentException(
@@ -427,8 +478,11 @@ private static void printHelp(OptionParser parser, PrintStream stream) {
             stream.format(rowFormat, "getoffer", "offer id", "Get current offer with id");
             stream.format(rowFormat, "getoffers", "buy | sell, currency code", "Get current offers");
             stream.format(rowFormat, "takeoffer", "offer id", "Take offer with id");
+            stream.format(rowFormat, "gettrade", "trade id [,showcontract]", "Get trade summary or full contract");
             stream.format(rowFormat, "confirmpaymentstarted", "trade id", "Confirm payment started");
             stream.format(rowFormat, "confirmpaymentreceived", "trade id", "Confirm payment received");
+            stream.format(rowFormat, "keepfunds", "trade id", "Keep received funds in Bisq wallet");
+            stream.format(rowFormat, "withdrawfunds", "trade id, bitcoin wallet address", "Withdraw received funds to external wallet address");
             stream.format(rowFormat, "createpaymentacct", "account name, account number, currency code", "Create PerfectMoney dummy account");
             stream.format(rowFormat, "getpaymentaccts", "", "Get user payment accounts");
             stream.format(rowFormat, "lockwallet", "", "Remove wallet password from memory, locking the wallet");

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

@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+import static com.google.common.base.Strings.padEnd;
+import static com.google.common.base.Strings.padStart;
+
+class ColumnHeaderConstants {
+
+    // For inserting 2 spaces between column headers.
+    static final String COL_HEADER_DELIMITER = "  ";
+
+    // Table column header format specs, right padded with two spaces.  In some cases
+    // such as COL_HEADER_CREATION_DATE, COL_HEADER_VOLUME and COL_HEADER_UUID, the
+    // expected max data string length is accounted for.  In others, the column header length
+    // are expected to be greater than any column value length.
+    static final String COL_HEADER_ADDRESS = padEnd("Address", 34, ' ');
+    static final String COL_HEADER_AMOUNT = padEnd("BTC(min - max)", 24, ' ');
+    static final String COL_HEADER_BALANCE = padStart("Balance", 12, ' ');
+    static final String COL_HEADER_CONFIRMATIONS = "Confirmations";
+    static final String COL_HEADER_CREATION_DATE = padEnd("Creation Date (UTC)", 20, ' ');
+    static final String COL_HEADER_CURRENCY = "Currency";
+    static final String COL_HEADER_DIRECTION = "Buy/Sell";
+    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_TRADE_AMOUNT = padStart("Amount(%-3s)", 12, ' ');
+    static final String COL_HEADER_TRADE_DEPOSIT_CONFIRMED = "Deposit Confirmed";
+    static final String COL_HEADER_TRADE_DEPOSIT_PUBLISHED = "Deposit Published";
+    static final String COL_HEADER_TRADE_FIAT_SENT = "Fiat Sent";
+    static final String COL_HEADER_TRADE_FIAT_RECEIVED = "Fiat Received";
+    static final String COL_HEADER_TRADE_PAYOUT_PUBLISHED = "Payout Published";
+    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_VOLUME = padEnd("%-3s(min - max)", 15, ' ');
+    static final String COL_HEADER_UUID = padEnd("ID", 52, ' ');
+}

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

@@ -29,41 +29,21 @@
 import java.util.TimeZone;
 import java.util.stream.Collectors;
 
+import static bisq.cli.ColumnHeaderConstants.*;
 import static bisq.cli.CurrencyFormat.formatAmountRange;
 import static bisq.cli.CurrencyFormat.formatOfferPrice;
 import static bisq.cli.CurrencyFormat.formatSatoshis;
 import static bisq.cli.CurrencyFormat.formatVolumeRange;
 import static com.google.common.base.Strings.padEnd;
-import static com.google.common.base.Strings.padStart;
 import static java.lang.String.format;
 import static java.util.Collections.max;
 import static java.util.Comparator.comparing;
 import static java.util.TimeZone.getTimeZone;
 
 class TableFormat {
 
-    private static final TimeZone TZ_UTC = getTimeZone("UTC");
-    private static final SimpleDateFormat DATE_FORMAT_ISO_8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-
-    // For inserting 2 spaces between column headers.
-    private static final String COL_HEADER_DELIMITER = "  ";
-
-    // Table column header format specs, right padded with two spaces.  In some cases
-    // such as COL_HEADER_CREATION_DATE, COL_HEADER_VOLUME and COL_HEADER_UUID, the
-    // expected max data string length is accounted for.  In others, the column header length
-    // are expected to be greater than any column value length.
-    private static final String COL_HEADER_ADDRESS = padEnd("Address", 34, ' ');
-    private static final String COL_HEADER_AMOUNT = padEnd("BTC(min - max)", 24, ' ');
-    private static final String COL_HEADER_BALANCE = padStart("Balance", 12, ' ');
-    private static final String COL_HEADER_CONFIRMATIONS = "Confirmations";
-    private static final String COL_HEADER_CREATION_DATE = padEnd("Creation Date (UTC)", 20, ' ');
-    private static final String COL_HEADER_CURRENCY = "Currency";
-    private static final String COL_HEADER_DIRECTION = "Buy/Sell";  // TODO "Take Offer to
-    private static final String COL_HEADER_NAME = "Name";
-    private static final String COL_HEADER_PAYMENT_METHOD = "Payment Method";
-    private static final String COL_HEADER_PRICE = "Price in %-3s for 1 BTC";
-    private static final String COL_HEADER_VOLUME = padEnd("%-3s(min - max)", 15, ' ');
-    private static final String COL_HEADER_UUID = padEnd("ID", 52, ' ');
+    static final TimeZone TZ_UTC = getTimeZone("UTC");
+    static final SimpleDateFormat DATE_FORMAT_ISO_8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 
     static String formatAddressBalanceTbl(List<AddressBalanceInfo> addressBalanceInfo) {
         String headerLine = (COL_HEADER_ADDRESS + COL_HEADER_DELIMITER