From 5072272075468a068b6100310291af6a6691aea9 Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Sun, 2 Jan 2022 01:00:01 +0000
Subject: [PATCH] chantools update to v0.10.1

---
 CHANGES.md                                   |  1 +
 home.admin/config.scripts/bonus.chantools.sh | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index db44d4570..1fab88ac6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@
 - Update: LND v0.14.1-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.14.1-beta)
 - Update: C-lightning v0.10.2 [details](https://github.com/ElementsProject/lightning/releases/tag/v0.10.2)
 - Update: Lightning Terminal v0.6.1-alpha with Lightning Node Connect over Tor [details](https://github.com/lightninglabs/lightning-terminal/releases/tag/v0.6.1-alpha)
+_ Update: Channel Tools (chantools) v0.10.1 [details](https://github.com/guggero/chantools/releases/tag/v0.10.1)
 - Update: BTCPayServer v1.3.6 with UPDATE option [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.3.6)
 - Update: Electrum Server in Rust (electrs) v0.9.3 [details](https://github.com/romanz/electrs/blob/v0.9.3/RELEASE-NOTES.md)
 - Update: JoinMarket v0.9.4 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.9.4)
diff --git a/home.admin/config.scripts/bonus.chantools.sh b/home.admin/config.scripts/bonus.chantools.sh
index 220a6a530..015697ca3 100644
--- a/home.admin/config.scripts/bonus.chantools.sh
+++ b/home.admin/config.scripts/bonus.chantools.sh
@@ -5,12 +5,8 @@
 # see https://github.com/guggero/chantools/releases
 
 lndVersion=$(lncli -v | cut -d " " -f 3 | cut -d"." -f2)
-if [ $lndVersion -eq 13 ]; then
-  pinnedVersion="0.9.3"
-elif [ $lndVersion -eq 12 ]; then
-  pinnedVersion="0.8.2"
-elif [ $lndVersion -eq 11 ]; then
-  pinnedVersion="0.7.1" 
+if [ $lndVersion -eq 14 ]; then
+  pinnedVersion="0.10.1"
 else
   echo "# LND not installed or a version not tested with chantools"
   lncli -v
@@ -80,7 +76,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   sudo -u admin wget -N https://github.com/guggero/chantools/releases/download/v${pinnedVersion}/${binaryName}
 
   # check binary was not manipulated (checksum test)
-  sudo -u admin wget -N https://github.com/guggero/chantools/releases/download/v${pinnedVersion}/manifest-v${pinnedVersion}.txt.sig
+  sudo -u admin wget -N https://github.com/guggero/chantools/releases/download/v${pinnedVersion}/manifest-v${pinnedVersion}.txt
   sudo -u admin wget --no-check-certificate -N -O "${downloadDir}/pgp_keys.asc" ${PGPpkeys}
   binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1)
   if [ "${binaryChecksum}" != "${SHA256}" ]; then
@@ -100,8 +96,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   fi
   gpg --import ./pgp_keys.asc
   sleep 3
-  echo "# running: gpg --verify manifest-v${pinnedVersion}.txt.sig"
-  verifyResult=$(gpg --verify manifest-v${pinnedVersion}.txt.sig 2>&1)
+  sudo -u admin wget -N https://github.com/guggero/chantools/releases/download/v${pinnedVersion}/manifest-v${pinnedVersion}.sig
+
+  echo "# running: gpg --verify manifest-v${pinnedVersion}.sig manifest-v${pinnedVersion}.txt"
+  verifyResult=$(gpg --verify manifest-v${pinnedVersion}.sig manifest-v${pinnedVersion}.txt 2>&1)
   echo "# verifyResult(${verifyResult})"
   goodSignature=$(echo ${verifyResult} | grep 'Good signature' -c)
   echo "# goodSignature(${goodSignature})"
@@ -143,7 +141,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
 
   # setting value in raspi blitz config
   /home/admin/config.scripts/blitz.conf.sh set chantools "off"
-  
+
   echo "# REMOVING Channel Tools"
   sudo rm -rf /home/admin/download/chantools*
   sudo rm -rf /home/bitcoin/bin/chantools*