diff options
| author | Cozz Lovan <cozzlovan@yahoo.com> | 2013-08-12 17:03:03 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-14 14:25:10 +0100 |
| commit | 6a86c24db146d9ca5d1d5c83099d935c3feb63bb (patch) | |
| tree | 84ea08401061e81d178a4c2caf34233281227da4 /src/wallet.h | |
| parent | 8dfd8c62dccac96afbda5ad0e66e68ee4820481f (diff) | |
| download | bitcoin-6a86c24db146d9ca5d1d5c83099d935c3feb63bb.tar.xz | |
Coin Control Features
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wallet.h b/src/wallet.h index 5c38d7a1a0..928ba3de3f 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -28,6 +28,7 @@ class COutput; class CReserveKey; class CScript; class CWalletTx; +class CCoinControl; /** (client) version numbers for particular wallet features */ enum WalletFeature @@ -87,7 +88,7 @@ public: class CWallet : public CCryptoKeyStore, public CWalletInterface { private: - bool SelectCoins(int64_t nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64_t& nValueRet) const; + bool SelectCoins(int64_t nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64_t& nValueRet, const CCoinControl *coinControl=NULL) const; CWalletDB *pwalletdbEncryption; @@ -152,7 +153,7 @@ public: // check whether we are allowed to upgrade (or already support) to the named feature bool CanSupportFeature(enum WalletFeature wf) { return nWalletMaxVersion >= wf; } - void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true) const; + void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true, const CCoinControl *coinControl=NULL) const; bool SelectCoinsMinConf(int64_t nTargetValue, int nConfMine, int nConfTheirs, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64_t& nValueRet) const; bool IsLockedCoin(uint256 hash, unsigned int n) const; void LockCoin(COutPoint& output); @@ -212,9 +213,9 @@ public: int64_t GetUnconfirmedBalance() const; int64_t GetImmatureBalance() const; bool CreateTransaction(const std::vector<std::pair<CScript, int64_t> >& vecSend, - CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, std::string& strFailReason); + CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, std::string& strFailReason, const CCoinControl *coinControl=NULL); bool CreateTransaction(CScript scriptPubKey, int64_t nValue, - CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, std::string& strFailReason); + CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, std::string& strFailReason, const CCoinControl *coinControl=NULL); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false); std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false); |