From c53cd93aee8fafa992681d2f0ef7238f1097686d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 10 Dec 2024 03:33:16 +0000
Subject: [PATCH] merge bitcoin#29347: enable v2transport by default

---
 src/net.h                                   |  2 +-
 test/functional/test_framework/test_node.py | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/net.h b/src/net.h
index cf0469ff3f..446e687048 100644
--- a/src/net.h
+++ b/src/net.h
@@ -117,7 +117,7 @@ static const bool DEFAULT_FIXEDSEEDS = true;
 static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
 static const size_t DEFAULT_MAXSENDBUFFER    = 1 * 1000;
 
-static constexpr bool DEFAULT_V2_TRANSPORT{false};
+static constexpr bool DEFAULT_V2_TRANSPORT{true};
 
 #if defined USE_KQUEUE
 #define DEFAULT_SOCKETEVENTS "kqueue"
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py
index 6863e72b40..98377e06c4 100755
--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -131,8 +131,15 @@ class TestNode():
         # Default behavior from global -v2transport flag is added to args to persist it over restarts.
         # May be overwritten in individual tests, using extra_args.
         self.default_to_v2 = v2transport
-        if self.default_to_v2:
-            self.args.append("-v2transport=1")
+        if self.version_is_at_least(22000000):
+            # 22.0 and later support v2transport
+            if v2transport:
+                self.args.append("-v2transport=1")
+            else:
+                self.args.append("-v2transport=0")
+        else:
+            # v2transport requested but not supported for node
+            assert not v2transport
 
         self.cli = TestNodeCLI(bitcoin_cli, self.datadir)
         self.use_cli = use_cli