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
2018-04-13 16:11:11 +03:00
parent 141950a496
commit 010f741c1f
1 changed files with 12 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/komodo_bitcoind.h
View File

@@ -727,22 +727,19 @@ void komodo_pindex_init(CBlockIndex *pindex)
int32_t i,num; uint8_t pubkeys[64][33]; int32_t i,num; uint8_t pubkeys[64][33];
pindex->notaryid = -1; pindex->notaryid = -1;
memset(pindex->pubkey33,0,33); memset(pindex->pubkey33,0,33);
if ( pindex->vtx[0].vout.size() > 0 ) if ( komodo_blockload(block,pindex) == 0 )
{ {
uint8_t *ptr = (uint8_t *)pindex->vtx[0].vout[0].scriptPubKey.data(); komodo_block2pubkey33(pindex->pubkey33,block);
n = pindex->vtx[0].vout[0].scriptPubKey.size(); if ( (pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3) && (num= komodo_notaries(pubkeys,(int32_t)pindex->nHeight,(uint32_t)pindex->nTime)) > 0 )
if ( n == 35 )
memcpy(pindex->pubkey33,ptr+1,33);
}
if ( (pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3) && (num= komodo_notaries(pubkeys,(int32_t)pindex->nHeight,(uint32_t)pindex->nTime)) > 0 )
{
pindex->notaryid = -1;
for (i=0; i<num; i++)
{ {
if ( memcmp(pubkeys[i],pindex->pubkey33,33) == 0 ) pindex->notaryid = -1;
for (i=0; i<num; i++)
{ {
pindex->notaryid = i; if ( memcmp(pubkeys[i],pindex->pubkey33,33) == 0 )
break; {
pindex->notaryid = i;
break;
}
} }
} }
} }
@@ -751,50 +748,16 @@ void komodo_pindex_init(CBlockIndex *pindex)
void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height) void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
{ {
CBlock block; int32_t num,i; CBlock block; int32_t num,i;
//komodo_init(height);
memset(pubkey33,0,33); memset(pubkey33,0,33);
if ( pindex != 0 && pindex->nHeight == height ) if ( pindex != 0 && pindex->nHeight == height )
{ {
if ( pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3 ) if ( pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3 )
{ {
memcpy(pubkey33,pindex->pubkey33,33); memcpy(pubkey33,pindex->pubkey33,33);
if ( pindex->notaryid < 0 )
komodo_pindex_init(pindex);
return; return;
} }
if ( komodo_blockload(block,pindex) == 0 ) komodo_pindex_init(pindex);
{ memcpy(pubkey33,pindex->pubkey33,33);
komodo_pindex_init(pindex);
memcpy(pubkey33,pindex->pubkey33,33);
/*komodo_block2pubkey33(pubkey33,block);
if ( (pubkey33[0] == 2 || pubkey33[0] == 3) )
{
memcpy(pindex->pubkey33,pubkey33,33);
if ( (num= komodo_notaries(pubkeys,(int32_t)pindex->nHeight,(uint32_t)pindex->nTime)) > 0 )
{
pindex->notaryid = -1;
for (i=0; i<num; i++)
{
if ( memcmp(pubkeys[i],pubkey33,33) == 0 )
{
pindex->notaryid = i;
break;
}
}
}
}
if ( pindex->notaryid < 0 )
{
for (i=0; i<33; i++)
fprintf(stderr,"%02x",pindex->pubkey33[i]);
fprintf(stderr," error loading height.%d block.%d notaryid.%d\n",height,pindex->nHeight,pindex->notaryid);
}*/
} fprintf(stderr," error loading height.%d block.%d notaryid.%d\n",height,pindex->nHeight,pindex->notaryid);
}
else
{
// height -> pubkey33
fprintf(stderr,"extending chaintip komodo_index2pubkey33 height.%d pindex.%d need to get pubkey33\n",height,pindex!=0?pindex->nHeight:-1);
} }
} }