DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 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

6
src/cc/rewards.cpp
View File

@@ -242,13 +242,7 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
//vout.0: funding CC change or recover normal payout //vout.0: funding CC change or recover normal payout
//vout.1: normal output to unlock address //vout.1: normal output to unlock address
//vout.n-1: opreturn 'U' sbits fundingtxid //vout.n-1: opreturn 'U' sbits fundingtxid
<<<<<<< HEAD
if ( fundingtxid == txid )
=======
//char str[65],str2[65];
//fprintf(stderr,"funding.%s vs %s\n",uint256_str(str,fundingtxid),uint256_str(str2,tx.vin[0].prevout.hash));
if ( fundingtxid == tx.vin[0].prevout.hash ) if ( fundingtxid == tx.vin[0].prevout.hash )
>>>>>>> jl777
return eval->Invalid("cant unlock fundingtxid"); return eval->Invalid("cant unlock fundingtxid");
else if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 ) else if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 )
return eval->Invalid("always should find vin.0, but didnt"); return eval->Invalid("always should find vin.0, but didnt");

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 ) else if ( ASSETCHAINS_STAKED != 0 && (i == (block.vtx.size() - 1)) && komodo_isPoS((CBlock *)&block) != 0 )
continue; continue;
Tx = tx; Tx = tx;
<<<<<<< HEAD
if ( myAddtomempool(Tx) == false ) // happens with out of order tx in block on resync 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++; rejects++;
} }
if ( rejects == 0 || rejects == lastrejects ) if ( rejects == 0 || rejects == lastrejects )