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

Test

Browse Source
This commit is contained in:
jl777
2018-04-13 18:06:44 +03:00
parent 48fec2e771
commit 065505b795
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chain.h
View File

@@ -177,7 +177,7 @@ public:
//! (memory only) Sequential id assigned to distinguish order in which blocks are received. //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
uint32_t nSequenceId; uint32_t nSequenceId;
int8_t notaryid; uint8_t pubkey33[33]; int8_t notaryid; uint8_t pubkey33[33],didinit;
void SetNull() void SetNull()
{ {

11
src/komodo_bitcoind.h
View File

@@ -727,11 +727,11 @@ uint32_t komodo_heightstamp(int32_t height)
void komodo_pindex_init(CBlockIndex *pindex,int32_t height) void komodo_pindex_init(CBlockIndex *pindex,int32_t height)
{ {
int32_t i,num; uint8_t pubkeys[64][33]; CBlock block; int32_t i,num; uint8_t pubkeys[64][33]; CBlock block;
if ( pindex->notaryid >= 0 && (pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3 || pindex->pubkey33[0] == 0xff) ) if ( pindex->notaryid >= 0 )
return; return;
//printf("pindex.%d komodo_pindex_init notary.%d from height.%d\n",pindex->nHeight,pindex->notaryid,height); printf("pindex.%d komodo_pindex_init notary.%d from height.%d\n",pindex->nHeight,pindex->notaryid,height);
pindex->notaryid = -1; pindex->notaryid = -1;
if ( pindex->pubkey33[0] != 2 && pindex->pubkey33[0] != 3 && pindex->pubkey33[0] != 0xff ) if ( pindex->didinit == 0 )
{ {
if ( KOMODO_LOADINGBLOCKS == 0 ) if ( KOMODO_LOADINGBLOCKS == 0 )
memset(pindex->pubkey33,0xff,33); memset(pindex->pubkey33,0xff,33);
@@ -742,9 +742,10 @@ void komodo_pindex_init(CBlockIndex *pindex,int32_t height)
for (i=0; i<33; i++) for (i=0; i<33; i++)
fprintf(stderr,"%02x",pindex->pubkey33[i]); fprintf(stderr,"%02x",pindex->pubkey33[i]);
fprintf(stderr," set pubkey at height %d/%d\n",pindex->nHeight,height); fprintf(stderr," set pubkey at height %d/%d\n",pindex->nHeight,height);
} pindex->didinit = 1;
} else fprintf(stderr,"error loading block at %d/%d",pindex->nHeight,height);
} }
if ( (pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3) && pindex->nHeight >= 0 && (num= komodo_notaries(pubkeys,(int32_t)pindex->nHeight,(uint32_t)pindex->nTime)) > 0 ) if ( pindex->didinit != 0 && pindex->nHeight >= 0 && (num= komodo_notaries(pubkeys,(int32_t)pindex->nHeight,(uint32_t)pindex->nTime)) > 0 )
{ {
for (i=0; i<num; i++) for (i=0; i<num; i++)
{ {