From 78533def7eaf4b59823ea0dc072305985a543bb0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 22 Jul 2018 10:45:40 -1100 Subject: [PATCH] Test --- src/cc/CCassetsCore.cpp | 8 +++----- src/cc/assets.cpp | 9 +++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp index 14066f43b..cc5b413e8 100644 --- a/src/cc/CCassetsCore.cpp +++ b/src/cc/CCassetsCore.cpp @@ -256,12 +256,10 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector if ( (funcid= DecodeAssetOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' ) return eval->Invalid("invalid opreturn for buyvin"); else if ( refassetid != assetid ) - { - //for (i=32; i>=0; i--) - // fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]); - //fprintf(stderr," AssetValidateBuyvin\n"); return eval->Invalid("invalid assetid for buyvin"); - } + for (i=32; i>=0; i--) + fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]); + fprintf(stderr," AssetValidateBuyvin assetid for %s\n",origaddr); } return(nValue); } diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index f4c5554e5..e4cceb5de 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -186,7 +186,16 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u 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;