Bump joinmarket to fix receive-payjoin

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
 

docs/joinmarket.md

@@ -107,6 +107,14 @@ supervisorctl start yg-privacyenhanced
 
 *** Note that services will NOT be restarted automatically if the container restart. ***
 
+If you want to automatically restart the service when the container restart,
+
+```bash
+vim $AUTO_START
+```
+
+Then remove the comment `#` in front of the service name you want to automatically restart.
+
 ## OB-Watcher
 
 The `ob-watcher` service allows you to [see an order book](https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/docs/orderbook.md).

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