Rename ScanMidstateWorker to KernelWorker, move kernel scanning to separate module.

[novacoin.git] / src / kernel.cpp

diff --git a/src/kernel.cpp b/src/kernel.cpp
index 9891de5..e554aff 100644 (file)
--- a/src/kernel.cpp
+++ b/src/kernel.cpp
@@ -1,10 +1,14 @@
 // Copyright (c) 2012-2013 The PPCoin developers
+// Copyright (c) 2013-2015 The Novacoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <boost/assign/list_of.hpp>
 
 #include "kernel.h"
+#include "kernel_worker.h"
 #include "txdb.h"
 
 extern unsigned int nStakeMaxAge;
@@ -377,7 +381,7 @@ bool CheckStakeKernelHash(uint32_t nBits, const CBlock& blockFrom, uint32_t nTxP
 
     uint256 hashBlockFrom = blockFrom.GetHash();
 
-    CBigNum bnCoinDayWeight = CBigNum(nValueIn) * GetWeight((int64_t)txPrev.nTime, (int64_t)nTimeTx) / COIN / (24 * 60 * 60);
+    CBigNum bnCoinDayWeight = CBigNum(nValueIn) * GetWeight((int64_t)txPrev.nTime, (int64_t)nTimeTx) / COIN / nOneDay;
     targetProofOfStake = (bnCoinDayWeight * bnTargetPerCoinDay).getuint256();
 
     // Calculate hash
@@ -423,81 +427,6 @@ bool CheckStakeKernelHash(uint32_t nBits, const CBlock& blockFrom, uint32_t nTxP
     return true;
 }
 
-class ScanMidstateWorker
-{
-public:
-    ScanMidstateWorker()
-    { }
-    ScanMidstateWorker(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, uint32_t nIntervalBegin, uint32_t nIntervalEnd) 
-        : nBits(nBits), nInputTxTime(nInputTxTime), nValueIn(nValueIn), nIntervalBegin(nIntervalBegin), nIntervalEnd(nIntervalEnd)
-    {
-        // Init new sha256 context and update it
-        //   with first 24 bytes of kernel
-        SHA256_Init(&workerCtx);
-        SHA256_Update(&workerCtx, kernel, 8 + 16);
-        workerSolutions = vector<std::pair<uint256,uint32_t> >();
-    }
-
-    void Do()
-    {
-        SetThreadPriority(THREAD_PRIORITY_LOWEST);
-
-        CBigNum bnTargetPerCoinDay;
-        bnTargetPerCoinDay.SetCompact(nBits);
-
-        // Get maximum possible target to filter out the majority of obviously insufficient hashes
-        CBigNum bnMaxTargetPerCoinDay = bnTargetPerCoinDay * CBigNum(nValueIn) * nStakeMaxAge / COIN / (24 * 60 * 60);
-        uint256 maxTarget = bnMaxTargetPerCoinDay.getuint256();
-
-        SHA256_CTX ctx = workerCtx;
-
-        // Search forward in time from the given timestamp
-        // Stopping search in case of shutting down
-        for (uint32_t nTimeTx=nIntervalBegin; nTimeTx<nIntervalEnd && !fShutdown; nTimeTx++)
-        {
-            // Complete first hashing iteration
-            uint256 hash1;
-            SHA256_Update(&ctx, (unsigned char*)&nTimeTx, 4);
-            SHA256_Final((unsigned char*)&hash1, &ctx);
-
-            // Restore context
-            ctx = workerCtx;
-
-            // Finally, calculate kernel hash
-            uint256 hashProofOfStake;
-            SHA256((unsigned char*)&hash1, sizeof(hashProofOfStake), (unsigned char*)&hashProofOfStake);
-
-
-            // Skip if hash doesn't satisfy the maximum target
-            if (hashProofOfStake > maxTarget)
-                continue;
-
-            CBigNum bnCoinDayWeight = CBigNum(nValueIn) * GetWeight((int64_t)nInputTxTime, (int64_t)nTimeTx) / COIN / (24 * 60 * 60);
-            CBigNum bnTargetProofOfStake = bnCoinDayWeight * bnTargetPerCoinDay;
-
-            if (bnTargetProofOfStake >= CBigNum(hashProofOfStake))
-            {
-                workerSolutions.push_back(std::pair<uint256,uint32_t>(hashProofOfStake, nTimeTx));
-            }
-        }
-    }
-
-    vector<std::pair<uint256,uint32_t> >& GetSolutions()
-    {
-        return workerSolutions;
-    }
-
-private:
-    SHA256_CTX workerCtx;
-    std::vector<std::pair<uint256,uint32_t> > workerSolutions;
-
-    uint32_t nBits;
-    uint32_t nInputTxTime;
-    int64_t nValueIn;
-    uint32_t nIntervalBegin;
-    uint32_t nIntervalEnd;
-};
-
 // Scan given kernel for solution
 bool ScanKernelForward(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, std::pair<uint32_t, uint32_t> &SearchInterval, std::vector<std::pair<uint256, uint32_t> > &solutions)
 {
@@ -507,15 +436,15 @@ bool ScanKernelForward(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxT
     uint32_t nPart = (SearchInterval.second - SearchInterval.first) / nThreads;
 
 
-    ScanMidstateWorker *workers = new ScanMidstateWorker[nThreads];
+    KernelWorker *workers = new KernelWorker[nThreads];
 
     boost::thread_group group;
     for(size_t i = 0; i < nThreads; i++)
     {
         uint32_t nBegin = SearchInterval.first + nPart * i;
         uint32_t nEnd = SearchInterval.first + nPart * (i + 1);
-        workers[i] = ScanMidstateWorker(kernel, nBits, nInputTxTime, nValueIn, nBegin, nEnd);
-        boost::function<void()> workerFnc = boost::bind(&ScanMidstateWorker::Do, &workers[i]);
+        workers[i] = KernelWorker(kernel, nBits, nInputTxTime, nValueIn, nBegin, nEnd);
+        boost::function<void()> workerFnc = boost::bind(&KernelWorker::Do, &workers[i]);
         group.create_thread(workerFnc);
     }
 
@@ -546,7 +475,7 @@ bool ScanContextBackward(SHA256_CTX &ctx, uint32_t nBits, uint32_t nInputTxTime,
     bnTargetPerCoinDay.SetCompact(nBits);
 
     // Get maximum possible target to filter out the majority of obviously insufficient hashes
-    CBigNum bnMaxTargetPerCoinDay = bnTargetPerCoinDay * CBigNum(nValueIn) * nStakeMaxAge / COIN / (24 * 60 * 60);
+    CBigNum bnMaxTargetPerCoinDay = bnTargetPerCoinDay * CBigNum(nValueIn) * nStakeMaxAge / COIN / nOneDay;
     uint256 maxTarget = bnMaxTargetPerCoinDay.getuint256();
 
     SHA256_CTX ctxCopy = ctx;
@@ -571,7 +500,7 @@ bool ScanContextBackward(SHA256_CTX &ctx, uint32_t nBits, uint32_t nInputTxTime,
         if (hashProofOfStake > maxTarget)
             continue;
 
-        CBigNum bnCoinDayWeight = CBigNum(nValueIn) * GetWeight((int64_t)nInputTxTime, (int64_t)nTimeTx) / COIN / (24 * 60 * 60);
+        CBigNum bnCoinDayWeight = CBigNum(nValueIn) * GetWeight((int64_t)nInputTxTime, (int64_t)nTimeTx) / COIN / nOneDay;
         CBigNum bnTargetProofOfStake = bnCoinDayWeight * bnTargetPerCoinDay;
 
         if (bnTargetProofOfStake >= CBigNum(hashProofOfStake))