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

fix

Browse Source
This commit is contained in:
blackjok3r
2019-02-15 00:32:44 +08:00
parent 3c605c86a0
commit 2172cb6742
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/miner.cpp
View File

@@ -418,7 +418,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
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 ) else if ( notarizedheight == last_notarizedheight )
continue; // this shouldnt happen, it would mean there are 2 notarisations for the same block! continue; // this shouldnt happen, it would mean there are 2 notarisations for the same block!
else else if ( notarizedheight < last_notarizedheight )
{ {
// we need to remove the last seen notarzation from block // we need to remove the last seen notarzation from block
const CTransaction& Tx = *(vecPriority.front().get<2>()); const CTransaction& Tx = *(vecPriority.front().get<2>());
@@ -433,12 +433,13 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
fprintf(stderr, "Notarisation %s set to maximum priority replacing notarization %s\n",hash.ToString().c_str(), Tx.GetHash().ToString().c_str()); fprintf(stderr, "Notarisation %s set to maximum priority replacing notarization %s\n",hash.ToString().c_str(), Tx.GetHash().ToString().c_str());
} }
} }
else if ( fNotarisationBlock == true ) else if ( Notarisations > 1 )
{ {
// Any attempted notarization needs to be in its own block! // Any attempted notarization needs to be in its own block!
// If we find a valid one and place it in position 1, an invalid one must wait until the next block to be mined. // If we find a valid one and place it in position 1, an invalid one must wait until the next block to be mined.
continue; continue;
} }
Notarisations++;
} }
} }
} }