From ed98cf44559e2049d5bf59b4ef14f9a6f741be88 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 20 Oct 2021 11:14:15 +0900
Subject: [PATCH] Bump joinmarket to fix receive-payjoin

---
 .../docker-fragments/opt-add-joinmarket.yml          |  7 ++++---
 jm.sh                                                | 12 +++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml
index c7b9080..444f664 100644
--- a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml
@@ -3,8 +3,8 @@ version: "3"
 services:
   joinmarket:
     container_name: joinmarket
-    image: btcpayserver/joinmarket:0.9.1
-    restart: 'no'
+    image: btcpayserver/joinmarket:0.9.3-devbtcpay
+    restart: unless-stopped
     environment:
       READY_FILE: /root/.nbxplorer/btc_fully_synched
       ENSURE_WALLET: 1
@@ -25,7 +25,8 @@ services:
       - "nbxplorer_datadir:/root/.nbxplorer"
       - "tor_datadir:/home/tor/.tor"
     expose:
-      - 62601
+      - 62601 # obwatch
+      - 8080 # payjoin server
     links:
       - bitcoind
 
diff --git a/jm.sh b/jm.sh
index a7a1fa9..eb7019a 100755
--- a/jm.sh
+++ b/jm.sh
@@ -13,6 +13,7 @@ Tooling to setup your joinmarket yield generator
     bash: Open an interactive bash session in the joinmarket container
     receive-payjoin: Receive a payjoin payment
     sendpayment: Send a payjoin through coinjoin (password needed)
+    reset-config: Reset the configuration to its default value
 
 Example:
     * jm.sh wallet-tool-generate
@@ -21,6 +22,7 @@ Example:
     * jm.sh receive-payjoin <amount>
     * jm.sh sendpayment <amount> <address>
     * jm.sh wallet-tool history
+    * jm.sh reset-config
     * jm.sh bash
 
 See https://github.com/btcpayserver/btcpayserver-docker/tree/master/docs/joinmarket.md for more information.
@@ -34,6 +36,11 @@ while (( "$#" )); do
       shift 1
       break;
       ;;
+    reset-config)
+      CMD="$1"
+      shift 1
+      break;
+      ;;
     wallet-tool)
       CMD="$1"
       shift 1
@@ -89,7 +96,10 @@ else
     elif [[ "$CMD" == "set-wallet" ]]; then
         docker exec joinmarket set-wallet.sh "$@"
         docker restart joinmarket
-    elif [[ "$CMD" == "bash" ]]; then    
+    elif [[ "$CMD" == "reset-config" ]]; then
+        docker exec -ti joinmarket bash -c 'rm -f "$CONFIG"'
+        docker restart joinmarket
+    elif [[ "$CMD" == "bash" ]]; then
         docker exec -ti joinmarket exec-wrapper.sh bash "$@"
     else
         display_help