Preparation Algoswitch

Author: limxdev

src/pow.cpp

@@ -185,21 +185,21 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
     {
     return DUAL_KGW3(pindexLast, pblock, params);
     }
-/*
-    // Megacoin Miningalgo switch
-	// 1571832146 Wednesday, 23. October 2019 12:02:26
+
+    // Bitcore Miningalgo switch
 	// please check also block.cpp:L62
-    if(pblock->GetBlockTime() >= HASH_FORK_TIME_1 && pindexLast->GetBlockTime() <= HASH_FORK_TIME_1 + 86400) // We have a timerange from 24 hours  to find a new block
+    // We have a timerange from 24 hours  to find a new block
+    if(pblock->GetBlockTime() >= HASH_FORK_TIME_1 && pindexLast->GetBlockTime() <= HASH_FORK_TIME_1 + 86400)    
     {
         if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*24) 
             {
-        //consensus.nPowTargetSpacing = 2.5 * 60; // Megacoin	
-        //This should be one hour then is this function possible
-    LogPrintf("Megacoin Hashalgoupdate MEGA BTX!!! \n");
-    return nProofOfWorkLimit;
+                //consensus.nPowTargetSpacing = 2.5 * 60; // Megacoin	
+                //This should be one hour then is this function possible
+                LogPrintf("Megacoin Hashalgoupdate MEGA BTX!!! \n");
+                return nProofOfWorkLimit;
             }
     }
-*/
+
 
 
     if (pindexLast->nHeight+1 <= fork2)

src/primitives/block.cpp

@@ -33,79 +33,26 @@ uint256 CBlockHeader::GetPoWHash() const
     uint256 powHash = uint256S("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 
     //BitCore
-
-    if(GetBlockTime() >= 1493124696) //Human time (GMT): Tue, 25 Apr 2017 12:51:36 GMT
-        {
+    if(GetBlockTime() >= HASH_FORK_TIME_1) //Wednesday, 23. October 2019 12:02:26
+    {
+        return Mega_Btx(BEGIN(nVersion), END(nNonce), GetBlockTime());
+    }
+    else
+    {
+        if(GetBlockTime() >= 1493124696) //Human time (GMT): Tue, 25 Apr 2017 12:51:36 GMT
+            {
                 return HashTimeTravel(BEGIN(nVersion), END(nNonce), GetBlockTime()); // BitCore TimeTravel
-        }
-        else
-        {
+            }
+            else
+            {
 
                 scrypt_1024_1_1_256(BEGIN(nVersion), BEGIN(powHash)); // BitCore Scrypt
                 return powHash;
-        }
-        return powHash;
-
-    //Brainstormingpart
-/*
-    switch (nVersion & ALGO_VERSION_MASK)
-    {
-        case ALGO_SHA256D: powHash = GetHash(); break;
-        case ALGO_SCRYPT:  scrypt_1024_1_1_256(BEGIN(nVersion), BEGIN(powHash)); break;
-        case ALGO_NIST5:   powHash = NIST5(BEGIN(nVersion), END(nNonce)); break;
-        case ALGO_LYRA2Z:  lyra2z_hash(BEGIN(nVersion), BEGIN(powHash)); break;
-        case ALGO_X11:     powHash = HashX11(BEGIN(nVersion), END(nNonce)); break;
-        case ALGO_X16R:    powHash = HashX16R(BEGIN(nVersion), END(nNonce), hashPrevBlock); break;
-        default:           break; // FXTC TODO: we should not be here
+            }
     }
-
     return powHash;
-*/
-/*
-// Megacoin
-    
-    if(GetBlockTime() >= 1493124696) { //Human time (GMT): Tue, 25 Apr 2017 12:51:36 GMT
-        return HashTimeTravel(BEGIN(nVersion), END(nNonce), GetBlockTime()); // MegaCoin TimeTravel
-    }
-    else 
-    {
-    
-    uint256 thash;
-    // please check also pow.cpp:L414
-	//10/21/2019 @ 12:00am (UTC)
-    if(GetBlockTime() >= HASH_FORK_TIME_1) //Wednesday, 23. October 2019 12:02:26
-    {
-        //thash = HashX16R(BEGIN(nVersion), END(nNonce), hashPrevBlock);
-        scrypt_1024_1_1_256(BEGIN(nVersion), BEGIN(thash));
-    } //10/21/2019 @ 12:00am (UTC)
-    else 
-    {
-        scrypt_1024_1_1_256(BEGIN(nVersion), BEGIN(thash));
-        return thash;
-    }
-    return thash;
-*/
 }
 
-
-/*
-unsigned int CBlockHeader::GetAlgoEfficiency(int nBlockHeight) const
-{
-    switch (nVersion & ALGO_VERSION_MASK)
-    {
-        case ALGO_SHA256D: return       1;
-        case ALGO_SCRYPT:  return   13747;
-        case ALGO_NIST5:   return    2631;
-        case ALGO_LYRA2Z:  return 2014035;
-        case ALGO_X11:     return     477;
-        case ALGO_X16R:    return  263100;
-        default:           return       1; // FXTC TODO: we should not be here
-    }
-
-    return 1; // FXTC TODO: we should not be here
-}
-*/
-
 std::string CBlock::ToString() const
 {
     std::stringstream s;