From b3ad08258e7583354bcc768999c87a3372b01c85 Mon Sep 17 00:00:00 2001
From: Taylor Helsper <tehelsper@gmail.com>
Date: Fri, 11 Nov 2022 21:40:47 -0600
Subject: [PATCH] Upgrade Whirlpool to v0.10.16

---
 .../standard/usr/bin/mynode_post_upgrade.sh   |  2 --
 .../usr/share/mynode/mynode_app_versions.sh   |  4 +--
 .../usr/share/whirlpool/whirlpool.asc         | 28 +++++++++----------
 setup/setup_device.sh                         |  2 --
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
index 62ab769b..c37dc226 100755
--- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh
+++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
@@ -679,7 +679,6 @@ fi
 # Install Whirlpool
 if should_install_app "whirlpool" ; then
     WHIRLPOOL_UPGRADE_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/$WHIRLPOOL_UPLOAD_FILE_ID/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
-    WHIRLPOOL_SIG_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/$WHIRLPOOL_UPLOAD_SIG_ID/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar.sig.asc
     CURRENT=""
     if [ -f $WHIRLPOOL_VERSION_FILE ]; then
         CURRENT=$(cat $WHIRLPOOL_VERSION_FILE)
@@ -690,7 +689,6 @@ if should_install_app "whirlpool" ; then
         sudo rm -rf *.jar
         sudo -u bitcoin wget -O whirlpool.jar $WHIRLPOOL_UPGRADE_URL
 
-        #wget -O whirlpool.asc $WHIRLPOOL_SIG_URL
         cp -f /usr/share/whirlpool/whirlpool.asc whirlpool.asc
         gpg --verify whirlpool.asc
 
diff --git a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh
index 478cd011..a2948201 100644
--- a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh
+++ b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh
@@ -87,9 +87,9 @@ 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.15"
+WHIRLPOOL_VERSION="0.10.16"
 WHIRLPOOL_VERSION=$(get_app_version "$WHIRLPOOL_VERSION" "whirlpool")
-WHIRLPOOL_UPLOAD_FILE_ID="3259fdd4a6ea87de3e138db592593558"
+WHIRLPOOL_UPLOAD_FILE_ID="63621e145967f536a562851853bd0990"
 # 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
diff --git a/rootfs/standard/usr/share/whirlpool/whirlpool.asc b/rootfs/standard/usr/share/whirlpool/whirlpool.asc
index 5816e990..d803b982 100644
--- a/rootfs/standard/usr/share/whirlpool/whirlpool.asc
+++ b/rootfs/standard/usr/share/whirlpool/whirlpool.asc
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-3cfbfddbd3be66b66d37a55d65d99824730d01cd226ca192f4f9591e7bc2e03d
+01e9c49cfaa207f31b3fb85ed4175d8e6fee663dbb46b4486162ea12dd40047c
 -----BEGIN PGP SIGNATURE-----
 
-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
+iQIzBAEBCAAdFiEE7RoSgN78pgMUzRW/crW6zf7fOdcFAmMIc0QACgkQcrW6zf7f
+OdcZ6hAAmq96P+ZeTOxJ+HS/EDrN4/tIZPI01VxLjzVg9e836GpU/6pPkU2wTzVB
+K6q30llmNbonZ3ekS9niM3gl/iWtH3yllDIZik1c4XggLQxV1KcW4OWUj8F13UIf
+o79jGft49sqz50krT2BAC1R2hp5hHi0CP7MQc0s29C+oXrBXpWk3Vwl/JhMBBzIk
+HcLew+0Z+w6u1tM36l22549NIvq01J646TKalpFLXPWXJgGNnTulj5ar6aLCP9Ai
+jzC9xTd7RjP9T33jwyQRSD4bX1EqtIPM5DUBGKwAEuTzBOfJY9tE6gQKwM4N8Ovi
+X5s/QdoyYhI8pWplhr0FisJdPi6e6amIR+gmwbIaA97hR+fJbYaGIi2TtmyvgrTI
+A8AmZFw+k6fpWLMajLZejZuuCBWkiNdBuInd0C6urDpk0QgdojAy86mJDfNh4V88
+f53vlnZJEGfsKS/Uxjav5ZpA123SNKRdZkdNwNC4xDn5tNBg1PAWRU7MAg3ACj/f
+U5n/rFgZZoecCtW/geNUEAsmkVYW25qVfdkSF00JGSVnShYZgDr2ITYwj8JN4jcF
+nbHzHCxRMQlpTlLf5PKqy2G2ntyGQ8Nmq3OrOJ3vVhXs75lvD8xFxc6LscgrRp30
+qjaQRBMmDRZWKYZfgJt3bItWJtGtynYElgcBKkWu5WkDnEtc1RU=
+=bsnd
 -----END PGP SIGNATURE-----
diff --git a/setup/setup_device.sh b/setup/setup_device.sh
index 3908c8d2..616ad66f 100755
--- a/setup/setup_device.sh
+++ b/setup/setup_device.sh
@@ -715,7 +715,6 @@ fi
 
 # Install Whirlpool
 WHIRLPOOL_UPGRADE_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/$WHIRLPOOL_UPLOAD_FILE_ID/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
-WHIRLPOOL_SIG_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/$WHIRLPOOL_UPLOAD_SIG_ID/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar.sig.asc
 CURRENT=""
 if [ -f $WHIRLPOOL_VERSION_FILE ]; then
     CURRENT=$(cat $WHIRLPOOL_VERSION_FILE)
@@ -726,7 +725,6 @@ if [ "$CURRENT" != "$WHIRLPOOL_VERSION" ]; then
     sudo rm -rf *.jar
     sudo -u bitcoin wget -O whirlpool.jar $WHIRLPOOL_UPGRADE_URL
 
-    #wget -O whirlpool.asc $WHIRLPOOL_SIG_URL
     cp -f $TMP_INSTALL_PATH/usr/share/whirlpool/whirlpool.asc whirlpool.asc
     gpg --verify whirlpool.asc