This commit is contained in:
jl777
2018-04-13 20:13:38 +03:00
parent 6def1dd580
commit 0fba8caa9d

View File

@@ -770,11 +770,11 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
memset(pubkey33,0,33); memset(pubkey33,0,33);
if ( pindex != 0 ) if ( pindex != 0 )
{ {
/*if ( komodo_blockload(block,pindex) == 0 ) if ( komodo_blockload(block,pindex) == 0 )
{ {
komodo_block2pubkey33(pindex->pubkey33,block); komodo_block2pubkey33(pindex->pubkey33,block);
return; return;
}*/ }
if ( pindex->didinit != 0 ) if ( pindex->didinit != 0 )
{ {
memcpy(pubkey33,pindex->pubkey33,33); memcpy(pubkey33,pindex->pubkey33,33);
@@ -811,7 +811,7 @@ int8_t komodo_minerid(int32_t height,uint8_t *pubkey33)
int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height) int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height)
{ {
int32_t i,j,duplicate; CBlockIndex *pindex; uint8_t pubkey33[33]; int32_t i,j,duplicate; CBlock block; CBlockIndex *pindex; uint8_t pubkey33[33];
memset(mids,-1,sizeof(*mids)*66); memset(mids,-1,sizeof(*mids)*66);
for (i=duplicate=0; i<66; i++) for (i=duplicate=0; i<66; i++)
{ {
@@ -823,6 +823,8 @@ int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *non
pindex->notaryid = -1; pindex->notaryid = -1;
memset(pindex->pubkey33,0,33); memset(pindex->pubkey33,0,33);
pindex->didinit = 0; pindex->didinit = 0;
if ( komodo_blockload(block,pindex) == 0 )
komodo_block2pubkey33(pindex->pubkey33,block);
} }
if ( pindex->notaryid >= 0 && pindex->didinit != 0 ) if ( pindex->notaryid >= 0 && pindex->didinit != 0 )
{ {