diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-22 17:10:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-23 12:40:00 +0200 |
| commit | 91389e51c78ae3565b037e31dd5382b52bd75136 (patch) | |
| tree | e38a1457340ce17036b9e257d75fb46958fa6699 /src/wallet/wallet.h | |
| parent | b77fbe095f44e182c484625a47940148d7c3b1e4 (diff) | |
| parent | 208589514cdc344c2d33228dba7f00b305d0174b (diff) | |
| download | bitcoin-91389e51c78ae3565b037e31dd5382b52bd75136.tar.xz | |
Merge pull request #6088
2085895 fundrawtransaction tests (Jonas Schnelli)
21bbd92 Add fundrawtransaction RPC method (Matt Corallo)
1e0d1a2 Add FundTransaction method to wallet (Matt Corallo)
2d84e22 Small tweaks to CCoinControl for fundrawtransaction (Matt Corallo)
9b4e7d9 Add DummySignatureCreator which just creates zeroed sigs (Pieter Wuille)
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 9f3f08d117..b6a8e8671f 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -625,8 +625,9 @@ public: CAmount GetWatchOnlyBalance() const; CAmount GetUnconfirmedWatchOnlyBalance() const; CAmount GetImmatureWatchOnlyBalance() const; - bool CreateTransaction(const std::vector<CRecipient>& vecSend, - CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosRet, std::string& strFailReason, const CCoinControl *coinControl = NULL); + bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosRet, std::string& strFailReason); + bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosRet, + std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); static CFeeRate minTxFee; |