Change minsigs to 4, remove supply hack.

This commit is contained in:
blackjok3r
2018-09-21 11:46:25 +08:00
parent af8470697b
commit 6f3af3ff83
3 changed files with 3 additions and 4 deletions

View File

@@ -76,7 +76,7 @@ bool CheckTxAuthority(const CTransaction &tx, CrosschainAuthority auth)
const CrosschainAuthority auth_STAKED = [&](){
CrosschainAuthority auth;
auth.size = (int32_t)(sizeof(notaries_STAKEDcc)/sizeof(*notaries_STAKEDcc));
auth.requiredSigs = 3;
auth.requiredSigs = 4;
for (int n=0; n<auth.size; n++)
for (size_t i=0; i<33; i++)
sscanf(notaries_STAKEDcc[n][1]+(i*2), "%2hhx", auth.notaries[n]+i);

View File

@@ -857,7 +857,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
if ( (((height < 90000 || (signedmask & 1) != 0) && numvalid >= KOMODO_MINRATIFY) ||
(numvalid >= KOMODO_MINRATIFY && ASSETCHAINS_SYMBOL[0] != 0) ||
numvalid > (numnotaries/5)) ||
( (strncmp(ASSETCHAINS_SYMBOL, "STKD", 4) == 0) || (strncmp(ASSETCHAINS_SYMBOL, "STAKED", 6) == 0) ) && numvalid > 3 )
( (strncmp(ASSETCHAINS_SYMBOL, "STKD", 4) == 0) || (strncmp(ASSETCHAINS_SYMBOL, "STAKED", 6) == 0) ) && numvalid > 4 )
{
if ( ASSETCHAINS_SYMBOL[0] != 0 )
{

View File

@@ -1554,7 +1554,7 @@ void komodo_args(char *argv0)
if ( name.c_str()[0] != 0 )
{
MAX_BLOCK_SIGOPS = 60000;
ASSETCHAINS_SUPPLY = ( GetArg("-ac_supply",10) + 1 );
ASSETCHAINS_SUPPLY = GetArg("-ac_supply",10);
ASSETCHAINS_ENDSUBSIDY = GetArg("-ac_end",0);
ASSETCHAINS_REWARD = GetArg("-ac_reward",0);
ASSETCHAINS_HALVING = GetArg("-ac_halving",0);
@@ -1752,4 +1752,3 @@ void komodo_prefetch(FILE *fp)
}
fseek(fp,fpos,SEEK_SET);
}