Upgrade Whirlpool CLI to v0.10.15

rootfs/standard/etc/tor/torrc

@@ -236,12 +236,12 @@ HiddenServicePort 4081 127.0.0.1:4081
 #HiddenServicePort 5000 127.0.0.1:5000        # Do NOT enable - only use separate service (LNBits)
 #HiddenServicePort 5001 127.0.0.1:5001        # Do NOT enable - only use separate service (LNBits)
 HiddenServicePort 8443 127.0.0.1:8443
-HiddenServicePort 8899 127.0.0.1:8899
+HiddenServicePort 8899 127.0.0.1:8899         # Remove at some point? Now separate.
 HiddenServicePort 19999 127.0.0.1:19999
 HiddenServicePort 20000 127.0.0.1:20000
 HiddenServicePort 25441 127.0.0.1:25441
-#HiddenServicePort 49392 127.0.0.1:49392       # Do NOT enable - only use separate service (BTCPayServer)
-#HiddenServicePort 49393 127.0.0.1:49393       # Do NOT enable - only use separate service (BTCPayServer)
+#HiddenServicePort 49392 127.0.0.1:49392      # Do NOT enable - only use separate service (BTCPayServer)
+#HiddenServicePort 49393 127.0.0.1:49393      # Do NOT enable - only use separate service (BTCPayServer)
 HiddenServicePort 61208 127.0.0.1:61208
 HiddenServicePort 61209 127.0.0.1:61209
 
@@ -278,6 +278,11 @@ HiddenServiceVersion 3
 HiddenServicePort 50001 127.0.0.1:50001
 HiddenServicePort 50002 127.0.0.1:50002
 
+# Hidden Service for myNode (Whirlpool)
+HiddenServiceDir /var/lib/tor/mynode_whirlpool/
+HiddenServiceVersion 3
+HiddenServicePort 8899 127.0.0.1:8899
+
 # Hidden Service for myNode (SSH)
 HiddenServiceDir /var/lib/tor/mynode_ssh/
 HiddenServiceVersion 3

rootfs/standard/usr/share/mynode/mynode_app_versions.sh

@@ -63,8 +63,8 @@ SECP256K1_VERSION=486205aa68b7f1d4291f78fa20bc4485fd843e1c
 SECP256K1_VERSION_FILE=/home/bitcoin/.mynode/secp256k1_version
 SECP256K1_LATEST_VERSION_FILE=/home/bitcoin/.mynode/secp256k1_version_latest
 
-WHIRLPOOL_VERSION="0.10.13"
-WHIRLPOOL_UPLOAD_FILE_ID="c1bb32bac6d4b377f625c996387375c2"
+WHIRLPOOL_VERSION="0.10.15"
+WHIRLPOOL_UPLOAD_FILE_ID="3259fdd4a6ea87de3e138db592593558"
 # Update sig file at /usr/share/whirlpool/whirlpool.asc for each release
 WHIRLPOOL_VERSION_FILE=/home/bitcoin/.mynode/whirlpool_version
 WHIRLPOOL_LATEST_VERSION_FILE=/home/bitcoin/.mynode/whirlpool_version_latest

rootfs/standard/usr/share/whirlpool/whirlpool.asc

