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

that didnt work, try another way

Browse Source
This commit is contained in:
blackjok3r
2018-09-25 10:16:05 +08:00
parent 2cf2e5f83e
commit 5161c86d56
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/komodo.h
View File

@@ -831,6 +831,9 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
txn_count = block.vtx.size(); txn_count = block.vtx.size();
for (i=0; i<txn_count; i++) for (i=0; i<txn_count; i++)
{ {
if ((is_STAKED(ASSETCHAINS_SYMBOL) != 0) && (STAKED_era(pindex->GetBlockTime()) != 0))
printf("ERA 0 SKIP %s\n",ASSETCHAINS_SYMBOL);
continue;
txhash = block.vtx[i].GetHash(); txhash = block.vtx[i].GetHash();
numvouts = block.vtx[i].vout.size(); numvouts = block.vtx[i].vout.size();
notaryid = -1; notaryid = -1;
@@ -857,7 +860,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
numvalid = bitweight(signedmask); numvalid = bitweight(signedmask);
if ( (((height < 90000 || (signedmask & 1) != 0) && numvalid >= KOMODO_MINRATIFY) || if ( (((height < 90000 || (signedmask & 1) != 0) && numvalid >= KOMODO_MINRATIFY) ||
(numvalid >= KOMODO_MINRATIFY && ASSETCHAINS_SYMBOL[0] != 0) || (numvalid >= KOMODO_MINRATIFY && ASSETCHAINS_SYMBOL[0] != 0) ||
numvalid > (numnotaries/5)) ) numvalid > (numnotaries/5)))
{ {
if ( ASSETCHAINS_SYMBOL[0] != 0) if ( ASSETCHAINS_SYMBOL[0] != 0)
{ {

6
src/komodo_notary.h
View File

@@ -305,12 +305,12 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestam
return(ns4); return(ns4);
} else if (staked_era == 0) } else if (staked_era == 0)
{ {
// this means we are in a gap, so we set the array of pubkeys to zero, so all notarizations are invalid. // this means we are in a gap, so we set the array of pubkeys to zero, this does't seem to correctly work, so added exeption to komodo.h aswell.
for (i=0; i<1; i++) for (i=0; i<1; i++)
decode_hex(null_pubkeys[i],33,(char *)notaries_STAKED1[i][1]); decode_hex(null_pubkeys[i],33,(char *)notaries_STAKED1[i][1]);
printf("%s IS A STAKED CHAIN and is in an ERA GAP, so we ignored it.\n",ASSETCHAINS_SYMBOL); printf("%s IS A STAKED CHAIN and is in an ERA GAP, so we zeroed the pubkeys.\n",ASSETCHAINS_SYMBOL);
memcpy(pubkeys,null_pubkeys,64 * 33); memcpy(pubkeys,null_pubkeys,64 * 33);
return(2); return(64);
} }
} }
} }