From aedc638dff4ded92055a348e1fa3a382df4227f8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 19 Jul 2018 22:08:24 -1100 Subject: [PATCH] -const --- src/cc/assets.cpp | 22 +++++++++++----------- src/cc/eval.cpp | 2 +- src/cc/eval.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index 1b556a6be..883d140e7 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -200,7 +200,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti return(funcid); } -bool Getorigaddr(char *destaddr,const CTransaction& tx) +bool Getorigaddr(char *destaddr,CTransaction& tx) { uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector origpubkey; CScript script; n = tx.vout.size(); @@ -236,7 +236,7 @@ bool IsAssetInput(CScript const& scriptSig) return out; } -uint64_t IsAssetvout(uint64_t &price,std::vector &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid) +uint64_t IsAssetvout(uint64_t &price,std::vector &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid) { uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid; if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) @@ -268,7 +268,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector &origpubkey,const CTra 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 ) @@ -535,10 +535,10 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu return(true); } -bool ProcessAssets(Eval* eval, std::vector paramsNull, const CTransaction &tx, unsigned int nIn) +bool ProcessAssets(Eval* eval, std::vector paramsNull, CTransaction &tx, unsigned int nIn) { static uint256 zero; - const CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector origpubkey; + CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector origpubkey; if ( paramsNull.size() != 0 ) // Don't expect params return eval->Invalid("Cannot have params"); if ( (n= tx.vout.size()) == 0 ) diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp index 2405c2375..b8044e0dd 100644 --- a/src/cc/eval.cpp +++ b/src/cc/eval.cpp @@ -84,7 +84,7 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector &spends) c } -bool Eval::GetTxUnconfirmed(const uint256 &hash, const CTransaction &txOut, uint256 &hashBlock) const +bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const { bool fAllowSlow = false; // Don't allow slow return GetTransaction(hash, txOut, hashBlock, fAllowSlow); diff --git a/src/cc/eval.h b/src/cc/eval.h index edff3d96b..96af359f1 100644 --- a/src/cc/eval.h +++ b/src/cc/eval.h @@ -81,7 +81,7 @@ public: /* * IO functions */ - virtual bool GetTxUnconfirmed(const uint256 &hash, const CTransaction &txOut, uint256 &hashBlock) const; + virtual bool GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const; virtual bool GetTxConfirmed(const uint256 &hash, CTransaction &txOut, CBlockIndex &block) const; virtual unsigned int GetCurrentHeight() const; virtual bool GetSpendsConfirmed(uint256 hash, std::vector &spends) const;