#3031 alby merge to dev

README.md

@@ -173,6 +173,7 @@ You can connect the following Wallet-Apps to your RaspiBlitz:
 * **Fully Noded** (iOS) [details](https://apps.apple.com/us/app/fully-noded/id1436425586)
 * **SendMany** (Android) [details](https://github.com/fusion44/sendmany/blob/master/README.md)
 * **Sphinx Chat App** (Android & iOS) [details](https://sphinx.chat)
+* **Alby** (Desktop) [details](https://getalby.com)
 
 Also many more features like Touchscreen, Channels Autopilot, Backup, DynDNS, SSH-Tunneling, UPS Support, ...
 

home.admin/99connectMenu.sh

@@ -26,6 +26,7 @@ fi
 OPTIONS+=(${network}RPC "Connect Specter Desktop or JoinMarket")
 OPTIONS+=(BISQ "Connect Bisq to this node")
 if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ]; then
+  OPTIONS+=(ALBY "Connect Alby to this node")
   OPTIONS+=(EXPORT "Get Macaroons and TLS.cert")
   OPTIONS+=(RESET "Recreate LND Macaroons & tls.cert")
   OPTIONS+=(SYNC "Sync Macaroons & tls.cert with Apps/Users")
@@ -68,6 +69,22 @@ case $CHOICE in
     sudo /home/admin/config.scripts/lnd.export.sh
     exit 0;;
 
+  ALBY)
+      websiteLink="https://getalby.com"
+      sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_alby.png
+    whiptail --title "Install Alby on your web browser" \
+    --yes-button "Continue" \
+    --no-button "Website" \
+    --yesno "Visit the website and install the browser extension then click --> Continue." 12 65
+    if [ $? -eq 1 ]; then
+    whiptail --title " Website Link " --msgbox "\
+To install app open the following link:\n
+${websiteLink}\n" 11 70
+    fi
+    /home/admin/config.scripts/bonus.lndconnect.sh alby tor
+    exit 0;
+  ;;
+
   BISQ)
     OPTIONS=()
     if [ $(grep -c "peerbloomfilters=1" < /mnt/hdd/bitcoin/bitcoin.conf) -eq 0 ]||\

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

@@ -4,7 +4,7 @@
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
  echo "# config script to connect mobile apps with lnd connect"
  echo "# will autodetect dyndns, sshtunnel or TOR"
- echo "# bonus.lndconnect.sh [zap-ios|zap-android|zeus-ios|zeus-android|shango-ios|shango-android|sendmany-android|fullynoded-lnd] [?ip|tor] [?key-value]"
+ echo "# bonus.lndconnect.sh [zap-ios|zap-android|zeus-ios|zeus-android|shango-ios|shango-android|sendmany-android|fullynoded-lnd|alby] [?ip|tor] [?key-value]"
  exit 1
 fi
 
@@ -53,7 +53,7 @@ if [ ${#error} -eq 0 ]; then
   ip2torGRPC_PORT="${port}"
 fi
 
-#### ADAPT PARAMETERS BASED TARGETWALLET 
+#### ADAPT PARAMETERS BASED TARGETWALLET
 
 # defaults
 host=""
@@ -78,8 +78,8 @@ if [ "${targetWallet}" = "zap-ios" ]; then
     forceTOR=0
     host="${ip2torGRPC_IP}"
     port="${ip2torGRPC_PORT}"
-  fi  
+  fi
-  
+
 elif [ "${targetWallet}" = "zap-android" ]; then
   connectInfo="- start the Zap Wallet --> SETUP WALLET\n  or choose new Wallet in app menu\n- scan the QR code \n- confirm host address"
   # ZAP uses gRPC ports
@@ -90,7 +90,7 @@ elif [ "${targetWallet}" = "zap-android" ]; then
     forceTOR=1
     host="${ip2torGRPC_IP}"
     port="${ip2torGRPC_PORT}"
-  fi 
+  fi
 
 elif [ "${targetWallet}" = "zeus-ios" ]; then
 
@@ -108,6 +108,14 @@ elif [ "${targetWallet}" = "zeus-android" ]; then
     host=$(sudo cat /mnt/hdd/tor/lndrest8080/hostname)
     connectInfo="- start the Zeus Wallet --> lndconnect\n- scan the QR code \n- activate 'Tor' option \n- activate 'Certification Verification' option\n- save Node Config"
 
+elif [ "${targetWallet}" = "alby" ]; then
+
+    port="8080"
+    usingIP2TOR="LND-REST-API"
+    forceTOR=1
+    host=$(sudo cat /mnt/hdd/tor/lndrest8080/hostname)
+    connectInfo="- open Alby --> enter password \n- select RaspiBlitz from connectors \n- enter lndconnect URL \n- Continue \n- Alby companion app required for Tor"
+
 elif [ "${targetWallet}" = "sendmany-android" ]; then
 
   connector="lndconnect"
@@ -127,7 +135,7 @@ elif [ "${targetWallet}" = "sendmany-android" ]; then
     forceTOR=0
     host="${ip2torGRPC_IP}"
     port="${ip2torGRPC_PORT}"
-  fi  
+  fi
 
 elif [ "${targetWallet}" = "fullynoded-lnd" ]; then
 
@@ -176,7 +184,7 @@ if [ ${forceTOR} -eq 1 ]; then
   fi
   echo "# TOR --> host ${host} port ${port}"
 fi
-  
+
 # tunnel thru SSH-Reverse-Tunnel if activated for that port
 if [ ${#sshtunnel} -gt 0 ]; then
   isForwarded=$(echo ${sshtunnel} | grep -c "${port}<")