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

Merge pull request #543 from jl777/jl777

Browse Source 
fix sync
This commit is contained in:
jl777
2018-03-25 22:51:25 +03:00
committed by GitHub
parent d72bab960b 643bc61b9e
commit 7dc03c7d46
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo_bitcoind.h
View File

@@ -621,7 +621,7 @@ int32_t komodo_block2height(CBlock *block)
//for (i=0; i<6; i++) //for (i=0; i<6; i++)
// printf("%02x",ptr[i]); // printf("%02x",ptr[i]);
n = ptr[0]; n = ptr[0];
for (i=0; i<4; i++) for (i=0; i<n; i++) // looks strange but this works
{ {
//03bb81000101(bb 187) (81 48001) (00 12288256) <- coinbase.6 ht.12288256 //03bb81000101(bb 187) (81 48001) (00 12288256) <- coinbase.6 ht.12288256
height += ((uint32_t)ptr[i+1] << (i*8)); height += ((uint32_t)ptr[i+1] << (i*8));
@@ -918,7 +918,7 @@ int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_
{ {
if ( tx.nLockTime != 1477258935 || dispflag != 0 ) if ( tx.nLockTime != 1477258935 || dispflag != 0 )
{ {
//fprintf(stderr,"komodo_validate_interest.%d reject.%d [%d] locktime %u cmp2.%u\n",dispflag,txheight,(int32_t)(tx.nLockTime - (cmptime-3600)),(uint32_t)tx.nLockTime,cmptime); fprintf(stderr,"komodo_validate_interest.%d reject.%d [%d] locktime %u cmp2.%u\n",dispflag,txheight,(int32_t)(tx.nLockTime - (cmptime-3600)),(uint32_t)tx.nLockTime,cmptime);
} }
return(-1); return(-1);
} }

2
src/main.cpp
View File

@@ -3539,7 +3539,7 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat
// Check transactions // Check transactions
BOOST_FOREACH(const CTransaction& tx, block.vtx) BOOST_FOREACH(const CTransaction& tx, block.vtx)
{ {
if ( komodo_validate_interest(tx,komodo_block2height((CBlock *)&block),block.nTime,1) < 0 ) if ( komodo_validate_interest(tx,height == 0 ? komodo_block2height((CBlock *)&block) : height,block.nTime,1) < 0 )
return error("CheckBlock: komodo_validate_interest failed"); return error("CheckBlock: komodo_validate_interest failed");
if (!CheckTransaction(tx, state, verifier)) if (!CheckTransaction(tx, state, verifier))
return error("CheckBlock(): CheckTransaction failed"); return error("CheckBlock(): CheckTransaction failed");