From 83f4cd156e9d52bd7c4351336dfa4806a43ee4e4 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Tue, 6 Sep 2011 16:39:05 -0400 Subject: Bugfix: Use timestamp in coinbase rather than "bits", needed to ensure coinbase txn is unique even if address is the same --- src/rpc.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/rpc.cpp') diff --git a/src/rpc.cpp b/src/rpc.cpp index 2a458423c..33cfa77b4 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1615,15 +1615,14 @@ Value getwork(const Array& params, bool fHelp) vNewBlock.push_back(pblock); } - // Update nExtraNonce - static unsigned int nExtraNonce = 0; - static int64 nPrevTime = 0; - IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime); - // Update nTime pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); pblock->nNonce = 0; + // Update nExtraNonce + static unsigned int nExtraNonce = 0; + IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); + // Save mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig); -- cgit v1.2.3