From 7caf2a889559991b9c972336b73a167cb5567897 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Thu, 11 Jan 2024 16:27:32 -0500 Subject: [PATCH] Make v2transport default for addnode RPC when enabled Github-Pull: #29239 Rebased-From: 3ba815b42db74804e341ce15f648c2b297af55ca --- src/rpc/net.cpp | 7 ++++--- test/functional/test_framework/test_framework.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 63788c3a03..0b0d625222 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -300,7 +300,7 @@ static RPCHelpMan addnode() { {"node", RPCArg::Type::STR, RPCArg::Optional::NO, "The address of the peer to connect to"}, {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "'add' to add a node to the list, 'remove' to remove a node from the list, 'onetry' to try a connection to the node once"}, - {"v2transport", RPCArg::Type::BOOL, RPCArg::Default{false}, "Attempt to connect using BIP324 v2 transport protocol (ignored for 'remove' command)"}, + {"v2transport", RPCArg::Type::BOOL, RPCArg::DefaultHint{"set by -v2transport"}, "Attempt to connect using BIP324 v2 transport protocol (ignored for 'remove' command)"}, }, RPCResult{RPCResult::Type::NONE, "", ""}, RPCExamples{ @@ -319,9 +319,10 @@ static RPCHelpMan addnode() CConnman& connman = EnsureConnman(node); const std::string node_arg{request.params[0].get_str()}; - bool use_v2transport = self.Arg(2); + bool node_v2transport = connman.GetLocalServices() & NODE_P2P_V2; + bool use_v2transport = self.MaybeArg(2).value_or(node_v2transport); - if (use_v2transport && !(node.connman->GetLocalServices() & NODE_P2P_V2)) { + if (use_v2transport && !node_v2transport) { throw JSONRPCError(RPC_INVALID_PARAMETER, "Error: v2transport requested but not enabled (see -v2transport)"); } diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 4e6d245b5f..507f59fe54 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -603,10 +603,10 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): if peer_advertises_v2 is None: peer_advertises_v2 = self.options.v2transport - if peer_advertises_v2: - from_connection.addnode(node=ip_port, command="onetry", v2transport=True) + if peer_advertises_v2 != from_connection.use_v2transport: + from_connection.addnode(node=ip_port, command="onetry", v2transport=peer_advertises_v2) else: - # skip the optional third argument (default false) for + # skip the optional third argument if it matches the default, for # compatibility with older clients from_connection.addnode(ip_port, "onetry")