Merge

src/cc/rewards.cpp

@@ -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.1: normal output to unlock address
                     //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 )
->>>>>>> jl777
                         return eval->Invalid("cant unlock fundingtxid");
                     else if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 )
                         return eval->Invalid("always should find vin.0, but didnt");

src/main.cpp

@@ -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 )