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
2018-11-05 18:23:59 +08:00
parent 102e221887
commit 8aee84c5b3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/komodo.h
View File

@@ -832,7 +832,6 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
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)) { if ((is_STAKED(ASSETCHAINS_SYMBOL) != 0) && (STAKED_era(pindex->GetBlockTime()) == 0)) {
printf("ERA 0 SKIP %s\n",ASSETCHAINS_SYMBOL);
continue; continue;
} }
txhash = block.vtx[i].GetHash(); txhash = block.vtx[i].GetHash();

8
src/notaries_staked.cpp
View File

@@ -208,7 +208,7 @@ int8_t numStakedNotaries(uint8_t pubkeys[64][33],int8_t era) {
if ( era != 0 ) { if ( era != 0 ) {
switch (era) { switch (era) {
case 1: case 1:
if ( didstaked1 == 0 ) if ( didstaked1 == 0 || NOTARYADDRS[0][0] == 0 )
{ {
for (i=0; i<num_notaries_STAKED1; i++) { for (i=0; i<num_notaries_STAKED1; i++) {
decode_hex(staked_pubkeys1[i],33,(char *)notaries_STAKED1[i][1]); decode_hex(staked_pubkeys1[i],33,(char *)notaries_STAKED1[i][1]);
@@ -230,7 +230,7 @@ int8_t numStakedNotaries(uint8_t pubkeys[64][33],int8_t era) {
retval = num_notaries_STAKED1; retval = num_notaries_STAKED1;
break; break;
case 2: case 2:
if ( didstaked2 == 0 ) if ( didstaked2 == 0 || NOTARYADDRS[0][0] == 0 )
{ {
for (i=0; i<num_notaries_STAKED2; i++) { for (i=0; i<num_notaries_STAKED2; i++) {
decode_hex(staked_pubkeys2[i],33,(char *)notaries_STAKED2[i][1]); decode_hex(staked_pubkeys2[i],33,(char *)notaries_STAKED2[i][1]);
@@ -250,7 +250,7 @@ int8_t numStakedNotaries(uint8_t pubkeys[64][33],int8_t era) {
retval = num_notaries_STAKED2; retval = num_notaries_STAKED2;
break; break;
case 3: case 3:
if ( didstaked3 == 0 ) if ( didstaked3 == 0 || NOTARYADDRS[0][0] == 0 )
{ {
for (i=0; i<num_notaries_STAKED3; i++) { for (i=0; i<num_notaries_STAKED3; i++) {
decode_hex(staked_pubkeys3[i],33,(char *)notaries_STAKED3[i][1]); decode_hex(staked_pubkeys3[i],33,(char *)notaries_STAKED3[i][1]);
@@ -269,7 +269,7 @@ int8_t numStakedNotaries(uint8_t pubkeys[64][33],int8_t era) {
retval = num_notaries_STAKED3; retval = num_notaries_STAKED3;
break; break;
case 4: case 4:
if ( didstaked4 == 0 ) if ( didstaked4 == 0 || NOTARYADDRS[0][0] == 0 )
{ {
for (i=0; i<num_notaries_STAKED4; i++) { for (i=0; i<num_notaries_STAKED4; i++) {
decode_hex(staked_pubkeys4[i],33,(char *)notaries_STAKED4[i][1]); decode_hex(staked_pubkeys4[i],33,(char *)notaries_STAKED4[i][1]);