DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2018-07-22 10:45:40 -11:00
parent 6edaac431f
commit 78533def7e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cc/CCassetsCore.cpp
View File

@@ -256,12 +256,10 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
if ( (funcid= DecodeAssetOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' ) if ( (funcid= DecodeAssetOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' )
return eval->Invalid("invalid opreturn for buyvin"); return eval->Invalid("invalid opreturn for buyvin");
else if ( refassetid != assetid ) 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"); 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); return(nValue);
} }

9
src/cc/assets.cpp
View File

@@ -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 ) if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
return(false); return(false);
else if ( tmporigpubkey != origpubkey ) 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"); return eval->Invalid("mismatched origpubkeys for cancelbuy");
}
else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 ) else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
return eval->Invalid("invalid refund for cancelbuy"); return eval->Invalid("invalid refund for cancelbuy");
preventCCvins = 1; preventCCvins = 1;