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

Change eras activation code. Fix reindex with ac_notarypay!

Browse Source
This commit is contained in:
blackjok3r
2019-02-11 17:25:51 +08:00
parent 8d7234bf22
commit d69be73aec
2 changed files with 18 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -1554,6 +1554,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (fReindex) { if (fReindex) {
boost::filesystem::remove(GetDataDir() / "komodostate");
boost::filesystem::remove(GetDataDir() / "signedmasks");
pblocktree->WriteReindexing(true); pblocktree->WriteReindexing(true);
//If we're reindexing in prune mode, wipe away unusable block files and all undo data files //If we're reindexing in prune mode, wipe away unusable block files and all undo data files
if (fPruneMode) if (fPruneMode)

72
src/notaries_staked.cpp
View File

@@ -70,8 +70,7 @@ int8_t StakedNotaryID(std::string &notaryname, char *Raddress) {
int8_t numStakedNotaries(uint8_t pubkeys[64][33],int8_t era) { int8_t numStakedNotaries(uint8_t pubkeys[64][33],int8_t era) {
int i; int8_t retval = 0; int i; int8_t retval = 0;
static uint8_t staked_pubkeys1[64][33],staked_pubkeys2[64][33],didstaked1,didstaked2; static uint8_t staked_pubkeys[NUM_STAKED_ERAS][64][33],didinit[NUM_STAKED_ERAS];
static uint8_t staked_pubkeys3[64][33],staked_pubkeys4[64][33],didstaked3,didstaked4;
static char ChainName[65]; static char ChainName[65];
if ( ChainName[0] == 0 ) if ( ChainName[0] == 0 )
@@ -82,65 +81,26 @@ int8_t numStakedNotaries(uint8_t pubkeys[64][33],int8_t era) {
strcpy(ChainName,ASSETCHAINS_SYMBOL); strcpy(ChainName,ASSETCHAINS_SYMBOL);
} }
if ( era != 0 ) { if ( era == 0 )
switch (era) {
case 1:
if ( didstaked1 == 0 )
{
for (i=0; i<num_notaries_STAKED[0]; i++) {
decode_hex(staked_pubkeys1[i],33,(char *)notaries_STAKED[0][i][1]);
}
didstaked1 = 1;
printf("%s is a STAKED chain in era 1 \n",ChainName);
}
memcpy(pubkeys,staked_pubkeys1,num_notaries_STAKED[0] * 33);
retval = num_notaries_STAKED[0];
break;
case 2:
if ( didstaked2 == 0 )
{
for (i=0; i<num_notaries_STAKED[1]; i++) {
decode_hex(staked_pubkeys2[i],33,(char *)notaries_STAKED[1][i][1]);
}
didstaked2 = 1;
printf("%s is a STAKED chain in era 2 \n",ChainName);
}
memcpy(pubkeys,staked_pubkeys2,num_notaries_STAKED[1] * 33);
retval = num_notaries_STAKED[1];
break;
case 3:
if ( didstaked3 == 0 )
{
for (i=0; i<num_notaries_STAKED[2]; i++) {
decode_hex(staked_pubkeys3[i],33,(char *)notaries_STAKED[2][i][1]);
}
didstaked3 = 1;
printf("%s is a STAKED chain in era 3 \n",ChainName);
}
memcpy(pubkeys,staked_pubkeys3,num_notaries_STAKED[2] * 33);
retval = num_notaries_STAKED[2];
break;
case 4:
if ( didstaked4 == 0 )
{
for (i=0; i<num_notaries_STAKED[3]; i++) {
decode_hex(staked_pubkeys4[i],33,(char *)notaries_STAKED[3][i][1]);
}
didstaked4 = 1;
printf("%s is a STAKED chain in era 4 \n",ChainName);
}
memcpy(pubkeys,staked_pubkeys4,num_notaries_STAKED[3] * 33);
retval = num_notaries_STAKED[3];
break;
}
}
else
{ {
// era is zero so we need to null out the pubkeys. // era is zero so we need to null out the pubkeys.
memset(pubkeys,0,64 * 33); memset(pubkeys,0,64 * 33);
printf("%s is a STAKED chain and is in an ERA GAP.\n",ASSETCHAINS_SYMBOL); printf("%s is a STAKED chain and is in an ERA GAP.\n",ChainName);
return(64); return(64);
} }
else
{
if ( didinit[era-1] == 0 )
{
for (i=0; i<num_notaries_STAKED[era-1]; i++) {
decode_hex(staked_pubkeys[era-1][i],33,(char *)notaries_STAKED[era-1][i][1]);
}
didinit[era-1] = 1;
printf("%s is a STAKED chain in era %i \n",ChainName,era);
}
memcpy(pubkeys,staked_pubkeys[era-1],num_notaries_STAKED[era-1] * 33);
retval = num_notaries_STAKED[era-1];
}
return(retval); return(retval);
} }