From 6f667a100e25a0212a93fe9cd86c4cfa083a825c Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 19 Jul 2018 21:47:37 -1100 Subject: [PATCH] Fix --- src/cc/assets.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index 052f68a99..963dfe664 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -249,7 +249,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector &origpubkey,CTransacti return(0); if ( funcid == 'c' ) { - if ( refassetid == tTx.GetHash() && v == 0 ) + if ( refassetid == tx.GetHash() && v == 0 ) return(nValue); } else if ( funcid != 'E' ) @@ -268,7 +268,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector &origpubkey,CTransacti 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]; 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); } -uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector &tmporigpubkey,char *origaddr,const CTransaction &tx) +uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector &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 ) return(0); else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 ) @@ -297,9 +297,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector else return(nValue); } -uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector &tmporigpubkey,char *origaddr,const CTransaction &tx,uint256 assetid) +uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector &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 ) return(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); } -bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector origpubkey) +bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector origpubkey) { static uint256 zero; - CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector 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 tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64]; numvins = tx.vin.size(); outputs = inputs = 0; if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )