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-21 11:02:28 -11:00
parent c940ac885c
commit bd92bb7202
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cc/assets.cpp
View File

@@ -792,6 +792,7 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256
{ {
mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,mypk)); mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,mypk));
} }
fprintf(stderr,"remaining %llu -> origpubkey\n");
return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey))); return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
} else fprintf(stderr,"filltx wasnt for assetid\n"); } else fprintf(stderr,"filltx wasnt for assetid\n");
} }
@@ -906,7 +907,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
return eval->Invalid("illegal asset vin0"); return eval->Invalid("illegal asset vin0");
if ( funcid != 'c' && assetid == zero ) if ( funcid != 'c' && assetid == zero )
return eval->Invalid("illegal assetid"); return eval->Invalid("illegal assetid");
fprintf(stderr,"switch\n");
switch ( funcid ) switch ( funcid )
{ {
case 'c': // create wont be called to be verified as it has no CC inputs case 'c': // create wont be called to be verified as it has no CC inputs
@@ -999,6 +999,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
//vout.2: vin.2 assetoshis to original pubkey //vout.2: vin.2 assetoshis to original pubkey
//vout.3: normal output for change (if any) //vout.3: normal output for change (if any)
//vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey] //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
fprintf(stderr,"inside fillbuy\n");
if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 ) if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
return(false); return(false);
else if ( tmporigpubkey != origpubkey ) else if ( tmporigpubkey != origpubkey )