diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-09 06:34:37 -0700 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-09 06:34:37 -0700 |
commit | b7598ceefa362ec1b97e7a6a8a28aa38cf9a3c96 (patch) | |
tree | 84a47b03eb615c8d8a4c3df2f7d0dbb0ad698dc0 /src/main.cpp | |
parent | f92f022edaa2f14951b9ce8304a304ff9693ae16 (diff) | |
parent | 5a3dea451d8a53ec87cbd7a7d1405a970fb1b263 (diff) | |
download | bitcoin-0.4.00rc2.tar.xz |
Merge pull request #505 from gavinandresen/unique_coinbasev0.4.00rc2
Unique coinbase: Fixes #482
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index dce26d3599..5b159fe415 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2798,16 +2798,17 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) } -void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime) +void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce) { // Update nExtraNonce - int64 nNow = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); - if (++nExtraNonce >= 0x7f && nNow > nPrevTime+1) + static uint256 hashPrevBlock; + if (hashPrevBlock != pblock->hashPrevBlock) { - nExtraNonce = 1; - nPrevTime = nNow; + nExtraNonce = 0; + hashPrevBlock = pblock->hashPrevBlock; } - pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce); + ++nExtraNonce; + pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nTime << CBigNum(nExtraNonce); pblock->hashMerkleRoot = pblock->BuildMerkleTree(); } @@ -2905,7 +2906,6 @@ void static BitcoinMiner(CWallet *pwallet) // Each thread has its own key and counter CReserveKey reservekey(pwallet); unsigned int nExtraNonce = 0; - int64 nPrevTime = 0; while (fGenerateBitcoins) { @@ -2932,7 +2932,7 @@ void static BitcoinMiner(CWallet *pwallet) auto_ptr<CBlock> pblock(CreateNewBlock(reservekey)); if (!pblock.get()) return; - IncrementExtraNonce(pblock.get(), pindexPrev, nExtraNonce, nPrevTime); + IncrementExtraNonce(pblock.get(), pindexPrev, nExtraNonce); printf("Running BitcoinMiner with %d transactions in block\n", pblock->vtx.size()); |