Merge xmrig v6.15.3 into master

src/base/net/dns/DnsUvBackend.cpp

@@ -28,13 +28,19 @@
 
 namespace xmrig {
 
+static Storage<DnsUvBackend>* storage = nullptr;
 
 Storage<DnsUvBackend>& DnsUvBackend::getStorage()
 {
-    static Storage<DnsUvBackend>* storage = new Storage<DnsUvBackend>();
+    if (storage == nullptr) storage = new Storage<DnsUvBackend>();
     return *storage;
 }
 
+void DnsUvBackend::releaseStorage()
+{
+    delete storage;
+}
+
 static addrinfo hints{};
 
 
@@ -56,6 +62,7 @@ xmrig::DnsUvBackend::DnsUvBackend()
 xmrig::DnsUvBackend::~DnsUvBackend()
 {
     getStorage().release(m_key);
+    releaseStorage();
 }
 
 

src/base/net/dns/DnsUvBackend.h

@@ -62,6 +62,7 @@ private:
     uintptr_t m_key;
 
     static Storage<DnsUvBackend>& getStorage();
+    void releaseStorage();
 };
 
 

src/base/net/stratum/SelfSelectClient.cpp

@@ -72,7 +72,14 @@ int64_t xmrig::SelfSelectClient::submit(const JobResult &result)
         submitOriginDaemon(result);
     }
 
-    return m_client->submit(result);
+    uint64_t submit_result = m_client->submit(result);
+
+    if (m_submitToOrigin) {
+        // Ensure that the latest block template is available after block submission
+        getBlockTemplate();
+    }
+
+    return submit_result;
 }
 
 
@@ -285,9 +292,6 @@ void xmrig::SelfSelectClient::submitOriginDaemon(const JobResult& result)
     LOG_INFO("%s " GREEN_BOLD("submitted to origin daemon") " (%" PRId64 "/%" PRId64 ") " 
         " diff " WHITE("%" PRIu64) " vs. " WHITE("%" PRIu64),
         Tags::origin(), m_originSubmitted, m_originNotSubmitted, m_blockDiff, result.actualDiff(), result.diff);
-
-    // Ensure that the latest block template is available after block submission
-    getBlockTemplate();
 }
 
 void xmrig::SelfSelectClient::onHttpData(const HttpData &data)