cleanup

Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>

cmake/XrplInterface.cmake

@@ -23,7 +23,6 @@ target_compile_definitions(
         BOOST_FILESYSTEM_NO_DEPRECATED
         >
         $<$<NOT:$<BOOL:${boost_show_deprecated}>>:
-        BOOST_COROUTINES2_NO_DEPRECATION_WARNING
         BOOST_BEAST_ALLOW_DEPRECATED
         BOOST_FILESYSTEM_DEPRECATED
         >

conan/profiles/sanitizers

@@ -82,5 +82,12 @@ tools.info.package_id:confs+=["tools.build:cxxflags", "tools.build:exelinkflags"
         boost/*:without_context=False
         # Boost stacktrace fails to build with some sanitizers
         boost/*:without_stacktrace=True
+    {% elif "thread" in sanitizers %}
+        # Build Boost.Context with ucontext backend for TSAN. fcontext (assembly)
+        # has no TSAN annotations, so without this the BOOST_USE_TSAN/BOOST_USE_UCONTEXT
+        # defines in [conf] would be ineffective.
+        boost/*:extra_b2_flags=context-impl=ucontext thread-sanitizer=on define=BOOST_USE_TSAN=1
+        boost/*:without_context=False
+        boost/*:without_stacktrace=True
     {% endif %}
 {% endif %}

conanfile.py

@@ -129,12 +129,6 @@ class Xrpl(ConanFile):
         if self.settings.compiler in ["clang", "gcc"]:
             self.options["boost"].without_cobalt = True
 
-        # Check if environment variable exists
-        if "SANITIZERS" in os.environ:
-            sanitizers = os.environ["SANITIZERS"]
-            if "address" in sanitizers.lower():
-                self.default_options["fPIC"] = False
-
     def requirements(self):
         self.requires("boost/1.90.0", force=True, transitive_headers=True)
         self.requires("date/3.0.4", transitive_headers=True)

include/xrpl/core/Coro.ipp

@@ -2,17 +2,19 @@
 
 namespace xrpl {
 
+/// Coroutine stack size (1.5 MB). Increased from 1 MB because
+/// ASAN-instrumented deep call stacks exceeded the original limit.
+constexpr std::size_t coroStackSize = 1536 * 1024;
+
 template <class F>
 JobQueue::Coro::Coro(Coro_create_t, JobQueue& jq, JobType type, std::string const& name, F&& f)
     : jq_(jq)
     , type_(type)
     , name_(name)
     , coro_(
-          // Stack size of 1MB wasn't sufficient for deep calls. ASAN tests flagged the issue. Hence
-          // increasing the size to 1.5MB.
-          boost::context::protected_fixedsize_stack(1536 * 1024),
-          [this, fn = std::forward<F>(f)](
-              boost::coroutines2::asymmetric_coroutine<void>::push_type& do_yield) {
+          boost::context::protected_fixedsize_stack(coroStackSize),
+          [this,
+           fn = std::forward<F>(f)](boost::coroutines2::coroutine<void>::push_type& do_yield) {
               yield_ = &do_yield;
               yield();
               fn(shared_from_this());

include/xrpl/proto/xrpl.proto

@@ -234,11 +234,9 @@ message TMGetObjectByHash {
     otTRANSACTIONS = 7;
   }
 
-  // Previously used - don't reuse.
-  reserved 3;
-
   required ObjectType type = 1;
   required bool query = 2;               // is this a query or a reply?
+  optional uint32 seq = 3;               // used to match replies to queries
   optional bytes ledgerHash = 4;         // the hash of the ledger these queries are for
   optional bool fat = 5;                 // return related nodes
   repeated TMIndexedObject objects = 6;  // the specific objects requested

src/test/overlay/compression_test.cpp

@@ -279,6 +279,7 @@ public:
         getObject->set_type(
             protocol::TMGetObjectByHash_ObjectType::TMGetObjectByHash_ObjectType_otTRANSACTION);
         getObject->set_query(true);
+        getObject->set_seq(123456789);
         uint256 hash(xrpl::sha512Half(123456789));
         getObject->set_ledgerhash(hash.data(), hash.size());
         getObject->set_fat(true);

src/xrpld/app/ledger/detail/LedgerMaster.cpp

@@ -2113,6 +2113,9 @@ LedgerMaster::makeFetchPack(
         protocol::TMGetObjectByHash reply;
         reply.set_query(false);
 
+        if (request->has_seq())
+            reply.set_seq(request->seq());
+
         reply.set_ledgerhash(request->ledgerhash());
         reply.set_type(protocol::TMGetObjectByHash::otFETCH_PACK);
 

src/xrpld/overlay/detail/PeerImp.cpp

@@ -2596,6 +2596,9 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
 
         reply.set_query(false);
 
+        if (packet.has_seq())
+            reply.set_seq(packet.seq());
+
         reply.set_type(packet.type());
 
         if (packet.has_ledgerhash())
@@ -2633,6 +2636,8 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
                     if (obj.has_ledgerseq())
                         newObj.set_ledgerseq(obj.ledgerseq());
 
+                    // VFALCO NOTE "seq" in the message is obsolete
+
                     // Check if by adding this object, reply has reached its
                     // limit
                     if (reply.objects_size() >= Tuning::hardMaxReplyNodes)