diff --git a/CHANGES.md b/CHANGES.md index a9a0c0b90..ad72efc9d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,7 @@ - Update: Thunderhub v0.12.31 [details](https://github.com/apotdevin/thunderhub/releases/tag/v0.12.31) - Update: C-lightningREST v0.5.2 [details](https://github.com/Ride-The-Lightning/c-lightning-REST/releases/tag/v0.5.2) - Update: Specter Desktop 1.7.2 [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v1.7.2) +- Update: Re-Add connecting node with Zap mobile wallet iOS & Android ## What's new in Version 1.7.1 of RaspiBlitz? diff --git a/README.md b/README.md index 93517c98a..bd0ebb220 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ There are further Services that can be switched on: You can connect the following Wallet-Apps to your RaspiBlitz: * **Zeus** (Android & iOS) [details](https://zeusln.app) +* **Zap** (Android & iOS) [details](https://www.zaphq.io) * **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) @@ -885,6 +886,7 @@ This feature should support connecting your RaspiBlitz to a mobile wallets or ot At the moment the following mobile wallets are supported - some are only available if LND or c-lightning is activated: * [Zeus (iOS/Android)](https://github.com/ZeusLN/zeus) (LND & c-lightning) +* [Zap (iOS/Android)](https://www.zaphq.io/) (only LND) * [Fully Noded (iOS over Tor)](https://apps.apple.com/us/app/fully-noded/id1436425586) * [SendMany (Android)](https://github.com/fusion44/sendmany/blob/master/README.md) (only LND) * [Sphinx Chat App (iOS/Android)](https://sphinx.chat/) (only LND) diff --git a/home.admin/97addMobileWallet.sh b/home.admin/97addMobileWallet.sh index b3651c916..fa6d2cc0f 100755 --- a/home.admin/97addMobileWallet.sh +++ b/home.admin/97addMobileWallet.sh @@ -144,9 +144,10 @@ checkIP2TOR() OPTIONS=() if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ]; then - # Zap deactivated for now - see: https://github.com/rootzoll/raspiblitz/issues/2198#issuecomment-822808428 OPTIONS+=(ZEUS_IOS "Zeus to LND (iOS)") OPTIONS+=(ZEUS_ANDROID "Zeus to LND (Android)") + OPTIONS+=(ZAP_IOS "Zap to LND (iOS)") + OPTIONS+=(ZAP_ANDROID "Zap to LND (Android)") OPTIONS+=(SPHINX "Sphinx Chat to LND (Android/iOS)") OPTIONS+=(SENDMANY_ANDROID "SendMany to LND (Android)") OPTIONS+=(FULLYNODED_LND "Fully Noded to LND REST (iOS+Tor)") @@ -164,7 +165,7 @@ if [ "${runBehindTor}" = "on" ]; then OPTIONS+=(FULLYNODED_BTC "Fully Noded to bitcoinRPC (iOS+Tor)") fi -CHOICE=$(whiptail --clear --title "Choose Mobile Wallet" --menu "" 16 75 10 "${OPTIONS[@]}" 2>&1 >/dev/tty) +CHOICE=$(whiptail --clear --title "Choose Mobile Wallet" --menu "" 18 75 12 "${OPTIONS[@]}" 2>&1 >/dev/tty) /home/admin/config.scripts/blitz.display.sh hide @@ -194,15 +195,6 @@ case $CHOICE in ;; ZAP_IOS) appstoreLink="https://apps.apple.com/us/app/zap-bitcoin-lightning-wallet/id1406311960" - #/home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} - #whiptail --title "Install Testflight and Zap on your iOS device" \ - # --yes-button "continue" \ - # --no-button "link as QR code" \ - # --yesno "Search for 'Zap Bitcoin' in Apple Appstore for basic version\nOr join public beta test for latest features:\n${appstoreLink}\n\nJoin testing and follow ALL instructions.\n\nWhen installed and started -> continue" 11 65 - # if [ $? -eq 1 ]; then - # /home/admin/config.scripts/blitz.display.sh qr-console ${appstoreLink} - #fi - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zap.png whiptail --title "Install Fully Noded on your iOS device" \ --yes-button "Continue" \ @@ -217,12 +209,7 @@ Or scan the qr code on the LCD with your mobile phone. " 11 70 fi /home/admin/config.scripts/blitz.display.sh hide - checkIP2TOR LND-GRPC-API - see https://github.com/rootzoll/raspiblitz/issues/1001#issuecomment-634580257 - if [ ${#ip2tor} -eq 0 ]; then - choose_IP_or_TOR - fi - /home/admin/config.scripts/bonus.lndconnect.sh zap-ios ${connect} + /home/admin/config.scripts/bonus.lndconnect.sh zap-ios tor exit 0; ;; ZAP_ANDROID) @@ -241,11 +228,7 @@ Or scan the qr code on the LCD with your mobile phone. " 11 70 fi /home/admin/config.scripts/blitz.display.sh hide - checkIP2TOR LND-GRPC-API - if [ ${#ip2tor} -eq 0 ]; then - choose_IP_or_TOR - fi - /home/admin/config.scripts/bonus.lndconnect.sh zap-android ${connect} + /home/admin/config.scripts/bonus.lndconnect.sh zap-android tor exit 0; ;; SENDMANY_ANDROID) diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh index bb7dc06af..3256dfd32 100755 --- a/home.admin/_provision_.sh +++ b/home.admin/_provision_.sh @@ -204,8 +204,6 @@ echo "allow: lightning gRPC" sudo ufw allow 10009 comment 'lightning gRPC' echo "allow: lightning REST API" sudo ufw allow 8080 comment 'lightning REST API' -echo "allow: transmission" -sudo ufw allow 49200:49250/tcp comment 'rtorrent' echo "allow: public web HTTP" sudo ufw allow from any to any port 80 comment 'allow public web HTTP' echo "allow: local web admin HTTPS" diff --git a/home.admin/config.scripts/lnd.install.sh b/home.admin/config.scripts/lnd.install.sh index 4c42b585d..cd8d6fd61 100644 --- a/home.admin/config.scripts/lnd.install.sh +++ b/home.admin/config.scripts/lnd.install.sh @@ -216,9 +216,9 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo "# OK will init wallet if not exists (may ask for passwordc)" fi - sudo ufw allow ${portprefix}9735 comment '${netprefix}lnd' - sudo ufw allow ${portprefix}8080 comment '${netprefix}lnd REST' - sudo ufw allow 1${rpcportmod}009 comment '${netprefix}lnd RPC' + sudo ufw allow ${portprefix}9735 comment "${netprefix}lnd" + sudo ufw allow ${portprefix}8080 comment "${netprefix}lnd REST" + sudo ufw allow 1${rpcportmod}009 comment "${netprefix}lnd RPC" echo "# Prepare directories" if [ ! -d /mnt/hdd/lnd ]; then