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
2016-11-18 08:32:17 -03:00
parent e21ffa1d2f
commit e9ed4986e1
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/komodo_bitcoind.h
View File

@@ -471,23 +471,28 @@ int8_t komodo_minerid(int32_t height)
CBlock block; int32_t notaryid,num,i; CBlockIndex *pindex; uint8_t pubkeys[64][33],script[35]; CBlock block; int32_t notaryid,num,i; CBlockIndex *pindex; uint8_t pubkeys[64][33],script[35];
if ( (pindex= chainActive[height]) != 0 ) if ( (pindex= chainActive[height]) != 0 )
{ {
if ( ReadBlockFromDisk(block,(const CBlockIndex *)pindex block.SetNull();
#ifndef KOMODO_ZCASH // Open history file to read
,Params().GetConsensus() CAutoFile filein(OpenBlockFile(pindex->GetBlockPos(),true),SER_DISK,CLIENT_VERSION);
#endif if (filein.IsNull())
) != 0 ) return(-1);
// Read block
try { filein >> block; }
catch (const std::exception& e)
{ {
if ( gettxout_scriptPubKey(script,sizeof(script),block.vtx[0].GetHash(),0) == 35 ) fprintf(stderr,"readblockfromdisk err B\n");
return(-1);
}
if ( gettxout_scriptPubKey(script,sizeof(script),block.vtx[0].GetHash(),0) == 35 )
{
if ( (num= komodo_notaries(pubkeys,height)) > 0 )
{ {
if ( (num= komodo_notaries(pubkeys,height)) > 0 ) for (i=0; i<num; i++)
{ if ( memcmp(pubkeys[i],&script[1],33) == 0 )
for (i=0; i<num; i++) {
if ( memcmp(pubkeys[i],&script[1],33) == 0 ) printf("minderid.%d ht.%d\n",i,height);
{ return(i);
printf("minderid.%d ht.%d\n",i,height); }
return(i);
}
}
} }
} }
} }

2
src/pow.cpp
View File

@@ -108,7 +108,7 @@ int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33)
int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]); int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]);
int32_t komodo_currentheight(); int32_t komodo_currentheight();
extern int32_t KOMODO_CHOSEN_ONE; extern int32_t KOMODO_CHOSEN_ONE;
extern int8_t Minerids[1024 * 1024 * 5]; // 5 million blocks //extern int8_t Minerids[1024 * 1024 * 5]; // 5 million blocks
bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params) bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params)
{ {