2.6.0-rc2

.git-blame-ignore-revs

@@ -11,3 +11,4 @@ b9d007813378ad0ff45660dc07285b823c7e9855
 fe9a5365b8a52d4acc42eb27369247e6f238a4f9
 9a93577314e6a8d4b4a8368cc9d2b15a5d8303e8
 552377c76f55b403a1c876df873a23d780fcc81c
+97f0747e103f13e26e45b731731059b32f7679ac

BUILD.md

@@ -147,8 +147,9 @@ git sparse-checkout set recipes/snappy
 git sparse-checkout add recipes/soci
 git fetch origin master
 git checkout master
-conan export --version 1.1.10 external/recipes/snappy
-conan export --version 4.0.3 external/recipes/soci
+conan export --version 1.1.10 recipes/snappy/all
+conan export --version 4.0.3 recipes/soci/all
+rm -rf .git
 ```
 
 In the case we switch to a newer version of a dependency that still requires a

CONTRIBUTING.md

@@ -384,9 +384,8 @@ Maintainers are users with maintain or admin access to the repo.
 - [bthomee](https://github.com/bthomee) (Ripple)
 - [intelliot](https://github.com/intelliot) (Ripple)
 - [JoelKatz](https://github.com/JoelKatz) (Ripple)
-- [nixer89](https://github.com/nixer89) (XRP Ledger Foundation)
-- [RichardAH](https://github.com/RichardAH) (XRP Ledger Foundation)
-- [Silkjaer](https://github.com/Silkjaer) (XRP Ledger Foundation)
+- [legleux](https://github.com/legleux) (Ripple)
+- [mankins](https://github.com/mankins) (XRP Ledger Foundation)
 - [WietseWind](https://github.com/WietseWind) (XRPL Labs + XRP Ledger Foundation)
 - [ximinez](https://github.com/ximinez) (Ripple)
 
@@ -395,27 +394,24 @@ Maintainers are users with maintain or admin access to the repo.
 Code Reviewers are developers who have the ability to review, approve, and
 in some cases merge source code changes.
 
-- [HowardHinnant](https://github.com/HowardHinnant) (Ripple)
-- [scottschurr](https://github.com/scottschurr) (Ripple)
-- [seelabs](https://github.com/seelabs) (Ripple)
-- [Ed Hennis](https://github.com/ximinez) (Ripple)
-- [mvadari](https://github.com/mvadari) (Ripple)
-- [thejohnfreeman](https://github.com/thejohnfreeman) (Ripple)
+- [a1q123456](https://github.com/a1q123456) (Ripple)
 - [Bronek](https://github.com/Bronek) (Ripple)
-- [manojsdoshi](https://github.com/manojsdoshi) (Ripple)
+- [bthomee](https://github.com/bthomee) (Ripple)
+- [ckeshava](https://github.com/ckeshava) (Ripple)
+- [dangell7](https://github.com/dangell7) (XRPL Labs)
 - [godexsoft](https://github.com/godexsoft) (Ripple)
-- [mDuo13](https://github.com/mDuo13) (Ripple)
-- [ckniffen](https://github.com/ckniffen) (Ripple)
-- [arihantkothari](https://github.com/arihantkothari) (Ripple)
+- [gregtatcam](https://github.com/gregtatcam) (Ripple)
+- [kuznetsss](https://github.com/kuznetsss) (Ripple)
+- [lmaisons](https://github.com/lmaisons) (Ripple)
+- [mathbunnyru](https://github.com/mathbunnyru) (Ripple)
+- [mvadari](https://github.com/mvadari) (Ripple)
+- [oleks-rip](https://github.com/oleks-rip) (Ripple)
+- [PeterChen13579](https://github.com/PeterChen13579) (Ripple)
 - [pwang200](https://github.com/pwang200) (Ripple)
-- [sophiax851](https://github.com/sophiax851) (Ripple)
+- [q73zhao](https://github.com/q73zhao) (Ripple)
 - [shawnxie999](https://github.com/shawnxie999) (Ripple)
-- [gregtatcam](https://github.com/gregtatcam) (Ripple)
-- [mtrippled](https://github.com/mtrippled) (Ripple)
-- [ckeshava](https://github.com/ckeshava) (Ripple)
-- [nbougalis](https://github.com/nbougalis) None
-- [RichardAH](https://github.com/RichardAH) (XRPL Labs + XRP Ledger Foundation)
-- [dangell7](https://github.com/dangell7) (XRPL Labs)
+- [Tapanito](https://github.com/Tapanito) (Ripple)
+- [ximinez](https://github.com/ximinez) (Ripple)
 
 Developers not on this list are able and encouraged to submit feedback
 on pending code changes (open pull requests).

cmake/RippledCompiler.cmake

@@ -94,6 +94,7 @@ else ()
     INTERFACE
       -Wall
       -Wdeprecated
+      $<$<BOOL:${is_clang}>:-Wno-deprecated-declarations>
       $<$<BOOL:${wextra}>:-Wextra -Wno-unused-parameter>
       $<$<BOOL:${werr}>:-Werror>
       -fstack-protector

include/xrpl/basics/Expected.h

@@ -22,18 +22,8 @@
 
 #include <xrpl/basics/contract.h>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated"
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 #include <boost/outcome.hpp>
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #include <stdexcept>
 
 namespace ripple {

include/xrpl/beast/hash/hash_append.h

@@ -24,35 +24,10 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/endian/conversion.hpp>
 
-/*
-
-Workaround for overzealous clang warning, which trips on libstdc++ headers
-
-  In file included from
-  /usr/lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/stl_algo.h:61:
-  /usr/lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/stl_tempbuf.h:263:8:
-  error: 'get_temporary_buffer<std::pair<ripple::Quality, const
-  std::vector<std::unique_ptr<ripple::Step>> *>>' is deprecated
-  [-Werror,-Wdeprecated-declarations] 263 |
-  std::get_temporary_buffer<value_type>(_M_original_len));
-       ^
-*/
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated"
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-#include <functional>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #include <array>
 #include <chrono>
 #include <cstring>
+#include <functional>
 #include <memory>
 #include <string>
 #include <system_error>

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-rc1"
+char const* const versionString = "2.6.0-rc2"
 // clang-format on
 
 #if defined(DEBUG) || defined(SANITIZER)

src/xrpld/app/paths/detail/AMMLiquidity.cpp

@@ -248,7 +248,7 @@ AMMLiquidity<TIn, TOut>::getOffer(
             return offer;
         }
 
-        JLOG(j_.error()) << "AMMLiquidity::getOffer, failed "
+        JLOG(j_.debug()) << "AMMLiquidity::getOffer, no valid offer "
                          << ammContext_.multiPath() << " "
                          << ammContext_.curIters() << " "
                          << (clobQuality ? clobQuality->rate() : STAmount{})

src/xrpld/app/paths/detail/DirectStep.cpp

@@ -423,7 +423,7 @@ DirectIPaymentStep::check(
             !((*sleLine)[sfFlags] & authField) &&
             (*sleLine)[sfBalance] == beast::zero)
         {
-            JLOG(j_.warn())
+            JLOG(j_.debug())
                 << "DirectStepI: can't receive IOUs from issuer without auth."
                 << " src: " << src_;
             return terNO_AUTH;