mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-12 19:32:35 +02:00
Merge bitcoin/bitcoin#22729: Make it possible to disable Tor binds and abort startup on bind failure
bca346a970
net: require P2P binds to succeed (Vasil Dimov)af552534ab
net: report an error if unable to bind on the Tor listening addr:port (Vasil Dimov)9a7e5f4d68
net: don't extra bind for Tor if binds are restricted (Vasil Dimov) Pull request description: Make it possible to disable the Tor binding on `127.0.0.1:8334` and stop startup if any P2P bind fails instead of "if all P2P binds fail". Fixes https://github.com/bitcoin/bitcoin/issues/22726 Fixes https://github.com/bitcoin/bitcoin/issues/22727 ACKs for top commit: achow101: ACKbca346a970
cbergqvist: ACKbca346a970
pinheadmz: ACKbca346a970
Tree-SHA512: fabef89a957191eea4f3e3b6109d2b8389f27ecc74440a920b0c10f31fff00a85bcfd1eb3c91826c7169c618f4de8a8d0a260e2caf40fd854f07ea9a980d8603
This commit is contained in:
@ -39,6 +39,7 @@ from .util import (
|
||||
rpc_url,
|
||||
wait_until_helper_internal,
|
||||
p2p_port,
|
||||
tor_port,
|
||||
)
|
||||
|
||||
BITCOIND_PROC_WAIT_TIMEOUT = 60
|
||||
@ -88,8 +89,11 @@ class TestNode():
|
||||
self.coverage_dir = coverage_dir
|
||||
self.cwd = cwd
|
||||
self.descriptors = descriptors
|
||||
self.has_explicit_bind = False
|
||||
if extra_conf is not None:
|
||||
append_config(self.datadir_path, extra_conf)
|
||||
# Remember if there is bind=... in the config file.
|
||||
self.has_explicit_bind = any(e.startswith("bind=") for e in extra_conf)
|
||||
# Most callers will just need to add extra args to the standard list below.
|
||||
# For those callers that need more flexibility, they can just set the args property directly.
|
||||
# Note that common args are set in the config file (see initialize_datadir)
|
||||
@ -210,6 +214,17 @@ class TestNode():
|
||||
if extra_args is None:
|
||||
extra_args = self.extra_args
|
||||
|
||||
# If listening and no -bind is given, then bitcoind would bind P2P ports on
|
||||
# 0.0.0.0:P and 127.0.0.1:18445 (for incoming Tor connections), where P is
|
||||
# a unique port chosen by the test framework and configured as port=P in
|
||||
# bitcoin.conf. To avoid collisions on 127.0.0.1:18445, change it to
|
||||
# 127.0.0.1:tor_port().
|
||||
will_listen = all(e != "-nolisten" and e != "-listen=0" for e in extra_args)
|
||||
has_explicit_bind = self.has_explicit_bind or any(e.startswith("-bind=") for e in extra_args)
|
||||
if will_listen and not has_explicit_bind:
|
||||
extra_args.append(f"-bind=0.0.0.0:{p2p_port(self.index)}")
|
||||
extra_args.append(f"-bind=127.0.0.1:{tor_port(self.index)}=onion")
|
||||
|
||||
self.use_v2transport = "-v2transport=1" in extra_args or (self.default_to_v2 and "-v2transport=0" not in extra_args)
|
||||
|
||||
# Add a new stdout and stderr file each time bitcoind is started
|
||||
|
@ -316,9 +316,9 @@ def sha256sum_file(filename):
|
||||
|
||||
# The maximum number of nodes a single test can spawn
|
||||
MAX_NODES = 12
|
||||
# Don't assign rpc or p2p ports lower than this
|
||||
# Don't assign p2p, rpc or tor ports lower than this
|
||||
PORT_MIN = int(os.getenv('TEST_RUNNER_PORT_MIN', default=11000))
|
||||
# The number of ports to "reserve" for p2p and rpc, each
|
||||
# The number of ports to "reserve" for p2p, rpc and tor, each
|
||||
PORT_RANGE = 5000
|
||||
|
||||
|
||||
@ -358,7 +358,11 @@ def p2p_port(n):
|
||||
|
||||
|
||||
def rpc_port(n):
|
||||
return PORT_MIN + PORT_RANGE + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
|
||||
return p2p_port(n) + PORT_RANGE
|
||||
|
||||
|
||||
def tor_port(n):
|
||||
return p2p_port(n) + PORT_RANGE * 2
|
||||
|
||||
|
||||
def rpc_url(datadir, i, chain, rpchost):
|
||||
|
Reference in New Issue
Block a user