Merge xmrig v6.15.3 into master

src/base/kernel/Process.cpp

@@ -152,7 +152,7 @@ xmrig::String xmrig::Process::exepath()
 {
     size_t size = sizeof(pathBuf);
 
-    return uv_exepath(pathBuf, &size) < 0 ? "" : String(pathBuf, size);
+    return uv_exepath(pathBuf, &size) < 0 ? String("") : String(pathBuf, size);
 }
 
 

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)

src/base/tools/cryptonote/BlockTemplate.cpp

@@ -244,22 +244,27 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     ar.skip(m_extraSize);
 
     while (ar_extra.index() < m_extraSize) {
-        uint64_t extra_tag = 0;
+        uint64_t extra_tag  = 0;
+        uint64_t size       = 0;
+
         ar_extra(extra_tag);
 
         switch (extra_tag) {
-        case 0x01: // TX_EXTRA_TAG_PUBKEY
+        case 0x01: // TX_EXTRA_TAG_PUBKEY        
             setOffset(TX_PUBKEY_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
             ar_extra.skip(kKeySize);
             break;
 
         case 0x02: // TX_EXTRA_NONCE
-            {
-                uint64_t size = 0;
-                ar_extra(size);
-                setOffset(TX_EXTRA_NONCE_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
-                ar_extra(m_txExtraNonce, size);
-            }
+            ar_extra(size);
+            setOffset(TX_EXTRA_NONCE_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
+            ar_extra(m_txExtraNonce, size);
+            break;
+
+        case 0x03: // TX_EXTRA_MERGE_MINING_TAG
+            ar_extra(size);
+            setOffset(TX_EXTRA_MERGE_MINING_TAG_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
+            ar_extra(m_txMergeMiningTag, size + kKeySize);
             break;
 
         default:

src/base/tools/cryptonote/BlockTemplate.h

@@ -54,6 +54,7 @@ public:
         TX_EXTRA_OFFSET,
         TX_PUBKEY_OFFSET,
         TX_EXTRA_NONCE_OFFSET,
+        TX_EXTRA_MERGE_MINING_TAG_OFFSET,
         OFFSET_COUNT
     };
 
@@ -86,6 +87,7 @@ public:
     inline uint64_t outputType() const                      { return m_outputType; }
     inline const Span &ephPublicKey() const                 { return m_ephPublicKey; }
     inline const Span &txExtraNonce() const                 { return m_txExtraNonce; }
+    inline const Span &txMergeMiningTag() const             { return m_txMergeMiningTag; }
 
     // Transaction hashes
     inline uint64_t numHashes() const                       { return m_numHashes; }
@@ -140,7 +142,7 @@ private:
     Span m_ephPublicKey;
     uint64_t m_extraSize    = 0;
     Span m_txExtraNonce;
-
+    Span m_txMergeMiningTag = 0;
     uint64_t m_numHashes    = 0;
     Buffer m_hashes;
     Buffer m_minerTxMerkleTreeBranch;