From 040b96754d42453094188ae9713a1777d67ee3fe Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Mon, 3 Jan 2022 11:38:47 -0500
Subject: [PATCH 01/15] v0.8.0-rc.1

---
 build.sh        | 18 +++++++++---------
 dist/setup.sh   | 20 ++++++++++----------
 docker-build.sh | 10 +++++-----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/build.sh b/build.sh
index 92c8562..4c6564a 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.7.0-dev"
-CONF_VERSION="v0.7.0-dev-local"
-GATEKEEPER_VERSION="v0.7.0-dev-local"
-TOR_VERSION="v0.7.0-dev-local"
-PROXY_VERSION="v0.7.0-dev-local"
-NOTIFIER_VERSION="v0.7.0-dev-local"
-PROXYCRON_VERSION="v0.7.0-dev-local"
-OTSCLIENT_VERSION="v0.7.0-dev-local"
-PYCOIN_VERSION="v0.7.0-dev-local"
+# CYPHERNODE VERSION "v0.8.0-rc.1-dev" -> dev over v0.8.0-rc.1
+CONF_VERSION="v0.8.0-rc.1-dev-local"
+GATEKEEPER_VERSION="v0.8.0-rc.1-dev-local"
+TOR_VERSION="v0.8.0-rc.1-dev-local"
+PROXY_VERSION="v0.8.0-rc.1-dev-local"
+NOTIFIER_VERSION="v0.8.0-rc.1-dev-local"
+PROXYCRON_VERSION="v0.8.0-rc.1-dev-local"
+OTSCLIENT_VERSION="v0.8.0-rc.1-dev-local"
+PYCOIN_VERSION="v0.8.0-rc.1-dev-local"
 
 trace()
 {
diff --git a/dist/setup.sh b/dist/setup.sh
index 6485c29..8f7042d 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -860,16 +860,16 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.7.0-dev"
-SETUP_VERSION="v0.7.0-dev"
-CONF_VERSION="v0.7.0-dev"
-GATEKEEPER_VERSION="v0.7.0-dev"
-TOR_VERSION="v0.7.0-dev"
-PROXY_VERSION="v0.7.0-dev"
-NOTIFIER_VERSION="v0.7.0-dev"
-PROXYCRON_VERSION="v0.7.0-dev"
-OTSCLIENT_VERSION="v0.7.0-dev"
-PYCOIN_VERSION="v0.7.0-dev"
+# CYPHERNODE VERSION "v0.8.0-rc.1-dev" -> dev over v0.8.0-rc.1
+SETUP_VERSION="v0.8.0-rc.1-dev"
+CONF_VERSION="v0.8.0-rc.1-dev"
+GATEKEEPER_VERSION="v0.8.0-rc.1-dev"
+TOR_VERSION="v0.8.0-rc.1-dev"
+PROXY_VERSION="v0.8.0-rc.1-dev"
+NOTIFIER_VERSION="v0.8.0-rc.1-dev"
+PROXYCRON_VERSION="v0.8.0-rc.1-dev"
+OTSCLIENT_VERSION="v0.8.0-rc.1-dev"
+PYCOIN_VERSION="v0.8.0-rc.1-dev"
 CYPHERAPPS_VERSION="dev"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"
diff --git a/docker-build.sh b/docker-build.sh
index 83d53cf..bb2f606 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -62,12 +62,12 @@ aarch64_docker="arm64"
 # Build amd64 and arm64 first, building for arm will trigger the manifest creation and push on hub
 
 #arch_docker=${arm_docker}
-#arch_docker=${aarch64_docker}
-arch_docker=${x86_docker}
+arch_docker=${aarch64_docker}
+#arch_docker=${x86_docker}
 
-v1="v0"
-v2="v0.7"
-v3="v0.7.0"
+v1="v0-rc.1"
+v2="v0.8-rc.1"
+v3="v0.8.0-rc.1"
 
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"

From 04f7f0606b7a4881b555cd9355d142540bfc84a1 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Mon, 3 Jan 2022 12:10:32 -0500
Subject: [PATCH 02/15] cypherapps releases/v0.8.0

---
 dist/setup.sh   |  2 +-
 docker-build.sh | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dist/setup.sh b/dist/setup.sh
index 8f7042d..416e8a5 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -870,7 +870,7 @@ NOTIFIER_VERSION="v0.8.0-rc.1-dev"
 PROXYCRON_VERSION="v0.8.0-rc.1-dev"
 OTSCLIENT_VERSION="v0.8.0-rc.1-dev"
 PYCOIN_VERSION="v0.8.0-rc.1-dev"
-CYPHERAPPS_VERSION="dev"
+CYPHERAPPS_VERSION="releases/v0.8.0"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"
 TRAEFIK_VERSION="v1.7.9-alpine"
diff --git a/docker-build.sh b/docker-build.sh
index bb2f606..832adb1 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -72,14 +72,14 @@ v3="v0.8.0-rc.1"
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"
 
-image "gatekeeper" "api_auth_docker/" ${arch_docker} \
-&& image "proxycron" "cron_docker/" ${arch_docker} \
-&& image "otsclient" "otsclient_docker/" ${arch_docker} \
-&& image "tor" "tor_docker/" ${arch_docker} \
-&& image "proxy" "proxy_docker/" ${arch_docker} \
-&& image "notifier" "notifier_docker/" ${arch_docker} \
-&& image "pycoin" "pycoin_docker/" ${arch_docker} \
-&& image "cyphernodeconf" "cyphernodeconf_docker/" ${arch_docker}
+#image "gatekeeper" "api_auth_docker/" ${arch_docker} \
+#&& image "proxycron" "cron_docker/" ${arch_docker} \
+#&& image "otsclient" "otsclient_docker/" ${arch_docker} \
+#&& image "tor" "tor_docker/" ${arch_docker} \
+#&& image "proxy" "proxy_docker/" ${arch_docker} \
+#&& image "notifier" "notifier_docker/" ${arch_docker} \
+#&& image "pycoin" "pycoin_docker/" ${arch_docker} \
+image "cyphernodeconf" "cyphernodeconf_docker/" ${arch_docker}
 
 [ $? -ne 0 ] && echo "Error" && exit 1
 

From 4a50d556e77695c84d6ce31403bc9f4519675bb6 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Mon, 3 Jan 2022 15:45:08 -0500
Subject: [PATCH 03/15] Using published images v0.8.0-rc.1

---
 dist/setup.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dist/setup.sh b/dist/setup.sh
index 416e8a5..352ec5a 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -860,16 +860,16 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.8.0-rc.1-dev" -> dev over v0.8.0-rc.1
-SETUP_VERSION="v0.8.0-rc.1-dev"
-CONF_VERSION="v0.8.0-rc.1-dev"
-GATEKEEPER_VERSION="v0.8.0-rc.1-dev"
-TOR_VERSION="v0.8.0-rc.1-dev"
-PROXY_VERSION="v0.8.0-rc.1-dev"
-NOTIFIER_VERSION="v0.8.0-rc.1-dev"
-PROXYCRON_VERSION="v0.8.0-rc.1-dev"
-OTSCLIENT_VERSION="v0.8.0-rc.1-dev"
-PYCOIN_VERSION="v0.8.0-rc.1-dev"
+# CYPHERNODE VERSION "v0.8.0-rc.1"
+SETUP_VERSION="v0.8.0-rc.1"
+CONF_VERSION="v0.8.0-rc.1"
+GATEKEEPER_VERSION="v0.8.0-rc.1"
+TOR_VERSION="v0.8.0-rc.1"
+PROXY_VERSION="v0.8.0-rc.1"
+NOTIFIER_VERSION="v0.8.0-rc.1"
+PROXYCRON_VERSION="v0.8.0-rc.1"
+OTSCLIENT_VERSION="v0.8.0-rc.1"
+PYCOIN_VERSION="v0.8.0-rc.1"
 CYPHERAPPS_VERSION="releases/v0.8.0"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"

From 9165e950e2c259e7a5d8caa6f4378a2a0cd40825 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 18 Jan 2022 11:29:21 -0500
Subject: [PATCH 04/15] v0.8.0-rc.2

---
 build.sh        | 18 +++++++++---------
 dist/setup.sh   | 20 ++++++++++----------
 docker-build.sh |  6 +++---
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/build.sh b/build.sh
index 4c6564a..329cbf5 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.8.0-rc.1-dev" -> dev over v0.8.0-rc.1
-CONF_VERSION="v0.8.0-rc.1-dev-local"
-GATEKEEPER_VERSION="v0.8.0-rc.1-dev-local"
-TOR_VERSION="v0.8.0-rc.1-dev-local"
-PROXY_VERSION="v0.8.0-rc.1-dev-local"
-NOTIFIER_VERSION="v0.8.0-rc.1-dev-local"
-PROXYCRON_VERSION="v0.8.0-rc.1-dev-local"
-OTSCLIENT_VERSION="v0.8.0-rc.1-dev-local"
-PYCOIN_VERSION="v0.8.0-rc.1-dev-local"
+# CYPHERNODE VERSION "v0.8.0-rc.2-dev" -> dev over v0.8.0-rc.2
+CONF_VERSION="v0.8.0-rc.2-dev-local"
+GATEKEEPER_VERSION="v0.8.0-rc.2-dev-local"
+TOR_VERSION="v0.8.0-rc.2-dev-local"
+PROXY_VERSION="v0.8.0-rc.2-dev-local"
+NOTIFIER_VERSION="v0.8.0-rc.2-dev-local"
+PROXYCRON_VERSION="v0.8.0-rc.2-dev-local"
+OTSCLIENT_VERSION="v0.8.0-rc.2-dev-local"
+PYCOIN_VERSION="v0.8.0-rc.2-dev-local"
 
 trace()
 {
diff --git a/dist/setup.sh b/dist/setup.sh
index 2d51cde..e6b996f 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -859,16 +859,16 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.8.0-rc.1"
-SETUP_VERSION="v0.8.0-rc.1"
-CONF_VERSION="v0.8.0-rc.1"
-GATEKEEPER_VERSION="v0.8.0-rc.1"
-TOR_VERSION="v0.8.0-rc.1"
-PROXY_VERSION="v0.8.0-rc.1"
-NOTIFIER_VERSION="v0.8.0-rc.1"
-PROXYCRON_VERSION="v0.8.0-rc.1"
-OTSCLIENT_VERSION="v0.8.0-rc.1"
-PYCOIN_VERSION="v0.8.0-rc.1"
+# CYPHERNODE VERSION "v0.8.0-rc.2"
+SETUP_VERSION="v0.8.0-rc.2"
+CONF_VERSION="v0.8.0-rc.2"
+GATEKEEPER_VERSION="v0.8.0-rc.2"
+TOR_VERSION="v0.8.0-rc.2"
+PROXY_VERSION="v0.8.0-rc.2"
+NOTIFIER_VERSION="v0.8.0-rc.2"
+PROXYCRON_VERSION="v0.8.0-rc.2"
+OTSCLIENT_VERSION="v0.8.0-rc.2"
+PYCOIN_VERSION="v0.8.0-rc.2"
 CYPHERAPPS_VERSION="releases/v0.8.0"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"
diff --git a/docker-build.sh b/docker-build.sh
index 832adb1..ee2ba4e 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -65,9 +65,9 @@ aarch64_docker="arm64"
 arch_docker=${aarch64_docker}
 #arch_docker=${x86_docker}
 
-v1="v0-rc.1"
-v2="v0.8-rc.1"
-v3="v0.8.0-rc.1"
+v1="v0-rc.2"
+v2="v0.8-rc.2"
+v3="v0.8.0-rc.2"
 
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"

From c1c99f1ad005f9fc824a0ae8a07758fab01731fc Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 18 Jan 2022 11:41:00 -0500
Subject: [PATCH 05/15] Removed comments in builder and ask arch

---
 docker-build.sh | 45 ++++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/docker-build.sh b/docker-build.sh
index ee2ba4e..905dfe3 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Must be logged to docker hub:
 # docker login -u cyphernode
@@ -59,27 +59,42 @@ x86_docker="amd64"
 arm_docker="arm"
 aarch64_docker="arm64"
 
-# Build amd64 and arm64 first, building for arm will trigger the manifest creation and push on hub
-
-#arch_docker=${arm_docker}
-arch_docker=${aarch64_docker}
-#arch_docker=${x86_docker}
-
 v1="v0-rc.2"
 v2="v0.8-rc.2"
 v3="v0.8.0-rc.2"
 
+# Build amd64 and arm64 first, building for arm will trigger the manifest creation and push on hub
+
+echo -e "\nBuild ${v3} for:\n"
+echo "1) AMD 64 bits (Most PCs)"
+echo "2) ARM 64 bits (RPi4, Mac M1)"
+echo "3) ARM 32 bits (RPi2-3)"
+echo -en "\nYour choice (1, 2, 3): "
+read arch_input
+
+case "${arch_input}" in
+  1)
+    arch_docker=${x86_docker}
+    ;;
+  2)
+    arch_docker=${aarch64_docker}
+    ;;
+  3)
+    arch_docker=${arm_docker}
+    ;;
+esac
+
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"
 
