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-23 03:18:15 -11:00
parent 31511e4185
commit 470d9cb012
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/assets.cpp
View File

@@ -147,7 +147,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
else starti = 1; else starti = 1;
if ( assetid == zero ) if ( assetid == zero )
return eval->Invalid("illegal assetid"); return eval->Invalid("illegal assetid");
else if ( AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false ) else if ( funcid == 'o' || funcid == 'x' || AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
return eval->Invalid("asset inputs != outputs"); return eval->Invalid("asset inputs != outputs");
} }
switch ( funcid ) switch ( funcid )
@@ -318,8 +318,8 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
static uint256 zero,prevtxid; static uint256 zero,prevtxid;
CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey; CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
txid = ctx.GetHash(); txid = ctx.GetHash();
if ( txid == prevtxid ) //if ( txid == prevtxid )
return(true); // return(true);
fprintf(stderr,"ProcessAssets\n"); fprintf(stderr,"ProcessAssets\n");
if ( paramsNull.size() != 0 ) // Don't expect params if ( paramsNull.size() != 0 ) // Don't expect params
return eval->Invalid("Cannot have params"); return eval->Invalid("Cannot have params");