f'HF: Move block.proof.challenge to Consensus::Params::signblockscript'

Author: jtimon

src/miner.cpp

@@ -66,10 +66,6 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
     if (nOldTime < nNewTime)
         pblock->nTime = nNewTime;
 
-    // Updating time can change work required on testnet:
-    if (consensusParams.fPowAllowMinDifficultyBlocks)
-        ResetChallenge(*pblock, *pindexPrev, consensusParams);
-
     return nNewTime - nOldTime;
 }
 
@@ -146,7 +142,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     // Reset proof here, for weight calculations since header
     // is not fixed size.
     ResetProof(*pblock);
-    ResetChallenge(*pblock, *pindexPrev, chainparams.GetConsensus());
 
     // Pad weight for challenge
     // We won't bother with serialization byte(s), we have room

src/pow.cpp

@@ -28,15 +28,6 @@ CScript CombineBlockSignatures(const Consensus::Params& params, const CBlockHead
     return GenericCombineSignatures(params.signblockscript, header, sig1, sig2).scriptSig;
 }
 
-bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
-{
-    return true;
-}
-
-void ResetChallenge(CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
-{
-}
-
 bool CheckBitcoinProof(uint256 hash, unsigned int nBits)
 {
     bool fNegative;

src/pow.h

@@ -25,9 +25,6 @@ bool CheckProof(const CBlockHeader& block, const Consensus::Params&);
 /** Scans nonces looking for a hash with at least some zero bits */
 bool MaybeGenerateProof(const Consensus::Params& params, CBlockHeader* pblock, CWallet* pwallet);
 void ResetProof(CBlockHeader& block);
-bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params&);
-void ResetChallenge(CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params&);
-
 CScript CombineBlockSignatures(const Consensus::Params& params, const CBlockHeader& header, const CScript& scriptSig1, const CScript& scriptSig2);
 
 #endif // BITCOIN_POW_H

src/rpc/blockchain.cpp

@@ -11,7 +11,6 @@
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "validation.h"
-#include "core_io.h"
 #include "policy/policy.h"
 #include "primitives/transaction.h"
 #include "rpc/server.h"

src/validation.cpp

@@ -3898,11 +3898,6 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
 
 bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime)
 {
-    const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
-    // Check proof of work
-    if (!CheckChallenge(block, *pindexPrev, consensusParams))
-        return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work");
-
     // Check timestamp against prev
     if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast())
         return state.Invalid(false, REJECT_INVALID, "time-too-old", "block's timestamp is too early");