-#image "gatekeeper" "api_auth_docker/" ${arch_docker} \
-#&& image "proxycron" "cron_docker/" ${arch_docker} \
-#&& image "otsclient" "otsclient_docker/" ${arch_docker} \
-#&& image "tor" "tor_docker/" ${arch_docker} \
-#&& image "proxy" "proxy_docker/" ${arch_docker} \
-#&& image "notifier" "notifier_docker/" ${arch_docker} \
-#&& image "pycoin" "pycoin_docker/" ${arch_docker} \
-image "cyphernodeconf" "cyphernodeconf_docker/" ${arch_docker}
+image "gatekeeper" "api_auth_docker/" ${arch_docker} \
+&& image "proxycron" "cron_docker/" ${arch_docker} \
+&& image "otsclient" "otsclient_docker/" ${arch_docker} \
+&& image "tor" "tor_docker/" ${arch_docker} \
+&& image "proxy" "proxy_docker/" ${arch_docker} \
+&& image "notifier" "notifier_docker/" ${arch_docker} \
+&& image "pycoin" "pycoin_docker/" ${arch_docker} \
+&& image "cyphernodeconf" "cyphernodeconf_docker/" ${arch_docker}
 
 [ $? -ne 0 ] && echo "Error" && exit 1
 

From 146310631f528533108c19fae69bad412245109f Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 18 Jan 2022 11:56:54 -0500
Subject: [PATCH 06/15] Small improvement to build script

