diff --git a/README.md b/README.md index 3ebd96629659ddd9cac90e6b67b22828d9cc130a..1b0c1e6206e12c2a4e17cccb50f09c93701e35e6 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ run in an onion network, guaranteeing a strong anonymity. ## How to install it -**Warning**: This version works with a dev version of Silkaj. If the latest release of Silkaj is still `0.7.1`, please use [this branch](https://git.duniter.org/clients/python/silkaj/tree/223_endpoint_click_decoupled) (you can also copy `network_tools.py` from this branch). - ### ➤ Debian (Ubuntu, Mint, etc.) sh install_gmixer.sh diff --git a/server.py b/server.py index c070883d2b035e7511d9308bca804f56db2a481a..9d15b5f1d7568cd9c7dfd8039cf98e0fff79582b 100644 --- a/server.py +++ b/server.py @@ -49,7 +49,7 @@ PUBLIC_HOST = BIND_HOST PUBLIC_PORT = BIND_PORT ID_SALT = "" ID_PASSWORD = "" -BMA_HOSTS = ["g1.duniter.fr 443", "g1.duniter.org 443", "g1.presles.fr 443", "g1.cgeek.fr 443", "ts.g1.librelois.fr 443"] +BMA_HOSTS = ["BASIC_MERKLED_API 149.91.88.175 10901", "BMAS g1.duniter.fr 443", "BMAS g1.duniter.org 443", "BMAS g1.presles.fr 443", "BMAS g1.cgeek.fr 443", "BMAS ts.g1.librelois.fr 443"] MIX_INTERVAL = 120 MIX_MIN_TXS = 5 # minimum amount of txs to mix MIX_REQ_AGE_MAX = 604800 # maximum mix request age before return to sender @@ -551,7 +551,7 @@ class ClientThread(Thread): self.tx_out_index = tx_out_index self.db_txs = db_txs - self.bma_endpoints = ["BMAS "+host for host in conf["client"]["bma_hosts"]] + self.bma_endpoints = conf["client"]["bma_hosts"].copy() self.work = True def detect_peers(self):# Check known peers and ask them for their known peer list diff --git a/utils.py b/utils.py index 91b68cd065fcd9a62a574f961ed21ffb2dfeb17f..409de783276be24119646462452f7f2db043c105 100644 --- a/utils.py +++ b/utils.py @@ -249,7 +249,7 @@ async def bma_client(bma_endpoints:list): client = None downs = 0 for bma_endpoint in bma_endpoints: - client = Client("BMAS "+bma_endpoint) + client = Client(bma_endpoint) try: await client(bma.node.summary) logprint("BMA up: "+bma_endpoint, LOG_TRACE)