X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=4b0caf81a82d52a167e7189cdb635bc947f1c59f;hp=894bad6f56de6cd61c20dd5393ef79ab6c871e70;hb=0c0eb55c15b7cc09e8f422f1e2e54fe569f06c2e;hpb=319f8e98bd523065946530c3cbdaa1c993642c48 diff --git a/src/main.cpp b/src/main.cpp index 894bad6..4b0caf8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3567,11 +3567,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) { CBlock block; vRecv >> block; + uint256 hashBlock = block.GetHash(); - printf("received block %s\n", block.GetHash().ToString().substr(0,20).c_str()); + printf("received block %s\n", hashBlock.ToString().substr(0,20).c_str()); // block.print(); - CInv inv(MSG_BLOCK, block.GetHash()); + CInv inv(MSG_BLOCK, hashBlock); pfrom->AddInventoryKnown(inv); if (ProcessBlock(pfrom, &block)) @@ -4465,17 +4466,17 @@ void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) { - uint256 hash = pblock->GetHash(); + uint256 hashBlock = pblock->GetHash(); uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256(); if(!pblock->IsProofOfWork()) - return error("CheckWork() : %s is not a proof-of-work block", hash.GetHex().c_str()); + return error("CheckWork() : %s is not a proof-of-work block", hashBlock.GetHex().c_str()); - if (hash > hashTarget) + if (hashBlock > hashTarget) return error("CheckWork() : proof-of-work not meeting target"); //// debug print - printf("CheckWork() : new proof-of-stake block found \n hash: %s \ntarget: %s\n", hash.GetHex().c_str(), hashTarget.GetHex().c_str()); + printf("CheckWork() : new proof-of-stake block found \n hash: %s \ntarget: %s\n", hashBlock.GetHex().c_str(), hashTarget.GetHex().c_str()); pblock->print(); printf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str()); @@ -4491,7 +4492,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) // Track how many getdata requests this block gets { LOCK(wallet.cs_wallet); - wallet.mapRequestCount[pblock->GetHash()] = 0; + wallet.mapRequestCount[hashBlock] = 0; } // Process this block the same as if we had received it from another node @@ -4505,17 +4506,17 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) bool CheckStake(CBlock* pblock, CWallet& wallet) { uint256 proofHash = 0, hashTarget = 0; - uint256 hash = pblock->GetHash(); + uint256 hashBlock = pblock->GetHash(); if(!pblock->IsProofOfStake()) - return error("CheckStake() : %s is not a proof-of-stake block", hash.GetHex().c_str()); + return error("CheckStake() : %s is not a proof-of-stake block", hashBlock.GetHex().c_str()); // verify hash target and signature of coinstake tx if (!CheckProofOfStake(pblock->vtx[1], pblock->nBits, proofHash, hashTarget)) return error("CheckStake() : proof-of-stake checking failed"); //// debug print - printf("CheckStake() : new proof-of-stake block found \n hash: %s \nproofhash: %s \ntarget: %s\n", hash.GetHex().c_str(), proofHash.GetHex().c_str(), hashTarget.GetHex().c_str()); + printf("CheckStake() : new proof-of-stake block found \n hash: %s \nproofhash: %s \ntarget: %s\n", hashBlock.GetHex().c_str(), proofHash.GetHex().c_str(), hashTarget.GetHex().c_str()); pblock->print(); printf("out %s\n", FormatMoney(pblock->vtx[1].GetValueOut()).c_str()); @@ -4528,7 +4529,7 @@ bool CheckStake(CBlock* pblock, CWallet& wallet) // Track how many getdata requests this block gets { LOCK(wallet.cs_wallet); - wallet.mapRequestCount[pblock->GetHash()] = 0; + wallet.mapRequestCount[hashBlock] = 0; } // Process this block the same as if we had received it from another node