DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

ok

Browse Source
This commit is contained in:
blackjok3r
2019-01-23 13:57:04 +08:00
parent 4d5d14216b
commit eb164bc03c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/komodo_bitcoind.h
View File

@@ -1867,14 +1867,8 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
return(-1); return(-1);
} else } else
{ {
<<<<<<< HEAD
// I think this means the block is valid PoW. We need to set the pindex->segid here.
failed = 0; failed = 0;
CBlockIndex *pindex; CBlockIndex *pindex;
=======
failed = 0;
CBlockIndex *pindex;
>>>>>>> new_staker
BlockMap::const_iterator it = mapBlockIndex.find(pblock->GetHash()); BlockMap::const_iterator it = mapBlockIndex.find(pblock->GetHash());
pindex = it != mapBlockIndex.end() ? it->second : NULL; pindex = it != mapBlockIndex.end() ? it->second : NULL;
if ( pindex != 0 && pindex->segid == -2 ) { if ( pindex != 0 && pindex->segid == -2 ) {