update bitcoin-scripts to latest, shellcheck fmt (#120)

scripts/menu.tools.sh

@@ -4,30 +4,30 @@ source /home/joinmarket/joinin.conf
 source /home/joinmarket/_functions.sh
 
 function installBitcoinScripts {
-  if [ ! -d "/home/bitcoin/bitcoin-scripts" ];then
+  if [ ! -d "/home/bitcoin/bitcoin-scripts" ]; then
     cd /home/bitcoin/ || exit 1
     sudo -u bitcoin git clone https://github.com/kristapsk/bitcoin-scripts.git
     cd bitcoin-scripts || exit 1
     # from https://github.com/kristapsk/bitcoin-scripts/commits/master
-    sudo -u bitcoin git checkout 9919d7410106aa99e64b605b4c7e836fe629d010
-    sudo -u bitcoin chmod +x *.sh
+    sudo -u bitcoin git checkout 435dc29f377f0563c3b94390fcfe3ba5df3b6f11
+    sudo -u bitcoin chmod +x ./*.sh
   fi
 }
 
 function listCJcandidateTXNs {
-clear
-cjTXNs=$(grep "Found Joinmarket coinjoin transaction" < \
-  /home/joinmarket/.joinmarket/candidates.txt| awk '{print $5}')
-installBitcoinScripts
-getRPC
-for i in $cjTXNs; do
-  sudo -u bitcoin /home/bitcoin/bitcoin-scripts/checktransaction.sh \
-    -rpcwallet=$rpc_wallet $i
-done
+  clear
+  cjTXNs=$(grep "Found Joinmarket coinjoin transaction" < \
+    /home/joinmarket/.joinmarket/candidates.txt | awk '{print $5}')
+  installBitcoinScripts
+  getRPC
+  for i in $cjTXNs; do
+    sudo -u bitcoin /home/bitcoin/bitcoin-scripts/checktransaction.sh \
+      -rpcwallet=$rpc_wallet $i
+  done
 }
 
 function installBoltzmann {
-  if [ ! -f "/home/joinmarket/boltzmann/bvenv/bin/activate" ] ; then
+  if [ ! -f "/home/joinmarket/boltzmann/bvenv/bin/activate" ]; then
     cd /home/joinmarket/ || exit 1
     git clone https://code.samourai.io/oxt/boltzmann.git
     cd boltzmann || exit 1
@@ -45,9 +45,9 @@ function dialog_inputbox {
   trap 'rm -f "$inputdata"' EXIT
   inputdata=$(mktemp -p /dev/shm/)
   dialog --backtitle "$title" \
-  --title "$title" \
-  --inputbox "
-  $text" $height $width 2> "$inputdata"
+    --title "$title" \
+    --inputbox "
+  $text" $height $width 2>"$inputdata"
   openMenuIfCancelled $?
   dialog_output=$(cat $inputdata)
 }
@@ -56,13 +56,13 @@ function getQRstring {
   trap 'rm -f "$QRstring"' EXIT
   QRstring=$(mktemp -p /dev/shm/)
   dialog --backtitle "Display a QR code from any text" \
-  --title "Enter any text" \
-  --inputbox "
-  Enter the text to be shown as a QR code" 9 71 2> "$QRstring"
+    --title "Enter any text" \
+    --inputbox "
+  Enter the text to be shown as a QR code" 9 71 2>"$QRstring"
   openMenuIfCancelled $?
 }
 
-isLocalBitcoinCLI=$(sudo -u bitcoin bitcoin-cli -version|grep -c "Bitcoin Core RPC client")
+isLocalBitcoinCLI=$(sudo -u bitcoin bitcoin-cli -version | grep -c "Bitcoin Core RPC client")
 isTxindex=$(sudo -u bitcoin cat /home/bitcoin/.bitcoin/bitcoin.conf | grep -c "txindex=1")
 
 # BASIC MENU INFO
@@ -78,29 +78,32 @@ BACKTITLE="JoininBox GUI"
 if [ "${runningEnv}" = standalone ]; then
   OPTIONS+=(
     SPECTER "Specter Desktop options")
-  HEIGHT=$((HEIGHT+1))
-  CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))
+  HEIGHT=$((HEIGHT + 1))
+  CHOICE_HEIGHT=$((CHOICE_HEIGHT + 1))
 fi
 OPTIONS+=(
-    QR "Display a QR code from any text"
-    CUSTOMRPC "Run a custom bitcoin RPC with curl"
-    CJFINDER "Scan blocks for JoinMarket coinjoins")
-if [ "$isLocalBitcoinCLI" -gt 0 ] && [ "$isTxindex" -gt 0 ];then
+  QR "Display a QR code from any text"
+  CUSTOMRPC "Run a custom bitcoin RPC with curl"
+  CJFINDER "Scan blocks for JoinMarket coinjoins")
+if [ "$isLocalBitcoinCLI" -gt 0 ] && [ "$isTxindex" -gt 0 ]; then
   OPTIONS+=(
     CHECKTXN "CLI transaction explorer")
-      HEIGHT=$((HEIGHT+1)); CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))
-  if [ -f /home/joinmarket/.joinmarket/candidates.txt ];then
-  OPTIONS+=(
-    LISTCJS "List filtered coinjoin transactions")
-      HEIGHT=$((HEIGHT+1)); CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))
+  HEIGHT=$((HEIGHT + 1))
+  CHOICE_HEIGHT=$((CHOICE_HEIGHT + 1))
+  if [ -f /home/joinmarket/.joinmarket/candidates.txt ]; then
+    OPTIONS+=(
+      LISTCJS "List filtered coinjoin transactions")
+    HEIGHT=$((HEIGHT + 1))
+    CHOICE_HEIGHT=$((CHOICE_HEIGHT + 1))
   fi
 fi
-  OPTIONS+=(
-    BOLTZMANN "Analyze the entropy of a transaction")
+OPTIONS+=(
+  BOLTZMANN "Analyze the entropy of a transaction")
 if [ "${runningEnv}" != mynode ]; then
   OPTIONS+=(
     PASSWORD "Change the ssh password")
-      HEIGHT=$((HEIGHT+1)); CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))
+  HEIGHT=$((HEIGHT + 1))
+  CHOICE_HEIGHT=$((CHOICE_HEIGHT + 1))
 fi
 if [ "${runningEnv}" != standalone ]; then
   if grep -Eq "^joinmarketSSH=off" /home/joinmarket/joinin.conf; then
@@ -110,132 +113,144 @@ if [ "${runningEnv}" != standalone ]; then
   fi
   OPTIONS+=(
     SSH "$sshAction ssh access with the joinmarket user")
-      HEIGHT=$((HEIGHT+1)); CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))
+  HEIGHT=$((HEIGHT + 1))
+  CHOICE_HEIGHT=$((CHOICE_HEIGHT + 1))
 fi
 OPTIONS+=(
-    LOGS "Show the bitcoind logs on $network"
-    API "Start the jmwalletd.py as a systemd service"
-    FULLYNODED "Connect Fully Noded with a QRcode")
+  LOGS "Show the bitcoind logs on $network"
+  API "Start the jmwalletd.py as a systemd service"
+  FULLYNODED "Connect Fully Noded with a QRcode")
 
 CHOICE=$(dialog \
-          --clear \
-          --backtitle "$BACKTITLE" \
-          --title "$TITLE" \
-          --ok-label "Select" \
-          --cancel-label "Back" \
-          --menu "$MENU" \
-            $HEIGHT $WIDTH $CHOICE_HEIGHT \
-            "${OPTIONS[@]}" \
-            2>&1 >/dev/tty)
+  --clear \
+  --backtitle "$BACKTITLE" \
+  --title "$TITLE" \
+  --ok-label "Select" \
+  --cancel-label "Back" \
+  --menu "$MENU" \
+  $HEIGHT $WIDTH $CHOICE_HEIGHT \
+  "${OPTIONS[@]}" \
+  2>&1 >/dev/tty)
 
 case $CHOICE in
-  QR)
-    getQRstring
-    datastring=$(cat $QRstring)
-    clear
-    echo
-    echo "Displaying the text:"
-    echo "$datastring"
-    echo
-    if [ ${#datastring} -eq 0 ]; then
-      echo "# Error='missing string'"
-    fi
-    qrencode -t ANSIUTF8 "${datastring}"
-    echo "(To shrink QR code: MacOS press CMD- / Linux press CTRL-)"
-    echo
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  CUSTOMRPC)
-    echo "***DANGER ZONE***"
-    echo "# See the options at https://developer.bitcoin.org/reference/rpc/"
-    echo
-    echo "# Input which method (command) to use"
-    read method
-    echo "# Input the parameter(s) (optional)"
-    read params
-    customRPC "# custom RPC" "$method" "$params"
-    echo
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  SPECTER)
-    /home/joinmarket/standalone/menu.specter.sh;;
-  PASSWORD)
-    sudo /home/joinmarket/set.password.sh;;
-  LOGS)
-    showBitcoinLogs;;
-  CHECKTXN)
-    dialog_inputbox "CLI transaction explorer" "\nUsing: https://github.com/kristapsk/bitcoin-scripts\n\nPaste a TXID to check" 11 71
-    clear
-    installBitcoinScripts
-    getRPC
-    echo
-    echo "# Running the command:"
-    echo "sudo -u bitcoin /home/bitcoin/bitcoin-scripts/checktransaction.sh -rpcwallet=$rpc_wallet $dialog_output"
-    echo
-    sudo -u bitcoin /home/bitcoin/bitcoin-scripts/checktransaction.sh -rpcwallet=$rpc_wallet $dialog_output
-    echo
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  BOLTZMANN)
-    dialog_inputbox "Boltzmann transaction entropy analysis" "\nUsing: https://code.samourai.io/oxt/boltzmann\n\nPaste a TXID to analyze" 11 71
-    clear
-    installBoltzmann
-    python /home/joinmarket/start.boltzmann.py --txid=$dialog_output
-    echo
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  CJFINDER)
-    BLOCKHEIGHT=$(customRPC "" "getblockchaininfo" ""\
-                  |grep blocks|awk '{print $2}'|cut -d, -f1)
-    dialog_inputbox "snicker-finder.py" \
+QR)
+  getQRstring
+  datastring=$(cat $QRstring)
+  clear
+  echo
+  echo "Displaying the text:"
+  echo "$datastring"
+  echo
+  if [ ${#datastring} -eq 0 ]; then
+    echo "# Error='missing string'"
+  fi
+  qrencode -t ANSIUTF8 "${datastring}"
+  echo "(To shrink QR code: MacOS press CMD- / Linux press CTRL-)"
+  echo
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+CUSTOMRPC)
+  echo "***DANGER ZONE***"
+  echo "# See the options at https://developer.bitcoin.org/reference/rpc/"
+  echo
+  echo "# Input which method (command) to use"
+  read method
+  echo "# Input the parameter(s) (optional)"
+  read params
+  customRPC "# custom RPC" "$method" "$params"
+  echo
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+SPECTER)
+  /home/joinmarket/standalone/menu.specter.sh
+  ;;
+PASSWORD)
+  sudo /home/joinmarket/set.password.sh
+  ;;
+LOGS)
+  showBitcoinLogs
+  ;;
+CHECKTXN)
+  dialog_inputbox "CLI transaction explorer" "\nUsing: https://github.com/kristapsk/bitcoin-scripts\n\nPaste a TXID to check" 11 71
+  clear
+  installBitcoinScripts
+  getRPC
+  echo
+  echo "# Running the command:"
+  echo "sudo -u bitcoin /home/bitcoin/bitcoin-scripts/checktransaction.sh -rpcwallet=$rpc_wallet $dialog_output"
+  echo
+  sudo -u bitcoin /home/bitcoin/bitcoin-scripts/checktransaction.sh -rpcwallet=$rpc_wallet $dialog_output
+  echo
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+BOLTZMANN)
+  dialog_inputbox "Boltzmann transaction entropy analysis" "\nUsing: https://code.samourai.io/oxt/boltzmann\n\nPaste a TXID to analyze" 11 71
+  clear
+  installBoltzmann
+  python /home/joinmarket/start.boltzmann.py --txid=$dialog_output
+  echo
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+CJFINDER)
+  BLOCKHEIGHT=$(customRPC "" "getblockchaininfo" "" |
+    grep blocks | awk '{print $2}' | cut -d, -f1)
+  dialog_inputbox "snicker-finder.py" \
     "\nUsing: https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/\
 master/scripts/snicker/snicker-finder.py\n\n\
 Note that scanning the blocks is slow.\n\
 Current blockheight is: $BLOCKHEIGHT\n\
 Input how many previous blocks from the tip you want to scan" 14 108
-    clear
-    echo
-    echo "Running the command:"
-    echo "python snicker/snicker-finder.py -j $((BLOCKHEIGHT - dialog_output)) \
+  clear
+  echo
+  echo "Running the command:"
+  echo "python snicker/snicker-finder.py -j $((BLOCKHEIGHT - dialog_output)) \
 -f /home/joinmarket/.joinmarket/candidates.txt"
+  echo
+  python /home/joinmarket/joinmarket-clientserver/scripts/snicker/snicker-finder.py -j $((BLOCKHEIGHT - dialog_output)) -f /home/joinmarket/.joinmarket/candidates.txt
+  echo
+  echo "The transaction details are saved in /home/joinmarket/.joinmarket/candidates.txt"
+  echo "To display the file in the terminal use:"
+  echo "'cat /home/joinmarket/.joinmarket/candidates.txt'"
+  if [ $isLocalBitcoinCLI -gt 0 ]; then
+    echo "or menu -> TOOLS -> CHECKTXN for a CLI transaction explorer"
     echo
-    python /home/joinmarket/joinmarket-clientserver/scripts/snicker/snicker-finder.py\
-    -j $((BLOCKHEIGHT - dialog_output)) -f /home/joinmarket/.joinmarket/candidates.txt
-    echo
-    echo "The transaction details are saved in /home/joinmarket/.joinmarket/candidates.txt"
-    echo "To display the file in the terminal use:"
-    echo "'cat /home/joinmarket/.joinmarket/candidates.txt'"
-    if [ $isLocalBitcoinCLI -gt 0 ];then
-      echo "or menu -> TOOLS -> CHECKTXN for a CLI transaction explorer"
-      echo
-      echo "Press ENTER for an overview of the JoinMarket coinjoins found with CHECKTXN"
-      read key
-      listCJcandidateTXNs
-    fi
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  LISTCJS)
+    echo "Press ENTER for an overview of the JoinMarket coinjoins found with CHECKTXN"
+    read key
     listCJcandidateTXNs
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  SSH)
-    if [ $sshAction = "Disable" ];then
-      sudo /home/joinmarket/set.ssh.sh off
-    elif [ $sshAction = "Enable" ];then
-      sudo /home/joinmarket/set.ssh.sh on
-    fi
-    echo
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  API)
-    clear
-    echo
-    /home/joinmarket/install.joinmarket-api.sh on
-    echo "Press ENTER to return to the menu..."
-    read key;;
-  FULLYNODED)
-    clear
-    /home/joinmarket/install.joinmarket-api.sh connect
-    echo "Press ENTER to return to the menu..."
-    read key;;
+  fi
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+LISTCJS)
+  listCJcandidateTXNs
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+SSH)
+  if [ $sshAction = "Disable" ]; then
+    sudo /home/joinmarket/set.ssh.sh off
+  elif [ $sshAction = "Enable" ]; then
+    sudo /home/joinmarket/set.ssh.sh on
+  fi
+  echo
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+API)
+  clear
+  echo
+  /home/joinmarket/install.joinmarket-api.sh on
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
+FULLYNODED)
+  clear
+  /home/joinmarket/install.joinmarket-api.sh connect
+  echo "Press ENTER to return to the menu..."
+  read key
+  ;;
 esac