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

Fix

Browse Source
This commit is contained in:
jl777
2018-07-19 21:47:37 -11:00
parent 517ab98c47
commit 6f667a100e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cc/assets.cpp
View File

@@ -249,7 +249,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
return(0); return(0);
if ( funcid == 'c' ) if ( funcid == 'c' )
{ {
if ( refassetid == tTx.GetHash() && v == 0 ) if ( refassetid == tx.GetHash() && v == 0 )
return(nValue); return(nValue);
} }
else if ( funcid != 'E' ) else if ( funcid != 'E' )
@@ -268,7 +268,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
return(0); return(0);
} }
uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const CTransaction &vinTx) uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransaction &vinTx)
{ {
uint256 hashBlock; char destaddr[64]; uint256 hashBlock; char destaddr[64];
origaddr[0] = destaddr[0] = 0; origaddr[0] = destaddr[0] = 0;
@@ -285,9 +285,9 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const
else return(vinTx.vout[0].nValue); else return(vinTx.vout[0].nValue);
} }
uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx) uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx)
{ {
const CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 ) if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
return(0); return(0);
else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 ) else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
@@ -297,9 +297,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
else return(nValue); else return(nValue);
} }
uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx,uint256 assetid) uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 assetid)
{ {
const CTransaction vinTx; uint64_t nValue,assetoshis; CTransaction vinTx; uint64_t nValue,assetoshis;
if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 ) if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
return(0); return(0);
if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 ) if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
@@ -326,10 +326,10 @@ bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64
return(true); return(true);
} }
bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey) bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
{ {
static uint256 zero; static uint256 zero;
CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64]; CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
numvins = tx.vin.size(); numvins = tx.vin.size();
outputs = inputs = 0; outputs = inputs = 0;
if ( IsAssetInput(tx.vin[0].scriptSig) != 0 ) if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )