Merge branch 'master_upstream' into show-past-deviation-in-monitor

apitest/scripts/mainnet-test.sh

@@ -14,7 +14,7 @@
 #
 #  This script must be run from the root of the project, e.g.:
 #
-#     ./cli/test.sh
+#     bats apitest/scripts/mainnet-test.sh
 
 @test "test unsupported method error" {
   run ./bisq-cli --password=xyz bogus

apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java

@@ -70,10 +70,8 @@ public boolean hasShutdownExceptions() {
 
     @Override
     public void logExceptions(List<Throwable> exceptions, org.slf4j.Logger log) {
-        StringBuilder errorBuilder = new StringBuilder();
         for (Throwable t : exceptions) {
             log.error("", t);
-            errorBuilder.append(t.getMessage()).append("\n");
         }
     }
 

apitest/src/test/java/bisq/apitest/ApiTestCase.java

@@ -26,6 +26,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
+import org.junit.jupiter.api.TestInfo;
+
 import static java.util.Arrays.stream;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
@@ -117,4 +119,10 @@ protected static void sleep(long ms) {
             // empty
         }
     }
+
+    protected final String testName(TestInfo testInfo) {
+        return testInfo.getTestMethod().isPresent()
+                ? testInfo.getTestMethod().get().getName()
+                : "unknown test name";
+    }
 }

apitest/src/test/java/bisq/apitest/method/CreatePaymentAccountTest.java

