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

Merge pull request #545 from jl777/jl777

Browse Source 
revert pindex caching
This commit is contained in:
jl777
2018-03-26 05:59:24 +03:00
committed by GitHub
parent 65e1bee473 1746e25c18
commit 6aecfddc35
2 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/komodo_bitcoind.h
View File

@@ -698,25 +698,15 @@ uint32_t komodo_heightstamp(int32_t height)
return(0);
}
int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp);
int32_t komodo_electednotary(int32_t *numnotariesp,uint8_t *pubkey33,int32_t height,uint32_t timestamp);
void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
{
CBlock block; int32_t numnotaries;
CBlock block;
//komodo_init(height);
memset(pubkey33,0,33);
if ( pindex != 0 )
{
if ( pindex->pubkey33[0] == 0 )
{
if ( komodo_blockload(block,pindex) == 0 )
{
komodo_block2pubkey33(pindex->pubkey33,block);
pindex->notaryid = komodo_electednotary(&numnotaries,pindex->pubkey33,height,pindex->nTime);
}
}
memcpy(pubkey33,pindex->pubkey33,33);
if ( komodo_blockload(block,pindex) == 0 )
komodo_block2pubkey33(pubkey33,block);
}
else
{
@@ -732,54 +722,47 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
komodo_connectblock(pindex,block);
}*/
int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp);
int32_t komodo_electednotary(int32_t *numnotariesp,uint8_t *pubkey33,int32_t height,uint32_t timestamp);
int8_t komodo_minerid(int32_t height,uint8_t *pubkey33)
{
int32_t num,i,numnotaries; CBlockIndex *pindex; uint32_t timestamp=0; uint8_t _pubkey33[33],pubkeys[64][33];
if ( (pindex= chainActive[height]) != 0 )
if ( pubkey33 == 0 && (pindex= chainActive[height]) != 0 )
{
if ( pindex->pubkey33[0] == 0 )
timestamp = pindex->GetBlockTime();
if ( pubkey33 == 0 )
{
timestamp = pindex->GetBlockTime();
if ( pubkey33 == 0 )
pubkey33 = _pubkey33;
pubkey33 = _pubkey33;
komodo_index2pubkey33(pubkey33,pindex,height);
pindex->notaryid = komodo_electednotary(&numnotaries,pindex->pubkey33,height,pindex->nTime);
/*if ( (num= komodo_notaries(pubkeys,height,timestamp)) > 0 )
{
for (i=0; i<num; i++)
if ( memcmp(pubkeys[i],pubkey33,33) == 0 )
return(i);
}*/
}
return(pindex->notaryid);
if ( (num= komodo_notaries(pubkeys,height,timestamp)) > 0 )
{
for (i=0; i<num; i++)
if ( memcmp(pubkeys[i],pubkey33,33) == 0 )
return(i);
}
}
return(komodo_electednotary(&numnotaries,pubkey33,height,timestamp));
}
int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height)
{
int32_t i,j,duplicate,numnotaries; CBlockIndex *pindex; uint8_t pubkey33[33];
int32_t i,j,duplicate; CBlockIndex *pindex; uint8_t pubkey33[33];
memset(mids,-1,sizeof(*mids)*66);
for (i=duplicate=0; i<66; i++)
{
if ( (pindex= komodo_chainactive(height-i)) != 0 )
{
if ( pindex->pubkey33[0] == 0 )
komodo_index2pubkey33(pubkey33,pindex,height-i);
//for (j=0; j<33; j++)
// pubkeys[i][j] = pubkey33[j];
memcpy(pubkeys[i],pubkey33,33);
if ( (mids[i]= komodo_minerid(height-i,pubkey33)) >= 0 )
{
komodo_index2pubkey33(pubkey33,pindex,height-i);
pindex->notaryid = komodo_electednotary(&numnotaries,pindex->pubkey33,height,pindex->nTime);
//for (j=0; j<33; j++)
// pubkeys[i][j] = pubkey33[j];
/*if ( (mids[i]= komodo_minerid(height-i,pubkey33)) >= 0 )
{
//mids[i] = *(int32_t *)pubkey33;
(*nonzpkeysp)++;
}*/
}
memcpy(pubkeys[i],pindex->pubkey33,33);
if ( (mids[i]= pindex->notaryid) >= 0 )
//mids[i] = *(int32_t *)pubkey33;
(*nonzpkeysp)++;
}
if ( mids[0] >= 0 && i > 0 && mids[i] == mids[0] )
duplicate++;
}

7
src/komodo_notary.h
View File

@@ -236,6 +236,11 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestam
htind = height / KOMODO_ELECTION_GAP;
if ( htind >= KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP )
htind = (KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP) - 1;
if ( Pubkeys == 0 )
{
komodo_init(height);
printf("Pubkeys.%p htind.%d vs max.%d\n",Pubkeys,htind,KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP);
}
pthread_mutex_lock(&komodo_mutex);
n = Pubkeys[htind].numnotaries;
if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 )
@@ -288,7 +293,7 @@ void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num)
static int32_t hwmheight;
int32_t k,i,htind,height; struct knotary_entry *kp; struct knotaries_entry N;
if ( Pubkeys == 0 )
Pubkeys = (struct knotaries_entry *)calloc(KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP,sizeof(*Pubkeys));
Pubkeys = (struct knotaries_entry *)calloc(1 + (KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP),sizeof(*Pubkeys));
memset(&N,0,sizeof(N));
if ( origheight > 0 )
{