Verified Commit fb2b95fd authored by likewhoa's avatar likewhoa
Browse files

Cosmetic changes that reflect Tor v3 only as v2 addresses

are now deprecated
parent f2cfbf41
......@@ -39,8 +39,8 @@ fi\n\
sed -i "/onion() {/a\
if [ \"\$INDEXER_INSTALL\" == \"on\" ]; then\n\
v3_addr_electrs=\$( docker exec -it tor cat /var/lib/tor/hsv3electrs/hostname )\n\
echo \"Electrs hidden service address (v3) = \$v3_addr_electrs\"\n\
tor_addr_electrs=\$( docker exec -it tor cat /var/lib/tor/hsv3electrs/hostname )\n\
echo \"Electrs hidden service address (v3) = \$tor_addr_electrs\"\n\
fi\n\
" "${dojo_path_my_dojo}"/dojo.sh
# modify dojo.sh for electrs
......
......@@ -41,7 +41,7 @@ WARNING: Do not share these onion addresses with anyone!
${nc}
Maintenance Tool:
Tor V3 URL = http://${v3_addr_dojo_api}/admin
Tor Address = http://${tor_addr_dojo_api}/admin
Admin Key = $NODE_ADMIN_KEY
API Key = $NODE_API_KEY
EOF
......@@ -64,7 +64,7 @@ WARNING: Do not share these onion addresses with anyone!
***
${nc}
Tor V3 URL = http://${v3_addr_whirlpool}
Tor Address = http://${tor_addr_whirlpool}
Whirlpool API Key = ${whirlpool_api_key:-Whirlpool not Initiated yet. Pair wallet with GUI}
EOF
_pause return
......@@ -81,7 +81,7 @@ Electrs Credentials
***
${nc}
Electrs Tor URL = http://${v3_addr_electrs}
Tor Address = http://${tor_addr_electrs}
EOF
# displaying electrs tor address to connect to electrum
......@@ -130,7 +130,7 @@ Mempool Space Visualizer Credentials
***
${nc}
Mempool Tor URL = http://${v3_addr_mempool}
Tor Address = http://${tor_addr_mempool}
EOF
_pause return
......@@ -151,7 +151,7 @@ ${nc}
Local Access Domain = http://ronindojo.local
Local Access IP = http://${ip} # fallback for when ronindojo.local doesn't work for you.
Ronin Tor URL = http://${BACKEND_TOR}
Tor Address = http://${BACKEND_TOR}
EOF
_pause return
bash -c "${ronin_credentials_menu}"
......@@ -167,14 +167,14 @@ ${nc}
Bitcoin Daemon:
Tor V3 URL = http://${v3_addr_bitcoind}
Tor Address = http://${tor_addr_bitcoind}
RPC User = $BITCOIND_RPC_USER
RPC Password = $BITCOIND_RPC_PASSWORD
RPC IP = $BITCOIND_IP
RPC Port = $BITCOIND_RPC_PORT
Bitcoin RPC Explorer (No username required):
Tor V3 URL = http://${v3_addr_explorer}
Tor Address = http://${tor_addr_explorer}
Password = $EXPLORER_KEY
EOF
_pause return
......@@ -212,8 +212,8 @@ Specter Server Credentials
***
${nc}
Local IP URL = http://${ip}:25441
Tor URL = http://${v3_addr_specter}
Local IP = http://${ip}:25441
Tor Address = http://${tor_addr_specter}
RPC User = $BITCOIND_RPC_USER
RPC Password = $BITCOIND_RPC_PASSWORD
RPC IP = $BITCOIND_IP
......@@ -249,7 +249,7 @@ WARNING: Do not share these onion addresses with anyone!
${nc}
Maintenance Tool:
Tor V3 URL = http://${v3_addr_dojo_api}/admin
Tor Address = http://${tor_addr_dojo_api}/admin
Admin Key = $NODE_ADMIN_KEY
API Key = $NODE_API_KEY
......@@ -263,7 +263,7 @@ WARNING: Do not share these onion addresses with anyone!
***
${nc}
Tor V3 URL = http://${v3_addr_whirlpool}
Tor Address = http://${tor_addr_whirlpool}
Whirlpool API Key = ${whirlpool_api_key:-Whirlpool not Initiated yet. Pair wallet with GUI}
${red}
......@@ -274,7 +274,7 @@ ${nc}
Local Access Domain = http://ronindojo.local
Local Access IP = http://${ip} # fallback for when ronindojo.local doesn't work for you.
Ronin Tor URL = http://${BACKEND_TOR}
Tor Address = http://${BACKEND_TOR}
${red}
***
......@@ -284,14 +284,14 @@ ${nc}
Bitcoin Daemon:
Tor V3 URL = http://${v3_addr_bitcoind}
Tor Address = http://${tor_addr_bitcoind}
RPC User = $BITCOIND_RPC_USER
RPC Password = $BITCOIND_RPC_PASSWORD
RPC IP = $BITCOIND_IP
RPC Port = $BITCOIND_RPC_PORT
Bitcoin RPC Explorer (No username required):
Tor V3 URL = http://${v3_addr_explorer}
Tor Address = http://${tor_addr_explorer}
Password = $EXPLORER_KEY
EOF
if [ -f "${dojo_path_my_dojo}"/indexer/electrs.toml ]; then
......@@ -302,7 +302,7 @@ Electrs Credentials
***
${nc}
Electrs Tor URL = http://${v3_addr_electrs}
Tor Address = http://${tor_addr_electrs}
EOF
fi
......@@ -313,7 +313,7 @@ ${red}
Mempool Space Visualizer Credentials
***
${nc}
Mempool Tor URL = http://${v3_addr_mempool}
Tor Address = http://${tor_addr_mempool}
EOF
fi
......@@ -324,8 +324,8 @@ ${red}
Specter Server Credentials
***
${nc}
Local IP URL = http://${ip}:25441
Tor URL = http://${v3_addr_specter}
Local IP = http://${ip}:25441
Tor Address = http://${tor_addr_specter}
RPC User = $BITCOIND_RPC_USER
RPC Password = $BITCOIND_RPC_PASSWORD
RPC IP = $BITCOIND_IP
......
......@@ -21,32 +21,32 @@ fi
# Bitcoind
if sudo test -d "${docker_volume_tor}"/_data/hsv3bitcoind; then
v3_addr_bitcoind=$(sudo cat "${docker_volume_tor}"/_data/hsv3bitcoind/hostname)
tor_addr_bitcoind=$(sudo cat "${docker_volume_tor}"/_data/hsv3bitcoind/hostname)
fi
# Bitcoin Explorer
if sudo test -d "${docker_volume_tor}"/_data/hsv3explorer; then
v3_addr_explorer=$(sudo cat "${docker_volume_tor}"/_data/hsv3explorer/hostname)
tor_addr_explorer=$(sudo cat "${docker_volume_tor}"/_data/hsv3explorer/hostname)
fi
# Dojo Maintanance Tool
if sudo test -d "${docker_volume_tor}"/_data/hsv3dojo; then
v3_addr_dojo_api=$(sudo cat "${docker_volume_tor}"/_data/hsv3dojo/hostname)
tor_addr_dojo_api=$(sudo cat "${docker_volume_tor}"/_data/hsv3dojo/hostname)
fi
# Electrum Server
if sudo test -d "${docker_volume_tor}"/_data/hsv3electrs; then
v3_addr_electrs=$(sudo cat "${docker_volume_tor}"/_data/hsv3electrs/hostname)
tor_addr_electrs=$(sudo cat "${docker_volume_tor}"/_data/hsv3electrs/hostname)
fi
# Whirlpool
if sudo test -d "${docker_volume_tor}"/_data/hsv3whirlpool; then
v3_addr_whirlpool=$(sudo cat "${docker_volume_tor}"/_data/hsv3whirlpool/hostname)
tor_addr_whirlpool=$(sudo cat "${docker_volume_tor}"/_data/hsv3whirlpool/hostname)
fi
# Mempool Space Visualizer
if sudo test -d "${docker_volume_tor}"/_data/hsv3mempool; then
v3_addr_mempool=$(sudo cat "${docker_volume_tor}"/_data/hsv3mempool/hostname)
tor_addr_mempool=$(sudo cat "${docker_volume_tor}"/_data/hsv3mempool/hostname)
fi
# Specter
......@@ -54,6 +54,6 @@ shopt -s nullglob
for dir in "${HOME}"/specter*; do
if [[ -d "${dir}" ]]; then
v3_addr_specter=$(sudo cat "${install_dir_tor}"/specter_server/hostname)
tor_addr_specter=$(sudo cat "${install_dir_tor}"/specter_server/hostname)
fi
done
\ No newline at end of file
......@@ -1261,9 +1261,9 @@ _mempool_urls_to_local_btc_explorer() {
. "$HOME"/RoninDojo/Scripts/dojo-defaults.sh
if _is_mempool && grep "blockstream" "${dojo_path_my_dojo}"/mempool/frontend/src/app/blockchain-blocks/blockchain-blocks.component.html 1>/dev/null ; then
sudo sed -i "s:https\://www.blockstream.info/block-height/:http\://ronindojo\:${EXPLORER_KEY}@${v3_addr_explorer}/block-height/:" "${dojo_path_my_dojo}"/mempool/frontend/src/app/blockchain-blocks/blockchain-blocks.component.html
sudo sed -i "s:https\://www.blockstream.info/block-height/:http\://ronindojo\:${EXPLORER_KEY}@${v3_addr_explorer}/block-height/:" "${dojo_path_my_dojo}"/mempool/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.html
sudo sed -i "s:http\://www.blockstream.info/tx/:http\://ronindojo\:${EXPLORER_KEY}@${v3_addr_explorer}/tx/:" "${dojo_path_my_dojo}"/mempool/frontend/src/app/tx-bubble/tx-bubble.component.html
sudo sed -i "s:https\://www.blockstream.info/block-height/:http\://ronindojo\:${EXPLORER_KEY}@${tor_addr_explorer}/block-height/:" "${dojo_path_my_dojo}"/mempool/frontend/src/app/blockchain-blocks/blockchain-blocks.component.html
sudo sed -i "s:https\://www.blockstream.info/block-height/:http\://ronindojo\:${EXPLORER_KEY}@${tor_addr_explorer}/block-height/:" "${dojo_path_my_dojo}"/mempool/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.html
sudo sed -i "s:http\://www.blockstream.info/tx/:http\://ronindojo\:${EXPLORER_KEY}@${tor_addr_explorer}/tx/:" "${dojo_path_my_dojo}"/mempool/frontend/src/app/tx-bubble/tx-bubble.component.html
fi
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment