add HDD migration notice

home.admin/99systemMenu.sh

@@ -64,11 +64,11 @@ case $CHOICE in
     ;;
   ${network}LOG)
     if [ ${CHAIN} = signet ]; then
-      bitcoinlogpath="/mnt/hdd/bitcoin/signet/debug.log"
+      bitcoinlogpath="/mnt/hdd/app-data/bitcoin/signet/debug.log"
     elif [ ${CHAIN} = testnet ]; then
-      bitcoinlogpath="/mnt/hdd/bitcoin/testnet3/debug.log"
+      bitcoinlogpath="/mnt/hdd/app-data/bitcoin/testnet3/debug.log"
     elif [ ${CHAIN} = mainnet ]; then
-      bitcoinlogpath="/mnt/hdd/bitcoin/debug.log"      
+      bitcoinlogpath="/mnt/hdd/app-data/bitcoin/debug.log"      
     fi
     clear
     echo

home.admin/_provision.setup.sh

@@ -79,6 +79,7 @@ cp /home/admin/assets/${network}.conf /home/admin/.${network}/${network}.conf
 chown -R admin:admin /home/admin/.${network} >>${logFile} 2>&1
 
 # make sure all directories are linked
+/home/admin/_cache.sh set message "Update HDD layout (can take long time)"
 /home/admin/config.scripts/blitz.data.sh link >> ${logFile}
 
 # test bitcoin config
@@ -114,6 +115,7 @@ if [ "${network}" == "bitcoin" ]; then
   fi
 fi
 
+
 # start network service
 echo ""
 echo "*** Start ${network} (SETUP) ***" >> ${logFile}
@@ -134,7 +136,7 @@ do
   sync
   loopcount=$(($loopcount +1))
   if [ ${loopcount} -gt 50 ]; then
-    /home/admin/config.scripts/blitz.error.sh _provision.setup.sh "btc-testrun-fail" "${network}d not running" "sudo -u bitcoin ${network}-cli getblockchaininfo | grep "initialblockdownload" -c --> ${bitcoinRunning}" ${logFile}
+    /home/admin/config.scripts/blitz.error.sh _provision.setup.sh "btc-testrun-fail" "${network}d not running" "sudo -u bitcoin ${network}-cli getblockchaininfo | grep 'initialblockdownload' -c --> ${bitcoinRunning}" ${logFile}
     exit 4
   fi
 done
@@ -198,6 +200,7 @@ if [ "${lightning}" == "lnd" ]; then
   fi
 
   # make sure all directories are linked
+  /home/admin/_cache.sh set message "Update HDD layout (can take long time)"
   /home/admin/config.scripts/blitz.data.sh link
 
   # check if now a config exists

home.admin/_provision_.sh

@@ -789,6 +789,7 @@ echo "" >> ${logFile}
 echo "*** Repair Bitcoin Conf (if needed)" >> ${logFile}
 confExists="$(ls /mnt/hdd/app-data/${network} | grep -c "${network}.conf")"
 if [ ${confExists} -eq 0 ]; then
+  /home/admin/_cache.sh set message "Update HDD layout (can take long time)"
   echo "Doing init of ${network}.conf" >> ${logFile}
   cp /home/admin/assets/bitcoin.conf /mnt/hdd/app-data/bitcoin/bitcoin.conf
   chown bitcoin:bitcoin /mnt/hdd/app-data/bitcoin/bitcoin.conf

home.admin/assets/bitcoin.conf

@@ -10,10 +10,10 @@ daemon=1
 txindex=0
 disablewallet=1
 peerbloomfilters=1
-datadir=/mnt/hdd/bitcoin
-main.debuglogfile=/mnt/hdd/bitcoin/debug.log
-test.debuglogfile=/mnt/hdd/bitcoin/testnet3/debug.log
-signet.debuglogfile=/mnt/hdd/bitcoin/signet/debug.log
+datadir=/mnt/hdd/app-storage/bitcoin
+main.debuglogfile=/mnt/hdd/app-data/bitcoin/debug.log
+test.debuglogfile=/mnt/hdd/app-data/bitcoin/testnet3/debug.log
+signet.debuglogfile=/mnt/hdd/app-data/bitcoin/signet/debug.log
 
 # Connection settings
 rpcuser=raspibolt

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

@@ -85,6 +85,9 @@ if [ "$1" == "prestart" ]; then
   sed -i '/^test.datadir=/d' /mnt/hdd/app-data/bitcoin/bitcoin.conf
   sed -i '/^signet.datadir=/d' /mnt/hdd/app-data/bitcoin/bitcoin.conf   
   
+  # remove any whitelist entries (whitebind is used instead)
+  sed -i '/^whitelist=/d' /mnt/hdd/app-data/bitcoin/bitcoin.conf
+
   # make sure bitcoin debug file exists
   echo "# make sure bitcoin debug file exists"
   touch ${bitcoinlog_path}

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

@@ -44,11 +44,11 @@ elif [ ${CHAIN} = mainnet ]; then
 fi
 # bitcoinlogpath
 if [ ${CHAIN} = signet ]; then
-  bitcoinlogpath="/mnt/hdd/app-storage/bitcoin/signet/debug.log"
+  bitcoinlogpath="/mnt/hdd/app-data/bitcoin/signet/debug.log"
 elif [ ${CHAIN} = testnet ]; then
-  bitcoinlogpath="/mnt/hdd/app-storage/bitcoin/testnet3/debug.log"
+  bitcoinlogpath="/mnt/hdd/app-data/bitcoin/testnet3/debug.log"
 elif [ ${CHAIN} = mainnet ]; then
-  bitcoinlogpath="/mnt/hdd/app-storage/bitcoin/debug.log"
+  bitcoinlogpath="/mnt/hdd/app-data/bitcoin/debug.log"
 fi
 
 function addBitcoinAliases {

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

@@ -1342,16 +1342,16 @@ if [ "$action" = "copy-system" ]; then
 
     # RASPBERRY PI
     if [ "${computerType}" = "raspberrypi" ]; then
-        echo "# RaspberryPi - set LBA flag" >> ${logFile}
-        parted /dev/${actionDevice} --script set 1 lba on
+        echo "# RaspberryPi - set ESP flag" >> ${logFile}
+        parted /dev/${actionDevice} --script set 1 esp on
         
-        # DEBUG: Log partition count after LBA flag
-        afterLBAPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-        echo "# DEBUG: Partition count after LBA flag: ${afterLBAPartitionCount}" >> ${logFile}
+        # DEBUG: Log partition count after ESP flag
+        afterESPPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
+        echo "# DEBUG: Partition count after ESP flag: ${afterESPPartitionCount}" >> ${logFile}
         
-        isFlagSetLBA=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*lba')
-        if [ ${isFlagSetLBA} -eq 0 ]; then
-            echo "error='failed to set LBA flag'"
+        isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
+        if [ ${isFlagSetESP} -eq 0 ]; then
+            echo "error='failed to set ESP flag'"
             exit 1
         fi
         echo "# RaspberryPi - Bootorder" >> ${logFile}
@@ -1368,25 +1368,14 @@ if [ "$action" = "copy-system" ]; then
 
     # VM & PC
     else
-        echo "# VM & PC - set BOOT/ESP flag" >> ${logFile}
-        parted /dev/${actionDevice} --script set 1 boot on
-        
-        # DEBUG: Log partition count after boot flag
-        afterBootPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-        echo "# DEBUG: Partition count after boot flag: ${afterBootPartitionCount}" >> ${logFile}
-        
+        echo "# VM & PC - set ESP flag" >> ${logFile}
         parted /dev/${actionDevice} --script set 1 esp on
         
         # DEBUG: Log partition count after setting ESP flag
         afterESPPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG: Partition count after ESP flag: ${afterESPPartitionCount}" >> ${logFile}
         
-        isFlagSetBOOT=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*boot')
-        if [ ${isFlagSetBOOT} -eq 0 ]; then
-            echo "error='failed to set BOOT flag'"
-            exit 1
-        fi
-        isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*esp')
+        isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
         if [ ${isFlagSetESP} -eq 0 ]; then
             echo "error='failed to set ESP flag'"
             exit 1
@@ -1721,7 +1710,7 @@ if [ "$action" = "setup" ]; then
             afterWipeFsCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
             echo "# DEBUG SETUP SYSTEM: Partition count after wipefs: ${afterWipeFsCount}" >> ${logFile}
             
-            parted /dev/${actionDevice} --script mklabel msdos
+            parted /dev/${actionDevice} --script mklabel gpt
             
             # DEBUG: Log partition count after mklabel
             afterMklabelCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
@@ -1770,16 +1759,16 @@ if [ "$action" = "setup" ]; then
 
             # RASPBERRY PI
             if [ "${computerType}" = "raspberrypi" ]; then
-                echo "# RaspberryPi - set LBA flag" >> ${logFile}
-                parted /dev/${actionDevice} --script set 1 lba on
+                echo "# RaspberryPi - set ESP flag" >> ${logFile}
+                parted /dev/${actionDevice} --script set 1 esp on
                 
-                # DEBUG: Log partition count after LBA flag
-                afterLBASystemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-                echo "# DEBUG SETUP SYSTEM: Partition count after LBA flag: ${afterLBASystemCount}" >> ${logFile}
+                # DEBUG: Log partition count after ESP flag
+                afterESPSysteemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
+                echo "# DEBUG SETUP SYSTEM: Partition count after ESP flag: ${afterESPSysteemCount}" >> ${logFile}
                 
-                isFlagSetLBA=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*lba')
-                if [ ${isFlagSetLBA} -eq 0 ]; then
-                    echo "error='failed to set LBA flag'"
+                isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
+                if [ ${isFlagSetESP} -eq 0 ]; then
+                    echo "error='failed to set ESP flag'"
                     exit 1
                 fi
                 echo "# RaspberryPi - Bootorder" >> ${logFile}
@@ -1796,25 +1785,14 @@ if [ "$action" = "setup" ]; then
 
             # VM & PC
             else
-                echo "# VM & PC - set BOOT/ESP flag" >> ${logFile}
-                parted /dev/${actionDevice} --script set 1 boot on
-                
-                # DEBUG: Log partition count after boot flag
-                afterBootFlagSystemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-                echo "# DEBUG SETUP SYSTEM: Partition count after boot flag: ${afterBootFlagSystemCount}" >> ${logFile}
-                
+                echo "# VM & PC - set ESP flag" >> ${logFile}
                 parted /dev/${actionDevice} --script set 1 esp on
                 
                 # DEBUG: Log partition count after setting ESP flag
                 afterESPFlagSystemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
                 echo "# DEBUG SETUP SYSTEM: Partition count after ESP flag: ${afterESPFlagSystemCount}" >> ${logFile}
                 
-                isFlagSetBOOT=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*boot')
-                if [ ${isFlagSetBOOT} -eq 0 ]; then
-                    echo "error='failed to set BOOT flag'"
-                    exit 1
-                fi
-                isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*esp')
+                isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
                 if [ ${isFlagSetESP} -eq 0 ]; then
                     echo "error='failed to set ESP flag'"
                     exit 1
@@ -1843,25 +1821,25 @@ if [ "$action" = "setup" ]; then
         afterWipeFsStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after wipefs: ${afterWipeFsStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mklabel msdos >> ${logFile}
+    parted /dev/${actionDevice} --script mklabel gpt >> ${logFile}
         
         # DEBUG: Log partition count after mklabel
         afterMklabelStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after mklabel: ${afterMklabelStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary fat32 1MiB 513MiB >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary fat32 1MiB 513MiB >> ${logFile}
         
         # DEBUG: Log partition count after first mkpart
         afterFirstMkpartStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after first mkpart: ${afterFirstMkpartStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 541MB 65GB >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary ext4 541MB 65GB >> ${logFile}
         
         # DEBUG: Log partition count after second mkpart
         afterSecondMkpartStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after second mkpart: ${afterSecondMkpartStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 65GB 100% >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary ext4 65GB 100% >> ${logFile}
         
         # DEBUG: Log partition count after third mkpart
         afterThirdMkpartStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
@@ -1938,13 +1916,13 @@ if [ "$action" = "setup" ]; then
         afterWipeFsNoBootCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE NO-BOOT: Partition count after wipefs: ${afterWipeFsNoBootCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mklabel msdos >> ${logFile}
+    parted /dev/${actionDevice} --script mklabel gpt >> ${logFile}
         
         # DEBUG: Log partition count after mklabel
         afterMklabelNoBootCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE NO-BOOT: Partition count after mklabel: ${afterMklabelNoBootCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100% >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100% >> ${logFile}
         
         # DEBUG: Log partition count after mkpart
         afterMkpartNoBootCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
@@ -2007,13 +1985,13 @@ if [ "$action" = "setup" ]; then
         afterWipeFsDataCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP DATA: Partition count after wipefs: ${afterWipeFsDataCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mklabel msdos
+    parted /dev/${actionDevice} --script mklabel gpt
         
         # DEBUG: Log partition count after mklabel
         afterMklabelDataCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP DATA: Partition count after mklabel: ${afterMklabelDataCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100%
+    parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100%
         
         # DEBUG: Log partition count after mkpart
         afterMkpartDataCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)

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

@@ -90,9 +90,9 @@ function add_repo {
 function bitcoinI2Pstatus {
   echo "# I2P related logs from the bitcoin debug log"
   echo "# Follow live with the command:"
-  echo "sudo tail -n 1000 -f /mnt/hdd/bitcoin/debug.log | grep i2p"
+  echo "sudo tail -n 1000 -f /mnt/hdd/app-data/bitcoin/debug.log | grep i2p"
   echo
-  sudo cat /mnt/hdd/bitcoin/debug.log | grep i2p
+  sudo cat /mnt/hdd/app-data/bitcoin/debug.log | grep i2p
   echo
   echo "# Running the command:"
   echo "bitcoin-cli -netinfo 4"
@@ -215,7 +215,7 @@ EOF
   echo "# Config: /etc/i2pd/i2pd.conf"
   echo "# i2pd web console: ${localip}:7070"
   echo "# Monitor i2p in bitcoind:"
-  echo "sudo tail -n 100 /mnt/hdd/bitcoin/debug.log | grep i2p"
+  echo "sudo tail -n 100 /mnt/hdd/app-data/bitcoin/debug.log | grep i2p"
   echo "bitcoin-cli -netinfo 4"
 
   exit 0

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

@@ -390,7 +390,7 @@ EOF
   sudo /home/admin/config.scripts/blitz.conf.sh set BTCRPCexplorer "on"
 
   echo "# needs to finish creating txindex to be functional"
-  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/bitcoin/debug.log"
+  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/app-data/bitcoin/debug.log"
   echo "# npm audit fix"
   cd /home/btcrpcexplorer/btc-rpc-explorer/
   sudo npm audit fix

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

@@ -59,6 +59,7 @@ function NBXplorerConfig() {
   sudo -u btcpay mkdir -p /home/btcpay/.nbxplorer/Main
   echo "\
 network=mainnet
+btcnodeendpoint=127.0.0.1:8336
 btc.rpc.user=${RPC_USER}
 btc.rpc.password=${PASSWORD_B}
 postgres=User ID=nbxplorer;Host=localhost;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorermainnet;Password='raspiblitz';
@@ -670,9 +671,9 @@ WantedBy=multi-user.target
 
   NBXplorerConfig
 
-  # whitelist localhost in bitcoind
-  if ! sudo grep -Eq "^whitelist=127.0.0.1" /mnt/hdd/app-data/bitcoin/bitcoin.conf; then
-    echo "whitelist=127.0.0.1" | sudo tee -a /mnt/hdd/app-data/bitcoin/bitcoin.conf
+  # whitelist connection in bitcoind
+  if ! sudo grep -Eq "^whitebind=127.0.0.1:8336" /mnt/hdd/app-data/bitcoin/bitcoin.conf; then
+    echo "whitebind=127.0.0.1:8336" | sudo tee -a /mnt/hdd/app-data/bitcoin/bitcoin.conf
     bitcoindRestart=yes
   fi
 

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

@@ -376,6 +376,7 @@ index-batch-size = 10
 wait_duration_secs = 10
 jsonrpc_timeout_secs = 15
 db_dir = \"/mnt/hdd/app-storage/electrs/db\"
+daemon_p2p_addr = \"127.0.0.1:8335\"
 auth = \"${RPC_USER}:${PASSWORD_B}\"
 # allow BTC-RPC-explorer show tx-s for addresses with a history of more than 100
 txid_limit = 1000
@@ -497,9 +498,9 @@ WantedBy=multi-user.target
     /home/admin/config.scripts/tor.onion-service.sh electrs 50002 50002 50001 50001
   fi
 
-  # whitelist downloading to localhost from bitcoind
-  if ! sudo grep -Eq "^whitelist=download@127.0.0.1" /mnt/hdd/app-data/bitcoin/bitcoin.conf; then
-    echo "whitelist=download@127.0.0.1" | sudo tee -a /mnt/hdd/app-data/bitcoin/bitcoin.conf
+ # whitelist connection in bitcoind
+  if ! sudo grep -Eq "^whitebind=download@127.0.0.1:8335" /mnt/hdd/app-data/bitcoin/bitcoin.conf; then
+    echo "whitebind=download@127.0.0.1:8335" | sudo tee -a /mnt/hdd/app-data/bitcoin/bitcoin.conf
     bitcoindRestart=yes
   fi
 

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

@@ -376,7 +376,7 @@ EOF
   /home/admin/config.scripts/blitz.conf.sh set mempoolExplorer "on"
 
   echo "# needs to finish creating txindex to be functional"
-  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/bitcoin/debug.log"
+  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/app-data/bitcoin/debug.log"
 
   # Hidden Service for Mempool if Tor is active
   if [ "${runBehindTor}" = "on" ]; then

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

@@ -410,7 +410,7 @@ EOF
       echo "# ${network}d is not running - so NOT restarting"
     fi
     echo "# The indexing takes ~10h on an RPi4 with SSD"
-    echo "# check with: sudo cat /mnt/hdd/bitcoin/debug.log | grep filter"
+    echo "# check with: sudo cat /mnt/hdd/app-data/bitcoin/debug.log | grep filter"
   else
     echo "# blockfilterindex is already active"
   fi