Add BTC/BSQ pair offer & trading tests

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

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

@@ -42,10 +42,14 @@
 import javax.annotation.Nullable;
 
 import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
+import static bisq.apitest.config.ApiTestConfig.MEDIATOR;
+import static bisq.apitest.config.ApiTestConfig.REFUND_AGENT;
 import static bisq.apitest.config.BisqAppConfig.*;
+import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY;
 import static java.lang.String.format;
 import static java.lang.System.exit;
 import static java.lang.System.out;
+import static java.net.InetAddress.getLoopbackAddress;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -58,6 +62,7 @@
 import bisq.apitest.linux.BisqProcess;
 import bisq.apitest.linux.BitcoinDaemon;
 import bisq.apitest.linux.LinuxProcess;
+import bisq.cli.GrpcClient;
 
 @Slf4j
 public class Scaffold {
@@ -146,6 +151,8 @@ public Scaffold setUp() throws IOException, InterruptedException, ExecutionExcep
 
         // Verify each startup task's future is done.
         verifyStartupCompleted();
+
+        maybeRegisterDisputeAgents();
         return this;
     }
 
@@ -448,4 +455,15 @@ private void verifyNotWindows() {
         if (Utilities.isWindows())
             throw new IllegalStateException("ApiTest not supported on Windows");
     }
+
+    private void maybeRegisterDisputeAgents() {
+        if (config.hasSupportingApp(arbdaemon.name()) && config.registerDisputeAgents) {
+            log.info("Option --registerDisputeAgents=true, registering dispute agents in arbdaemon ...");
+            GrpcClient arbClient = new GrpcClient(getLoopbackAddress().getHostAddress(),
+                    arbdaemon.apiPort,
+                    config.apiPassword);
+            arbClient.registerDisputeAgent(MEDIATOR, DEV_PRIVILEGE_PRIV_KEY);
+            arbClient.registerDisputeAgent(REFUND_AGENT, DEV_PRIVILEGE_PRIV_KEY);
+        }
+    }
 }

apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java

@@ -54,6 +54,13 @@
 @Slf4j
 public class ApiTestConfig {
 
+    // Global constants
+    public static final String BSQ = "BSQ";
+    public static final String BTC = "BTC";
+    public static final String ARBITRATOR = "arbitrator";
+    public static final String MEDIATOR = "mediator";
+    public static final String REFUND_AGENT = "refundagent";
+
     // Option name constants
     static final String HELP = "help";
     static final String BASH_PATH = "bashPath";
@@ -73,6 +80,7 @@ public class ApiTestConfig {
     static final String SUPPORTING_APPS = "supportingApps";
     static final String CALL_RATE_METERING_CONFIG_PATH = "callRateMeteringConfigPath";
     static final String ENABLE_BISQ_DEBUGGING = "enableBisqDebugging";
+    static final String REGISTER_DISPUTE_AGENTS = "registerDisputeAgents";
 
     // Default values for certain options
     static final String DEFAULT_CONFIG_FILE_NAME = "apitest.properties";
@@ -105,6 +113,7 @@ public class ApiTestConfig {
     public final List<String> supportingApps;
     public final String callRateMeteringConfigPath;
     public final boolean enableBisqDebugging;
+    public final boolean registerDisputeAgents;
 
     // Immutable system configurations set in the constructor.
     public final String bitcoinDatadir;
@@ -242,6 +251,13 @@ public ApiTestConfig(String... args) {
                         .withRequiredArg()
                         .ofType(Boolean.class)
                         .defaultsTo(false);
+
+        ArgumentAcceptingOptionSpec<Boolean> registerDisputeAgentsOpt =
+                parser.accepts(REGISTER_DISPUTE_AGENTS,
+                        "Register dispute agents in arbitration daemon")
+                        .withRequiredArg()
+                        .ofType(Boolean.class)
+                        .defaultsTo(true);
         try {
             CompositeOptionSet options = new CompositeOptionSet();
 
@@ -299,6 +315,7 @@ public ApiTestConfig(String... args) {
             this.supportingApps = asList(options.valueOf(supportingAppsOpt).split(","));
             this.callRateMeteringConfigPath = options.valueOf(callRateMeteringConfigPathOpt);
             this.enableBisqDebugging = options.valueOf(enableBisqDebuggingOpt);
+            this.registerDisputeAgents = options.valueOf(registerDisputeAgentsOpt);
 
             // Assign values to special-case static fields.
             BASH_PATH_VALUE = bashPath;