clean up some notary pay stuff. Put current LABS notaries in ERA1 ready for reset.

This commit is contained in:
blackjok3r
2019-04-17 16:16:10 +08:00
parent cf02649727
commit 2692d48f0c
4 changed files with 21 additions and 23 deletions

View File

@@ -371,7 +371,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
}
dPriority += (double)nValueIn * nConf;
}
if ( numSN != 0 && TMP_NotarisationNotaries.size() >= numSN / 5 )
if ( numSN != 0 && notarypubkeys[0][0] != 0 && TMP_NotarisationNotaries.size() >= numSN / 5 )
{
// check a notary didnt sign twice (this would be an invalid notarisation later on and cause problems)
std::set<int> checkdupes( TMP_NotarisationNotaries.begin(), TMP_NotarisationNotaries.end() );
@@ -418,7 +418,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
NotarisationNotaries = TMP_NotarisationNotaries;
dPriority = 1e16;
fNotarisationBlock = true;
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());
}
}
}