Delete CNAME

excepted -> accepted

CODEOWNERS

@@ -0,0 +1,6 @@
+# For info see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# These owners will be the default owners for everything in the repo.
+# Unless a later match takes precedence, these users will be requested for review when someone opens a pull request.
+
+* @rootzoll @openoms

README.md

@@ -3,7 +3,7 @@
 
 _Build your own Lightning & Bitcoin Fullnode on a RaspberryPi with a nice Display._
 
-`Version 1.8.0b with lnd 0.15.2 & Core Lightning 0.11.2 and bitcoin 23.0.0`
+`Version 1.8.0c with lnd 0.15.4 & Core Lightning 0.11.2 and bitcoin 23.0.0`
 
 ![RaspiBlitz](pictures/raspiblitz.jpg)
 
@@ -253,13 +253,13 @@ In the end your RaspiBlitz should look like this:
 | Philosophy       | Trust                                                                                                                                                                            | Sovereignty                                                       |
 | Difficulty level | Easy                                                                                                                                                                             | Medium                                                            |
 | Pros             | Make Blitz accessible to everyone                                                                                                                                                | You don't need to trust us, build from your own forked repository |
-| Instructions     | [Download 1.8.0b image (with lnd-bug fix)](https://raspiblitz.fulmo.org/images/raspiblitz-v1.8.0b-2022-10-10.img.gz) and [Flash the sd card](README.md#write-the-sd-card-image-to-your-sd-card) | [Build your own sd card image](#build-the-sd-card-image)          |
-| Verify what?     | [Signature file](https://raspiblitz.fulmo.org/images/raspiblitz-v1.8.0b-2022-10-10.img.gz.sig) and [verify the Sig](FAQ.md#how-to-verify-the-sd-card-image-after-download) OR SHA-256 (below)                                                               | All of the code, don't trust, verify                              |
+| Instructions     | [Download 1.8.0c image (with both lnd hot fixes)](https://raspiblitz.fulmo.org/images/raspiblitz-v1.8.0c-2022-11-01.img.gz) and [Flash the sd card](README.md#write-the-sd-card-image-to-your-sd-card) | [Build your own sd card image](#build-the-sd-card-image)          |
+| Verify what?     | [Signature file](https://raspiblitz.fulmo.org/images/raspiblitz-v1.8.0c-2022-11-01.img.gz.sig) and [verify the Sig](FAQ.md#how-to-verify-the-sd-card-image-after-download) OR SHA-256 (below)                                                               | All of the code, don't trust, verify                              |
 
 If downloading the maintainer SD card image:
 
 - GPG 64-bit (main): 1C73 060C 7C17 6461 & (sub): AA9D D1B5 CC56 47DA
-- SHA-256: 42c96fb29e03eb8276b40861f77b141bde30a2ff461947e107cff7d24c5a8096
+- SHA-256: 402cc47dd7546ffdf8c5e2a8c0269bbb4d3fe7fedb73ac5a3dad7559edf76eea
 
 Which verification method should I used: Hash or Signature?
 
@@ -268,11 +268,11 @@ Which verification method should I used: Hash or Signature?
 
 The maintainer sd card image can also be downloaded via torrent:
 
-- [assets/raspiblitz-v1.8.0-2022-07-28.img.gz.torrent](https://github.com/rootzoll/raspiblitz/raw/dev/home.admin/assets/raspiblitz-v1.8.0-2022-07-28.img.gz.torrent)
+- [assets/raspiblitz-v1.8.0c-2022-11-01.img.gz.torrent](https://github.com/rootzoll/raspiblitz/raw/v1.8/home.admin/assets/raspiblitz-v1.8.0c-2022-11-01.img.gz.torrent)
 
 Useful info:
 
-- [What's new in Version 1.8.0 of RaspiBlitz?](CHANGES.md#whats-new-in-version-180-of-raspiblitz)
+- [What's new in Version 1.8.0 of RaspiBlitz?](CHANGES.md#whats-new-in-version-180c-of-raspiblitz)
 - [How to update my RaspiBlitz?](README.md#updating-raspiblitz-to-new-version)
 - [How to migrate to RaspiBlitz from Umbrel/myNode/Citadel](#make-a-raspiblitz-out-of-your-umbrel-citadel-or-mynode)
 - [How to verify the SD card image after download?](FAQ.md#how-to-verify-the-sd-card-image-after-download)
@@ -1128,7 +1128,7 @@ To try out the IP2TOR tunnel choose in `MAINMENU` the extra menu point of the Se
 If you want a web service, like BTCPay Server or LNbits, to be available to the outside internet (like with IP2TOR) people expect you to offer an HTTPS address so that the communication between the client and your RaspiBlitz is encrypted.
 You could use the self-signed HTTPS certificate that RaspiBlitz is offering you, but this will give users Security Warnings in their browser and is not very user friendly.
 
-That's where you can use a LetsEncrypt Subscription to get a free valid HTTPS certificate that is excepted without warning from almost all common browsers
+That's where you can use a LetsEncrypt Subscription to get a free valid HTTPS certificate that is accepted without warning from almost all common browsers
 
 Because you also need a domain name for that you will need to open a free account, the following are presently supported, would be good to add more with the help of the community:
 [DuckDNS.org](https://www.duckdns.org)
@@ -1351,7 +1351,7 @@ To develop your own scripts/apps and connect other services/apps to your RaspiBl
 - `lncli` command line interface on the terminal [DOC](https://api.lightning.community/)
 - `lnd` running on port 9735 (public)
 - `gRPC` running on port 10009 (public) [DOC](https://api.lightning.community/)
-- `REST` running on port 8080 (public) [DOC](https://api.lightning.community/rest/index.html)
+- `REST` running on port 8080 (public) [DOC](https://api.lightning.community/#lnd-rest-api-reference)
 
 If you activate Tor then your LND gRPC & REST APIs will also be reachable publicly as a Hidden Service.
 
@@ -1446,7 +1446,7 @@ But if you want to build that image yourself - here is a quick guide:
 - Get a latest RaspiOS 64-bit (Desktop): [DOWNLOAD](https://downloads.raspberrypi.org/raspios_arm64/images).
 - Write the image to an SD card: [TUTORIAL](https://www.raspberrypi.org/documentation/installation/installing-images/README.md).
 - Add a file called `ssh` to the root of the SD card when mounted on your laptop to enable SSH login.
-- Add a file called `userconf` next to the empty `ssh` file that contains the just the string `pi:$6$p2DNwHsYzR06mVFX$jwZnOo5Jl/6pEMFFowpUBqM7E0Rz8vEtXtupwxuXZA7eqyKxDk8barhYZ24ei/JEP4e8Jr0mOvRThASuUxIAZ0`.
+- Add a file called `userconf` next to the empty `ssh` file that contains just the string `pi:$6$p2DNwHsYzR06mVFX$jwZnOo5Jl/6pEMFFowpUBqM7E0Rz8vEtXtupwxuXZA7eqyKxDk8barhYZ24ei/JEP4e8Jr0mOvRThASuUxIAZ0`.
 - Start the card on a Raspi and login via SSH with `ssh pi@[IP-OF-YOUR-RASPI]`. Password is `raspberry`.
 
 Now you are ready to start the SD card build script (check the code to see if the installation and config are OK for you).

alternative.platforms/README.md

@@ -239,7 +239,7 @@ Work notes partially based on: https://github.com/rootzoll/raspiblitz/blob/v1.7/
 
 ### Requirements:
 * amd64 Laptop or Server connected to the internet via a LAN cable
-* [`Ubuntu Live`](https://releases.ubuntu.com/focal/ubuntu-20.04.4-desktop-amd64.iso) USB Stick to start on a clean system
+* [`Ubuntu Live`](https://releases.ubuntu.com/focal/ubuntu-20.04.5-desktop-amd64.iso) USB Stick to start on a clean system
 * `Installation medium`: min 8GB SDcard / USB stick to install the base image from
 * `OS disk`: min 32 GB Endurance type SDcard or USB SSD to run the operating system on
 * (`Data disk`: a new, minimum 1TB SSD is recommended - not needed to create the image release)
@@ -251,7 +251,7 @@ Work notes partially based on: https://github.com/rootzoll/raspiblitz/blob/v1.7/
 * can be prepared any time on a separate computer and can reuse the Installation medium
 
 ### Boot Ubuntu Live from USB
-* Start [`Ubuntu Live`](https://releases.ubuntu.com/focal/ubuntu-20.04.4-desktop-amd64.iso) from USB stick
+* Start [`Ubuntu Live`](https://releases.ubuntu.com/focal/ubuntu-20.04.5-desktop-amd64.iso) from USB stick
 * Under Settings: best to set correct keyboard language & power settings to prevent monitor turn off
 
 ### Download and verify the base image
@@ -299,7 +299,7 @@ Work notes partially based on: https://github.com/rootzoll/raspiblitz/blob/v1.7/
 * Insert the installation medium to the USB and power up - boot from USB.
 * Continue to work on the screen of the laptop or a connected monitor
 * Install Debian with the defaults:
-    * leave the root oassword empty (root user disabled)
+    * leave the root password empty (root user disabled)
     * create a new user called `pi`, set the password to `raspiblitz`
     * use a single partition for the OS
       * Choose: `Guided - use entire disk`

home.admin/config.scripts/bitcoin.update.sh

@@ -137,7 +137,7 @@ if [ "${mode}" = "tested" ]||[ "${mode}" = "reckless" ]||[ "${mode}" = "custom"
   
   displayInfo
 
-  if [ $installedVersion = $bitcoinVersion ];then
+  if [ "$installedVersion" = "$bitcoinVersion" ]; then
     echo "# installedVersion = bitcoinVersion"
     echo "# exiting script"
     exit 0

home.admin/config.scripts/blitz.backupdevice.sh

@@ -103,7 +103,7 @@ if [ "$1" = "on" ]; then
 
     # check if there is only one candidate
     if [ ${backupCandidates} -gt 1 ]; then
-      dialog --title ' FAIL ' --msgbox 'There is more then one possible backup target connected.\nMake sure that just that one device is connected and try again.' 8 40
+      dialog --title ' FAIL ' --msgbox 'There is more than one possible backup target connected.\nMake sure that just that one device is connected and try again.' 8 40
       clear
       exit 1
     fi

home.admin/config.scripts/blitz.debug.sh

@@ -39,6 +39,7 @@ if [ "$1" == "redact" ]; then
   sed -i 's/alias [A-Za-z0-9]* /alias *** /' ${redactFile}
   sed -i 's/public key [a-z0-9]*,/public key *** /' ${redactFile}
   sed -i 's/[a-z0-9][a-z0-9]*.onion/###.onion/' ${redactFile}
+  sed -i 's/alias=[^\r\n]*/alias=****/' ${redactFile}
   
   exit 0
 fi

home.admin/config.scripts/bonus.btc-rpc-explorer.sh

@@ -85,7 +85,7 @@ if [ "$1" = "status" ]; then
     echo "installed=${installed}"
 
     # get network info
-    localIP=$(ip addr | grep 'state UP' -A2 | grep -E -v 'docker0|veth' | grep 'eth0\|wlan0\|enp0' | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
+    localIP=$(hostname -I | awk '{print $1}')
     toraddress=$(sudo cat /mnt/hdd/tor/btc-rpc-explorer/hostname 2>/dev/null)
     fingerprint=$(openssl x509 -in /mnt/hdd/app-data/nginx/tls.cert -fingerprint -noout | cut -d"=" -f2)
 

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

@@ -145,7 +145,7 @@ if [ "$1" = "menu" ]; then
 
   # get status
   echo "# collecting status info ... (please wait)"
-  source <(sudo /home/admin/config.scripts/bonus.electrs.sh status)
+  source <(sudo /home/admin/config.scripts/bonus.electrs.sh status showAddress)
 
   if [ ${serviceInstalled} -eq 0 ]; then
     echo "# FAIL not installed"
@@ -208,11 +208,11 @@ Check 'sudo nginx -t' for a detailed error message.
     echo
     echo "On Network Settings > Server menu:"
     echo "- deactivate automatic server selection"
-    echo "- as manual server set '${localip}' & '${portSSL}'"
+    echo "- as manual server set '${localIP}' & '${portSSL}'"
     echo "- laptop and RaspiBlitz need to be within same local network"
     echo
     echo "To start directly from laptop terminal use:"
-    echo "electrum --oneserver --server ${localip}:${portSSL}:s"
+    echo "electrum --oneserver --server ${localIP}:${portSSL}:s"
     if [ ${TorRunning} -eq 1 ]; then
       echo
       echo "The Tor Hidden Service address for electrs is (see LCD for QR code):"

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

@@ -23,7 +23,7 @@ if [ "$1" = "menu" ]; then
   source <(sudo /home/admin/config.scripts/bonus.homer.sh status)
 
   # get network info
-  localip=$(ip addr | grep 'state UP' -A2 | egrep -v 'docker0' | grep 'eth0\|wlan0' | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
+  localIP=$(hostname -I | awk '{print $1}')
   toraddress=$(sudo cat /mnt/hdd/tor/homer/hostname 2>/dev/null)
   fingerprint=$(openssl x509 -in /mnt/hdd/app-data/nginx/tls.cert -fingerprint -noout | cut -d"=" -f2)
 
@@ -34,7 +34,7 @@ if [ "$1" = "menu" ]; then
     # TOR
     /home/admin/config.scripts/blitz.display.sh qr "${toraddress}"
     whiptail --title " Homer " --msgbox "Open in your local web browser & accept self-signed cert:
-https://${localip}:4091\n
+https://${localIP}:4091\n
 SHA1 Thumb/Fingerprint:
 ${fingerprint}\n
 Hidden Service address for TOR Browser (QR see LCD):
@@ -46,7 +46,7 @@ ${additionalInfo}
 
     # IP + Domain
     whiptail --title " Homer " --msgbox "Open in your local web browser & accept self-signed cert:
-https://${localip}:4091\n
+https://${localIP}:4091\n
 SHA1 Thumb/Fingerprint:
 ${fingerprint}\n
 Activate TOR to access the web block explorer from outside your local network.\n

home.admin/config.scripts/bonus.tallycoin-connect.sh

@@ -8,7 +8,7 @@ HOME_DIR=/home/$USERNAME
 CONFIG_FILE=$APP_DATA_DIR/tallycoin_api.key
 RASPIBLITZ_INFO=/home/admin/raspiblitz.info
 SERVICE_FILE=/etc/systemd/system/tallycoin-connect.service
-TC_VERSION=1.7.1
+TC_VERSION=1.8.0
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then

pull_request_template.md

@@ -0,0 +1,4 @@
+Thank you for your contribution to RaspiBlitz. Before submitting this PR, please make sure:
+- [ ] it is based against the `dev` branch - not the default release branch.
+- [ ] format shell scripts with [shellcheck](https://www.shellcheck.net/) to improve readability.
+(this entry can be deleted)