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

test

Browse Source
This commit is contained in:
jl777
2016-10-21 18:32:52 -03:00
parent 2897cc41e0
commit 8ad9f27fdd
7 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bitcoin-tx.cpp
View File

@@ -327,6 +327,11 @@ uint32_t komodo_txtime(uint256 hash)
return(0); 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) static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
{ {
int nHashType = SIGHASH_ALL; int nHashType = SIGHASH_ALL;

2
src/coins.cpp
View File

@@ -384,7 +384,7 @@ const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const
} }
uint32_t komodo_txtime(uint256 hash); 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 CAmount CCoinsViewCache::GetValueIn(const CTransaction& tx,uint32_t tiptime) const
{ {

2
src/komodo.h
View File

@@ -269,7 +269,7 @@ uint32_t komodo_txtime(uint256 hash)
return(0); 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; int32_t minutes,days; uint64_t interest = 0;
if ( tiptime == 0 ) if ( tiptime == 0 )

2
src/rpcblockchain.cpp
View File

@@ -380,7 +380,7 @@ Value gettxoutsetinfo(const Array& params, bool fHelp)
return ret; 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) Value gettxout(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() < 2 || params.size() > 3) if (fHelp || params.size() < 2 || params.size() > 3)

2
src/rpcrawtransaction.cpp
View File

@@ -96,7 +96,7 @@ Array TxJoinSplitToJSON(const CTransaction& tx) {
return vjoinsplit; 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) void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
{ {
entry.push_back(Pair("txid", tx.GetHash().GetHex())); entry.push_back(Pair("txid", tx.GetHash().GetHex()));

2
src/wallet/rpcwallet.cpp
View File

@@ -2259,7 +2259,7 @@ Value resendwallettransactions(const Array& params, bool fHelp)
return result; 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) Value listunspent(const Array& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))

2
src/wallet/wallet.cpp
View File

@@ -2333,7 +2333,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
return true; 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<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, bool& fOnlyCoinbaseCoinsRet, bool& fNeedCoinbaseCoinsRet, const CCoinControl* coinControl) const bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx*,unsigned int> >& 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. // Output parameter fOnlyCoinbaseCoinsRet is set to true when the only available coins are coinbase utxos.