Pow fix #2

firoorg · Apr 17, 2018 · ee2afde · ee2afde
1 parent bbb5db7
commit ee2afde
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/src/chain.h b/src/chain.h
@@ -293,9 +293,9 @@ class CBlockIndex
         return *phashBlock;
     }
 
-    uint256 GetBlockPoWHash() const
+    uint256 GetBlockPoWHash(bool forceCalc = false) const
     {
-        return GetBlockHeader().GetPoWHash(nHeight);
+        return GetBlockHeader().GetPoWHash(nHeight, forceCalc);
     }
 
     int64_t GetBlockTime() const

diff --git a/src/main.cpp b/src/main.cpp
@@ -1782,7 +1782,9 @@ bool ReadBlockFromDisk(CBlock &block, const CDiskBlockPos &pos, int nHeight, con
     }
     // Check the header
     if (!CheckProofOfWork(block.GetPoWHash(nHeight), block.nBits, consensusParams))
-        return error("ReadBlockFromDisk: Errors in block header at %s", pos.ToString());
+        //Maybe cache is not valid
+        if (!CheckProofOfWork(block.GetPoWHash(nHeight, true), block.nBits, consensusParams))
+            return error("ReadBlockFromDisk: Errors in block header at %s", pos.ToString());
     return true;
 }
 
@@ -3699,7 +3701,10 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
 bool CheckBlockHeader(const CBlockHeader &block, CValidationState &state, const Consensus::Params &consensusParams, bool fCheckPOW) {
     int nHeight = ZerocoinGetNHeight(block);
     if (fCheckPOW && !CheckProofOfWork(block.GetPoWHash(nHeight), block.nBits, consensusParams)) {
-        return state.DoS(50, false, REJECT_INVALID, "high-hash", false, "proof of work failed");
+        //Maybe cache is not valid
+        if (fCheckPOW && !CheckProofOfWork(block.GetPoWHash(nHeight, true), block.nBits, consensusParams)) {
+            return state.DoS(50, false, REJECT_INVALID, "high-hash", false, "proof of work failed");
+        }
     }
     return true;
 }

diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
@@ -50,7 +50,7 @@ uint256 CBlockHeader::GetHash() const {
     return SerializeHash(*this);
 }
 
-uint256 CBlockHeader::GetPoWHash(int nHeight) const {
+uint256 CBlockHeader::GetPoWHash(int nHeight, bool forceCalc) const {
 //    int64_t start = std::chrono::duration_cast<std::chrono::milliseconds>(
 //            std::chrono::system_clock::now().time_since_epoch()).count();
     bool fTestNet = (Params().NetworkIDString() == CBaseChainParams::TESTNET);
@@ -61,7 +61,7 @@ uint256 CBlockHeader::GetPoWHash(int nHeight) const {
                 buildMapPoWHash();
             }
         }
-        if (mapPoWHash.count(nHeight)) {
+        if (!forceCalc && mapPoWHash.count(nHeight)) {
 //        std::cout << "GetPowHash nHeight=" << nHeight << ", hash= " << mapPoWHash[nHeight].ToString() << std::endl;
             return mapPoWHash[nHeight];
         }

diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -94,7 +94,7 @@ class CBlockHeader
 //        powHash = hash;
     }
 
-    uint256 GetPoWHash(int nHeight) const;
+    uint256 GetPoWHash(int nHeight, bool forceCalc = false) const;
 
     uint256 GetHash() const;
 

diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -205,7 +205,8 @@ bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256
                 pindexNew->spentSerials       = diskindex.spentSerials;
 
                 if (!CheckProofOfWork(pindexNew->GetBlockPoWHash(), pindexNew->nBits, Params().GetConsensus()))
-                    return error("LoadBlockIndex(): CheckProofOfWork failed: %s", pindexNew->ToString());
+                    if (!CheckProofOfWork(pindexNew->GetBlockPoWHash(true), pindexNew->nBits, Params().GetConsensus()))
+                        return error("LoadBlockIndex(): CheckProofOfWork failed: %s", pindexNew->ToString());
 
                 pcursor->Next();
             } else {