Merge branch 'v1.6' of https://github.com/rootzoll/raspiblitz into v1.6

README.md

@@ -820,7 +820,7 @@ This is common way to update your RaspiBlitz. Choose this option to prepeare you
 
 Sometimes there is a new LND release that has some breaking changes that once you updated the LND databse that cannot be reversed (like the update from 0.9.2 to 0.10.0). Then RaspiBlitz offers you an optional update ... this is where you then can update LND.
 
-If oyu choose this you get the option to do this `VERIFIED` that means it offers you the optional LND update we tested the raspiBlitz with or `RECKLESS` which will just grab the latest LND release from the GitHub releases page (also Release Candidates) and install it with no further garantees and verification checks - this is for people that run nodes to test new releases and how they work with existing RaspiBlitz apps. 
+If you choose this you get the option to do this `VERIFIED` that means it offers you the optional LND update we tested the raspiBlitz with or `RECKLESS` which will just grab the latest LND release from the GitHub releases page (also Release Candidates) and install it with no further garantees and verification checks - this is for people that run nodes to test new releases and how they work with existing RaspiBlitz apps.
 
 #### PATCH: Patch RaspiBlitz code
 

home.admin/config.scripts/bonus.cryptoadvance-specter.sh

@@ -92,9 +92,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   if [ ${isInstalled} -eq 0 ]; then
 
     echo "#    --> Enable wallets in Bitcoin Core"
-    sudo sed -i "s/^disablewallet=.*/disablewallet=0/g" /home/bitcoin/.bitcoin/bitcoin.conf
-    sudo service bitcoind stop
-    sudo service bitcoind start
+    /home/admin/config.scripts/network.wallet.sh on
 
     echo "#    --> Installing prerequisites"
     sudo apt install -y libusb-1.0.0-dev libudev-dev virtualenv

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

@@ -85,6 +85,11 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     chown -R joinmarket:joinmarket /mnt/hdd/app-data/.joinmarket
     ln -s /mnt/hdd/app-data/.joinmarket /home/joinmarket/ 2>/dev/null
     chown -R joinmarket:joinmarket /home/joinmarket/.joinmarket
+    # specify wallet.dat in old config for multiwallet for multiwallet support
+    if [ -f "/home/joinmarket/.joinmarket/joinmarket.cfg" ] ; then
+      sudo -u joinmarket sed -i "s/^rpc_wallet_file =.*/rpc_wallet_file = wallet.dat/g" /home/joinmarket/.joinmarket/joinmarket.cfg
+      echo "Specified to use wallet.dat in the recovered joinmarket.cfg"
+    fi
 
     # install joinmarket
     cd /home/joinmarket
@@ -169,6 +174,8 @@ if [ ! -f "/home/joinmarket/.joinmarket/joinmarket.cfg" ] ; then
   PASSWORD_B=\$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcpassword | cut -c 13-)
   sed -i "s/^rpc_password =.*/rpc_password = \$PASSWORD_B/g" /home/joinmarket/.joinmarket/joinmarket.cfg
   echo "Filled the bitcoin RPC password (PASSWORD_B)"
+  sed -i "s/^rpc_wallet_file =.*/rpc_wallet_file = wallet.dat/g" /home/joinmarket/.joinmarket/joinmarket.cfg
+  echo "Using the bitcoind wallet: wallet.dat"
   #communicate with IRC servers via Tor
   sed -i "s/^host = irc.darkscience.net/#host = irc.darkscience.net/g" /home/joinmarket/.joinmarket/joinmarket.cfg
   sed -i "s/^#host = darksci3bfoka7tw.onion/host = darksci3bfoka7tw.onion/g" /home/joinmarket/.joinmarket/joinmarket.cfg

home.admin/config.scripts/network.wallet.sh

@@ -34,15 +34,27 @@ fi
 # switch on
 ###################
 if [ "$1" = "1" ] || [ "$1" = "on" ]; then
+  
+  if ! grep -Eq "^wallet=wallet.dat" /mnt/hdd/${network}/${network}.conf; then
+    echo "Enable the multiwallet feature in ${network} core and specify wallet.dat" 
+    echo "wallet=wallet.dat" | sudo tee -a /mnt/hdd/${network}/${network}.conf >/dev/null
+    restartService=1
+  else
+    echo "Multiwallet is active and wallet.dat is used." 
+    restartService=0
+  fi
   if [ ${disablewallet} == 1 ]; then
     sudo sed -i "s/^disablewallet=.*/disablewallet=0/g" /mnt/hdd/${network}/${network}.conf
-    echo "switching the ${network} core wallet on and restarting ${network}d"
-    sudo systemctl restart ${network}d
-    exit 0
+    echo "Switching the ${network} core wallet on"
+    restartService=1
   else
     echo "The ${network} core wallet is already on"    
-    exit 0
   fi
+  if [ ${restartService} == 1 ]; then
+    echo "Restarting ${network}d"
+    sudo systemctl restart ${network}d
+  fi
+  exit 0
 fi