midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2026-04-08 18:37:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reverted BCH to the original logic.

Browse Source
This commit is contained in:
gerlofvanek
2026-01-28 20:57:30 +01:00
parent afae62ae38
commit 8f076c7bfb
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
basicswap/bin/run.py
View File

@@ -303,24 +303,21 @@ def getCoreBinArgs(coin_id: int, coin_settings, prepare=False, use_tor_proxy=Fal
if prepare is False and use_tor_proxy: if prepare is False and use_tor_proxy:
if coin_id == Coins.BCH: if coin_id == Coins.BCH:
# Without this BCH (27.1) will bind to the default BTC port, even with proxy set # Without this BCH (27.1) will bind to the default BTC port, even with proxy set
port: int = int(coin_settings["port"]) extra_args.append("--bind=127.0.0.1:" + str(int(coin_settings["port"])))
onionport: int = coin_settings.get("onionport", 8335)
extra_args.append(f"--bind=127.0.0.1:{port}")
extra_args.append(f"--bind=127.0.0.1:{onionport}=onion")
else: else:
extra_args.append("--port=" + str(int(coin_settings["port"]))) extra_args.append("--port=" + str(int(coin_settings["port"])))
# BTC versions from v28 fail to start if the onionport is in use. # BTC versions from v28 fail to start if the onionport is in use.
# As BCH may use port 8334, disable it here. # As BCH may use port 8334, disable it here.
# When tor is enabled a bind option for the onionport will be added to bitcoin.conf. # When tor is enabled a bind option for the onionport will be added to bitcoin.conf.
# https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-28.0.md?plain=1#L84 # https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-28.0.md?plain=1#L84
if prepare is False and coin_id in (Coins.BTC, Coins.NMC): if (
prepare is False
and use_tor_proxy is False
and coin_id in (Coins.BTC, Coins.NMC)
):
port: int = coin_settings.get("port", 8333) port: int = coin_settings.get("port", 8333)
if use_tor_proxy: extra_args.append(f"--bind=0.0.0.0:{port}")
onionport: int = coin_settings.get("onionport", 8334)
extra_args.append(f"--bind=0.0.0.0:{port}")
extra_args.append(f"--bind=127.0.0.1:{onionport}=onion")
else:
extra_args.append(f"--bind=0.0.0.0:{port}")
return extra_args return extra_args