---
 docker-build.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker-build.sh b/docker-build.sh
index 905dfe3..11532e5 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -82,10 +82,14 @@ case "${arch_input}" in
   3)
     arch_docker=${arm_docker}
     ;;
+  *)
+    echo "Not a valid choice."
+    exit 1
+    ;;
 esac
 
-echo "\nBuilding Cyphernode Core containers\n"
-echo "arch_docker=$arch_docker\n"
+echo -e "\nBuilding Cyphernode Core containers\n"
+echo -e "arch_docker=$arch_docker\n"
 
 image "gatekeeper" "api_auth_docker/" ${arch_docker} \
 && image "proxycron" "cron_docker/" ${arch_docker} \

From 0a8a560896f1c3c14ce6682f9c0eb5984fad5594 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 18 Jan 2022 12:43:55 -0500
Subject: [PATCH 07/15] Right image tags when building locally

---
 build.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index 329cbf5..16f83e6 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.8.0-rc.2-dev" -> dev over v0.8.0-rc.2
-CONF_VERSION="v0.8.0-rc.2-dev-local"
-GATEKEEPER_VERSION="v0.8.0-rc.2-dev-local"
-TOR_VERSION="v0.8.0-rc.2-dev-local"
-PROXY_VERSION="v0.8.0-rc.2-dev-local"
-NOTIFIER_VERSION="v0.8.0-rc.2-dev-local"
-PROXYCRON_VERSION="v0.8.0-rc.2-dev-local"
-OTSCLIENT_VERSION="v0.8.0-rc.2-dev-local"
-PYCOIN_VERSION="v0.8.0-rc.2-dev-local"
+# CYPHERNODE VERSION "v0.8.0-rc.2"
+CONF_VERSION="v0.8.0-rc.2-local"
+GATEKEEPER_VERSION="v0.8.0-rc.2-local"
+TOR_VERSION="v0.8.0-rc.2-local"
+PROXY_VERSION="v0.8.0-rc.2-local"
+NOTIFIER_VERSION="v0.8.0-rc.2-local"
+PROXYCRON_VERSION="v0.8.0-rc.2-local"
+OTSCLIENT_VERSION="v0.8.0-rc.2-local"
+PYCOIN_VERSION="v0.8.0-rc.2-local"
 
 trace()
 {

From 46d277e10b9d8fdc9faf8589b85f74461da3756c Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 18 Jan 2022 13:18:40 -0500
Subject: [PATCH 08/15] Added release-notes-v0.8.0.md

---
 doc/release-notes-v0.8.0.md | 75 +++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 doc/release-notes-v0.8.0.md

diff --git a/doc/release-notes-v0.8.0.md b/doc/release-notes-v0.8.0.md
new file mode 100644
index 0000000..f023fe3
--- /dev/null
+++ b/doc/release-notes-v0.8.0.md
@@ -0,0 +1,75 @@
+# Cyphernode v0.8.0
+
+Say hello to PostgreSQL!  We moved from SQLite3 to PostgreSQL to take advantage of its enterprise-class features.  Here are some of our motivations:
+
+- Better overall performance
+- Easier to implement replicas / distributed redundancy
+- Running in an independent container: can be used by other containers as well
+- More/better administration tools
+- Easier to configure C-lightning to use PostgreSQL
+- Future development
+
+All of that may also be possible with SQLite3, but with a lot more work.
+
+If you have an existing Cyphernode installation with existing data, Cyphernode will take care of the migration: we built all the required ETL scripts that will hopefully flawlessly move your current instance to the new DBMS.
+
+There are also several improvements and new features in this release.  Thanks go to [@pablof7z](https://twitter.com/pablof7z) @phillamy and @schulterklopfer for their valuable contributions, feedbacks and inputs!
+
+## New features
+
+- PostgreSQL: migrating from SQLite3 to PostgreSQL
+  - Automatic migration from current SQLite3 to new PostgreSQL (ETL)
+  - New Indexes
+  - Separate container
+- Support for labels when:
+  - watching addresses
+  - getting new addresses
+- New `ln_paystatus` endpoint
+- New `validateaddress` endpoint
+- New `deriveindex_bitcoind` endpoint (20x faster than Pycoin), also supports ypub/upub and zpub/vpub notations!
+- New `derivepubpath_bitcoind` (20x faster than Pycoin), also supports ypub/upub and zpub/vpub notations!
+
+## Fixes and improvements
+
+- Refactoring of _manage_missed_conf_ and _confirmation management_
+- `ln_pay` now first pays using `legacy_pay` (MPP disabled) and on failure (for routing reasons), retry with the `pay` plugin (MPP enabled by default)
+- Small fixes in `ln_pay`
+- Small fixes in `ln_delinvoice`
+- Small fixes in `ln_connectfund`
+- Small fixes in LN webhooks
+- `ln_listpays` can now take a `bolt11` string argument
+- Sometimes, Gatekeeper was not compliant to JWT: now it is but still compatible with previous buggy version
+- Fixed CN client examples
+- Gatekeeper now returns _401 Unauthorized_ on authentication error and _403 Forbidden_ on authorization error
+- Gatekeeper now waits for the Proxy to be ready before listening to requests
+- More graceful shutdown on certain containers
+- Docker now uses the `helloworld` endpoint to check Proxy's health
+- Better way to determine slow machine during setup
+- Better tests when starting up
+- Fixed a bug when running Cyphernode as current user instead of dedicated user
+- When trying to add a batcher that already exists (same `label`), it will now modify existing one
+- Got rid of the full rawtx from the database!  Let's use Bitcoin Core if needed
+- `helloworld` endpoint now returns a JSON compliant response
+- Added and improved tests:
+  - api_auth_docker/tests/test-gatekeeper.sh
+  - proxy_docker/app/tests/test-manage-missed.sh
+  - proxy_docker/app/tests/test-batching.sh
+  - proxy_docker/app/tests/test-derive.sh
+  - proxy_docker/app/tests/test-watchpub32.sh
+- Fixed typos and improved clarity in messages
+- Bump ws from 5.2.2 to 5.2.3 in /cyphernodeconf_docker
+- Bump path-parse from 1.0.6 to 1.0.7 in /cyphernodeconf_docker
+- Bump tmpl from 1.0.4 to 1.0.5 in /cyphernodeconf_docker
+- Bump validator from 10.11.0 to 13.7.0 in /cyphernodeconf_docker
+- Code cleaning
+
+## Upgrades
+
+- C-lightning from v0.10.0 to v0.10.2
+- Bitcoin Core from v0.21.1 to v22.0
+
+## Cypherapps
+
+- Batcher from v0.1.2 to v0.2.0
+- Spark Wallet from v0.2.17 to v0.3.0
+- Specter from v1.3.1 to v1.7.1

From a9a7d5550b36d96ddf60dbc2335add0c689977aa Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Thu, 17 Feb 2022 16:56:34 -0500
Subject: [PATCH 09/15] v0.8.0-rc.3

---
 build.sh                    | 18 +++++++++---------
 dist/setup.sh               | 20 ++++++++++----------
 doc/release-notes-v0.8.0.md |  1 +
 docker-build.sh             |  6 +++---
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/build.sh b/build.sh
index 16f83e6..286f197 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.8.0-rc.2"
-CONF_VERSION="v0.8.0-rc.2-local"
-GATEKEEPER_VERSION="v0.8.0-rc.2-local"
-TOR_VERSION="v0.8.0-rc.2-local"
-PROXY_VERSION="v0.8.0-rc.2-local"
-NOTIFIER_VERSION="v0.8.0-rc.2-local"
-PROXYCRON_VERSION="v0.8.0-rc.2-local"
-OTSCLIENT_VERSION="v0.8.0-rc.2-local"
-PYCOIN_VERSION="v0.8.0-rc.2-local"
+# CYPHERNODE VERSION "v0.8.0-rc.3"
+CONF_VERSION="v0.8.0-rc.3-local"
+GATEKEEPER_VERSION="v0.8.0-rc.3-local"
+TOR_VERSION="v0.8.0-rc.3-local"
+PROXY_VERSION="v0.8.0-rc.3-local"
+NOTIFIER_VERSION="v0.8.0-rc.3-local"
+PROXYCRON_VERSION="v0.8.0-rc.3-local"
+OTSCLIENT_VERSION="v0.8.0-rc.3-local"
+PYCOIN_VERSION="v0.8.0-rc.3-local"
 
 trace()
 {
diff --git a/dist/setup.sh b/dist/setup.sh
index e6b996f..2cbf53f 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -859,16 +859,16 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.8.0-rc.2"
-SETUP_VERSION="v0.8.0-rc.2"
-CONF_VERSION="v0.8.0-rc.2"
-GATEKEEPER_VERSION="v0.8.0-rc.2"
-TOR_VERSION="v0.8.0-rc.2"
-PROXY_VERSION="v0.8.0-rc.2"
-NOTIFIER_VERSION="v0.8.0-rc.2"
-PROXYCRON_VERSION="v0.8.0-rc.2"
-OTSCLIENT_VERSION="v0.8.0-rc.2"
-PYCOIN_VERSION="v0.8.0-rc.2"
+# CYPHERNODE VERSION "v0.8.0-rc.3"
+SETUP_VERSION="v0.8.0-rc.3"
+CONF_VERSION="v0.8.0-rc.3"
+GATEKEEPER_VERSION="v0.8.0-rc.3"
+TOR_VERSION="v0.8.0-rc.3"
+PROXY_VERSION="v0.8.0-rc.3"
+NOTIFIER_VERSION="v0.8.0-rc.3"
+PROXYCRON_VERSION="v0.8.0-rc.3"
+OTSCLIENT_VERSION="v0.8.0-rc.3"
+PYCOIN_VERSION="v0.8.0-rc.3"
 CYPHERAPPS_VERSION="releases/v0.8.0"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"
diff --git a/doc/release-notes-v0.8.0.md b/doc/release-notes-v0.8.0.md
index f023fe3..4bdc1e7 100644
--- a/doc/release-notes-v0.8.0.md
+++ b/doc/release-notes-v0.8.0.md
@@ -56,6 +56,7 @@ There are also several improvements and new features in this release.  Thanks go
   - proxy_docker/app/tests/test-batching.sh
   - proxy_docker/app/tests/test-derive.sh
   - proxy_docker/app/tests/test-watchpub32.sh
+  - proxy_docker/app/tests/test-watches.sh
 - Fixed typos and improved clarity in messages
 - Bump ws from 5.2.2 to 5.2.3 in /cyphernodeconf_docker
 - Bump path-parse from 1.0.6 to 1.0.7 in /cyphernodeconf_docker
diff --git a/docker-build.sh b/docker-build.sh
index 11532e5..b50e9b6 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -59,9 +59,9 @@ x86_docker="amd64"
 arm_docker="arm"
 aarch64_docker="arm64"
 
-v1="v0-rc.2"
-v2="v0.8-rc.2"
-v3="v0.8.0-rc.2"
+v1="v0-rc.3"
+v2="v0.8-rc.3"
+v3="v0.8.0-rc.3"
 
 # Build amd64 and arm64 first, building for arm will trigger the manifest creation and push on hub
 

From afc3104b9fdfec5b2af8b5f65e9213a1ebf193e5 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Wed, 23 Feb 2022 13:36:55 -0500
Subject: [PATCH 10/15] v0.8.0-rc.4

---
 build.sh        | 18 +++++++++---------
 dist/setup.sh   | 20 ++++++++++----------
 docker-build.sh |  6 +++---
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/build.sh b/build.sh
index 286f197..76d102c 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.8.0-rc.3"
-CONF_VERSION="v0.8.0-rc.3-local"
-GATEKEEPER_VERSION="v0.8.0-rc.3-local"
-TOR_VERSION="v0.8.0-rc.3-local"
-PROXY_VERSION="v0.8.0-rc.3-local"
-NOTIFIER_VERSION="v0.8.0-rc.3-local"
-PROXYCRON_VERSION="v0.8.0-rc.3-local"
-OTSCLIENT_VERSION="v0.8.0-rc.3-local"
-PYCOIN_VERSION="v0.8.0-rc.3-local"
+# CYPHERNODE VERSION "v0.8.0-rc.4"
+CONF_VERSION="v0.8.0-rc.4-local"
+GATEKEEPER_VERSION="v0.8.0-rc.4-local"
+TOR_VERSION="v0.8.0-rc.4-local"
+PROXY_VERSION="v0.8.0-rc.4-local"
+NOTIFIER_VERSION="v0.8.0-rc.4-local"
+PROXYCRON_VERSION="v0.8.0-rc.4-local"
+OTSCLIENT_VERSION="v0.8.0-rc.4-local"
+PYCOIN_VERSION="v0.8.0-rc.4-local"
 
 trace()
 {
diff --git a/dist/setup.sh b/dist/setup.sh
index 2cbf53f..06646ed 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -859,16 +859,16 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.8.0-rc.3"
-SETUP_VERSION="v0.8.0-rc.3"
-CONF_VERSION="v0.8.0-rc.3"
-GATEKEEPER_VERSION="v0.8.0-rc.3"
-TOR_VERSION="v0.8.0-rc.3"
-PROXY_VERSION="v0.8.0-rc.3"
-NOTIFIER_VERSION="v0.8.0-rc.3"
-PROXYCRON_VERSION="v0.8.0-rc.3"
-OTSCLIENT_VERSION="v0.8.0-rc.3"
-PYCOIN_VERSION="v0.8.0-rc.3"
+# CYPHERNODE VERSION "v0.8.0-rc.4"
+SETUP_VERSION="v0.8.0-rc.4"
+CONF_VERSION="v0.8.0-rc.4"
+GATEKEEPER_VERSION="v0.8.0-rc.4"
+TOR_VERSION="v0.8.0-rc.4"
+PROXY_VERSION="v0.8.0-rc.4"
+NOTIFIER_VERSION="v0.8.0-rc.4"
+PROXYCRON_VERSION="v0.8.0-rc.4"
+OTSCLIENT_VERSION="v0.8.0-rc.4"
+PYCOIN_VERSION="v0.8.0-rc.4"
 CYPHERAPPS_VERSION="releases/v0.8.0"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"
diff --git a/docker-build.sh b/docker-build.sh
index b50e9b6..1b29160 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -59,9 +59,9 @@ x86_docker="amd64"
 arm_docker="arm"
 aarch64_docker="arm64"
 
-v1="v0-rc.3"
-v2="v0.8-rc.3"
-v3="v0.8.0-rc.3"
+v1="v0-rc.4"
+v2="v0.8-rc.4"
+v3="v0.8.0-rc.4"
 
 # Build amd64 and arm64 first, building for arm will trigger the manifest creation and push on hub
 

From e5cdd071b778e6a4b33dec7d9fd16ca1628b310e Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Mon, 28 Feb 2022 17:12:47 -0500
Subject: [PATCH 11/15] v0.8.0 final

---
 build.sh                                      | 18 +++++++--------
 dist/setup.sh                                 | 22 +++++++++----------
 .../release-notes-v0.8.0.md                   |  0
 docker-build.sh                               |  6 ++---
 4 files changed, 23 insertions(+), 23 deletions(-)
 rename doc/{ => release-notes}/release-notes-v0.8.0.md (100%)

diff --git a/build.sh b/build.sh
index 76d102c..ef27e13 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.8.0-rc.4"
-CONF_VERSION="v0.8.0-rc.4-local"
-GATEKEEPER_VERSION="v0.8.0-rc.4-local"
-TOR_VERSION="v0.8.0-rc.4-local"
-PROXY_VERSION="v0.8.0-rc.4-local"
-NOTIFIER_VERSION="v0.8.0-rc.4-local"
-PROXYCRON_VERSION="v0.8.0-rc.4-local"
-OTSCLIENT_VERSION="v0.8.0-rc.4-local"
-PYCOIN_VERSION="v0.8.0-rc.4-local"
+# CYPHERNODE VERSION "v0.8.0"
+CONF_VERSION="v0.8.0-local"
+GATEKEEPER_VERSION="v0.8.0-local"
+TOR_VERSION="v0.8.0-local"
+PROXY_VERSION="v0.8.0-local"
+NOTIFIER_VERSION="v0.8.0-local"
+PROXYCRON_VERSION="v0.8.0-local"
+OTSCLIENT_VERSION="v0.8.0-local"
+PYCOIN_VERSION="v0.8.0-local"
 
 trace()
 {
diff --git a/dist/setup.sh b/dist/setup.sh
index 06646ed..91e2043 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -859,17 +859,17 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.8.0-rc.4"
-SETUP_VERSION="v0.8.0-rc.4"
-CONF_VERSION="v0.8.0-rc.4"
-GATEKEEPER_VERSION="v0.8.0-rc.4"
-TOR_VERSION="v0.8.0-rc.4"
-PROXY_VERSION="v0.8.0-rc.4"
-NOTIFIER_VERSION="v0.8.0-rc.4"
-PROXYCRON_VERSION="v0.8.0-rc.4"
-OTSCLIENT_VERSION="v0.8.0-rc.4"
-PYCOIN_VERSION="v0.8.0-rc.4"
-CYPHERAPPS_VERSION="releases/v0.8.0"
+# CYPHERNODE VERSION "v0.8.0"
+SETUP_VERSION="v0.8.0"
+CONF_VERSION="v0.8.0"
+GATEKEEPER_VERSION="v0.8.0"
+TOR_VERSION="v0.8.0"
+PROXY_VERSION="v0.8.0"
+NOTIFIER_VERSION="v0.8.0"
+PROXYCRON_VERSION="v0.8.0"
+OTSCLIENT_VERSION="v0.8.0"
+PYCOIN_VERSION="v0.8.0"
+CYPHERAPPS_VERSION="v0.8.0"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"
 TRAEFIK_VERSION="v1.7.9-alpine"
diff --git a/doc/release-notes-v0.8.0.md b/doc/release-notes/release-notes-v0.8.0.md
similarity index 100%
rename from doc/release-notes-v0.8.0.md
rename to doc/release-notes/release-notes-v0.8.0.md
diff --git a/docker-build.sh b/docker-build.sh
index 1b29160..4431aeb 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -59,9 +59,9 @@ x86_docker="amd64"
 arm_docker="arm"
 aarch64_docker="arm64"
 
-v1="v0-rc.4"
-v2="v0.8-rc.4"
-v3="v0.8.0-rc.4"
+v1="v0"
+v2="v0.8"
+v3="v0.8.0"
 
 # Build amd64 and arm64 first, building for arm will trigger the manifest creation and push on hub
 

From 18f7bcb4a39c336f6ed0d47556107f99dbf3d248 Mon Sep 17 00:00:00 2001
From: BHodl <hodlb@protonmail.com>
Date: Mon, 21 Mar 2022 20:24:42 -0400
Subject: [PATCH 12/15] Fix test container name

---
 cyphernodeconf_docker/templates/installer/start.sh          | 3 ++-
 cyphernodeconf_docker/templates/installer/testdeployment.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cyphernodeconf_docker/templates/installer/start.sh b/cyphernodeconf_docker/templates/installer/start.sh
index 647cab4..40c92e1 100644
--- a/cyphernodeconf_docker/templates/installer/start.sh
+++ b/cyphernodeconf_docker/templates/installer/start.sh
@@ -59,9 +59,10 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
 <% } %>
 
 current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+dist_dir=${current_path##/*/}
 
 # Let's make sure the container readyness files are deleted before starting the stack
-docker run --rm -v cyphernode_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
+docker run --rm -v ${dist_dir}_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
 
 <% if (docker_mode == 'swarm') { %>
 docker stack deploy -c $current_path/docker-compose.yaml cyphernode
diff --git a/cyphernodeconf_docker/templates/installer/testdeployment.sh b/cyphernodeconf_docker/templates/installer/testdeployment.sh
index 2cfa327..d46dbd0 100644
--- a/cyphernodeconf_docker/templates/installer/testdeployment.sh
+++ b/cyphernodeconf_docker/templates/installer/testdeployment.sh
@@ -52,12 +52,13 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
 <% } %>
 
 current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+dist_dir=${current_path##/*/}
 
 # Will test if Cyphernode is fully up and running...
 docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \
 -v <%= gatekeeper_datapath %>:/gatekeeper \
 -v $current_path:/dist \
--v cyphernode_container_monitor:/container_monitor:ro \
+-v ${dist_dir}_container_monitor:/container_monitor:ro \
 --network cyphernodenet eclipse-mosquitto:<%= mosquitto_version %> /testfeatures.sh
 
 if [ -f $current_path/exitStatus.sh ]; then

From 0fd7ea955b1cb7ac1e0b0028883d2ec19c747a82 Mon Sep 17 00:00:00 2001
From: BHodl <hodlb@protonmail.com>
Date: Tue, 22 Mar 2022 02:55:53 -0400
Subject: [PATCH 13/15] Fix testfeatures postgres and notifier log

---
 cyphernodeconf_docker/templates/installer/testfeatures.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cyphernodeconf_docker/templates/installer/testfeatures.sh b/cyphernodeconf_docker/templates/installer/testfeatures.sh
index 6a2b045..0c516b2 100644
--- a/cyphernodeconf_docker/templates/installer/testfeatures.sh
+++ b/cyphernodeconf_docker/templates/installer/testfeatures.sh
@@ -84,7 +84,7 @@ checkpostgres() {
   echo -en "\r\n\e[1;36mTesting Postgres... " > /dev/console
   local rc
 
-  pg_isready -h postgres -U cyphernode
+  pg_isready -h postgres -U cyphernode > /dev/null
   [ "${?}" -ne "0" ] && return 105
 
   echo -e "\e[1;36mPostgres rocks!" > /dev/console
@@ -109,7 +109,7 @@ checknotifier() {
   local response
   local returncode
 
-  nc -vlp1111 -e sh -c 'echo -en "HTTP/1.1 200 OK\\r\\n\\r\\n" ; date >&2 ; timeout 1 tee /dev/tty | cat ; ' &
+  nc -lp1111 -e sh -c 'echo -en "HTTP/1.1 200 OK\\r\\n\\r\\n" ; timeout 1 tee /dev/null ;' > /dev/null &
   response=$(mosquitto_rr -h broker -W 15 -t notifier -e "response/$$" -m "{\"response-topic\":\"response/$$\",\"cmd\":\"web\",\"url\":\"http://$(hostname):1111/notifiertest\",\"tor\":false}")
   returncode=$?
   [ "${returncode}" -ne "0" ] && return 115

From 1b2f53f2371938930b2a51d39439cf8588931096 Mon Sep 17 00:00:00 2001
From: BHodl <hodlb@protonmail.com>
Date: Tue, 22 Mar 2022 21:02:25 -0400
Subject: [PATCH 14/15] Update fix Add name to docker-compose.yaml

---
 .../templates/installer/docker/docker-compose.yaml             | 2 ++
 cyphernodeconf_docker/templates/installer/start.sh             | 3 +--
 cyphernodeconf_docker/templates/installer/testdeployment.sh    | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
index 6250e32..2b253b7 100644
--- a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
+++ b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
@@ -1,5 +1,7 @@
 version: "3"
 
+name: cyphernode
+
 services:
 
   ##########################
diff --git a/cyphernodeconf_docker/templates/installer/start.sh b/cyphernodeconf_docker/templates/installer/start.sh
index 40c92e1..647cab4 100644
--- a/cyphernodeconf_docker/templates/installer/start.sh
+++ b/cyphernodeconf_docker/templates/installer/start.sh
@@ -59,10 +59,9 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
 <% } %>
 
 current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
-dist_dir=${current_path##/*/}
 
 # Let's make sure the container readyness files are deleted before starting the stack
-docker run --rm -v ${dist_dir}_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
+docker run --rm -v cyphernode_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
 
 <% if (docker_mode == 'swarm') { %>
 docker stack deploy -c $current_path/docker-compose.yaml cyphernode
diff --git a/cyphernodeconf_docker/templates/installer/testdeployment.sh b/cyphernodeconf_docker/templates/installer/testdeployment.sh
index d46dbd0..2cfa327 100644
--- a/cyphernodeconf_docker/templates/installer/testdeployment.sh
+++ b/cyphernodeconf_docker/templates/installer/testdeployment.sh
@@ -52,13 +52,12 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
 <% } %>
 
 current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
-dist_dir=${current_path##/*/}
 
 # Will test if Cyphernode is fully up and running...
 docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \
 -v <%= gatekeeper_datapath %>:/gatekeeper \
 -v $current_path:/dist \
--v ${dist_dir}_container_monitor:/container_monitor:ro \
+-v cyphernode_container_monitor:/container_monitor:ro \
 --network cyphernodenet eclipse-mosquitto:<%= mosquitto_version %> /testfeatures.sh
 
 if [ -f $current_path/exitStatus.sh ]; then

From 8b7455089b7bb947ed01d27181725735b2cae373 Mon Sep 17 00:00:00 2001
From: BHodl <hodlb@protonmail.com>
Date: Tue, 22 Mar 2022 21:38:35 -0400
Subject: [PATCH 15/15] Only name if not swarm

---
 .../templates/installer/docker/docker-compose.yaml             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
index 2b253b7..57805ec 100644
--- a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
+++ b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
@@ -1,6 +1,7 @@
 version: "3"
-
+<% if ( docker_mode !== 'swarm' ) { %>
 name: cyphernode
+<% } %>
 
 services: