Skip to content

Commit 3c63c2f

Browse files
committed
Merge bitcoin/bitcoin#29347: net: enable v2transport by default
0bef104 net: enable v2transport by default (Pieter Wuille) Pull request description: This enables BIP324's v2 transport by default (see #27634): * Inbound connections will auto-sense whether v1 or v2 is in use. * Automatic outbound connections will use v2 if `NODE_P2P_V2` was set in addr gossip, but retry with v1 if met with immediate failure. * Manual outbound connections will default to v2, but retry with v1 if met with immediate failure. It remains possible to run with `-v2transport=0` to disable all of these, and make all outbound and inbound connections v1. It also remains possible to specify the `v2transport` argument to the `addnode` RPC as `false`, to disable attempting a v2 connection for that particular added node. ACKs for top commit: stratospher: ACK 0bef104. josibake: reACK bitcoin/bitcoin@0bef104 achow101: ACK 0bef104 naumenkogs: ACK 0bef104 theStack: ACK 0bef104 willcl-ark: crACK 0bef104 BrandonOdiwuor: utACK 0bef104 pablomartin4btc: re ACK 0bef104 kristapsk: utACK 0bef104 Tree-SHA512: 3f17a91e318b9304c40c74a7a5b231149f664ae684d13e9739a05be6c05ba9720f3c3c62da6a73ace0ae8ce733f1c8410b211f9fa15694e6a8d28999ab9882d8
2 parents a01da41 + 0bef104 commit 3c63c2f

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/net.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static constexpr bool DEFAULT_FIXEDSEEDS{true};
9797
static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
9898
static const size_t DEFAULT_MAXSENDBUFFER = 1 * 1000;
9999

100-
static constexpr bool DEFAULT_V2_TRANSPORT{false};
100+
static constexpr bool DEFAULT_V2_TRANSPORT{true};
101101

102102
typedef int64_t NodeId;
103103

test/functional/test_framework/test_node.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,15 @@ def __init__(self, i, datadir_path, *, chain, rpchost, timewait, timeout_factor,
130130
# Default behavior from global -v2transport flag is added to args to persist it over restarts.
131131
# May be overwritten in individual tests, using extra_args.
132132
self.default_to_v2 = v2transport
133-
if self.default_to_v2:
134-
self.args.append("-v2transport=1")
133+
if self.version_is_at_least(260000):
134+
# 26.0 and later support v2transport
135+
if v2transport:
136+
self.args.append("-v2transport=1")
137+
else:
138+
self.args.append("-v2transport=0")
139+
else:
140+
# v2transport requested but not supported for node
141+
assert not v2transport
135142

136143
self.cli = TestNodeCLI(bitcoin_cli, self.datadir_path)
137144
self.use_cli = use_cli

0 commit comments

Comments
 (0)