@@ -29,6 +29,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -40,7 +41,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 
-
+@Disabled
 @Slf4j
 @TestMethodOrder(OrderAnnotation.class)
 public class CreatePaymentAccountTest extends MethodTest {

apitest/src/test/java/bisq/apitest/method/GetBalanceTest.java

@@ -23,6 +23,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -35,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 
-
+@Disabled
 @Slf4j
 @TestMethodOrder(OrderAnnotation.class)
 public class GetBalanceTest extends MethodTest {

apitest/src/test/java/bisq/apitest/method/GetVersionTest.java

@@ -23,6 +23,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -33,7 +34,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 
-
+@Disabled
 @Slf4j
 @TestMethodOrder(OrderAnnotation.class)
 public class GetVersionTest extends MethodTest {

apitest/src/test/java/bisq/apitest/method/MethodTest.java

@@ -17,6 +17,7 @@
 
 package bisq.apitest.method;
 
+import bisq.proto.grpc.CancelOfferRequest;
 import bisq.proto.grpc.ConfirmPaymentReceivedRequest;
 import bisq.proto.grpc.ConfirmPaymentStartedRequest;
 import bisq.proto.grpc.CreatePaymentAccountRequest;
@@ -25,6 +26,7 @@
 import bisq.proto.grpc.GetOfferRequest;
 import bisq.proto.grpc.GetPaymentAccountsRequest;
 import bisq.proto.grpc.GetTradeRequest;
+import bisq.proto.grpc.KeepFundsRequest;
 import bisq.proto.grpc.LockWalletRequest;
 import bisq.proto.grpc.MarketPriceRequest;
 import bisq.proto.grpc.OfferInfo;
@@ -34,27 +36,71 @@
 import bisq.proto.grpc.TakeOfferRequest;
 import bisq.proto.grpc.TradeInfo;
 import bisq.proto.grpc.UnlockWalletRequest;
+import bisq.proto.grpc.WithdrawFundsRequest;
 
 import protobuf.PaymentAccount;
 
 import java.util.stream.Collectors;
 
+import static bisq.apitest.config.BisqAppConfig.alicedaemon;
+import static bisq.apitest.config.BisqAppConfig.arbdaemon;
+import static bisq.apitest.config.BisqAppConfig.bobdaemon;
 import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY;
 import static bisq.core.payment.payload.PaymentMethod.PERFECT_MONEY;
+import static java.util.Arrays.stream;
 import static java.util.Comparator.comparing;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 
 import bisq.apitest.ApiTestCase;
 import bisq.apitest.config.BisqAppConfig;
+import bisq.cli.GrpcStubs;
 
 public class MethodTest extends ApiTestCase {
 
     protected static final String ARBITRATOR = "arbitrator";
     protected static final String MEDIATOR = "mediator";
     protected static final String REFUND_AGENT = "refundagent";
 
+    protected static GrpcStubs aliceStubs;
+    protected static GrpcStubs bobStubs;
+
+    protected static PaymentAccount alicesDummyAcct;
+    protected static PaymentAccount bobsDummyAcct;
+
+    public static void startSupportingApps(boolean registerDisputeAgents,
+                                           boolean generateBtcBlock,
+                                           Enum<?>... supportingApps) {
+        try {
+            // To run Bisq apps in debug mode, use the other setUpScaffold method:
+            // setUpScaffold(new String[]{"--supportingApps", "bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon",
+            //                            "--enableBisqDebugging", "true"});
+            setUpScaffold(supportingApps);
+            if (registerDisputeAgents) {
+                registerDisputeAgents(arbdaemon);
+            }
+
+            if (stream(supportingApps).map(Enum::name).anyMatch(name -> name.equals(alicedaemon.name()))) {
+                aliceStubs = grpcStubs(alicedaemon);
+                alicesDummyAcct = getDefaultPerfectDummyPaymentAccount(alicedaemon);
+            }
+
+            if (stream(supportingApps).map(Enum::name).anyMatch(name -> name.equals(bobdaemon.name()))) {
+                bobStubs = grpcStubs(bobdaemon);
+                bobsDummyAcct = getDefaultPerfectDummyPaymentAccount(bobdaemon);
+            }
+
+            // Generate 1 regtest block for alice's and/or bob's wallet to
+            // show 10 BTC balance, and allow time for daemons parse the new block.
+            if (generateBtcBlock)
+                genBtcBlocksThenWait(1, 1500);
+        } catch (Exception ex) {
+            fail(ex);
+        }
+    }
+
     // Convenience methods for building gRPC request objects
 
     protected final GetBalanceRequest createBalanceRequest() {
@@ -93,6 +139,10 @@ protected final GetOfferRequest createGetOfferRequest(String offerId) {
         return GetOfferRequest.newBuilder().setId(offerId).build();
     }
 
+    protected final CancelOfferRequest createCancelOfferRequest(String offerId) {
+        return CancelOfferRequest.newBuilder().setId(offerId).build();
+    }
+
     protected final TakeOfferRequest createTakeOfferRequest(String offerId, String paymentAccountId) {
         return TakeOfferRequest.newBuilder().setOfferId(offerId).setPaymentAccountId(paymentAccountId).build();
     }
@@ -109,6 +159,19 @@ protected final ConfirmPaymentReceivedRequest createConfirmPaymentReceivedReques
         return ConfirmPaymentReceivedRequest.newBuilder().setTradeId(tradeId).build();
     }
 
+    protected final KeepFundsRequest createKeepFundsRequest(String tradeId) {
+        return KeepFundsRequest.newBuilder()
+                .setTradeId(tradeId)
+                .build();
+    }
+
+    protected final WithdrawFundsRequest createWithdrawFundsRequest(String tradeId, String address) {
+        return WithdrawFundsRequest.newBuilder()
+                .setTradeId(tradeId)
+                .setAddress(address)
+                .build();
+    }
+
     // Convenience methods for calling frequently used & thoroughly tested gRPC services.
 
     protected final long getBalance(BisqAppConfig bisqAppConfig) {
@@ -148,7 +211,7 @@ protected final CreatePaymentAccountRequest createCreatePerfectMoneyPaymentAccou
                 .build();
     }
 
-    protected final PaymentAccount getDefaultPerfectDummyPaymentAccount(BisqAppConfig bisqAppConfig) {
+    protected static PaymentAccount getDefaultPerfectDummyPaymentAccount(BisqAppConfig bisqAppConfig) {
         var req = GetPaymentAccountsRequest.newBuilder().build();
         var paymentAccountsService = grpcStubs(bisqAppConfig).paymentAccountsService;
         PaymentAccount paymentAccount = paymentAccountsService.getPaymentAccounts(req)
@@ -170,21 +233,40 @@ protected final OfferInfo getOffer(BisqAppConfig bisqAppConfig, String offerId)
         return grpcStubs(bisqAppConfig).offersService.getOffer(req).getOffer();
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    protected final void cancelOffer(BisqAppConfig bisqAppConfig, String offerId) {
+        var req = createCancelOfferRequest(offerId);
+        grpcStubs(bisqAppConfig).offersService.cancelOffer(req);
+    }
+
     protected final TradeInfo getTrade(BisqAppConfig bisqAppConfig, String tradeId) {
         var req = createGetTradeRequest(tradeId);
         return grpcStubs(bisqAppConfig).tradesService.getTrade(req).getTrade();
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     protected final void confirmPaymentStarted(BisqAppConfig bisqAppConfig, String tradeId) {
         var req = createConfirmPaymentStartedRequest(tradeId);
         grpcStubs(bisqAppConfig).tradesService.confirmPaymentStarted(req);
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     protected final void confirmPaymentReceived(BisqAppConfig bisqAppConfig, String tradeId) {
         var req = createConfirmPaymentReceivedRequest(tradeId);
         grpcStubs(bisqAppConfig).tradesService.confirmPaymentReceived(req);
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    protected final void keepFunds(BisqAppConfig bisqAppConfig, String tradeId) {
+        var req = createKeepFundsRequest(tradeId);
+        grpcStubs(bisqAppConfig).tradesService.keepFunds(req);
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    protected final void withdrawFunds(BisqAppConfig bisqAppConfig, String tradeId, String address) {
+        var req = createWithdrawFundsRequest(tradeId, address);
+        grpcStubs(bisqAppConfig).tradesService.withdrawFunds(req);
+    }
     // Static conveniences for test methods and test case fixture setups.
 
     protected static RegisterDisputeAgentRequest createRegisterDisputeAgentRequest(String disputeAgentType) {

apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java

@@ -25,6 +25,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -40,6 +41,7 @@
 
 
 @SuppressWarnings("ResultOfMethodCallIgnored")
+@Disabled
 @Slf4j
 @TestMethodOrder(OrderAnnotation.class)
 public class RegisterDisputeAgentsTest extends MethodTest {
@@ -56,8 +58,7 @@ public static void setUp() {
     @Test
     @Order(1)
     public void testRegisterArbitratorShouldThrowException() {
-        var req =
-                createRegisterDisputeAgentRequest(ARBITRATOR);
+        var req = createRegisterDisputeAgentRequest(ARBITRATOR);
         Throwable exception = assertThrows(StatusRuntimeException.class, () ->
                 grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req));
         assertEquals("INVALID_ARGUMENT: arbitrators must be registered in a Bisq UI",
@@ -67,8 +68,7 @@ public void testRegisterArbitratorShouldThrowException() {
     @Test
     @Order(2)
     public void testInvalidDisputeAgentTypeArgShouldThrowException() {
-        var req =
-                createRegisterDisputeAgentRequest("badagent");
+        var req = createRegisterDisputeAgentRequest("badagent");
         Throwable exception = assertThrows(StatusRuntimeException.class, () ->
                 grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req));
         assertEquals("INVALID_ARGUMENT: unknown dispute agent type 'badagent'",
@@ -90,16 +90,14 @@ public void testInvalidRegistrationKeyArgShouldThrowException() {
     @Test
     @Order(4)
     public void testRegisterMediator() {
-        var req =
-                createRegisterDisputeAgentRequest(MEDIATOR);
+        var req = createRegisterDisputeAgentRequest(MEDIATOR);
         grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req);
     }
 
     @Test
     @Order(5)
     public void testRegisterRefundAgent() {
-        var req =
-                createRegisterDisputeAgentRequest(REFUND_AGENT);
+        var req = createRegisterDisputeAgentRequest(REFUND_AGENT);
         grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req);
     }
 

apitest/src/test/java/bisq/apitest/method/WalletProtectionTest.java

@@ -6,6 +6,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -18,6 +19,7 @@
 import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 
 @SuppressWarnings("ResultOfMethodCallIgnored")
+@Disabled
 @Slf4j
 @TestMethodOrder(OrderAnnotation.class)
 public class WalletProtectionTest extends MethodTest {

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

@@ -59,28 +59,15 @@
 @Slf4j
 public abstract class AbstractOfferTest extends MethodTest {
 
-    protected static GrpcStubs aliceStubs;
-    protected static GrpcStubs bobStubs;
-
     @BeforeAll
     public static void setUp() {
-        startSupportingApps();
-    }
-
-    static void startSupportingApps() {
-        try {
-            // setUpScaffold(new String[]{"--supportingApps", "bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon", "--enableBisqDebugging", "true"});
-            setUpScaffold(bitcoind, seednode, arbdaemon, alicedaemon, bobdaemon);
-            registerDisputeAgents(arbdaemon);
-            aliceStubs = grpcStubs(alicedaemon);
-            bobStubs = grpcStubs(bobdaemon);
-
-            // Generate 1 regtest block for alice's wallet to show 10 BTC balance,
-            // and give alicedaemon time to parse the new block.
-            genBtcBlocksThenWait(1, 1500);
-        } catch (Exception ex) {
-            fail(ex);
-        }
+        startSupportingApps(true,
+                true,
+                bitcoind,
+                seednode,
+                arbdaemon,
+                alicedaemon,
+                bobdaemon);
     }
 
     protected final OfferInfo createAliceOffer(PaymentAccount paymentAccount,
@@ -120,6 +107,11 @@ protected final OfferInfo getOffer(String offerId) {
         return aliceStubs.offersService.getOffer(createGetOfferRequest(offerId)).getOffer();
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    protected final void cancelOffer(GrpcStubs grpcStubs, String offerId) {
+        grpcStubs.offersService.cancelOffer(createCancelOfferRequest(offerId));
+    }
+
     protected final OfferInfo getMostRecentOffer(GrpcStubs grpcStubs, String direction, String currencyCode) {
         List<OfferInfo> offerInfoList = getOffersSortedByDate(grpcStubs, direction, currencyCode);
         if (offerInfoList.isEmpty())