Add signature to dispute result and various other improvements

apitest/scripts/mainnet-test.sh

@@ -48,14 +48,14 @@
   run ./bisq-cli --password="xyz" getversion
   [ "$status" -eq 0 ]
   echo "actual output:  $output" >&2
-  [ "$output" = "1.3.8" ]
+  [ "$output" = "1.3.9" ]
 }
 
 @test "test getversion" {
   run ./bisq-cli --password=xyz getversion
   [ "$status" -eq 0 ]
   echo "actual output:  $output" >&2
-  [ "$output" = "1.3.8" ]
+  [ "$output" = "1.3.9" ]
 }
 
 @test "test setwalletpassword \"a b c\"" {
@@ -166,15 +166,15 @@
   [ "$output" = "Error: address bogus not found in wallet" ]
 }
 
-@test "test createpaymentacct PerfectMoneyDummy (missing nbr, ccy params)" {
-  run ./bisq-cli --password=xyz createpaymentacct PerfectMoneyDummy
+@test "test createpaymentacct PerfectMoneyDummy (missing name, nbr, ccy params)" {
+  run ./bisq-cli --password=xyz createpaymentacct PERFECT_MONEY
   [ "$status" -eq 1 ]
  echo "actual output:  $output" >&2
-  [ "$output" = "Error: incorrect parameter count, expecting account name, account number, currency code" ]
+  [ "$output" = "Error: incorrect parameter count, expecting payment method id, account name, account number, currency code" ]
 }
 
-@test "test createpaymentacct PerfectMoneyDummy 0123456789 USD" {
-  run ./bisq-cli --password=xyz createpaymentacct PerfectMoneyDummy 0123456789 USD
+@test "test createpaymentacct PERFECT_MONEY PerfectMoneyDummy 0123456789 USD" {
+  run ./bisq-cli --password=xyz createpaymentacct PERFECT_MONEY PerfectMoneyDummy 0123456789 USD
   [ "$status" -eq 0 ]
 }
 

apitest/src/main/java/bisq/apitest/Scaffold.java

@@ -41,6 +41,7 @@
 
 import javax.annotation.Nullable;
 
+import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
 import static bisq.apitest.config.BisqAppConfig.*;
 import static java.lang.String.format;
 import static java.lang.System.exit;
@@ -64,6 +65,10 @@ public class Scaffold {
     public static final int EXIT_SUCCESS = 0;
     public static final int EXIT_FAILURE = 1;
 
+    public enum BitcoinCoreApp {
+        bitcoind
+    }
+
     public final ApiTestConfig config;
 
     @Nullable
@@ -295,7 +300,7 @@ private void startBackgroundProcesses(ExecutorService executor,
 
         log.info("Starting supporting apps {}", config.supportingApps.toString());
 
-        if (config.hasSupportingApp("bitcoind")) {
+        if (config.hasSupportingApp(bitcoind.name())) {
             BitcoinDaemon bitcoinDaemon = new BitcoinDaemon(config);
             bitcoinDaemon.verifyBitcoinPathsExist(true);
             bitcoindTask = new SetupTask(bitcoinDaemon, countdownLatch);

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

@@ -24,7 +24,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
 
+import static java.util.Arrays.stream;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 
@@ -68,15 +70,21 @@ public class ApiTestCase {
     // gRPC service stubs are used by method & scenario tests, but not e2e tests.
     private static final Map<BisqAppConfig, GrpcStubs> grpcStubsCache = new HashMap<>();
 
-    public static void setUpScaffold(String supportingApps)
+    public static void setUpScaffold(Enum<?>... supportingApps)
             throws InterruptedException, ExecutionException, IOException {
-        scaffold = new Scaffold(supportingApps).setUp();
+        scaffold = new Scaffold(stream(supportingApps).map(Enum::name)
+                .collect(Collectors.joining(",")))
+                .setUp();
         config = scaffold.config;
         bitcoinCli = new BitcoinCliHelper((config));
     }
 
     public static void setUpScaffold(String[] params)
             throws InterruptedException, ExecutionException, IOException {
+        // Test cases needing to pass more than just an ApiTestConfig
+        // --supportingApps option will use this setup method, but the
+        // --supportingApps option will need to be passed too, with its comma
+        // delimited app list value, e.g., "bitcoind,seednode,arbdaemon".
         scaffold = new Scaffold(params).setUp();
         config = scaffold.config;
     }

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

@@ -27,7 +27,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
+import static bisq.apitest.config.BisqAppConfig.seednode;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -41,7 +43,7 @@ public class GetBalanceTest extends MethodTest {
     @BeforeAll
     public static void setUp() {
         try {
-            setUpScaffold("bitcoind,seednode,alicedaemon");
+            setUpScaffold(bitcoind, seednode, alicedaemon);
 
             // Have to generate 1 regtest block for alice's wallet to show 10 BTC balance.
             bitcoinCli.generateBlocks(1);

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

@@ -41,7 +41,7 @@ public class GetVersionTest extends MethodTest {
     @BeforeAll
     public static void setUp() {
         try {
-            setUpScaffold(alicedaemon.name());
+            setUpScaffold(alicedaemon);
         } catch (Exception ex) {
             fail(ex);
         }

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

@@ -29,7 +29,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
 import static bisq.apitest.config.BisqAppConfig.arbdaemon;
+import static bisq.apitest.config.BisqAppConfig.seednode;
 import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -42,10 +44,14 @@
 @TestMethodOrder(OrderAnnotation.class)
 public class RegisterDisputeAgentsTest extends MethodTest {
 
+    private static final String ARBITRATOR = "arbitrator";
+    private static final String MEDIATOR = "mediator";
+    private static final String REFUNDAGENT = "refundagent";
+
     @BeforeAll
     public static void setUp() {
         try {
-            setUpScaffold("bitcoind,seednode,arbdaemon");
+            setUpScaffold(bitcoind, seednode, arbdaemon);
         } catch (Exception ex) {
             fail(ex);
         }
@@ -55,7 +61,7 @@ public static void setUp() {
     @Order(1)
     public void testRegisterArbitratorShouldThrowException() {
         var req =
-                createRegisterDisputeAgentRequest("arbitrator");
+                createRegisterDisputeAgentRequest(ARBITRATOR);
         Throwable exception = assertThrows(StatusRuntimeException.class, () ->
                 grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req));
         assertEquals("INVALID_ARGUMENT: arbitrators must be registered in a Bisq UI",
@@ -77,7 +83,7 @@ public void testInvalidDisputeAgentTypeArgShouldThrowException() {
     @Order(3)
     public void testInvalidRegistrationKeyArgShouldThrowException() {
         var req = RegisterDisputeAgentRequest.newBuilder()
-                .setDisputeAgentType("refundagent")
+                .setDisputeAgentType(REFUNDAGENT)
                 .setRegistrationKey("invalid" + DEV_PRIVILEGE_PRIV_KEY).build();
         Throwable exception = assertThrows(StatusRuntimeException.class, () ->
                 grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req));
@@ -89,15 +95,15 @@ public void testInvalidRegistrationKeyArgShouldThrowException() {
     @Order(4)
     public void testRegisterMediator() {
         var req =
-                createRegisterDisputeAgentRequest("mediator");
+                createRegisterDisputeAgentRequest(MEDIATOR);
         grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req);
     }
 
     @Test
     @Order(5)
     public void testRegisterRefundAgent() {
         var req =
-                createRegisterDisputeAgentRequest("refundagent");
+                createRegisterDisputeAgentRequest(REFUNDAGENT);
         grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req);
     }
 

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

@@ -25,7 +25,7 @@ public class WalletProtectionTest extends MethodTest {
     @BeforeAll
     public static void setUp() {
         try {
-            setUpScaffold(alicedaemon.name());
+            setUpScaffold(alicedaemon);
             MILLISECONDS.sleep(2000);
         } catch (Exception ex) {
             fail(ex);

apitest/src/test/java/bisq/apitest/scenario/FundWalletScenarioTest.java

@@ -26,7 +26,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
+import static bisq.apitest.config.BisqAppConfig.seednode;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -38,7 +40,7 @@ public class FundWalletScenarioTest extends ScenarioTest {
     @BeforeAll
     public static void setUp() {
         try {
-            setUpScaffold("bitcoind,seednode,alicedaemon");
+            setUpScaffold(bitcoind, seednode, alicedaemon);
             bitcoinCli.generateBlocks(1);
             MILLISECONDS.sleep(1500);
         } catch (Exception ex) {

assets/src/main/java/bisq/asset/Base58BitcoinAddressValidator.java → assets/src/main/java/bisq/asset/Base58AddressValidator.java

@@ -23,21 +23,21 @@
 import org.bitcoinj.params.MainNetParams;
 
 /**
- * {@link AddressValidator} for Base58-encoded Bitcoin addresses.
+ * {@link AddressValidator} for Base58-encoded addresses.
  *
  * @author Chris Beams
  * @since 0.7.0
  * @see org.bitcoinj.core.LegacyAddress#fromBase58(NetworkParameters, String)
  */
-public class Base58BitcoinAddressValidator implements AddressValidator {
+public class Base58AddressValidator implements AddressValidator {
 
     private final NetworkParameters networkParameters;
 
-    public Base58BitcoinAddressValidator() {
+    public Base58AddressValidator() {
         this(MainNetParams.get());
     }
 
-    public Base58BitcoinAddressValidator(NetworkParameters networkParameters) {
+    public Base58AddressValidator(NetworkParameters networkParameters) {
         this.networkParameters = networkParameters;
     }
 

assets/src/main/java/bisq/asset/BitcoinAddressValidator.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.asset;
+
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.params.MainNetParams;
+
+/**
+ * {@link AddressValidator} for Bitcoin addresses.
+ *
+ * @author Oscar Guindzberg
+ */
+public class BitcoinAddressValidator implements AddressValidator {
+
+    private final NetworkParameters networkParameters;
+
+    public BitcoinAddressValidator() {
+        this(MainNetParams.get());
+    }
+
+    public BitcoinAddressValidator(NetworkParameters networkParameters) {
+        this.networkParameters = networkParameters;
+    }
+
+    @Override
+    public AddressValidationResult validate(String address) {
+        try {
+            Address.fromString(networkParameters, address);
+        } catch (AddressFormatException ex) {
+            return AddressValidationResult.invalidAddress(ex);
+        }
+
+        return AddressValidationResult.validAddress();
+    }
+}

assets/src/main/java/bisq/asset/coins/Actinium.java

@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Actinium extends Coin {
 
     public Actinium() {
-        super("Actinium", "ACM", new Base58BitcoinAddressValidator(new ActiniumParams()));
+        super("Actinium", "ACM", new Base58AddressValidator(new ActiniumParams()));
     }
 
 

assets/src/main/java/bisq/asset/coins/Adeptio.java

@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public Adeptio() {
     }
 
 
-    public static class AdeptioAddressValidator extends Base58BitcoinAddressValidator {
+    public static class AdeptioAddressValidator extends Base58AddressValidator {
 
         public AdeptioAddressValidator() {
             super(new AdeptioParams());

assets/src/main/java/bisq/asset/coins/Animecoin.java

@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Animecoin extends Coin {
     public Animecoin() {
-        super("Animecoin", "ANI", new Base58BitcoinAddressValidator(new AnimecoinMainNetParams()));
+        super("Animecoin", "ANI", new Base58AddressValidator(new AnimecoinMainNetParams()));
     }
 
     public static class AnimecoinMainNetParams extends NetworkParametersAdapter {

assets/src/main/java/bisq/asset/coins/Australiacash.java

@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Australiacash extends Coin {
     public Australiacash() {
-        super("Australiacash", "AUS", new Base58BitcoinAddressValidator(new AustraliacashParams()));
+        super("Australiacash", "AUS", new Base58AddressValidator(new AustraliacashParams()));
     }
 	   public static class AustraliacashParams extends NetworkParametersAdapter {
 

assets/src/main/java/bisq/asset/coins/BSQ.java

@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 
 import org.bitcoinj.core.NetworkParameters;
@@ -57,7 +57,7 @@ public Regtest() {
     }
 
 
-    public static class BSQAddressValidator extends Base58BitcoinAddressValidator {
+    public static class BSQAddressValidator extends Base58AddressValidator {
 
         public BSQAddressValidator(NetworkParameters networkParameters) {
             super(networkParameters);

assets/src/main/java/bisq/asset/coins/Bitcoin.java

@@ -17,7 +17,7 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.BitcoinAddressValidator;
 import bisq.asset.Coin;
 
 import org.bitcoinj.core.NetworkParameters;
@@ -28,7 +28,7 @@
 public abstract class Bitcoin extends Coin {
 
     public Bitcoin(Network network, NetworkParameters networkParameters) {
-        super("Bitcoin", "BTC", new Base58BitcoinAddressValidator(networkParameters), network);
+        super("Bitcoin", "BTC", new BitcoinAddressValidator(networkParameters), network);
     }