From add613688e4d0b99f9094020d2dd08e0fb8a674d Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jul 2018 05:28:09 -1100 Subject: [PATCH] Constrain sell offer CC touts --- src/cc/assets.cpp | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index e09cc0569..f03dadb66 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -252,34 +252,29 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx break; case 's': // selloffer + case 'e': // selloffer //vin.0: normal input //vin.1+: valid CC output for sale //vout.0: vin.1 assetoshis output to CC to unspendable - //vout.1: normal output for change (if any) + //vout.1: CC output for change (if any) + //vout.2: normal output for change (if any) //'s'.vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey] //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey] + preventCCvouts = 1; if ( remaining_price == 0 ) return eval->Invalid("illegal null remaining_price for selloffer"); - else if ( ConstrainVout(tx.vout[0],1,(char *)cp->unspendableCCaddr,0) == 0 ) + if ( tx.vout[1].scriptPubKey.IsPayToCryptoCondition() != 0 ) + { + preventCCvouts++; + if ( ConstrainVout(tx.vout[0],1,(char *)cp->unspendableCCaddr,0) == 0 ) + return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer"); + else if ( tx.vout[0].nValue+tx.vout[1].nValue != inputs ) + return eval->Invalid("mismatched vout0+vout1 total for selloffer"); + } else if ( ConstrainVout(tx.vout[0],1,(char *)cp->unspendableCCaddr,inputs) == 0 ) return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer"); //fprintf(stderr,"remaining.%d for sell\n",(int32_t)remaining_price); - preventCCvouts = 1; break; - case 'e': // exchange - //vin.0: normal input - //vin.1+: valid CC output for sale - //vout.0: vin.1 assetoshis output to CC to unspendable - //vout.1: normal output for change (if any) - //'s'.vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey] - //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey] - if ( remaining_price == 0 ) - return eval->Invalid("illegal null remaining_price for exchangeoffer"); - else if ( ConstrainVout(tx.vout[0],1,(char *)cp->unspendableCCaddr,0) == 0 ) - return eval->Invalid("mismatched vout0 AssetsCCaddr for exchangeoffer"); - //fprintf(stderr,"remaining.%d for sell\n",(int32_t)remaining_price); - preventCCvouts = 2; - break; - + case 'x': // cancel //vin.0: normal input //vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx