Update testnet

Author: ComputerCraftr

src/miner.cpp

@@ -517,7 +517,8 @@ void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned
     static uint256 hashPrevBlock;
     if (hashPrevBlock != pblock->hashPrevBlock)
     {
-        nExtraNonce = 0;
+        if (!pblock->IsProofOfStake())
+            nExtraNonce = 0;
         hashPrevBlock = pblock->hashPrevBlock;
     }
     ++nExtraNonce;

src/rpc/mining.cpp

@@ -130,7 +130,8 @@ static bool GenerateBlock(ChainstateManager& chainman, CBlock& block, uint64_t&
     if (block.nNonce == std::numeric_limits<uint32_t>::max()) {
         return true;
     }
-    LogPrintf("proof-of-work found\n   hash: %s\n target: %s\n   bits: %08x\n  nonce: %u\n", block.GetPoWHash().ToString(), arith_uint256().SetCompact(block.nBits).ToString(), block.nBits, block.nNonce);
+    if (chainparams.NetworkIDString() != CBaseChainParams::REGTEST)
+        LogPrintf("proof-of-work found\n   hash: %s\n target: %s\n   bits: %08x\n  nonce: %u\n", block.GetPoWHash().ToString(), arith_uint256().SetCompact(block.nBits).ToString(), block.nBits, block.nNonce);
 
     std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
     if (!chainman.ProcessNewBlock(chainparams, shared_pblock, true, nullptr)) {

src/validation.cpp

@@ -1252,6 +1252,8 @@ CAmount GetBlockSubsidy(int nHeight, bool fProofOfStake, uint64_t nCoinAge, cons
     } else {
         if (nHeight == 0) // premine
             nSubsidy = 30000000000 * COIN; // 30 billion
+        else if (Params().NetworkIDString() != CBaseChainParams::MAIN)
+            nSubsidy = 1000 * COIN;
         else
             nSubsidy = 1 * COIN;
     }