From 4fae085c6e124d62022d3559a5b1a642e015182b Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Thu, 11 May 2023 19:38:02 +0200 Subject: [PATCH] 1.9.0rc5 merge (#3825) * update build manual * debug report info * Bitbanana Info * #3614 more debug log lines of BTC & LN mainnet * rc5 downloads --- CHANGES.md | 1 + FAQ.dev.md | 50 ++++++++++++++++--- FAQ.md | 13 ++++- README.md | 8 +-- home.admin/97addMobileWallet.sh | 17 ++----- home.admin/_version.info | 2 +- home.admin/config.scripts/blitz.debug.sh | 22 ++++---- home.admin/config.scripts/bonus.lndconnect.sh | 2 +- 8 files changed, 74 insertions(+), 41 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5967e3fbd..0705352f8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ - New: ↬lnproxy cli shortcut and server [details](https://github.com/lnproxy) - New: Homebanking Interface FinTS/HBCI (experimental) [details](https://github.com/rootzoll/raspiblitz/issues/1186) - New on WebUI: Jam (JoinMarket Web UI) v0.1.5 [details](https://github.com/joinmarket-webui/joinmarket-webui/releases/tag/v0.1.5) +- New on WebUI: Generate/Download Debug Report from Settings - 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.16.2-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.16.2-beta) - Update: Core Lightning v23.02.2 [details](https://github.com/ElementsProject/lightning/releases/tag/v23.02.2) diff --git a/FAQ.dev.md b/FAQ.dev.md index d63ae01f4..57a85be3a 100644 --- a/FAQ.dev.md +++ b/FAQ.dev.md @@ -2,9 +2,13 @@ ### What is the process of creating a new SD card image release? -Work notes for the process of producing a new SD card image release: +Checklist before making a SD card image release: + +* "Versioning" number is upfates in your RaspiBlitz Source Code (_version.info) +* Latest code is merged in release branch + +Creating the base minimal sd card: -* Make sure you have the "Versioning" final in your RaspiBlitz Source Code * Start [`Ubuntu LIVE`](http://releases.ubuntu.com/18.04.3/ubuntu-18.04.3-desktop-amd64.iso) from USB stick * Under Settings: best to set correct keyboard language & power settings to prevent monitor turn off * Connect to a secure WiFi (hardware switch on) or LAN @@ -33,6 +37,9 @@ Work notes for the process of producing a new SD card image release: * Login new with `ssh admin@[IP-OF-RASPIBLITZ]` (pw: raspiblitz) and run `release` * Disconnect WiFi/LAN on build laptop (hardware switch off) and shutdown * Remove `Ubuntu LIVE` USB stick and cut power from the RaspberryPi + +Creating the image of sd card: + * Connect USB stick with latest `TAILS` (make it stay offline) * Boot Tails with extra setting of Admin-Passwort and remember (use later for sudo) * Menu > Systemtools > Settings > Energy -> best to set monitor to never turn off @@ -43,18 +50,45 @@ Work notes for the process of producing a new SD card image release: * Take the SD card from the RaspberryPi and connect with an external SD card reader to the laptop * Click on `boot` volume once in the file manger * Connect the NTFS USB stick, open in file manager and delete old files - - * To make a raw image from sd card - second way (UI with progress): * Search "Laufwerke" or "Drives" on Tails Apps * Create image named `raspiblitz.img` to USB storage * Open Terminal and cd into directory of NTFS USB stick under `/media/amnesia` * `shasum -a 256 ./pishrink.sh` should be `e46e1e1e3c6e3555f9fff5435e2305e99b98aaa8dc28db1814cf861fbb472a69` * `chmod +x ./pishrink.sh | sudo ./pishrink.sh ./raspiblitz.img` -* `gzip -c ./raspiblitz.img > ./raspiblitz-vX.X-YEAR-MONTH-DAY.img.gz` -* Then run `shasum -a 256 *.gz > sha256.txt` -* Sign with `gpg --output raspiblitz-vX.X-YEAR-MONTH-DAY.img.gz.sig --detach-sign *.gz` -* Shutdown build computer +* `gzip -c ./raspiblitz.img > ./raspiblitz-min/fat-vX.X.X-YEAR-MONTH-DAY.img.gz` +* `shasum -a 256 ./raspiblitz-min/fat-vX.X.X-YEAR-MONTH-DAY.img.gz > ./raspiblitz-min/fat-vX.X.X-YEAR-MONTH-DAY.img.gz.sha` +* make analog copy/note of checksum +* Sign with `gpg --output raspiblitz-min/fat-vX.X.X-YEAR-MONTH-DAY.img.gz.sig --detach-sign raspiblitz-min/fat-vX.X.X-YEAR-MONTH-DAY.img.gz` + +Prepare template for subversion update later: + +* `mv ./raspiblitz.img ./raspiblitz-min-vX.X.X.img` +* `shasum -a 256 ./raspiblitz-min-vX.X.img > ./raspiblitz-min-vX.X.X.img.sha` +* make analog copy/note of checksum + +Creating a fatpack sd card from the minimal image: + +* Start TAILS live image +* On NTFS USB Stick (Open in Terminal) check hash of raspiblitz-min-vX.X.X.img wit analog note: +* `shasum -a 256 ./raspiblitz-min-vX.X.X.img` +* Right-Click the file and write to a min 32GB sd card +* On `bootfs` in FileManger (Open in Terminal): +* `touch stop` & `exit` terminal +* Shutdown TAILS & eject sd card +* Bootup UBUNTU LIVE +* Connect a RaspiBlitz (without HDD) to network, insert sd card and power up +* Find the IP of the RaspiBlitz (arp -a or check router) +* In terminal `ssh admin@[IP-OF-RASPIBLITZ]` +* Update to latest code with `patch code` +* the following only if its a `fatpack`: + * run command `fatpack` + * if it reboot, ssh in again & again run command `fatpack` + * check that script ended without errors +* do the creation & signing of the image file like in chapter above + +Publishing the images: + * Connect the NTFS USB stick to MacOS (it is just read-only) * Run tests on the new image * Upload the new image to the Download Server - put sig-file next to it diff --git a/FAQ.md b/FAQ.md index b551110b3..afaaa2928 100644 --- a/FAQ.md +++ b/FAQ.md @@ -307,14 +307,23 @@ You can also put an empty file just called `hdmi` (without any ending) onto the ### How do I generate a Debug Report? -If your RaspiBlitz is not working correctly and you like to get help from the community, it's good to provide more debug information, so others can better diagnose your problem - please follow the following steps to generate a debug report: +If your RaspiBlitz is not working correctly and you like to get help from the community, it's good to provide more debug information, so others can better diagnose your problem. + +When you use the WebUI in the browser than you can follow the steps: + +- Login into the WebUI and enter the Dashboard (needs to be fully snyced) +- In the left navigation bar - choose "Settings" +- Under "Generate Debug Report" click "Generate" +- This might take some minutes, but then a Text-File will be offered for download + + You can also get a debug report thru the SSH menus: - SSH into your raspiblitz as admin user with your password A - If you see the menu - use CTRL+C to get to the terminal - To generate debug report run: `debug`, optionally create a link with `debug -l` - Then copy all output beginning with `*** RASPIBLITZ LOGS ***` and share this -*PLEASE NOTICE: It's possible that these logs can contain private information (like IPs, node IDs, ...) - just share publicly what you feel OK with.* +*PLEASE NOTICE: Most private information (like IPs, node IDs, ...) will filtered from debug logs, but this might not catch all sensitive information - so recheck content yourself before you share publicly.* ### I have the full blockchain on another storage. How do I copy it to the RaspiBlitz? diff --git a/README.md b/README.md index a9b1b73d8..6019743f7 100644 --- a/README.md +++ b/README.md @@ -167,8 +167,8 @@ This is the sd card image you should choose if your at the beginning of your Ras *WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION
JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!* -- __FATPACK SD CARD IMAGE ⮕ [raspiblitz-fat-v1.9.0rc2-2023-02-07.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.9.0rc2-2023-02-07.img.gz)__ -- SHA-256: f49582e362046893c5dfbabdf73d7f85d919145bf339c72980f61ba79668a476 +- __FATPACK SD CARD IMAGE ⮕ [raspiblitz-fat-v1.9.0rc5-2023-05-11.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.9.0rc5-2023-05-11.img.gz)__ +- SHA-256: - GPG 64-bit (main): 1C73 060C 7C17 6461 & (sub): AA9D D1B5 CC56 47DA - Signature-File: n/a - Torrent: n/a @@ -181,8 +181,8 @@ This is the sd card image for RaspiBlitz users that are already more experienced *WARNING: THIS IS STILL A RELEASE CANDIDATE VERSION
JUST USE FOR TESTING, HIGHER RISK OF LOSING FUNDS!* -- __MINIMAL SD CARD IMAGE ⮕ [raspiblitz-min-v1.9.0rc2-2023-02-07.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.9.0rc2-2023-02-07.img.gz)__ -- SHA-256: 2a037ee3bce7d2092d6faa67f5bd74a135abe257a5af52c380b4ae68d4ad13f3 +- __MINIMAL SD CARD IMAGE ⮕ [raspiblitz-min-v1.9.0rc5-2023-05-11.img.gz](https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.9.0rc5-2023-05-11.img.gz)__ +- SHA-256: - GPG 64-bit (main): 1C73 060C 7C17 6461 & (sub): AA9D D1B5 CC56 47DA - Signature-File: n/a - Torrent: n/a diff --git a/home.admin/97addMobileWallet.sh b/home.admin/97addMobileWallet.sh index 124fa5552..7a3096e15 100755 --- a/home.admin/97addMobileWallet.sh +++ b/home.admin/97addMobileWallet.sh @@ -73,7 +73,7 @@ if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ]; then 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+=(ZAP_ANDROID "Zap/Bitbanana 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)") @@ -139,21 +139,10 @@ Or scan the qr code on the LCD with your mobile phone. exit 0; ;; ZAP_ANDROID) - appstoreLink="https://play.google.com/store/apps/details?id=zapsolutions.zap" - sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zap.png - whiptail --title "Install Zap on your Android Phone" \ + whiptail --title "Install Zap/Bitbanana on your Android Phone" \ --yes-button "Continue" \ --no-button "StoreLink" \ - --yesno "Open the Android Play Store on your mobile phone.\n\nSearch for --> 'zap bitcoin app'\n\nCheck that logo is like on LCD and author is: Zap\nWhen app is installed and started --> Continue." 12 65 - if [ $? -eq 1 ]; then - sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} - whiptail --title " App Store Link " --msgbox "\ -To install app open the following link:\n -${appstoreLink}\n -Or scan the qr code on the LCD with your mobile phone. -" 11 70 - fi - sudo /home/admin/config.scripts/blitz.display.sh hide + --yesno "Open the Android Play Store on your mobile phone.\n\nSearch for --> 'bitbanana' (for updated fork)\nSearch for --> 'zap bitcoin app' (for original)\n\nWhen app is installed and started --> Continue." 12 65 /home/admin/config.scripts/bonus.lndconnect.sh zap-android tor exit 0; ;; diff --git a/home.admin/_version.info b/home.admin/_version.info index 9a7e4fe60..b57f7e1e6 100644 --- a/home.admin/_version.info +++ b/home.admin/_version.info @@ -1,3 +1,3 @@ # RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1') -codeVersion="1.9.0rc4" +codeVersion="1.9.0rc5" # keep last line with comment \ No newline at end of file diff --git a/home.admin/config.scripts/blitz.debug.sh b/home.admin/config.scripts/blitz.debug.sh index d47b10c09..591435771 100755 --- a/home.admin/config.scripts/blitz.debug.sh +++ b/home.admin/config.scripts/blitz.debug.sh @@ -102,12 +102,12 @@ echo "*** BLOCKCHAIN (MAINNET) SYSTEMD STATUS ***" sudo systemctl status ${network}d -n2 --no-pager echo echo "*** LAST BLOCKCHAIN (MAINNET) ERROR LOGS ***" -echo "sudo journalctl -u ${network}d -b --no-pager -n8" -sudo journalctl -u ${network}d -b --no-pager -n8 +echo "sudo journalctl -u ${network}d -b --no-pager -n20" +sudo journalctl -u ${network}d -b --no-pager -n20 echo -echo "*** LAST BLOCKCHAIN (MAINNET) 20 INFO LOGS ***" -echo "sudo tail -n 20 /mnt/hdd/${network}/debug.log" -sudo tail -n 20 /mnt/hdd/${network}${pathAdd}/debug.log +echo "*** LAST BLOCKCHAIN (MAINNET) INFO LOGS ***" +echo "sudo tail -n 50 /mnt/hdd/${network}/debug.log" +sudo tail -n 50 /mnt/hdd/${network}${pathAdd}/debug.log echo echo "*** LND (MAINNET) SYSTEMD STATUS ***" @@ -118,9 +118,9 @@ if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ] || [ "${lnd}" == "1" ]; t echo "sudo journalctl -u lnd -b --no-pager -n12" sudo journalctl -u lnd -b --no-pager -n12 echo - echo "*** LAST 30 LND (MAINNET) INFO LOGS ***" - echo "sudo tail -n 30 /mnt/hdd/lnd/logs/${network}/mainnet/lnd.log" - sudo tail -n 30 /mnt/hdd/lnd/logs/${network}/mainnet/lnd.log + echo "*** LAST LND (MAINNET) INFO LOGS ***" + echo "sudo tail -n 50 /mnt/hdd/lnd/logs/${network}/mainnet/lnd.log" + sudo tail -n 50 /mnt/hdd/lnd/logs/${network}/mainnet/lnd.log else echo "- OFF by config -" fi @@ -130,10 +130,10 @@ echo "*** CORE LIGHTNING (MAINNET) SYSTEMD STATUS ***" if [ "${lightning}" == "cl" ] || [ "${cl}" == "on" ] || [ "${cl}" == "1" ]; then sudo systemctl status lightningd -n2 --no-pager echo - echo "*** LAST 30 CORE LIGHTNING (MAINNET) INFO LOGS ***" + echo "*** LAST CORE LIGHTNING (MAINNET) INFO LOGS ***" echo "For details also use command --> cllog" - echo "sudo tail -n 30 /home/bitcoin/.lightning/${network}/cl.log" - sudo tail -n 30 /home/bitcoin/.lightning/${network}/cl.log + echo "sudo tail -n 50 /home/bitcoin/.lightning/${network}/cl.log" + sudo tail -n 50 /home/bitcoin/.lightning/${network}/cl.log else echo "- not activated -" fi diff --git a/home.admin/config.scripts/bonus.lndconnect.sh b/home.admin/config.scripts/bonus.lndconnect.sh index 86439d0b5..fd1d65d8f 100755 --- a/home.admin/config.scripts/bonus.lndconnect.sh +++ b/home.admin/config.scripts/bonus.lndconnect.sh @@ -81,7 +81,7 @@ if [ "${targetWallet}" = "zap-ios" ]; then 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" + connectInfo="- start the Zap/Bitbanana Wallet --> SETUP WALLET\n or choose new Wallet in app menu\n- scan the QR code \n- confirm host address" # ZAP uses gRPC ports port="10009" if [ ${#ip2torGRPC_IP} -gt 0 ]; then