From 3ade63197c0b36ea8dfc3fb393ecca4450b3f20a Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 22 Jul 2018 10:50:50 -1100 Subject: [PATCH] Fix cancel roc --- src/cc/assets.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index e4cceb5de..865d87f64 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -185,17 +185,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u //vout.n-1: opreturn [EVAL_ASSETS] ['o'] if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 ) return(false); - else if ( tmporigpubkey != origpubkey ) - { - int32_t z; - for (z=31; z>=0; z--) - fprintf(stderr,"%02x",((uint8_t *)&tmporigpubkey)[z]); - fprintf(stderr," from buyvin \n"); - for (z=31; z>=0; z--) - fprintf(stderr,"%02x",((uint8_t *)&origpubkey)[z]); - fprintf(stderr," origpubkey\n"); - return eval->Invalid("mismatched origpubkeys for cancelbuy"); - } else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 ) return eval->Invalid("invalid refund for cancelbuy"); preventCCvins = 1; @@ -261,8 +250,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid] if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 ) return(false); - else if ( tmporigpubkey != origpubkey ) - return eval->Invalid("mismatched origpubkeys for cancel"); else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 ) return eval->Invalid("invalid vout for cancel"); preventCCvins = 2;