0.22.4-Leisure Upgrade

- Fix hang in clock timer comparison call for getorderlist

Author: biblepay

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 dnl Don't forget to push a corresponding tag when updating any of _CLIENT_VERSION_* numbers
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 22)
-define(_CLIENT_VERSION_BUILD, 3) 
+define(_CLIENT_VERSION_BUILD, 4) 
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

src/rpc/blockchain.cpp

@@ -3362,6 +3362,12 @@ UniValue exec(const JSONRPCRequest& request)
             iRow++;
             results.pushKV(DoubleToStringWithLeadingZeroes(iRow, 0, 3), sRow);
         }
+    } else if (sItem == "hamans-hanging")
+    {
+        std::map<std::string, std::string> mapRequestHeaders;
+        mapRequestHeaders["Address"] = "";
+        std::string sResponse = AtomicCommunication("Test0", mapRequestHeaders);
+        results.pushKV("hang", sResponse);
     }
     else if (sItem == "getdogebalance")
     {

src/rpcpog.cpp

@@ -924,7 +924,8 @@ std::string Uplink(bool bPost, std::string sPayload, std::string sBaseURL, std::
 
         //  Variables used to read the response from the server
         int size;
-        clock_t begin = clock();
+        double nClockStart = GetAdjustedTime();
+
         char buf[16384];
         memset(buf, 0, sizeof(buf));
 
@@ -948,7 +949,8 @@ std::string Uplink(bool bPost, std::string sPayload, std::string sBaseURL, std::
                 LogPrintf("\r\n BioReadFinished maxsize %f datasize %f ", dMaxSize, iRead);
 
             clock_t end = clock();
-            double elapsed_secs = double(end - begin) / (CLOCKS_PER_SEC + .01);
+            double elapsed_secs = GetAdjustedTime() - nClockStart;
+
             if (elapsed_secs > iTimeoutSecs) break;
             if (TermPeekFound(sData, iBOE)) break;
 
@@ -997,7 +999,7 @@ std::string AtomicCommunication(std::string Action, std::map<std::string, std::s
 {
     std::string sBaseDomain = "https://api.biblepay.org";
     std::string sPage = "api/AtomicTrading/" + Action;
-    std::string sResponse = Uplink(true, "", sBaseDomain, sPage, SSL_PORT, 15, 1, mapRequestHeaders);
+    std::string sResponse = Uplink(true, "", sBaseDomain, sPage, SSL_PORT, 10, 1, mapRequestHeaders);
     return sResponse;
 }
 

src/rpcpog.h

@@ -155,15 +155,17 @@ struct AtomicTrade
 
      void PopulateBX()
      {
-             if (Status == "canceled" && ReturnTXID != "") {
+             if (Status == "canceled" && ReturnTXID != "")
+             {
                  if (Action == "buy") {
                      BlockExplorerURL = "https://live.blockcypher.com/doge/tx/" + ReturnTXID + "/";
                  } else if (Action == "sell") {
                      BlockExplorerURL = "https://chainz.cryptoid.info/bbp/tx.dws?" + ReturnTXID + "/";
                  }
              }
 
-             if (Status == "open" && ReturnTXID != "") {
+             if (Status == "open" && CollateralTXID != "")
+             {
                  if (Action == "buy") {
                      BlockExplorerURL = "https://live.blockcypher.com/doge/tx/" + CollateralTXID + "/";
                  } else if (Action == "sell") {