Merge 5ac6d438fa into 64a0ed413b

Zephyr solo mining: handle multiple outputs

src/base/kernel/Platform_unix.cpp

@@ -169,6 +169,12 @@ bool xmrig::Platform::isOnBatteryPower()
             return (status == "Discharging");
         }
     }
+    std::ifstream f("/sys/class/power_supply/macsmc-battery/status");
+    if (f.is_open()) {
+        std::string status;
+        f >> status;
+        return (status == "Discharging");
+    }
     return false;
 }
 

src/base/tools/cryptonote/BlockTemplate.cpp

@@ -198,7 +198,7 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     }
 
     if (m_coin == Coin::ZEPHYR) {
-        uint8_t pricing_record[24];
+        uint8_t pricing_record[120];
         ar(pricing_record);
     }
 
@@ -225,8 +225,12 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     ar(m_height);
     ar(m_numOutputs);
 
-    const uint64_t expected_outputs = (m_coin == Coin::ZEPHYR) ? 2 : 1;
+    if (m_coin == Coin::ZEPHYR) {
-    if (m_numOutputs != expected_outputs) {
+        if (m_numOutputs < 2) {
+            return false;
+        }
+    }
+    else if (m_numOutputs != 1) {
         return false;
     }
 
@@ -252,23 +256,25 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         ar.skip(asset_type_len);
         ar(m_viewTag);
 
-        uint64_t amount2;
+        for (uint64_t k = 1; k < m_numOutputs; ++k) {
-        ar(amount2);
+            uint64_t amount2;
+            ar(amount2);
 
-        uint8_t output_type2;
+            uint8_t output_type2;
-        ar(output_type2);
+            ar(output_type2);
-        if (output_type2 != 2) {
+            if (output_type2 != 2) {
-            return false;
+                return false;
+            }
+
+            Span key2;
+            ar(key2, kKeySize);
+
+            ar(asset_type_len);
+            ar.skip(asset_type_len);
+
+            uint8_t view_tag2;
+            ar(view_tag2);
         }
-
-        Span key2;
-        ar(key2, kKeySize);
-
-        ar(asset_type_len);
-        ar.skip(asset_type_len);
-
-        uint8_t view_tag2;
-        ar(view_tag2);
     }
     else if (m_outputType == 3) {
         ar(m_viewTag);