From 9f2d38b39c6a9d051ecd7ec637dc4f07206215aa Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 28 Jul 2018 00:17:41 -1100 Subject: [PATCH] Test --- src/cc/rewards.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp index e9856bcbd..1d33dacbf 100644 --- a/src/cc/rewards.cpp +++ b/src/cc/rewards.cpp @@ -109,7 +109,7 @@ CScript EncodeRewardsOpRet(uint8_t funcid,uint64_t sbits,uint256 fundingtxid) uint8_t DecodeRewardsOpRet(uint256 txid,const CScript &scriptPubKey,uint64_t &sbits,uint256 &fundingtxid) { - std::vector vopret; uint8_t *script,e,f; uint64_t APR,minseconds,maxseconds,mindeposit; + std::vector vopret; uint8_t *script,e,f,funcid; uint64_t APR,minseconds,maxseconds,mindeposit; GetOpReturnData(scriptPubKey, vopret); if ( vopret.size() > 2 ) { @@ -179,7 +179,7 @@ bool RewardsExactAmounts(struct CCcontract_info *cp,Eval *eval,const CTransactio bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx) { - uint256 txid,fundingtxid; uint64_t sbits,APR,minseconds,maxseconds,mindeposit,amount,reward; int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; uint8_t funcid; CScript scriptPubKey; CTransaction fundingTx,vinTx; + uint256 txid,fundingtxid,hashBlock; uint64_t sbits,APR,minseconds,maxseconds,mindeposit,amount,reward,txfee=10000; int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; uint8_t funcid; CScript scriptPubKey; CTransaction fundingTx,vinTx; numvins = tx.vin.size(); numvouts = tx.vout.size(); preventCCvins = preventCCvouts = -1; @@ -240,7 +240,7 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t return eval->Invalid("unlock tx not enough vouts"); else if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) return eval->Invalid("unlock tx vout.0 is normal output"); - else if ( tx.vout[1].scriptPubKey.IsPayToCryptoCondition() A= 0 ) + else if ( tx.vout[1].scriptPubKey.IsPayToCryptoCondition() != 0 ) return eval->Invalid("unlock tx vout.1 is CC output"); amount = vinTx.vout[0].nValue; reward = RewardsCalc(amount,txid,APR,minseconds,maxseconds,mindeposit);