This commit is contained in:
jl777
2018-04-13 22:01:02 +03:00
parent 1481a43ddb
commit cd897e2b88

View File

@@ -767,15 +767,10 @@ void komodo_pindex_init(CBlockIndex *pindex,int32_t height)
void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height) void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
{ {
int32_t num,i; //CBlock block; int32_t num,i;
memset(pubkey33,0,33); memset(pubkey33,0,33);
if ( pindex != 0 ) if ( pindex != 0 )
{ {
/*if ( komodo_blockload(block,pindex) == 0 )
{
komodo_block2pubkey33(pindex->pubkey33,&block);
return;
}*/
if ( pindex->didinit != 0 ) if ( pindex->didinit != 0 )
{ {
memcpy(pubkey33,pindex->pubkey33,33); memcpy(pubkey33,pindex->pubkey33,33);
@@ -890,7 +885,7 @@ int32_t komodo_minerids(uint8_t *minerids,int32_t height,int32_t width) // depre
int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t height,uint8_t pubkey33[33],uint32_t timestamp) int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t height,uint8_t pubkey33[33],uint32_t timestamp)
{ {
int32_t i,notaryid=0,minerid,limit,nid; int32_t i,notaryid=0,minerid,limit,nid;
if ( height >= 700000 ) /*if ( height >= 700000 )
{ {
if ( mids[0] >= 0 ) if ( mids[0] >= 0 )
{ {
@@ -907,7 +902,7 @@ int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t heigh
return(1); return(1);
} else return(0); } else return(0);
} }
else else*/
{ {
//if ( height >= 225000 ) //if ( height >= 225000 )
komodo_chosennotary(&notaryid,height,pubkey33,timestamp); komodo_chosennotary(&notaryid,height,pubkey33,timestamp);
@@ -924,7 +919,7 @@ int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t heigh
if ( nid == notaryid ) if ( nid == notaryid )
{ {
//if ( (0) && notaryid > 0 ) //if ( (0) && notaryid > 0 )
fprintf(stderr,"ht.%d repeat notaryid.%d in mids[%d] nid.%d notaryid.%d\n",height,mids[0],i,nid,notaryid); fprintf(stderr,"ht.%d repeat mids0.%d in mids[%d] nid.%d notaryid.%d\n",height,mids[0],i,nid,notaryid);
if ( height > 225000 ) if ( height > 225000 )
return(-1); return(-1);
} }