Merge branch 'master' into log-priority

2022-02-07 08:59:01 +01:00
parent 20996cfb49 b383f9fc67
commit 5c4f6d6ada
32 changed files with 620 additions and 134 deletions
--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -59,5 +59,16 @@
  "BISQ": {
    "ENABLED": __BISQ_ENABLED__,
    "DATA_PATH": "__BISQ_DATA_PATH__"
+  },
+  "SOCKS5PROXY": {
+    "ENABLED": __SOCKS5PROXY_ENABLED__,
+    "HOST": "__SOCKS5PROXY_HOST__",
+    "PORT": "__SOCKS5PROXY_PORT__",
+    "USERNAME": "__SOCKS5PROXY_USERNAME__",
+    "PASSWORD": "__SOCKS5PROXY_PASSWORD__"
+  },
+  "PRICE_DATA_SERVER": {
+    "TOR_URL": "__PRICE_DATA_SERVER_TOR_URL__",
+    "CLEARNET_URL": "__PRICE_DATA_SERVER_CLEARNET_URL__"
  }
 }