diff --git a/CHANGES.md b/CHANGES.md index 3e9913168..090b8d4df 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ - New: Support of X708 UPS HAT [details](https://github.com/rootzoll/raspiblitz/pull/3087) - New: BOS Telegram Bot Support (see OPTIONS on LND Balance of Satoshis menu entry) - New: LightningTipBot v0.5 [details](https://github.com/LightningTipBot/LightningTipBot) +- New on WebUI: Jam (JoinMarket Web UI) v0.1.4 [details](https://github.com/joinmarket-webui/joinmarket-webui/releases/tag/v0.1.4) - Update: Bitcoin Core v24.0.1 [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-24.0.1.md) - Update: LND v0.15.5 [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.15.5-beta - Update: Core Lightning v22.11.1 [details](https://github.com/ElementsProject/lightning/releases/tag/v22.11.1) @@ -18,14 +19,14 @@ - Update: BTCPayServer 1.7.2 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.7.2) - Update: ItchySats 0.7.0 [details](https://github.com/itchysats/itchysats/releases/tag/0.7.0) - Update: Channel Tools (chantools) v0.10.5 [details](https://github.com/guggero/chantools/releases/tag/v0.10.5) -- Update: Jam (JoinMarket Web UI) v0.1.4 [details](https://github.com/joinmarket-webui/joinmarket-webui/releases/tag/v0.1.4) - Update: JoinMarket v0.9.8 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.9.8) - Update: JoininBox v0.7.4 [details](https://github.com/openoms/joininbox/releases/tag/v0.7.3) - Update: Electrum Server in Rust (electrs) v0.9.9 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#099-jul-12-2022) - Update: Balance of Satoshis 13.6.0 (BOS) [details](https://github.com/alexbosworth/balanceofsatoshis/blob/master/CHANGELOG.md#1360) - Update: Circuitbreaker v0.3.2 [details](https://github.com/lightningequipment/circuitbreaker/blob/master/README.md) -- Info: Run RaspiBlitz on Proxmox [details](https://github.com/rootzoll/raspiblitz/tree/dev/alternative.platforms/Proxmox) - Fixed: SCB/Emergency-Backup to USB drive (now also with cln emergency file) +- Info: Run RaspiBlitz on Proxmox [details](https://github.com/rootzoll/raspiblitz/tree/dev/alternative.platforms/Proxmox) +- Info: IP2Tor unavailable & deactivated in SSH menus [details](https://github.com/rootzoll/raspiblitz/issues/3417#issuecomment-1310303480) - Info: 32GB sdcard is now enforced (after being recommended since v1.5) ## What's new in Version 1.8.0c of RaspiBlitz? diff --git a/README.md b/README.md index 5103e07a4..efad31814 100644 --- a/README.md +++ b/README.md @@ -945,11 +945,6 @@ LNbits is a very simple server that sits on top of your Lightning Wallet. ![LNBITS](pictures/lnbits.png) -It can be used together with IP2Tor to provide: - -- Lightning Paper Vouchers (Plugin: LNURLw) -- Merchant Onboarding (Plugin: TPOS) - [![Video Tutorial](pictures/video-vouchers.png)](https://www.youtube.com/watch?v=0Bt3tHULAnw) You can also develop your own extensions on it. @@ -1104,20 +1099,7 @@ At the moment, the following subscription services are available: ##### IP2TOR (paid) -IP2TOR is a tunnel service where you can run your RaspiBlitz anonymously behind TOR but you rent a port on a clearnet IP through which you can make services of your RaspiBlitz easy reachable for everybody on the internet. -You don't need to care about your local router or firewall settings. -You can pay for this service directly through Lightning from your RaspiBlitz as subscription. - -At first you select what services of your RaspiBlitz you like to tunnel through a IP2TOR bridge. - -You will get a list of available IP2TOR bridge offerings. -Select `OK` on an IP2TOR bridge offering and you will see more details on it, such as how many satoshis the subscription will cost you. -Your node should be funded and have channels open already at this point. - -If you choose `AGREE` on the details of a IP2TOR bridge offering the RaspiBlitz tries for you to setup the IP2TOR bridge. -If everything worked you will find now the subscription under `MAINMENU` > `SUBSCRIBE` > `LIST My Subscriptions` where you can cancel it again. - -To try out the IP2TOR tunnel choose in `MAINMENU` the extra menu point of the Service you choose the bridge for and it should give you now an updated URL or try calling the API on the IP and Port that is displayed under the details of the subscription in the `LIST My Subscriptions` section. +DEACTIVATED SINCE 1.9 --> see for background: https://github.com/rootzoll/raspiblitz/issues/3417#issuecomment-1310303480 ##### HTTPS with LetsEncrypt (free) @@ -1134,9 +1116,6 @@ When you create a new LetsEncrypt subscription, you will be asked for your subdo Then RaspiBlitz tries to setup everything for you. If everything worked, you will find the subscription under `MAINMENU` > `SUBSCRIBE` > `LIST My Subscriptions`, where you can cancel it at any time if you wish. -To try out the IP2TOR tunnel, go into `MAINMENU` and the extra menu point of the Service you want to use the bridge for. -It should give you an updated URL to call your service. - HTTPS can be a hairy topic, you can try using a SSL Checker to help you quickly diagnose problems with your SSL certificate installation: [www.sslshopper.com/ssl-checker.html](https://www.sslshopper.com/ssl-checker.html) #### PASSWORD: Change Passwords diff --git a/home.admin/config.scripts/blitz.subscriptions.py b/home.admin/config.scripts/blitz.subscriptions.py index eae24c06a..c184776a0 100755 --- a/home.admin/config.scripts/blitz.subscriptions.py +++ b/home.admin/config.scripts/blitz.subscriptions.py @@ -225,7 +225,7 @@ def main(): choices = list() choices.append(("LIST", "My Subscriptions")) - choices.append(("NEW1", "+ IP2TOR Bridge (paid)")) + #choices.append(("NEW1", "+ IP2TOR Bridge (paid)")) choices.append(("NEW2", "+ LetsEncrypt HTTPS Domain (free)")) d = Dialog(dialog="dialog", autowidgetsize=True) diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh index 933e6298e..42f180c33 100644 --- a/home.admin/config.scripts/bonus.btcpayserver.sh +++ b/home.admin/config.scripts/bonus.btcpayserver.sh @@ -216,10 +216,10 @@ SHA1 ${sslFingerprintTOR}" IP2TOR: https://${ip2torIP}:${ip2torPort} SHA1 ${sslFingerprintTOR} go MAINMENU > SUBSCRIBE and add LetsEncrypt HTTPS Domain" - elif [ ${#publicDomain} -eq 0 ]; then - text="${text}\n -To enable easy reachability with normal browser from the outside -consider adding a IP2TOR Bridge: MAINMENU > SUBSCRIBE > IP2TOR" +# elif [ ${#publicDomain} -eq 0 ]; then +# text="${text}\n +#To enable easy reachability with normal browser from the outside +#consider adding a IP2TOR Bridge: MAINMENU > SUBSCRIBE > IP2TOR" fi text="${text}\n diff --git a/home.admin/config.scripts/bonus.lnbits.sh b/home.admin/config.scripts/bonus.lnbits.sh index 3e68266ca..4915a74f7 100644 --- a/home.admin/config.scripts/bonus.lnbits.sh +++ b/home.admin/config.scripts/bonus.lnbits.sh @@ -174,10 +174,10 @@ https://${ip2torDomain}:${ip2torPort} ready for public use" IP2TOR: https://${ip2torIP}:${ip2torPort} SHA1 ${sslFingerprintTOR}\n Consider adding a LetsEncrypt HTTPS Domain under OPTIONS." - elif [ ${#publicDomain} -eq 0 ]; then - text="${text}\n -To enable easy reachability with normal browser from the outside -Consider adding a IP2TOR Bridge under OPTIONS." +# elif [ ${#publicDomain} -eq 0 ]; then +# text="${text}\n +#To enable easy reachability with normal browser from the outside +#Consider adding a IP2TOR Bridge under OPTIONS." fi whiptail --title " LNbits ${fundinginfo}" --yes-button "OK" --no-button "OPTIONS" --yesno "${text}" 18 69 @@ -194,16 +194,16 @@ Consider adding a IP2TOR Bridge under OPTIONS." OPTIONS=() # IP2TOR options - if [ "${ip2torDomain}" != "" ]; then - # IP2TOR+LetsEncrypt active - offer cancel - OPTIONS+=(IP2TOR-OFF "Cancel IP2Tor Subscription for LNbits") - elif [ "${ip2torIP}" != "" ]; then - # just IP2TOR active - offer cancel or Lets Encrypt - OPTIONS+=(HTTPS-ON "Add free HTTPS-Certificate for LNbits") - OPTIONS+=(IP2TOR-OFF "Cancel IP2Tor Subscription for LNbits") - else - OPTIONS+=(IP2TOR-ON "Make Public with IP2Tor Subscription") - fi + #if [ "${ip2torDomain}" != "" ]; then + # # IP2TOR+LetsEncrypt active - offer cancel + # OPTIONS+=(IP2TOR-OFF "Cancel IP2Tor Subscription for LNbits") + #elif [ "${ip2torIP}" != "" ]; then + # # just IP2TOR active - offer cancel or Lets Encrypt + # OPTIONS+=(HTTPS-ON "Add free HTTPS-Certificate for LNbits") + # OPTIONS+=(IP2TOR-OFF "Cancel IP2Tor Subscription for LNbits") + #else + # OPTIONS+=(IP2TOR-ON "Make Public with IP2Tor Subscription") + #fi # Change Funding Source options (only if available) if [ "${LNBitsFunding}" == "lnd" ] && [ "${cl}" == "on" ]; then diff --git a/home.admin/config.scripts/bonus.sphinxrelay.sh b/home.admin/config.scripts/bonus.sphinxrelay.sh index 14f20862f..fe3d3c498 100755 --- a/home.admin/config.scripts/bonus.sphinxrelay.sh +++ b/home.admin/config.scripts/bonus.sphinxrelay.sh @@ -107,10 +107,10 @@ iOS support is native, Android needs Orbot" text="${text}\n At the moment your Sphinx Relay Server is just available within the local network - without transport encryption. -Local server for test & debug: ${publicURL}/app\n -To enable easy reachability from the outside consider -adding a IP2TOR Bridge and reconnect: -MAINMENU > SUBSCRIBE > IP2TOR > SPHINX" +Local server for test & debug: ${publicURL}/app"#\n +#To enable easy reachability from the outside consider +#adding a IP2TOR Bridge and reconnect: +#MAINMENU > SUBSCRIBE > IP2TOR > SPHINX" extraPairInfo="You need to be on the same local network to make this work." else diff --git a/home.admin/config.scripts/lnd.export.sh b/home.admin/config.scripts/lnd.export.sh index fa6307898..79eac0a89 100755 --- a/home.admin/config.scripts/lnd.export.sh +++ b/home.admin/config.scripts/lnd.export.sh @@ -136,9 +136,9 @@ elif [ "${exportType}" = "btcpay" ]; then echo "NOTE: You have a IP2TOR connection for LND REST API .. so you can use this connection string also with a external BTCPay server." else echo "IMPORTANT: You can only use this connection string for a BTCPay server running on this RaspiBlitz." - echo "If you want to connect from a external BTCPay server activate a IP2TOR tunnel for LND-REST first:" - echo "MAIN MENU > SUBSCRIBE > IP2TOR > LND REST API" - echo "Then come back and get a new connection string." + #echo "If you want to connect from a external BTCPay server activate a IP2TOR tunnel for LND-REST first:" + #echo "MAIN MENU > SUBSCRIBE > IP2TOR > LND REST API" + #echo "Then come back and get a new connection string." fi echo ""