Set fDigishieldDifficultyCalculation initial value to true

pepecoinppc · Jan 20, 2024 · 476a5b7 · 476a5b7
1 parent f2f919b
commit 476a5b7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -88,7 +88,7 @@ class CMainParams : public CChainParams {
         consensus.powLimit = uint256S("0x00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 20;
         consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours
         consensus.nPowTargetSpacing = 60; // 1 minute
-        consensus.fDigishieldDifficultyCalculation = false;
+        consensus.fDigishieldDifficultyCalculation = true;
         consensus.nCoinbaseMaturity = 30;
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.fPowAllowDigishieldMinDifficultyBlocks = false;
@@ -212,7 +212,7 @@ class CTestNetParams : public CChainParams {
         consensus.powLimit = uint256S("0x00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 20;
         consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours
         consensus.nPowTargetSpacing = 60; // 1 minute
-        consensus.fDigishieldDifficultyCalculation = false;
+        consensus.fDigishieldDifficultyCalculation = true;
         consensus.nCoinbaseMaturity = 30;
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowAllowDigishieldMinDifficultyBlocks = false;

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
@@ -228,30 +228,36 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
 
+        // Uncomment this code and it will generate the blockinfo at the top of this file.
+        // It grabs the extranonce (the first value of each tuple) and uses it to generate the nonce (the second value)
+        // You can run this in parallel incrementing the extranonces each time you run it, to generate the block info faster
+        // This is why you see many different values for the extra nonces. If you want, you can set them all to 1.
+        // It doesn't matter. This code will find the nonces for each extranonce.
+
+        // // CValidationState state;
+        // // pblock->fChecked = false;
+        // // std::cout << "Checked? " << pblock->fChecked << std::endl;
+        // BlockMap::iterator mi = mapBlockIndex.find(pblock->hashPrevBlock);
+        // CBlockIndex* pindexPrev = (*mi).second;
         // CValidationState state;
-        // pblock->fChecked = false;
-        // std::cout << "Checked? " << pblock->fChecked << std::endl;
-        BlockMap::iterator mi = mapBlockIndex.find(pblock->hashPrevBlock);
-        CBlockIndex* pindexPrev = (*mi).second;
-        CValidationState state;
-        if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, true) || !CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, chainparams.GetConsensus(chainActive.Height()))) {
-            pblock->nNonce = 0;
-            std::cout << "Mining Block " << i+1 << std::endl;
-             while (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, true) || !CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, chainparams.GetConsensus(chainActive.Height()))) {
-                ++pblock->nNonce;
-                if (pblock->nNonce % 100000 == 0) {
-                    printf("Block %d: %d, %d\n", i+1, blockinfo[i].extranonce, pblock->nNonce);
-                }
-            }
-            printf("Block %d mined: %d, 0x%08x\n", i+1, blockinfo[i].extranonce, pblock->nNonce);
-            // CheckBlock();
-        }
+        // if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, true) || !CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, chainparams.GetConsensus(chainActive.Height()))) {
+        //     pblock->nNonce = 0;
+        //     std::cout << "Mining Block " << i+1 << std::endl;
+        //      while (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, true) || !CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, chainparams.GetConsensus(chainActive.Height()))) {
+        //         ++pblock->nNonce;
+        //         if (pblock->nNonce % 100000 == 0) {
+        //             printf("Block %d: %d, %d\n", i+1, blockinfo[i].extranonce, pblock->nNonce);
+        //         }
+        //     }
+        //     printf("Block %d mined: %d, 0x%08x\n", i+1, blockinfo[i].extranonce, pblock->nNonce);
+        //     // CheckBlock();
+        // }
 
 
-        // std::cout << "Block Valid? " << CheckBlock(*pblock, state) << std::endl;
-        // std::cout << "Adding block " << i << "... " << std::endl;
-        // std::cout << "Hash: " << pblock->GetHash().ToString() << "Prev Hash: " << pblock->hashPrevBlock.ToString() << std::endl;
-        // std::cout << pblock->ToString() << std::endl;
+        // // std::cout << "Block Valid? " << CheckBlock(*pblock, state) << std::endl;
+        // // std::cout << "Adding block " << i << "... " << std::endl;
+        // // std::cout << "Hash: " << pblock->GetHash().ToString() << "Prev Hash: " << pblock->hashPrevBlock.ToString() << std::endl;
+        // // std::cout << pblock->ToString() << std::endl;
 
         std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);