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

test

Browse Source
This commit is contained in:
jl777
2016-11-14 13:09:59 -03:00
parent 0df0f9d1c8
commit 2a881c3e95
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/komodo_notary.h
View File

@@ -130,10 +130,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height)
void komodo_notarysinit(int32_t height,uint8_t pubkeys[64][33],int32_t num) void komodo_notarysinit(int32_t height,uint8_t pubkeys[64][33],int32_t num)
{ {
static int32_t hwmheight; static int32_t hwmheight;
int32_t k,i,htind; struct knotary_entry *kp; struct knotaries_entry N; int32_t k,i,htind,nonz; struct knotary_entry *kp; struct knotaries_entry N;
if ( height <= hwmheight )
return;
hwmheight = height;
memset(&N,0,sizeof(N)); memset(&N,0,sizeof(N));
if ( (htind= KOMODO_PUBKEYS_HEIGHT(height) / KOMODO_ELECTION_GAP) == 0 ) if ( (htind= KOMODO_PUBKEYS_HEIGHT(height) / KOMODO_ELECTION_GAP) == 0 )
htind = 1; htind = 1;
@@ -148,16 +145,20 @@ void komodo_notarysinit(int32_t height,uint8_t pubkeys[64][33],int32_t num)
{ {
for (i=0; i<33; i++) for (i=0; i<33; i++)
printf("%02x",pubkeys[k][i]); printf("%02x",pubkeys[k][i]);
printf(" notarypubs.[%d] ht.%d active at %d\n",k,height,htind*KOMODO_ELECTION_GAP); printf(" notarypubs.[%d] ht.%d active at %d\n",k,height,KOMODO_PUBKEYS_HEIGHT(height));
} }
} }
N.numnotaries = num; N.numnotaries = num;
for (i=htind; i<sizeof(Pubkeys)/sizeof(*Pubkeys); i++) for (i=height==0?0:htind; i<sizeof(Pubkeys)/sizeof(*Pubkeys); i++)
{ {
if ( Pubkeys[i].height != 0 && height < hwmheight )
break;
Pubkeys[i] = N; Pubkeys[i] = N;
Pubkeys[i].height = i * KOMODO_ELECTION_GAP; Pubkeys[i].height = i * KOMODO_ELECTION_GAP;
} }
pthread_mutex_unlock(&komodo_mutex); pthread_mutex_unlock(&komodo_mutex);
if ( height > hwmheight )
hwmheight = height;
} }
int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33) int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33)
@@ -277,7 +278,7 @@ void komodo_assetchain_pubkeys(char *jsonstr)
{ {
komodo_init(-1); komodo_init(-1);
komodo_notarysinit(0,pubkeys,n); komodo_notarysinit(0,pubkeys,n);
printf("initialize pubkeys[%d]\n",n); //printf("initialize pubkeys[%d]\n",n);
} else fprintf(stderr,"komodo_assetchain_pubkeys i.%d vs n.%d\n",i,n); } else fprintf(stderr,"komodo_assetchain_pubkeys i.%d vs n.%d\n",i,n);
} else fprintf(stderr,"assetchain pubkeys n.%d\n",n); } else fprintf(stderr,"assetchain pubkeys n.%d\n",n);
} }