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

fix miner getting stuck

Browse Source
This commit is contained in:
blackjok3r
2019-02-15 17:20:48 +08:00
parent 98fe10d12c
commit e6d764b081
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/miner.cpp
View File

@@ -406,13 +406,13 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
int32_t notarizedheight = komodo_getnotarizedheight(pblock->nTime, nHeight, script, scriptlen); int32_t notarizedheight = komodo_getnotarizedheight(pblock->nTime, nHeight, script, scriptlen);
if ( notarizedheight != 0 ) if ( notarizedheight != 0 )
{ {
//fprintf(stderr, "notarizations.%d notarizedheight.%d last_notarizedheight.%d\n",Notarisations,notarizedheight,last_notarizedheight);
if ( last_notarizedheight == 0 ) if ( last_notarizedheight == 0 )
{ {
// this is the first one we see, add it to the block as TX1 // this is the first one we see, add it to the block as TX1
NotarisationNotaries = TMP_NotarisationNotaries; NotarisationNotaries = TMP_NotarisationNotaries;
dPriority = 1e16; dPriority = 1e16;
fNotarisationBlock = true; fNotarisationBlock = true;
last_notarizedheight = notarizedheight;
fprintf(stderr, "Notarisation %s set to maximum priority\n",hash.ToString().c_str()); fprintf(stderr, "Notarisation %s set to maximum priority\n",hash.ToString().c_str());
} }
else if ( notarizedheight > last_notarizedheight ) else if ( notarizedheight > last_notarizedheight )
@@ -433,6 +433,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
fNotarisationBlock = true; fNotarisationBlock = true;
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());
} }
last_notarizedheight = notarizedheight;
} }
else if ( Notarisations > 1 ) else if ( Notarisations > 1 )
{ {
@@ -441,6 +442,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
// 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;
} }
//fprintf(stderr, "BOTTOM: notarizations.%d notarizedheight.%d last_notarizedheight.%d\n",Notarisations,notarizedheight,last_notarizedheight);
} }
} }
} }