Set version to 2.6.1-rc2

Mark PermissionDelegation as unsupported
Set version to 2.6.1-rc1
2025-11-04 19:25:51 +00:00 · 2025-09-18 18:09:04 +01:00 · 2025-09-18 18:04:12 +01:00 · 2025-09-16 15:35:54 -04:00 · 2025-09-16 15:35:47 -04:00
5 changed files with 7 additions and 4 deletions
--- a/conan/profiles/default
+++ b/conan/profiles/default
@@ -26,6 +26,9 @@ tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
 {% if compiler == "apple-clang" and compiler_version >= 17 %}
 tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
 {% endif %}
+{% if compiler == "clang" and compiler_version == 16 %}
+tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS']
+{% endif %}
 {% if compiler == "gcc" and compiler_version < 13 %}
 tools.build:cxxflags=['-Wno-restrict']
 {% endif %}
--- a/conanfile.py
+++ b/conanfile.py
@@ -104,7 +104,7 @@ class Xrpl(ConanFile):
    def requirements(self):
        # Conan 2 requires transitive headers to be specified
        transitive_headers_opt = {'transitive_headers': True} if conan_version.split('.')[0] == '2' else {}
-        self.requires('boost/1.86.0', force=True, **transitive_headers_opt)
+        self.requires('boost/1.83.0', force=True, **transitive_headers_opt)
        self.requires('date/3.0.4', **transitive_headers_opt)
        self.requires('lz4/1.10.0', force=True)
        self.requires('protobuf/3.21.12', force=True)
--- a/include/xrpl/protocol/detail/features.macro
+++ b/include/xrpl/protocol/detail/features.macro
@@ -41,7 +41,7 @@ XRPL_FIX    (AMMv1_3,                    Supported::yes, VoteBehavior::DefaultNo
 XRPL_FEATURE(PermissionedDEX,            Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(Batch,                      Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(SingleAssetVault,           Supported::no,  VoteBehavior::DefaultNo)
-XRPL_FEATURE(PermissionDelegation,       Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(PermissionDelegation,       Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FIX    (PayChanCancelAfter,         Supported::yes, VoteBehavior::DefaultNo)
 // Check flags in Credential transactions
 XRPL_FIX    (InvalidTxFlags,             Supported::yes, VoteBehavior::DefaultNo)
--- a/src/libxrpl/protocol/BuildInfo.cpp
+++ b/src/libxrpl/protocol/BuildInfo.cpp
@@ -36,7 +36,7 @@ namespace BuildInfo {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
-char const* const versionString = "2.6.0"
+char const* const versionString = "2.6.1-rc2"
 // clang-format on

 #if defined(DEBUG) || defined(SANITIZER)
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -681,7 +681,7 @@ class ServerStatus_test : public beast::unit_test::suite,
            resp["Upgrade"] == "websocket");
        BEAST_EXPECT(
            resp.find("Connection") != resp.end() &&
-            resp["Connection"] == "Upgrade");
+            resp["Connection"] == "upgrade");
    }

    void
Author	SHA1	Message	Date
Bronek Kozicki	c46888f8f7	Set version to 2.6.1-rc2	2025-09-18 18:09:04 +01:00
Bronek Kozicki	2ae65d2fdb	Mark PermissionDelegation as unsupported	2025-09-18 18:04:12 +01:00
Bronek Kozicki	8d01f35eb9	Set version to 2.6.1-rc1	2025-09-16 15:35:54 -04:00
Bronek Kozicki	1020a32d76	Downgrade to boost 1.83	2025-09-16 15:35:47 -04:00