Merge branch 'bugfix_CNBerr_daggy' into bugfix_CNBerr
Conflicts: rpc.cpp
This commit is contained in:
commit
5146599b01
1 changed files with 9 additions and 1 deletions
|
@ -1656,8 +1656,13 @@ Value getwork(const Array& params, bool fHelp)
|
||||||
delete pblock;
|
delete pblock;
|
||||||
vNewBlock.clear();
|
vNewBlock.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clear pindexPrev so future getworks make a new block, despite any failures from here on
|
||||||
|
pindexPrev = NULL;
|
||||||
|
|
||||||
|
// Store the pindexBest used before CreateNewBlock, to avoid races
|
||||||
nTransactionsUpdatedLast = nTransactionsUpdated;
|
nTransactionsUpdatedLast = nTransactionsUpdated;
|
||||||
pindexPrev = pindexBest;
|
CBlockIndex* pindexPrevNew = pindexBest;
|
||||||
nStart = GetTime();
|
nStart = GetTime();
|
||||||
|
|
||||||
// Create new block
|
// Create new block
|
||||||
|
@ -1665,6 +1670,9 @@ Value getwork(const Array& params, bool fHelp)
|
||||||
if (!pblock)
|
if (!pblock)
|
||||||
throw JSONRPCError(-7, "Out of memory");
|
throw JSONRPCError(-7, "Out of memory");
|
||||||
vNewBlock.push_back(pblock);
|
vNewBlock.push_back(pblock);
|
||||||
|
|
||||||
|
// Need to update only after we know CreateNewBlock succeeded
|
||||||
|
pindexPrev = pindexPrevNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update nTime
|
// Update nTime
|
||||||
|
|
Loading…
Reference in a new issue