From 3a9aeb543e768c5c51c791ca5ad4bf0562bdf20a Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Thu, 18 Mar 2021 17:00:26 -0400
Subject: [PATCH 1/5] v0.7.0-rc.1

---
 build.sh                       | 18 +++++++++---------
 cyphernodeconf_docker/build.sh |  2 +-
 cyphernodeconf_docker/run.sh   | 20 ++++++++++----------
 dist/setup.sh                  | 22 +++++++++++-----------
 docker-build.sh                |  6 +++---
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/build.sh b/build.sh
index 8948a7500..7516f02b2 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.6.0-dev", dev over v0.6.0
-CONF_VERSION="v0.6.0-dev-local"
-GATEKEEPER_VERSION="v0.6.0-dev-local"
-TOR_VERSION="v0.6.0-dev-local"
-PROXY_VERSION="v0.6.0-dev-local"
-NOTIFIER_VERSION="v0.6.0-dev-local"
-PROXYCRON_VERSION="v0.6.0-dev-local"
-OTSCLIENT_VERSION="v0.6.0-dev-local"
-PYCOIN_VERSION="v0.6.0-dev-local"
+# CYPHERNODE VERSION "v0.7.0-rc.1-dev", dev over v0.7.0-rc.1
+CONF_VERSION="v0.7.0-rc.1-dev-local"
+GATEKEEPER_VERSION="v0.7.0-rc.1-dev-local"
+TOR_VERSION="v0.7.0-rc.1-dev-local"
+PROXY_VERSION="v0.7.0-rc.1-dev-local"
+NOTIFIER_VERSION="v0.7.0-rc.1-dev-local"
+PROXYCRON_VERSION="v0.7.0-rc.1-dev-local"
+OTSCLIENT_VERSION="v0.7.0-rc.1-dev-local"
+PYCOIN_VERSION="v0.7.0-rc.1-dev-local"
 
 trace()
 {
diff --git a/cyphernodeconf_docker/build.sh b/cyphernodeconf_docker/build.sh
index e933af0d4..1299b6d7e 100755
--- a/cyphernodeconf_docker/build.sh
+++ b/cyphernodeconf_docker/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-VERSION=v0.6.0-dev
+VERSION=v0.7.0-rc.1
 
 docker build . -t cyphernode/cyphernodeconf:${VERSION}
diff --git a/cyphernodeconf_docker/run.sh b/cyphernodeconf_docker/run.sh
index fa843189a..663d702e0 100755
--- a/cyphernodeconf_docker/run.sh
+++ b/cyphernodeconf_docker/run.sh
@@ -3,17 +3,17 @@
 export SETUP_DIR=$(pwd)/../dist
 export DEFAULT_USER=$USER
 export DEFAULT_CERT_HOSTNAME=disk0book.local
-export PROXYCRON_VERSION=v0.6.0-dev
-export PYCOIN_VERSION=v0.6.0-dev
-export SETUP_VERSION=v0.6.0-dev
-export BITCOIN_VERSION=v0.21.0
-export LIGHTNING_VERSION=v0.9.1
+export PROXYCRON_VERSION=v0.7.0-rc.1
+export PYCOIN_VERSION=v0.7.0-rc.1
+export SETUP_VERSION=v0.7.0-rc.1
+export BITCOIN_VERSION=v0.21.1
+export LIGHTNING_VERSION=v0.10.0
 export DEFAULT_DATADIR_BASE=$HOME
-export GATEKEEPER_VERSION=v0.6.0-dev
-export TOR_VERSION=v0.6.0-dev
-export PROXY_VERSION=v0.6.0-dev
-export OTSCLIENT_VERSION=v0.6.0-dev
-export NOTIFIER_VERSION=v0.6.0-dev
+export GATEKEEPER_VERSION=v0.7.0-rc.1
+export TOR_VERSION=v0.7.0-rc.1
+export PROXY_VERSION=v0.7.0-rc.1
+export OTSCLIENT_VERSION=v0.7.0-rc.1
+export NOTIFIER_VERSION=v0.7.0-rc.1
 export EDITOR=/usr/bin/nano
 export TRAEFIK_VERSION="v1.7.9-alpine"
 export MOSQUITTO_VERSION="1.6"
diff --git a/dist/setup.sh b/dist/setup.sh
index c457a0797..2224ede67 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -849,17 +849,17 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.6.0-dev", dev over v0.6.0
-SETUP_VERSION="v0.6.0-dev"
-CONF_VERSION="v0.6.0-dev"
-GATEKEEPER_VERSION="v0.6.0-dev"
-TOR_VERSION="v0.6.0-dev"
-PROXY_VERSION="v0.6.0-dev"
-NOTIFIER_VERSION="v0.6.0-dev"
-PROXYCRON_VERSION="v0.6.0-dev"
-OTSCLIENT_VERSION="v0.6.0-dev"
-PYCOIN_VERSION="v0.6.0-dev"
-CYPHERAPPS_VERSION="dev"
+# CYPHERNODE VERSION "v0.7.0-rc.1"
+SETUP_VERSION="v0.7.0-rc.1"
+CONF_VERSION="v0.7.0-rc.1"
+GATEKEEPER_VERSION="v0.7.0-rc.1"
+TOR_VERSION="v0.7.0-rc.1"
+PROXY_VERSION="v0.7.0-rc.1"
+NOTIFIER_VERSION="v0.7.0-rc.1"
+PROXYCRON_VERSION="v0.7.0-rc.1"
+OTSCLIENT_VERSION="v0.7.0-rc.1"
+PYCOIN_VERSION="v0.7.0-rc.1"
+CYPHERAPPS_VERSION="releases/v0.7.0"
 BITCOIN_VERSION="v0.21.1"
 LIGHTNING_VERSION="v0.10.0"
 TRAEFIK_VERSION="v1.7.9-alpine"
diff --git a/docker-build.sh b/docker-build.sh
index 181f0e8c0..9edea27cd 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"
-v2="v0.6"
-v3="v0.6.0"
+v1="v0-rc.1"
+v2="v0.7-rc.1"
+v3="v0.7.0-rc.1"
 
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"

From b86eda1e4ae8fae0525d88cad083d99aafeefd0a Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Thu, 18 Mar 2021 22:05:11 -0400
Subject: [PATCH 2/5] Image tags were wrong if locally built

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

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

From a2efce08df13fe24cb921667f52914802900d781 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Mon, 22 Mar 2021 10:34:39 -0400
Subject: [PATCH 3/5] Small fixes in removefrombatch and watchtxid

---
 proxy_docker/app/script/batching.sh     |  3 ++-
 proxy_docker/app/script/watchrequest.sh | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/proxy_docker/app/script/batching.sh b/proxy_docker/app/script/batching.sh
index fa06d90a3..79f9242c8 100644
--- a/proxy_docker/app/script/batching.sh
+++ b/proxy_docker/app/script/batching.sh
@@ -264,7 +264,8 @@ removefrombatch() {
     trace "[removefrombatch] id missing"
     response='{"result":null,"error":{"code":-32700,"message":"outputId is required","data":'${request}'}}'
   else
-    batcher_id=$(sql "SELECT batcher_id FROM recipient WHERE id=${id}")
+    # We don't want to remove an already spent output
+    batcher_id=$(sql "SELECT batcher_id FROM recipient WHERE id=${id} AND tx_id IS NULL")
     returncode=$?
     trace_rc ${returncode}
 
diff --git a/proxy_docker/app/script/watchrequest.sh b/proxy_docker/app/script/watchrequest.sh
index 29cd49d69..e4aee1802 100644
--- a/proxy_docker/app/script/watchrequest.sh
+++ b/proxy_docker/app/script/watchrequest.sh
@@ -342,6 +342,8 @@ watchtxidrequest() {
   trace "[watchtxidrequest] cbxconf_url=${cbxconf_url}"
   local nbxconf=$(echo "${request}" | jq ".nbxconf")
   trace "[watchtxidrequest] nbxconf=${nbxconf}"
+  local cb1cond
+  local cbxcond
   local inserted
   local id_inserted
   local result
@@ -353,7 +355,17 @@ watchtxidrequest() {
 
   if [ "${returncode}" -eq 0 ]; then
     inserted=1
-    id_inserted=$(sql "SELECT id FROM watching_by_txid WHERE txid=${txid} AND callback1conf=${cb1conf_url} AND callbackxconf=${cbxconf_url}")
+    if [ "${cb1conf_url}" = "null" ]; then
+      cb1cond=" IS NULL"
+    else
+      cb1cond="=${cb1conf_url}"
+    fi
+    if [ "${cbxconf_url}" = "null" ]; then
+      cbxcond=" IS NULL"
+    else
+      cbxcond="=${cbxconf_url}"
+    fi
+    id_inserted=$(sql "SELECT id FROM watching_by_txid WHERE txid=${txid} AND callback1conf${cb1cond} AND callbackxconf${cbxcond}")
     trace "[watchtxidrequest] id_inserted: ${id_inserted}"
   else
     inserted=0

From 3b797243d01c4bed5eb84acf6f19d0501a11852c Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 22 Jun 2021 11:14:27 -0400
Subject: [PATCH 4/5] v0.7.0-rc.2

---
 build.sh                       | 18 +++++++++---------
 cyphernodeconf_docker/build.sh |  2 +-
 cyphernodeconf_docker/run.sh   | 16 ++++++++--------
 dist/setup.sh                  | 20 ++++++++++----------
 docker-build.sh                |  6 +++---
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/build.sh b/build.sh
index f8b4a4b4f..bdfe74e9a 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.7.0-rc.1"
-CONF_VERSION="v0.7.0-rc.1-local"
-GATEKEEPER_VERSION="v0.7.0-rc.1-local"
-TOR_VERSION="v0.7.0-rc.1-local"
-PROXY_VERSION="v0.7.0-rc.1-local"
-NOTIFIER_VERSION="v0.7.0-rc.1-local"
-PROXYCRON_VERSION="v0.7.0-rc.1-local"
-OTSCLIENT_VERSION="v0.7.0-rc.1-local"
-PYCOIN_VERSION="v0.7.0-rc.1-local"
+# CYPHERNODE VERSION "v0.7.0-rc.2"
+CONF_VERSION="v0.7.0-rc.2-local"
+GATEKEEPER_VERSION="v0.7.0-rc.2-local"
+TOR_VERSION="v0.7.0-rc.2-local"
+PROXY_VERSION="v0.7.0-rc.2-local"
+NOTIFIER_VERSION="v0.7.0-rc.2-local"
+PROXYCRON_VERSION="v0.7.0-rc.2-local"
+OTSCLIENT_VERSION="v0.7.0-rc.2-local"
+PYCOIN_VERSION="v0.7.0-rc.2-local"
 
 trace()
 {
diff --git a/cyphernodeconf_docker/build.sh b/cyphernodeconf_docker/build.sh
index 1299b6d7e..d2ab8b7b0 100755
--- a/cyphernodeconf_docker/build.sh
+++ b/cyphernodeconf_docker/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-VERSION=v0.7.0-rc.1
+VERSION=v0.7.0-rc.2
 
 docker build . -t cyphernode/cyphernodeconf:${VERSION}
diff --git a/cyphernodeconf_docker/run.sh b/cyphernodeconf_docker/run.sh
index 663d702e0..b2937257c 100755
--- a/cyphernodeconf_docker/run.sh
+++ b/cyphernodeconf_docker/run.sh
@@ -3,17 +3,17 @@
 export SETUP_DIR=$(pwd)/../dist
 export DEFAULT_USER=$USER
 export DEFAULT_CERT_HOSTNAME=disk0book.local
-export PROXYCRON_VERSION=v0.7.0-rc.1
-export PYCOIN_VERSION=v0.7.0-rc.1
-export SETUP_VERSION=v0.7.0-rc.1
+export PROXYCRON_VERSION=v0.7.0-rc.2
+export PYCOIN_VERSION=v0.7.0-rc.2
+export SETUP_VERSION=v0.7.0-rc.2
 export BITCOIN_VERSION=v0.21.1
 export LIGHTNING_VERSION=v0.10.0
 export DEFAULT_DATADIR_BASE=$HOME
-export GATEKEEPER_VERSION=v0.7.0-rc.1
-export TOR_VERSION=v0.7.0-rc.1
-export PROXY_VERSION=v0.7.0-rc.1
-export OTSCLIENT_VERSION=v0.7.0-rc.1
-export NOTIFIER_VERSION=v0.7.0-rc.1
+export GATEKEEPER_VERSION=v0.7.0-rc.2
+export TOR_VERSION=v0.7.0-rc.2
+export PROXY_VERSION=v0.7.0-rc.2
+export OTSCLIENT_VERSION=v0.7.0-rc.2
+export NOTIFIER_VERSION=v0.7.0-rc.2
 export EDITOR=/usr/bin/nano
 export TRAEFIK_VERSION="v1.7.9-alpine"
 export MOSQUITTO_VERSION="1.6"
diff --git a/dist/setup.sh b/dist/setup.sh
index 2224ede67..336c38e79 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -849,16 +849,16 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.7.0-rc.1"
-SETUP_VERSION="v0.7.0-rc.1"
-CONF_VERSION="v0.7.0-rc.1"
-GATEKEEPER_VERSION="v0.7.0-rc.1"
-TOR_VERSION="v0.7.0-rc.1"
-PROXY_VERSION="v0.7.0-rc.1"
-NOTIFIER_VERSION="v0.7.0-rc.1"
-PROXYCRON_VERSION="v0.7.0-rc.1"
-OTSCLIENT_VERSION="v0.7.0-rc.1"
-PYCOIN_VERSION="v0.7.0-rc.1"
+# CYPHERNODE VERSION "v0.7.0-rc.2"
+SETUP_VERSION="v0.7.0-rc.2"
+CONF_VERSION="v0.7.0-rc.2"
+GATEKEEPER_VERSION="v0.7.0-rc.2"
+TOR_VERSION="v0.7.0-rc.2"
+PROXY_VERSION="v0.7.0-rc.2"
+NOTIFIER_VERSION="v0.7.0-rc.2"
+PROXYCRON_VERSION="v0.7.0-rc.2"
+OTSCLIENT_VERSION="v0.7.0-rc.2"
+PYCOIN_VERSION="v0.7.0-rc.2"
 CYPHERAPPS_VERSION="releases/v0.7.0"
 BITCOIN_VERSION="v0.21.1"
 LIGHTNING_VERSION="v0.10.0"
diff --git a/docker-build.sh b/docker-build.sh
index 9edea27cd..0a1b69697 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.7-rc.1"
-v3="v0.7.0-rc.1"
+v1="v0-rc.2"
+v2="v0.7-rc.2"
+v3="v0.7.0-rc.2"
 
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"

From 00bb08b94489265752fdaa7b39d054300695b0a6 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 29 Jun 2021 10:53:05 -0400
Subject: [PATCH 5/5] v0.7.0

---
 build.sh                       | 18 ++++++-------
 cyphernodeconf_docker/build.sh |  5 ----
 cyphernodeconf_docker/run.sh   | 48 ----------------------------------
 dist/setup.sh                  | 22 ++++++++--------
 docker-build.sh                |  6 ++---
 5 files changed, 23 insertions(+), 76 deletions(-)
 delete mode 100755 cyphernodeconf_docker/build.sh
 delete mode 100755 cyphernodeconf_docker/run.sh

diff --git a/build.sh b/build.sh
index bdfe74e9a..705242665 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.7.0-rc.2"
-CONF_VERSION="v0.7.0-rc.2-local"
-GATEKEEPER_VERSION="v0.7.0-rc.2-local"
-TOR_VERSION="v0.7.0-rc.2-local"
-PROXY_VERSION="v0.7.0-rc.2-local"
-NOTIFIER_VERSION="v0.7.0-rc.2-local"
-PROXYCRON_VERSION="v0.7.0-rc.2-local"
-OTSCLIENT_VERSION="v0.7.0-rc.2-local"
-PYCOIN_VERSION="v0.7.0-rc.2-local"
+# CYPHERNODE VERSION "v0.7.0"
+CONF_VERSION="v0.7.0-local"
+GATEKEEPER_VERSION="v0.7.0-local"
+TOR_VERSION="v0.7.0-local"
+PROXY_VERSION="v0.7.0-local"
+NOTIFIER_VERSION="v0.7.0-local"
+PROXYCRON_VERSION="v0.7.0-local"
+OTSCLIENT_VERSION="v0.7.0-local"
+PYCOIN_VERSION="v0.7.0-local"
 
 trace()
 {
diff --git a/cyphernodeconf_docker/build.sh b/cyphernodeconf_docker/build.sh
deleted file mode 100755
index d2ab8b7b0..000000000
--- a/cyphernodeconf_docker/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-VERSION=v0.7.0-rc.2
-
-docker build . -t cyphernode/cyphernodeconf:${VERSION}
diff --git a/cyphernodeconf_docker/run.sh b/cyphernodeconf_docker/run.sh
deleted file mode 100755
index b2937257c..000000000
--- a/cyphernodeconf_docker/run.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-export SETUP_DIR=$(pwd)/../dist
-export DEFAULT_USER=$USER
-export DEFAULT_CERT_HOSTNAME=disk0book.local
-export PROXYCRON_VERSION=v0.7.0-rc.2
-export PYCOIN_VERSION=v0.7.0-rc.2
-export SETUP_VERSION=v0.7.0-rc.2
-export BITCOIN_VERSION=v0.21.1
-export LIGHTNING_VERSION=v0.10.0
-export DEFAULT_DATADIR_BASE=$HOME
-export GATEKEEPER_VERSION=v0.7.0-rc.2
-export TOR_VERSION=v0.7.0-rc.2
-export PROXY_VERSION=v0.7.0-rc.2
-export OTSCLIENT_VERSION=v0.7.0-rc.2
-export NOTIFIER_VERSION=v0.7.0-rc.2
-export EDITOR=/usr/bin/nano
-export TRAEFIK_VERSION="v1.7.9-alpine"
-export MOSQUITTO_VERSION="1.6"
-
-user=$(id -u):$(id -g)
-
-if [ "${MODE}" = 'docker' ]; then
-  docker build . -t cyphernodeconf:local
-  docker run -v $(pwd)/testinst:/data \
-           -e DEFAULT_USER=jash \
-           -e DEFAULT_DATADIR_BASE=$HOME \
-           -e SETUP_DIR=$SETUP_DIR \
-           -e DEFAULT_CERT_HOSTNAME=$(hostname) \
-           -e GATEKEEPER_VERSION=$GATEKEEPER_VERSION \
-           -e TRAEFIK_VERSION=$TRAEFIK_VERSION \
-           -e MOSQUITTO_VERSION=$MOSQUITTO_VERSION \
-           -e TOR_VERSION=$TOR_VERSION \
-           -e PROXY_VERSION=$PROXY_VERSION \
-           -e NOTIFIER_VERSION=$NOTIFIER_VERSION \
-           -e PROXYCRON_VERSION=$PROXYCRON_VERSION \
-           -e OTSCLIENT_VERSION=$OTSCLIENT_VERSION \
-           -e PYCOIN_VERSION=$PYCOIN_VERSION \
-           -e BITCOIN_VERSION=$BITCOIN_VERSION \
-           -e LIGHTNING_VERSION=$LIGHTNING_VERSION \
-           -e SETUP_VERSION=$SETUP_VERSION \
-           -e DEFAULT_USER=$DEFAULT_USER \
-           --log-driver=none \
-           --network none \
-           --rm -it cyphernodeconf:local $user node index.js $@
-else
-  /usr/local/bin/node index.js $@
-fi
diff --git a/dist/setup.sh b/dist/setup.sh
index 336c38e79..0338da00d 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -849,17 +849,17 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.7.0-rc.2"
-SETUP_VERSION="v0.7.0-rc.2"
-CONF_VERSION="v0.7.0-rc.2"
-GATEKEEPER_VERSION="v0.7.0-rc.2"
-TOR_VERSION="v0.7.0-rc.2"
-PROXY_VERSION="v0.7.0-rc.2"
-NOTIFIER_VERSION="v0.7.0-rc.2"
-PROXYCRON_VERSION="v0.7.0-rc.2"
-OTSCLIENT_VERSION="v0.7.0-rc.2"
-PYCOIN_VERSION="v0.7.0-rc.2"
-CYPHERAPPS_VERSION="releases/v0.7.0"
+# CYPHERNODE VERSION "v0.7.0"
+SETUP_VERSION="v0.7.0"
+CONF_VERSION="v0.7.0"
+GATEKEEPER_VERSION="v0.7.0"
+TOR_VERSION="v0.7.0"
+PROXY_VERSION="v0.7.0"
+NOTIFIER_VERSION="v0.7.0"
+PROXYCRON_VERSION="v0.7.0"
+OTSCLIENT_VERSION="v0.7.0"
+PYCOIN_VERSION="v0.7.0"
+CYPHERAPPS_VERSION="v0.7.0"
 BITCOIN_VERSION="v0.21.1"
 LIGHTNING_VERSION="v0.10.0"
 TRAEFIK_VERSION="v1.7.9-alpine"
diff --git a/docker-build.sh b/docker-build.sh
index 0a1b69697..83d53cfaf 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.2"
-v2="v0.7-rc.2"
-v3="v0.7.0-rc.2"
+v1="v0"
+v2="v0.7"
+v3="v0.7.0"
 
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"