From 3de15bed4901ec6be1dc206d0ca3fa7dd068853f Mon Sep 17 00:00:00 2001
From: openoms <43343391+openoms@users.noreply.github.com>
Date: Tue, 28 May 2024 21:56:45 +0200
Subject: [PATCH] specter update to 2.0.4 (#3709)

* specter update to 2.0.0 with python 3.10
* add deadsnake GPG key without using apt-key
* fix deleteData question
* fix config and formatting
* specter update to v2.0.1, remove default node
* readd config and del user on uninstall
* update config
* fix merge
* readd UPDATE option in menu
* specter update to v2.0.2, fix config
* specter update to 2.0.4
* add to change
---
 CHANGES.md                                 |  3 ++-
 home.admin/99updateMenu.sh                 |  6 +++---
 home.admin/config.scripts/bonus.specter.sh | 12 +++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3f74304a8..6209f946c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,6 @@
 ## What's new in Version 1.11.1 of RaspiBlitz?
 
+- Update: Specter Desktop 2.0.4 with reactivated UPDATE option [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v2.0.4)
 - Remove: Tallycoin-Connect [see service shutdown](https://x.com/djbooth007/status/1784409117563720082)
 
 ## What's new in Version 1.11.0 of RaspiBlitz?
@@ -83,7 +84,7 @@
 - Update: Core Lightning v23.02.2 [details](https://github.com/ElementsProject/lightning/releases/tag/v23.02.2)
 - Update: C-lightningREST v0.10.2 [details](https://github.com/Ride-The-Lightning/c-lightning-REST/releases/tag/v0.10.2)
 - Update: Electrum Server in Rust (electrs) v0.9.11 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0911-jan-5-2023)
-- Update: Lightning Terminal v0.9.2-alpha [details](https://github.com/lightninglabs/lightning-terminal/releases/tag/v0.9.2-alpha)
+- Update: Lightning Terminal v0.8.6-alpha [details](https://github.com/lightninglabs/lightning-terminal/releases/tag/v0.8.6-alpha)
 - Update: RTL v0.13.6 with update option [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.13.6)
 - Update: Thunderhub v0.13.16 with balance sharing disabled [details](https://github.com/apotdevin/thunderhub/releases/tag/v0.13.16)
 - Update: LNbits 0.10.6 [details](https://github.com/lnbits/lnbits/releases/tag/0.10.6)
diff --git a/home.admin/99updateMenu.sh b/home.admin/99updateMenu.sh
index ea75360c1..149159954 100755
--- a/home.admin/99updateMenu.sh
+++ b/home.admin/99updateMenu.sh
@@ -490,9 +490,9 @@ if [ "${lndg}" == "on" ]; then
 fi
 
 ## Disabled for now until the base image has Python 3.10
-#if [ "${specter}" == "on" ]; then
-#  OPTIONS+=(SPECTER "Update Specter Desktop")
-#fi
+if [ "${specter}" == "on" ]; then
+  OPTIONS+=(SPECTER "Update Specter Desktop")
+fi
 
 if [ "${BTCPayServer}" == "on" ]; then
   OPTIONS+=(BTCPAY "Update BTCPayServer")
diff --git a/home.admin/config.scripts/bonus.specter.sh b/home.admin/config.scripts/bonus.specter.sh
index b84bcd836..a781ff592 100755
--- a/home.admin/config.scripts/bonus.specter.sh
+++ b/home.admin/config.scripts/bonus.specter.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # https://github.com/cryptoadvance/specter-desktop
 
-pinnedVersion="1.13.1"
+pinnedVersion="2.0.4"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
@@ -131,7 +131,7 @@ function configure_specter {
     "proxy_url": "${proxy}",
     "only_tor": "${torOnly}",
     "tor_control_port": "${tor_control_port}",
-    "tor_status": true,
+    "tor_status": false,
     "hwi_bridge_url": "/hwi/api/"
 }
 EOF
@@ -146,6 +146,8 @@ EOF
   echo "# Connect Specter to the default mainnet node"
   cat >/home/admin/default.json <<EOF
 {
+    "python_class": "cryptoadvance.specter.node.Node",
+    "fullpath": "/home/specter/.specter/nodes/default.json"
     "name": "raspiblitz_mainnet",
     "alias": "default",
     "autodetect": false,
@@ -155,8 +157,6 @@ EOF
     "port": "8332",
     "host": "localhost",
     "protocol": "http",
-    "external_node": true,
-    "fullpath": "/home/specter/.specter/nodes/default.json"
 }
 EOF
   sudo mv /home/admin/default.json /home/specter/.specter/nodes/default.json
@@ -176,7 +176,7 @@ EOF
     "name": "raspiblitz_${chain}net",
     "alias": "raspiblitz_${chain}net",
     "autodetect": false,
-    "datadir": "",
+    "datadir": "/mnt/hdd/bitcoin",
     "user": "${RPCUSER}",
     "password": "${PASSWORD_B}",
     "port": "${PORT}",
@@ -238,6 +238,8 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     echo "#    --> creating a virtualenv"
     sudo -u specter virtualenv --python=python3 /home/specter/.env
 
+    sudo -u specter /home/specter/.env/bin/python3 -m pip install --upgrade pip
+
     echo "#    --> pip-installing specter"
     sudo -u specter /home/specter/.env/bin/python3 -m pip install --upgrade cryptoadvance.specter==$pinnedVersion || exit 1