joinmarket v0.9.11 in joininbox v0.8.3, jam 0.2.0, build improvements (#4443)

* joinmarket v0.9.11 in joininbox v0.8.3, build improvements

* jam update to v0.2.0

* jam: change the onion_serving_port to avoid collusion with LND REST port

discussed in:
https://github.com/joinmarket-webui/jam/issues/723

CHANGES.md

@@ -10,7 +10,9 @@
 - Update: Electrum Server in Rust (electrs) v0.10.2 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0102-dec-31-2023)
 - Update: Fulcrum Electrum server v1.9.7 (CLI install script) [details](https://github.com/cculianu/Fulcrum/releases/tag/v1.9.7)
 - Update: BTC-RPC-Explorer v3.4.0 [details](https://github.com/janoside/btc-rpc-explorer/blob/master/CHANGELOG.md#v340)
-- Update: JoininBox v0.8.2 [details](https://github.com/openoms/joininbox/releases/tag/v0.8.2)
+- Update: JoinMarket v0.9.11 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.9.11)
+- Update: Jam (JoinMarket Web UI) v0.2.0 [details](https://github.com/joinmarket-webui/jam/releases/tag/v0.2.0)
+- Update: JoininBox v0.8.3 [details](https://github.com/openoms/joininbox/releases/tag/v0.8.3)
 - Update: LND v0.17.3-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.17.3-beta)
 - Update: RTL v0.14.1 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.14.1)
 - Update: Thunderhub v0.13.30 [details](https://github.com/apotdevin/thunderhub/releases/tag/v0.13.30)

home.admin/config.scripts/bonus.jam.sh

@@ -2,7 +2,7 @@
 
 # https://github.com/joinmarket-webui/jam
 
-WEBUI_VERSION=0.1.6
+WEBUI_VERSION=0.2.0
 REPO=joinmarket-webui/jam
 USERNAME=jam
 HOME_DIR=/home/$USERNAME
@@ -280,6 +280,8 @@ if [ "$1" = "precheck" ]; then
   sed -i "s/#max_cj_fee_abs = x/max_cj_fee_abs = $(shuf -i 5000-10000 -n1)/g" /home/joinmarket/.joinmarket/joinmarket.cfg
   # max_cj_fee_rel between 0.01 - 0.03%
   sed -i "s/#max_cj_fee_rel = x/max_cj_fee_rel = 0.000$((RANDOM%3+1))/g" /home/joinmarket/.joinmarket/joinmarket.cfg
+  # change the onion_serving_port toavoid collusion with LND REST port
+  sed -i "s#^onion_serving_port = 8080#onion_serving_port = 8090#g" /home/joinmarket/.joinmarket/joinmarket.cfg
   exit 0
 fi
 

home.admin/config.scripts/bonus.joinmarket.sh

@@ -6,7 +6,7 @@
 # https://github.com/openoms/joininbox
 
 # https://github.com/openoms/joininbox/tags
-JBTAG="v0.8.2" # installs JoinMarket v0.9.10
+JBTAG="v0.8.3" # installs JoinMarket v0.9.11
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
@@ -120,11 +120,19 @@ if [ "$1" = "install" ]; then
     # install tmux
     apt -y install tmux
 
+    echo
     echo "##############################################"
     echo "# Install JoinMarket and configure JoininBox #"
     echo "##############################################"
     echo
-    if sudo -u joinmarket /home/joinmarket/install.joinmarket.sh -i install; then
+    # install joinmarket using the joininbox install script
+    if [ "${uname-m}" = x86_64 ]; then
+      qtgui=true
+    else
+      # no qtgui on arm
+      qtgui=false
+    fi
+    if sudo -u joinmarket /home/joinmarket/install.joinmarket.sh -i install -q $qtgui; then
       echo "# Installed JoinMarket"
       echo "# Run: 'sudo /home/admin/config.scripts/bonus.joinmarket.sh on' to configure and switch on"
     else
@@ -155,7 +163,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   if [ -f /home/joinmarket/start.joininbox.sh ]; then
     echo "# Ok, Joininbox is present"
   else
-    sudo /home/admin/config.scripts/bonus.joinmarket.sh install
+    sudo /home/admin/config.scripts/bonus.joinmarket.sh install || exit 1
   fi
 
   # store JoinMarket data on HDD
@@ -180,7 +188,6 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   echo "
 if [ -f \"/home/joinmarket/joinmarket-clientserver/jmvenv/bin/activate\" ]; then
   . /home/joinmarket/joinmarket-clientserver/jmvenv/bin/activate
-  /home/joinmarket/joinmarket-clientserver/jmvenv/bin/python -c \"import PySide2\"
   cd /home/joinmarket/joinmarket-clientserver/scripts/
 fi
 # shortcut commands