From 8ad9f27fdd719e13494123144453927fc163cdde Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 21 Oct 2016 18:32:52 -0300 Subject: [PATCH] test --- src/bitcoin-tx.cpp | 5 +++++ src/coins.cpp | 2 +- src/komodo.h | 2 +- src/rpcblockchain.cpp | 2 +- src/rpcrawtransaction.cpp | 2 +- src/wallet/rpcwallet.cpp | 2 +- src/wallet/wallet.cpp | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 89a54d846..42e5ebea7 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -327,6 +327,11 @@ uint32_t komodo_txtime(uint256 hash) return(0); } +uint64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime) +{ + return(0); +} + static void MutateTxSign(CMutableTransaction& tx, const string& flagStr) { int nHashType = SIGHASH_ALL; diff --git a/src/coins.cpp b/src/coins.cpp index 6387e13f2..2e4f23042 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -384,7 +384,7 @@ const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const } uint32_t komodo_txtime(uint256 hash); -int64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); +uint64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); CAmount CCoinsViewCache::GetValueIn(const CTransaction& tx,uint32_t tiptime) const { diff --git a/src/komodo.h b/src/komodo.h index 6382510c3..1cacb95de 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -269,7 +269,7 @@ uint32_t komodo_txtime(uint256 hash) return(0); } -int64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime) +uint64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime) { int32_t minutes,days; uint64_t interest = 0; if ( tiptime == 0 ) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 803fbd9d0..297755e3d 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -380,7 +380,7 @@ Value gettxoutsetinfo(const Array& params, bool fHelp) return ret; } -int64_t komodo_interest(uint64_t nValue,uint32_t pastlocktime,uint32_t tiptime); +uint64_t komodo_interest(uint64_t nValue,uint32_t pastlocktime,uint32_t tiptime); Value gettxout(const Array& params, bool fHelp) { if (fHelp || params.size() < 2 || params.size() > 3) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 864acef4e..9d688af1c 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -96,7 +96,7 @@ Array TxJoinSplitToJSON(const CTransaction& tx) { return vjoinsplit; } -int64_t komodo_interest(uint64_t nValue,uint32_t pastlocktime,uint32_t tiptime); +uint64_t komodo_interest(uint64_t nValue,uint32_t pastlocktime,uint32_t tiptime); void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) { entry.push_back(Pair("txid", tx.GetHash().GetHex())); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 1038854e1..1568ffb33 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2259,7 +2259,7 @@ Value resendwallettransactions(const Array& params, bool fHelp) return result; } -int64_t komodo_interest(uint64_t nValue,uint32_t pastlocktime,uint32_t tiptime); +uint64_t komodo_interest(uint64_t nValue,uint32_t pastlocktime,uint32_t tiptime); Value listunspent(const Array& params, bool fHelp) { if (!EnsureWalletIsAvailable(fHelp)) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 070badbd1..ad8976c70 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2333,7 +2333,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int return true; } -int64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); +uint64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); bool CWallet::SelectCoins(const CAmount& nTargetValue, set >& setCoinsRet, CAmount& nValueRet, bool& fOnlyCoinbaseCoinsRet, bool& fNeedCoinbaseCoinsRet, const CCoinControl* coinControl) const { // Output parameter fOnlyCoinbaseCoinsRet is set to true when the only available coins are coinbase utxos.