DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

try fix

Browse Source
This commit is contained in:
blackjok3r
2019-02-08 11:52:43 +08:00
parent 170ca55e46
commit f62017f83e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/miner.cpp
View File

@@ -415,12 +415,16 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
} }
else if ( notarizedheight > last_notarizedheight ) else if ( notarizedheight > last_notarizedheight )
continue; // leave this notarisation for the next block, it will be valid! continue; // leave this notarisation for the next block, it will be valid!
else if ( notarizedheight == last_notarizedheight )
continue; // this shouldnt happen :S
else else
{ {
// we need to remove the last seen notarzation from block // we need to remove the last seen notarzation from block
double dPriority = vecPriority.front().get<0>();
CFeeRate feeRate = vecPriority.front().get<1>();
const CTransaction& Tx = *(vecPriority.front().get<2>()); const CTransaction& Tx = *(vecPriority.front().get<2>());
TxPriorityCompare comparer(0);
std::make_heap(vecPriority.begin(), vecPriority.end(), comparer);
std::pop_heap(vecPriority.begin(), vecPriority.end(), comparer);
vecPriority.pop_back();
// add this one as its valid before the other one. // add this one as its valid before the other one.
NotarisationNotaries = TMP_NotarisationNotaries; NotarisationNotaries = TMP_NotarisationNotaries;
dPriority = 1e16; dPriority = 1e16;