fix job class

Author: Matteo Crippa

src/model/job.cpp

@@ -6,19 +6,12 @@
 #endif
 #include <climits>
 
-// Constructor
 Job::Job(const Notification &notification, const Subscribe &subscribe, double difficulty) : difficulty(difficulty)
 {
     const char *version = notification.version.c_str();
     const char *prevhash = notification.prevhash.c_str();
     const char *ntime_string = notification.ntime.c_str();
     const char *nbits = notification.nbits.c_str();
-    uint8_t merkle_branch_size = notification.merkle_branch.size();
-    std::vector<std::string> merkle_branch(merkle_branch_size);
-    for (uint8_t i = 0; i < merkle_branch_size; i++)
-    {
-        merkle_branch[i] = notification.merkle_branch[i].c_str();
-    }
 
     job_id = notification.job_id;
     ntime = ntime_string;
@@ -28,45 +21,33 @@ Job::Job(const Notification &notification, const Subscribe &subscribe, double di
 #else
     extranonce2 = "00000002";
 #endif
-    std::string coinbase = notification.coinb1 + subscribe.extranonce1 + extranonce2 + notification.coinb2;
-    l_info(TAG_JOB, "[%s] - Coinbase: %s", job_id.c_str(), coinbase.c_str());
-
-#if defined(ESP8266)
-    ESP.wdtFeed();
-#endif
+    const std::string coinbase = notification.coinb1 + subscribe.extranonce1 + extranonce2 + notification.coinb2;
 
     std::string coinbase_hash;
     generateCoinbaseHash(coinbase, coinbase_hash);
 
     std::string merkle_root;
-    calculateMerkleRoot(coinbase_hash, merkle_branch, merkle_root);
+    calculateMerkleRoot(coinbase_hash, notification.merkle_branch, merkle_root);
 
-    block.version = strtoul(version, NULL, 16);
+    block.version = strtoul(version, nullptr, 16);
     hexStringToByteArray(prevhash, block.previous_block);
     reverseBytesAndFlip(block.previous_block, 32);
 
     hexStringToByteArray(merkle_root.c_str(), block.merkle_root);
-    block.ntime = strtoul(ntime.c_str(), NULL, 16);
-    block.nbits = strtoul(nbits, NULL, 16);
+    block.ntime = strtoul(ntime.c_str(), nullptr, 16);
+    block.nbits = strtoul(nbits, nullptr, 16);
     block.nonce = 0;
 
     target.calculate(nbits);
 
-    nerd_mids(&sha, (unsigned char *)&block);
-}
-
-// Destructor
-Job::~Job()
-{
-    // No need to manually release resources for std::string members
+    nerd_mids(&sha, reinterpret_cast<unsigned char *>(&block));
 }
 
 uint8_t Job::pickaxe(uint32_t core, uint8_t *hash, uint32_t &winning_nonce)
 {
     nextNonce(core);
     winning_nonce = block.nonce;
-    uint8_t is_valid = nerd_sha256d(&sha, (unsigned char *)&block + 64, hash);
-    return is_valid;
+    return nerd_sha256d(&sha, reinterpret_cast<unsigned char *>(&block) + 64, hash);
 }
 
 void Job::setStartNonce(uint32_t start_nonce)
@@ -81,34 +62,25 @@ void Job::nextNonce(uint32_t core)
 
 void Job::generateCoinbaseHash(const std::string &coinbase, std::string &coinbase_hash)
 {
-    // Convert hex string to byte array
-    size_t len = coinbase.length();
+    const size_t len = coinbase.length();
     uint8_t coinbaseBytes[len / 2];
     hexStringToByteArray(coinbase.c_str(), coinbaseBytes);
-
-    // Calculate SHA256 hash
     uint8_t hash[SHA256M_BLOCK_SIZE];
     sha256_double(coinbaseBytes, len / 2, hash);
-
-    // Convert binary hash to hex string
     coinbase_hash = byteArrayToHexString(hash, SHA256M_BLOCK_SIZE);
-    l_info(TAG_JOB, "[%s] - Coinbase hash: %s", job_id.c_str(), coinbase_hash.c_str());
 }
 
 void Job::calculateMerkleRoot(const std::string &coinbase_hash, const std::vector<std::string> &merkle_branch, std::string &merkle_root)
 {
     uint8_t hash[SHA256M_BLOCK_SIZE] = {};
     hexStringToByteArray(coinbase_hash.c_str(), hash);
 
-    for (size_t i = 0; i < merkle_branch.size(); i++)
+    for (const auto &branch : merkle_branch)
     {
         uint8_t merkle_branch_bin[32];
-        hexStringToByteArray(merkle_branch[i].c_str(), merkle_branch_bin);
-
-        l_info(TAG_JOB, "[%s] - Merkle Branch [%d]: %s", job_id.c_str(), i, merkle_branch[i].c_str());
+        hexStringToByteArray(branch.c_str(), merkle_branch_bin);
 
         uint8_t merkle_concatenated[SHA256M_BLOCK_SIZE * 2];
-
         for (size_t j = 0; j < 32; j++)
         {
             merkle_concatenated[j] = hash[j];
@@ -123,7 +95,7 @@ void Job::calculateMerkleRoot(const std::string &coinbase_hash, const std::vecto
 
 std::string Job::generate_extra_nonce2(int extranonce2_size)
 {
-// Generate a random number between 0 and ULONG_MAX
+// Generate a random number between 0 and INT_MAX
 #if defined(ESP8266)
     uint32_t randomValue = esp.random(0, INT_MAX);
 #else
@@ -139,17 +111,11 @@ std::string Job::generate_extra_nonce2(int extranonce2_size)
 
     // Convert the random number to a hex string
     snprintf(extranonce2, hexStringLength, "%u", randomValue);
-
-    // Ensure the hex string is padded to the required length
-    while ((int)strlen(extranonce2) < hexStringLength - 1)
+    while (static_cast<int>(strlen(extranonce2)) < hexStringLength - 1)
     {
-        char *temp = new char[hexStringLength];
+        char temp[hexStringLength];
         snprintf(temp, hexStringLength, "0%s", extranonce2);
-        delete[] extranonce2;
-        extranonce2 = temp;
+        strcpy(extranonce2, temp);
     }
-
-    l_info(TAG_JOB, "ExtraNonce2: %s", extranonce2);
-
     return std::string(extranonce2);
-}
+}