From ba6c976cac1d9c808b89997c872a025f43a7c5e0 Mon Sep 17 00:00:00 2001
From: kenshin-samourai <kenshin_samourai@tutanota.com>
Date: Thu, 4 Feb 2021 14:39:35 +0100
Subject: [PATCH] reactivate tor v2 hidden service for bitcoind

---
 docker/my-dojo/bitcoin/restart.sh         | 1 +
 docker/my-dojo/dojo.sh                    | 9 +++++++++
 docker/my-dojo/install/upgrade-scripts.sh | 7 -------
 docker/my-dojo/tor/restart.sh             | 5 +++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/docker/my-dojo/bitcoin/restart.sh b/docker/my-dojo/bitcoin/restart.sh
index b04501d..db14dd3 100644
--- a/docker/my-dojo/bitcoin/restart.sh
+++ b/docker/my-dojo/bitcoin/restart.sh
@@ -32,6 +32,7 @@ bitcoind_options=(
 if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
   bitcoind_options+=(-listen=1)
   bitcoind_options+=(-bind=172.28.1.5)
+  bitcoind_options+=(-externalip=$(cat /var/lib/tor/hsv2bitcoind/hostname))
   bitcoind_options+=(-externalip=$(cat /var/lib/tor/hsv3bitcoind/hostname))
 fi
 
diff --git a/docker/my-dojo/dojo.sh b/docker/my-dojo/dojo.sh
index 1d39486..3798f38 100755
--- a/docker/my-dojo/dojo.sh
+++ b/docker/my-dojo/dojo.sh
@@ -85,6 +85,7 @@ stop() {
     # Renewal of bitcoind onion address
     if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
       if [ "$BITCOIND_EPHEMERAL_HS" = "on" ]; then
+        $( docker exec -it tor rm -rf /var/lib/tor/hsv2bitcoind ) &> /dev/null
         $( docker exec -it tor rm -rf /var/lib/tor/hsv3bitcoind ) &> /dev/null
       fi
     fi
@@ -417,6 +418,14 @@ onion() {
       echo "Your private Whirlpool client (do not share) = $V2_ADDR_WHIRLPOOL"
       echo " "
     fi
+
+    if [ "$BITCOIND_INSTALL" == "on" ]; then
+      if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
+        V2_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv2bitcoind/hostname )
+        echo "Your local bitcoind (do not share) = $V2_ADDR_BTCD"
+        echo " "
+      fi
+    fi
   fi
 }
 
diff --git a/docker/my-dojo/install/upgrade-scripts.sh b/docker/my-dojo/install/upgrade-scripts.sh
index ff810df..9669cd1 100755
--- a/docker/my-dojo/install/upgrade-scripts.sh
+++ b/docker/my-dojo/install/upgrade-scripts.sh
@@ -184,13 +184,6 @@ cleanup() {
 
 # Post start clean-up
 post_start_cleanup() {
-  #################
-  # Clean-up v1.9.0
-  #################
-
-  # Remove /var/lib/tor/hsv2bitcoind from tor volume
-  docker exec -it tor rm -rf /var/lib/tor/hsv2bitcoind
-
   #################
   # Clean-up v1.6.0
   #################
diff --git a/docker/my-dojo/tor/restart.sh b/docker/my-dojo/tor/restart.sh
index 26e66ef..ef1392b 100644
--- a/docker/my-dojo/tor/restart.sh
+++ b/docker/my-dojo/tor/restart.sh
@@ -23,6 +23,11 @@ tor_options=(
 
 if [ "$BITCOIND_INSTALL" == "on" ]; then
   if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
+    tor_options+=(--HiddenServiceDir /var/lib/tor/hsv2bitcoind)
+    tor_options+=(--HiddenServiceVersion 2)
+    tor_options+=(--HiddenServicePort "8333 172.28.1.5:8333")
+    tor_options+=(--HiddenServiceDirGroupReadable 1)
+
     tor_options+=(--HiddenServiceDir /var/lib/tor/hsv3bitcoind)
     tor_options+=(--HiddenServiceVersion 3)
     tor_options+=(--HiddenServicePort "8333 172.28.1.5:8333")