@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-78894b934716988eddb8da6db9c6734a3ded416fe68434bedb730f71ded7649d
+3cfbfddbd3be66b66d37a55d65d99824730d01cd226ca192f4f9591e7bc2e03d
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAEBCAAdFiEE7RoSgN78pgMUzRW/crW6zf7fOdcFAmIBR0cACgkQcrW6zf7f
-OdcdVxAAuJL/HL/zZfuBxQj25Ms3duRhJF1fFGAJ8oDlRIJoz7Hr+z6T/6SyhQLb
-PdBW81NPUgYGPwu7c7jYevUYTK/pQxTVzY3lYfYmdsEkdl2D/0iuZcNumgyeAMV9
-CMHsdqRIbeaahNsvQefx1aNcQ7MIGCOUQnmzQKoa1u3YM3zb5/W6sn1lKrNfBV45
-9SMCv5fnmpQuHTG98ydHwPzWGrtGziYU0lJr/J729w3zPo0opd1BOJ6MdQRx6X7G
-uyc8YqqcwM7oYgODd405IhUVGh5EZ4YgpBrEDXXLRTZSycTKMg4W4R6GoXzz7n89
-YPdDI5Gqe2IypxozmuhuqatvtKkjbphbrsaf0mqzFuEC6tQGCQT7IMuZFgSz7/mw
-W9xpIXvtXcXR797wB+YY4DfbZCMsFGLUcxDJzMNBxRIaFzWLkTxbblnKoNU3X31Q
-qJe9qh/Ulaaz027OHmTtoXYGaVBU9qDTFG2Nc7UOb2XC/g5IuGYFMx5QF2Gxvdkj
-p5SEIoyDSvimCX8KM47hlHAayvLqlSD5jhYgAIpcX6r2q2wKt4NTc9jcjs+TafKs
-l+ztyf8tIdh7fiNgt/UwaaZ9LmYD03xes2yleY6uK04Mco+Gx1l0xWtB6u3rVJaB
-JUQlsDamJ+IVU5roKsQpdAHs3mTF9HeGzBx50dn6UmSP0ZyLsAM=
-=zCLx
+iQIzBAEBCAAdFiEE7RoSgN78pgMUzRW/crW6zf7fOdcFAmJuNtUACgkQcrW6zf7f
+OddEDQ/+MxjV3yKa33iH9ALajaxPpuVxydfRFKcrz+M+A3mq7bTduif3/EzqHxNA
+NOfMhUvjzHWMq3jcgHxBF/hOjp9DpZvC6EV4CA2X7s0Tb3zB6lbDUFmYDzBUcLCY
+rwGDlRl1IuEZ2SqfRMnXHQp5SFJY9nA3Esil+QaeMSjJVazq51w/mIspl1n3goXM
+8I/wGDyGiJfZGk8JbvaM5Us9mHt7R2iZxVmvIflmwUguAZquxiLpRAD2kJV9i72a
+omE5oFPwGXyXwEuA6FvV70blfEGNoD9chlafuJoEgiwURQhJViJZUwVfHzCIi6fU
+fzf65dlh57cNJDsGRpfLBzWIytmoN/RNRFJAirpu0a+uryAqcaDJNSemHSYyxgIa
++g6ADZmFt4a7VFpxwJjWtbW/qAZOhUNQyq1rZ8tpob0c4g6ZvGqpgiexA1vg8lhl
+wccR528ymkeVNSOcNKfNS79qI5Gpm3giKo3xMQ7h/ug7egFKfbdsV/O5xayjmVBt
+WvgSjUghSJGTBF89GajpdAdlEqduRd2JOwdBL6VpW11CzCOorh0HvEFUzZYLwUDO
+A1AUoaeeHDCVzSfxMjllxKFPYxnOcYDd10mxU9V6krKSi7gNLbiXuQWXkCI/gmaJ
+kfpArTs16GVKXy2I/9UVtgK9MfyUpRqcTQAcolB5jLIacXVuZOI=
+=8+LK
 -----END PGP SIGNATURE-----

rootfs/standard/var/www/mynode/templates/whirlpool.html

@@ -57,6 +57,7 @@
                 <ul>
                     <li>https://mynode.local:8899</li>
                     <li>https://{{local_ip}}:8899</li>
+                    <li>https://{{whirlpool_onion_url}}:8899</li>
                 </ul>
                 <li>Follow the instructions and scan your payload. Use secure channels if you are copy/pasting the payload.</li>
                 <li>Once connected, enable Tor using the slider and click on "Initialize GUI".</li>

rootfs/standard/var/www/mynode/tor.py

@@ -66,6 +66,7 @@ def page_tor():
     electrs_onion_url = get_onion_url_electrs()
     btcpay_onion_url = get_onion_url_btcpay()
     sphinxrelay_onion_url = get_onion_url_sphinxrelay()
+    whirlpool_onion_url = get_onion_url_for_service("whirlpool")
 
     # v3 Services
     v3_services = []
@@ -79,7 +80,7 @@ def page_tor():
     v3_services.append(create_v3_service("Mempool", general_onion_url, "4080 / 4081", True, ""))
     v3_services.append(create_v3_service("LNbits", lnbits_onion_url, "80 / 443", True, ""))
     v3_services.append(create_v3_service("Lightning Terminal", general_onion_url, "8443", True, ""))
-    v3_services.append(create_v3_service("Whirlpool", general_onion_url, "8899", False, ""))
+    v3_services.append(create_v3_service("Whirlpool", whirlpool_onion_url, "8899", False, ""))
     v3_services.append(create_v3_service("Netdata", general_onion_url, "19999 / 20000", True, ""))
     v3_services.append(create_v3_service("Specter Desktop", general_onion_url, "25441", True, "", force_https=True))
     v3_services.append(create_v3_service("Glances", general_onion_url, "61208 / 61209", True, ""))

rootfs/standard/var/www/mynode/whirlpool.py

@@ -1,7 +1,7 @@
 from flask import Blueprint, render_template, redirect
 from user_management import check_logged_in
 from enable_disable_functions import *
-from device_info import read_ui_settings, is_testnet_enabled, get_local_ip
+from device_info import read_ui_settings, is_testnet_enabled, get_local_ip, get_onion_url_for_service
 from application_info import *
 from systemctl_info import *
 import subprocess
@@ -37,6 +37,7 @@ def whirlpool_page():
         "title": "myNode Whirlpool",
         "ui_settings": read_ui_settings(),
         "local_ip": get_local_ip(),
+        "whirlpool_onion_url": get_onion_url_for_service("whirlpool"),
         "whirlpool_status": whirlpool_status,
         "whirlpool_enabled": is_service_enabled("whirlpool"),
         "whirlpool_initialized": is_whirlpool_initialized(),