This commit is contained in:
jl777
2018-04-13 17:55:04 +03:00
parent 913339f118
commit 0690e63e4a
2 changed files with 8 additions and 5 deletions

View File

@@ -662,7 +662,9 @@ int32_t komodo_block2height(CBlock *block)
void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block) void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block)
{ {
int32_t n; int32_t n;
memset(pubkey33,0xff,33); if ( KOMODO_LOADINGBLOCKS == 0 )
memset(pubkey33,0xff,33);
else memset(pubkey33,0,33);
if ( block.vtx[0].vout.size() > 0 ) if ( block.vtx[0].vout.size() > 0 )
{ {
#ifdef KOMODO_ZCASH #ifdef KOMODO_ZCASH
@@ -732,9 +734,9 @@ void komodo_pindex_init(CBlockIndex *pindex,int32_t height)
pindex->notaryid = -1; pindex->notaryid = -1;
if ( pindex->pubkey33[0] != 2 && pindex->pubkey33[0] != 3 && pindex->pubkey33[0] != 0xff ) if ( pindex->pubkey33[0] != 2 && pindex->pubkey33[0] != 3 && pindex->pubkey33[0] != 0xff )
{ {
//if ( KOMODO_LOADINGBLOCKS == 0 ) if ( KOMODO_LOADINGBLOCKS == 0 )
memset(pindex->pubkey33,0xff,33); memset(pindex->pubkey33,0xff,33);
//else memset(pindex->pubkey33,0,33); else memset(pindex->pubkey33,0,33);
if ( komodo_blockload(block,pindex) == 0 ) if ( komodo_blockload(block,pindex) == 0 )
{ {
komodo_block2pubkey33(pindex->pubkey33,block); komodo_block2pubkey33(pindex->pubkey33,block);

View File

@@ -146,6 +146,8 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
} }
if ( height > 34000 && ASSETCHAINS_SYMBOL[0] == 0 ) // 0 -> non-special notary if ( height > 34000 && ASSETCHAINS_SYMBOL[0] == 0 ) // 0 -> non-special notary
{ {
if ( KOMODO_LOADINGBLOCKS == 0 )
return(true);
if ( (pindex= komodo_chainactive(height)) != 0 ) if ( (pindex= komodo_chainactive(height)) != 0 )
{ {
komodo_pindex_init(pindex,height); komodo_pindex_init(pindex,height);
@@ -206,8 +208,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
for (i=0; i<66; i++) for (i=0; i<66; i++)
printf("%d ",mids[i]); printf("%d ",mids[i]);
printf(" minerids from ht.%d pindex.%p\n",height,pindex); printf(" minerids from ht.%d pindex.%p\n",height,pindex);
if ( KOMODO_LOADINGBLOCKS == 0 ) return false;
return false;
} }
return true; return true;
} }