make sure Fully Noded TOR port is default

home.admin/97addMobileWallet.sh

@@ -64,7 +64,8 @@ if [ "${runBehindTor}" = "on" ]; then
   OPTIONS=(ZAP_IOS "Zap Wallet (iOS) over TOR" \
         ZAP_ANDROID "Zap Wallet (Android) over TOR" \
         ZEUS_IOS "Zeus Wallet (iOS) over TOR" \
-        ZEUS_ANDROID "Zeus Wallet (Android) over TOR"
+        ZEUS_ANDROID "Zeus Wallet (Android) over TOR" \
+		FULLY_NODED "Fully Noded (IOS) over TOR"
 	)
 fi
 
@@ -162,4 +163,18 @@ case $CHOICE in
   	  /home/admin/config.scripts/bonus.lndconnect.sh REST
   	  exit 1;
   	;;
+  FULLY_NODED)
+      appstoreLink="https://testflight.apple.com/join/PuFnSqgi"
+      /home/admin/config.scripts/blitz.lcd.sh qr ${appstoreLink}
+	  whiptail --title "Install Fully Noded on your iOS device" \
+		--yes-button "continue" \
+		--no-button "link as QR code" \
+		--yesno "At the moment this app is in public beta testing:\n\n${appstoreLink}\n\nJoin testing and follow ALL instructions.\n\nWhen installed and started -> continue" 10 60
+	  if [ $? -eq 1 ]; then
+	    /home/admin/config.scripts/blitz.lcd.sh qr-console ${appstoreLink}
+	  fi
+	  /home/admin/config.scripts/blitz.lcd.sh hide
+  	  /home/admin/config.scripts/bonus.fullynoded.sh
+  	  exit 1;
+  	;;
 esac

home.admin/97addMobileWalletFullyNoded.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-clear
-
-./config.scripts/network.wallet.sh on
-./config.scripts/network.txindex.sh on
-./config.scripts/internet.hiddenservice.sh bitcoinrpc 8332 8332
-
-whiptail --title 'Connect Fully Noded' --yes-button='Show QR code' --no-button='Cancel' --yesno "
-Find the links to download Fully Noded here:
-https://github.com/Fonta1n3/FullyNoded#join-the-testflight\n
-                       ***WARNING*** \n
-The QR code to allow connecting to your node remotely will show on your computer screen.\
- Be aware of the windows, cameras, mirrors and bystanders!
-" 15 62
-
-if [ $? -eq 0 ]; then
-  # extract RPC credentials from bitcoin.conf - store only in var
-  RPC_USER=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcuser | cut -c 9-)
-  PASSWORD_B=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcpassword | cut -c 13-)
-  hiddenService=$(sudo cat /mnt/hdd/tor/bitcoinrpc/hostname)
-  
-  # btcstandup://<rpcuser>:<rpcpassword>@<hidden service hostname>:<hidden service port>/?label=<optional node label> 
-  quickConnect="btcstandup://$RPC_USER:$PASSWORD_B@$hiddenService:8332/?label=$hostname"
-  echo ""
-  echo "scan the QR Code with Fully Noded to connect to your node:"
-  qrencode -t ANSI256 $quickConnect
-  echo "Press ENTER to return to the menu"
-  read key
-else
-  ech0 "pairing cancelled"
-  exit0
-fi

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

@@ -0,0 +1,23 @@
+#!/bin/bash
+clear
+
+# load raspiblitz config data
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
+
+# make sure txindex and wallet of bitcoin is on
+/home/admin/config.scripts/network.wallet.sh on
+/home/admin/config.scripts/network.txindex.sh on
+
+# extract RPC credentials from bitcoin.conf - store only in var
+RPC_USER=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcuser | cut -c 9-)
+PASSWORD_B=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcpassword | cut -c 13-)
+hiddenService=$(sudo cat /mnt/hdd/tor/bitcoinrpc/hostname)
+
+# btcstandup://<rpcuser>:<rpcpassword>@<hidden service hostname>:<hidden service port>/?label=<optional node label> 
+quickConnect="btcstandup://$RPC_USER:$PASSWORD_B@$hiddenService:8332/?label=$hostname"
+echo ""
+echo "scan the QR Code with Fully Noded to connect to your node:"
+qrencode -t ANSI256 $quickConnect
+echo "Press ENTER to return to the menu"
+read key

home.admin/config.scripts/internet.tor.sh

@@ -266,6 +266,8 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo mkdir /mnt/hdd/tor/web80 2>/dev/null
     sudo mkdir /mnt/hdd/tor/lnd9735 2>/dev/null
     sudo mkdir /mnt/hdd/tor/lndrpc9735 2>/dev/null
+    sudo mkdir /mnt/hdd/tor/lndrest8080 2>/dev/null
+    sudo mkdir /mnt/hdd/tor/bitcoinrpc 2>/dev/null
     sudo chmod -R 700 /mnt/hdd/tor
     sudo chown -R bitcoin:bitcoin /mnt/hdd/tor 
     cat > ./torrc <<EOF
@@ -294,9 +296,13 @@ CookieAuthFileGroupReadable 1
 HiddenServiceDir /mnt/hdd/tor/web80/
 HiddenServicePort 80 127.0.0.1:80
 
+# Hidden Service for WEB ADMIN INTERFACE
+HiddenServiceDir /mnt/hdd/tor/bitcoinrpc/
+HiddenServicePort 8332 127.0.0.1:8332
+ 
 # Hidden Service for LND RPC
 HiddenServiceDir /mnt/hdd/tor/lndrpc10009/
-HiddenServicePort 80 127.0.0.1:10009
+HiddenServicePort 10009 127.0.0.1:10009
 
 # Hidden Service for LND REST
 HiddenServiceDir /mnt/hdd/tor/lndrest8080/