mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-11-18 18:07:45 +01:00
Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
50d66fdb80 | ||
|
|
642dfd8858 | ||
|
|
ff6fafdfc9 | ||
|
f8f9d467ba | ||
|
a8d7c4197e | ||
|
f067ba93b7 | ||
|
b589b57215 | ||
|
fb8b8edc1e | ||
|
15b460098c | ||
|
c71bdc2f77 | ||
|
|
6e426871a9 | ||
|
67335444b3 | ||
|
5d61d0b216 | ||
|
baa2ca485d | ||
|
db1675042c | ||
|
|
ebd60e83e3 | ||
|
|
4c30048d3b | ||
|
|
423b54411d | ||
|
|
ba775b3285 | ||
|
|
1e64a4499a | ||
|
a91e2c433b | ||
|
|
0ba9121b37 | ||
|
|
b1c2e3c3a1 | ||
|
|
ace3e21a9c | ||
|
|
0a01d65e3a | ||
|
|
dc7f5f3645 | ||
|
|
e24c5440ef | ||
|
1a04af5c99 | ||
|
|
eaacab9679 | ||
|
7074455380 | ||
|
|
864b261355 |
@@ -1,5 +1,14 @@
|
||||
# CHANGES between Releases
|
||||
|
||||
## What's new in Version 1.8.0c of RaspiBlitz?
|
||||
|
||||
- Update: LND v0.15.4 (emergency hotfix release) [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.15.4-beta)
|
||||
- Update: Electrum Server in Rust (electrs) v0.9.9 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#099-jul-12-2022)
|
||||
|
||||
## What's new in Version 1.8.0b of RaspiBlitz?
|
||||
|
||||
- Update: LND v0.15.2 (emergency hotfix release) [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.15.2-beta)
|
||||
|
||||
## What's new in Version 1.8.0 of RaspiBlitz?
|
||||
|
||||
- New: Multilanguage WebUI [details](https://github.com/cstenglein/raspiblitz-web)
|
||||
|
||||
6
CODEOWNERS
Normal file
6
CODEOWNERS
Normal file
@@ -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
|
||||
20
README.md
20
README.md
@@ -3,7 +3,7 @@
|
||||
|
||||
_Build your own Lightning & Bitcoin Fullnode on a RaspberryPi with a nice Display._
|
||||
|
||||
`Version 1.8.0 with lnd 0.15.0 & 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`
|
||||
|
||||
|
||||
|
||||
@@ -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.0 image](https://raspiblitz.fulmo.org/images/raspiblitz-v1.8.0-2022-07-28.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.0-2022-07-28.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: 7711e371aba78097411b48d132c9c1fee35f1776e8faa6165dc59492fa2938f9
|
||||
- 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)
|
||||
@@ -433,7 +433,7 @@ For each password please choose unique, single strings, without spaces and speci
|
||||
|
||||
You can use this [RaspiBlitz Recovery Sheet (PDF)](https://github.com/rootzoll/raspiblitz/raw/v1.7/home.admin/assets/RaspiBlitzRecoverySheet.pdf) to write those passwords down for safe storage and also use it later on for your Seed Words.
|
||||
|
||||
_The password A,B,C idea is based on the [RaspiBolt Guide Preparations](https://raspibolt.org/preparations.html#write-down-your-passwords) - check out for more background._
|
||||
_The password A,B,C idea is based on the [RaspiBolt Guide Preparations](https://raspibolt.org/guide/raspberry-pi/preparations.html#write-down-your-passwords) - check out for more background._
|
||||
|
||||
First, password A is requested - this is the password which will be used for SSH login and it's also set for the existing users: admin, root, bitcoin & pi.
|
||||
|
||||
@@ -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).
|
||||
|
||||
@@ -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`
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
##########################################################################
|
||||
|
||||
defaultRepo="rootzoll"
|
||||
defaultBranch="v1.7"
|
||||
defaultBranch="v1.8"
|
||||
|
||||
me="${0##/*}"
|
||||
|
||||
|
||||
1
ci/arm64-rpi/packer-builder-arm
Submodule
1
ci/arm64-rpi/packer-builder-arm
Submodule
Submodule ci/arm64-rpi/packer-builder-arm added at 6636c687ec
@@ -16,7 +16,7 @@ function clRescan() {
|
||||
dialog --backtitle "Choose the new gap limit" \
|
||||
--title "Enter the rescan depth or blockheight (-)" \
|
||||
--inputbox "
|
||||
Enter the number of blocks to rescan from the current tip
|
||||
Enter the number of blocks to rescan from the current tip
|
||||
or use a negative number for the absolute blockheight to scan from.
|
||||
|
||||
If left empty will start to rescan from the block 700000 (-700000).
|
||||
@@ -29,6 +29,13 @@ If left empty will start to rescan from the block 700000 (-700000).
|
||||
sudo systemctl restart ${netprefix}lightningd
|
||||
}
|
||||
|
||||
function resetWallet() {
|
||||
echo "# Delete ${CLCONF}"
|
||||
sudo rm -f ${CLCONF}
|
||||
echo "# Delete and recreate /home/bitcoin/.lightning/${CLNETWORK}"
|
||||
sudo rm -rf /home/bitcoin/.lightning/${CLNETWORK}
|
||||
sudo -u bitcoin mkdir /home/bitcoin/.lightning/${CLNETWORK}
|
||||
}
|
||||
|
||||
# BASIC MENU INFO
|
||||
WIDTH=64
|
||||
@@ -76,31 +83,33 @@ case $CHOICE in
|
||||
/home/admin/config.scripts/cl.hsmtool.sh decrypt $CHAIN
|
||||
source /mnt/hdd/raspiblitz.conf
|
||||
;;
|
||||
|
||||
|
||||
PASSWORD_C)
|
||||
/home/admin/config.scripts/cl.hsmtool.sh change-password $CHAIN
|
||||
;;
|
||||
|
||||
|
||||
AUTOUNLOCK-ON)
|
||||
/home/admin/config.scripts/cl.hsmtool.sh autounlock-on $CHAIN
|
||||
;;
|
||||
|
||||
|
||||
AUTOUNLOCK-OFF)
|
||||
/home/admin/config.scripts/cl.hsmtool.sh autounlock-off $CHAIN
|
||||
;;
|
||||
|
||||
|
||||
BACKUP)
|
||||
if [ "${cl}" == "on" ] || [ "${cl}" == "1" ] && [ "${clEncryptedHSM}" != "on" ]; then
|
||||
dialog \
|
||||
--title "Encrypt the Core Lightning wallet" \
|
||||
--msgbox "\nWill proceed to encrypt and lock the Core Lightning wallet to prevent it from starting automatically after the backup" 9 55
|
||||
--msgbox "
|
||||
Will proceed to encrypt and lock the Core Lightning wallet to prevent it from starting automatically after the backup.
|
||||
Save this password as it will be needed to restore the backup (same as the Password C for CLN)." 10 55
|
||||
sudo /home/admin/config.scripts/cl.hsmtool.sh encrypt mainnet
|
||||
fi
|
||||
if [ "${clAutoUnlock}" = "on" ]; then
|
||||
/home/admin/config.scripts/cl.hsmtool.sh autounlock-off mainnet
|
||||
fi
|
||||
/home/admin/config.scripts/cl.hsmtool.sh lock mainnet
|
||||
## from dialogLightningWallet.sh
|
||||
## from dialogLightningWallet.sh
|
||||
_temp="/var/cache/raspiblitz/temp/.temp.tmp"
|
||||
clear
|
||||
/home/admin/config.scripts/cl.backup.sh cl-export-gui production $_temp
|
||||
@@ -110,10 +119,10 @@ case $CHOICE in
|
||||
echo "Press ENTER when finished downloading."
|
||||
read key
|
||||
;;
|
||||
|
||||
|
||||
RESET)
|
||||
# backup
|
||||
## from dialogLightningWallet.sh
|
||||
## from dialogLightningWallet.sh
|
||||
_temp="/var/cache/raspiblitz/temp/.temp.tmp"
|
||||
clear
|
||||
/home/admin/config.scripts/cl.backup.sh cl-export-gui production $_temp
|
||||
@@ -122,15 +131,12 @@ case $CHOICE in
|
||||
echo
|
||||
echo "The rescue file is stored on the SDcard named cl-rescue.*.tar.gz just in case."
|
||||
echo
|
||||
echo "The next step will overwrite the old C-lighthning $CHAIN wallet"
|
||||
echo "The next step will overwrite the old Core Lightning $CHAIN wallet"
|
||||
echo "Press ENTER to continue or CTRL+C to abort"
|
||||
read key
|
||||
# reset
|
||||
echo "# Delete ${CLCONF}"
|
||||
sudo rm -f ${CLCONF}
|
||||
echo "# Delete and recreate /home/bitcoin/.lightning/${CLNETWORK}"
|
||||
sudo rm -rf /home/bitcoin/.lightning/${CLNETWORK}
|
||||
sudo -u bitcoin mkdir /home/bitcoin/.lightning/${CLNETWORK}
|
||||
|
||||
resetWallet
|
||||
|
||||
# make sure the new hsm_secret is treated as unencrypted and clear autounlock
|
||||
/home/admin/config.scripts/blitz.conf.sh set ${netprefix}clEncryptedHSM "off"
|
||||
/home/admin/config.scripts/blitz.conf.sh set ${netprefix}clAutoUnlock "off"
|
||||
@@ -149,10 +155,10 @@ case $CHOICE in
|
||||
/home/admin/config.scripts/cl.install-service.sh signet
|
||||
fi
|
||||
;;
|
||||
|
||||
|
||||
FILERESTORE)
|
||||
# backup
|
||||
## from dialogLightningWallet.sh
|
||||
## from dialogLightningWallet.sh
|
||||
_temp="/var/cache/raspiblitz/temp/.temp.tmp"
|
||||
clear
|
||||
/home/admin/config.scripts/cl.backup.sh cl-export-gui production $_temp
|
||||
@@ -161,12 +167,12 @@ case $CHOICE in
|
||||
echo
|
||||
echo "The rescue file is stored on the SDcard named cl-rescue.*.tar.gz just in case."
|
||||
echo
|
||||
echo "The next step will overwrite the old C-lighthning $CHAIN wallet"
|
||||
echo "The next step will overwrite the old Core Lightning $CHAIN wallet"
|
||||
echo "Press ENTER to continue or CTRL+C to abort"
|
||||
read key
|
||||
# reset
|
||||
sudo rm /home/bitcoin/.lightning/${CLNETWORK}/hsm_secret
|
||||
sudo rm -rf /home/bitcoin/.lightning/${CLNETWORK}/*.*
|
||||
|
||||
resetWallet
|
||||
|
||||
# import file
|
||||
_temp="/var/cache/raspiblitz/temp/.temp.tmp"
|
||||
clear
|
||||
@@ -174,10 +180,10 @@ case $CHOICE in
|
||||
source $_temp 2>/dev/null
|
||||
sudo rm $_temp 2>/dev/null
|
||||
;;
|
||||
|
||||
|
||||
SEEDRESTORE)
|
||||
# backup
|
||||
## from dialogLightningWallet.sh
|
||||
## from dialogLightningWallet.sh
|
||||
_temp="/var/cache/raspiblitz/temp/.temp.tmp"
|
||||
clear
|
||||
/home/admin/config.scripts/cl.backup.sh cl-export-gui production $_temp
|
||||
@@ -186,13 +192,12 @@ case $CHOICE in
|
||||
echo
|
||||
echo "The rescue file is stored on the SDcard named cl-rescue.*.tar.gz just in case."
|
||||
echo
|
||||
echo "The next step will overwrite the old C-lighthning $CHAIN wallet"
|
||||
echo "The next step will overwrite the old Core Lightning $CHAIN wallet"
|
||||
echo "Press ENTER to continue or CTRL+C to abort"
|
||||
read key
|
||||
# reset
|
||||
sudo rm /home/bitcoin/.lightning/${CLNETWORK}/hsm_secret
|
||||
sudo rm -f /home/bitcoin/.lightning/${CLNETWORK}/config
|
||||
sudo rm -rf /home/bitcoin/.lightning/${CLNETWORK}/*.*
|
||||
|
||||
resetWallet
|
||||
|
||||
# import seed
|
||||
_temp="/var/cache/raspiblitz/.temp.tmp"
|
||||
/home/admin/config.scripts/cl.backup.sh seed-import-gui $_temp
|
||||
|
||||
BIN
home.admin/assets/raspiblitz-v1.8.0c-2022-11-01.img.gz.torrent
Normal file
BIN
home.admin/assets/raspiblitz-v1.8.0c-2022-11-01.img.gz.torrent
Normal file
Binary file not shown.
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -243,4 +243,4 @@ if [ "$1" = "off" ]; then
|
||||
fi
|
||||
|
||||
echo "error='unknown command'"
|
||||
exit 1
|
||||
exit 1
|
||||
|
||||
@@ -39,7 +39,8 @@ 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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/bin/bash
|
||||
|
||||
# https://github.com/romanz/electrs/releases
|
||||
ELECTRSVERSION="v0.9.7"
|
||||
ELECTRSVERSION="v0.9.9"
|
||||
# https://github.com/romanz/electrs/commits/master
|
||||
# ELECTRSVERSION="3041e89cd2fb377541b929d852ef6298c2d4e60a"
|
||||
# ELECTRSVERSION="446858ea621416916f84cbce61be92b748e8133e"
|
||||
|
||||
# command info
|
||||
if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
|
||||
@@ -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):"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -143,10 +143,10 @@ function decryptHSMsecret() {
|
||||
echo "# using the password from parameter"
|
||||
elif [ -f $passwordFile ];then
|
||||
echo "# Getting the password from $passwordFile"
|
||||
password=$(cat sudo cat $passwordFile)
|
||||
password=$(sudo cat $passwordFile)
|
||||
else
|
||||
passwordToFile
|
||||
password=$(cat sudo cat $passwordFile)
|
||||
password=$(sudo cat $passwordFile)
|
||||
fi
|
||||
if echo "${password}" | sudo -u bitcoin lightning-hsmtool decrypt \
|
||||
"$hsmSecretPath"; then
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
## based on https://raspibolt.github.io/raspibolt/raspibolt_40_lnd.html#lightning-lnd
|
||||
## see LND releases: https://github.com/lightningnetwork/lnd/releases
|
||||
### If you change here - make sure to also change interims version in lnd.update.sh #!
|
||||
lndVersion="0.15.0-beta"
|
||||
lndVersion="0.15.4-beta"
|
||||
|
||||
# olaoluwa
|
||||
PGPauthor="roasbeef"
|
||||
PGPpkeys="https://keybase.io/roasbeef/pgp_keys.asc"
|
||||
PGPcheck="E4D85299674B2D31FAA1892E372CBD7633C61696"
|
||||
#PGPauthor="roasbeef"
|
||||
#PGPpkeys="https://keybase.io/roasbeef/pgp_keys.asc"
|
||||
#PGPcheck="E4D85299674B2D31FAA1892E372CBD7633C61696"
|
||||
|
||||
# guggero
|
||||
# PGPauthor="guggero"
|
||||
# PGPpkeys="https://keybase.io/guggero/pgp_keys.asc"
|
||||
# PGPcheck="F4FC70F07310028424EFC20A8E4256593F177720"
|
||||
PGPauthor="guggero"
|
||||
PGPpkeys="https://keybase.io/guggero/pgp_keys.asc"
|
||||
PGPcheck="F4FC70F07310028424EFC20A8E4256593F177720"
|
||||
|
||||
# bitconner
|
||||
#PGPauthor="bitconner"
|
||||
|
||||
@@ -48,10 +48,17 @@ add_tor_sources(){
|
||||
"${tor_deb_repo_clean}/torproject.org/${tor_deb_repo_pgp_fingerprint}.asc" \
|
||||
| gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/torproject.gpg 1>/dev/null
|
||||
if [ -s /etc/apt/trusted.gpg.d/torproject.gpg ]; then
|
||||
echo "- OK key added"
|
||||
echo "- OK key added over Tor"
|
||||
else
|
||||
echo "! FAIL: Was not able to import deb.torproject.org key";
|
||||
exit 1
|
||||
echo "WARN: Was not able to import deb.torproject.org key over Tor";
|
||||
curl -s "https://deb.torproject.org/torproject.org/${tor_deb_repo_pgp_fingerprint}.asc" \
|
||||
| gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/torproject.gpg 1>/dev/null
|
||||
if [ -s /etc/apt/trusted.gpg.d/torproject.gpg ]; then
|
||||
echo "- OK key added over clearnet"
|
||||
else
|
||||
echo "! FAIL: Was not able to import deb.torproject.org key over clearnet";
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo -e "\n*** Adding Tor Sources ***"
|
||||
|
||||
4
pull_request_template.md
Normal file
4
pull_request_template.md
Normal file
@@ -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)
|
||||
Reference in New Issue
Block a user