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

Merge

Browse Source
This commit is contained in:
jl777
2018-08-31 22:08:25 -11:00
parent 9a44d9ea32
commit bea5d28567
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@@ -4186,11 +4186,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
else if ( ASSETCHAINS_STAKED != 0 && (i == (block.vtx.size() - 1)) && komodo_isPoS((CBlock *)&block) != 0 )
continue;
Tx = tx;
<<<<<<< HEAD
if ( myAddtomempool(Tx) == false ) // happens with out of order tx in block on resync
=======
if ( myAddtomempool(Tx) == false ) // can happen with out of order tx in block on resync
>>>>>>> jl777
rejects++;
}
if ( rejects == 0 || rejects == lastrejects )