dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git

Browse Source
This commit is contained in:
Gavin Andresen
2012-02-17 13:48:01 -05:00
parent 25bc37f8a2 0f8cb5db73
commit 0a6b081cca
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitcoinrpc.cpp
View File

@@ -1816,7 +1816,7 @@ Value getwork(const Array& params, bool fHelp)
}
// Update nTime
pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
pblock->UpdateTime(pindexPrev);
pblock->nNonce = 0;
// Update nExtraNonce
@@ -1916,7 +1916,7 @@ Value getmemorypool(const Array& params, bool fHelp)
}
// Update nTime
pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
pblock->UpdateTime(pindexPrev);
pblock->nNonce = 0;
Array transactions;