diff options
| author | Matt Corallo <git@bluematt.me> | 2015-08-08 09:27:19 -0700 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2015-08-08 09:30:53 -0700 |
| commit | d04285430d1b54b3ce3d50ffa67b6098157e7c14 (patch) | |
| tree | 8d162c741dfe8222a293a7eb77d5056804f2bbd3 | |
| parent | 428a898acd37e1c0afa21623a8fe5728859067be (diff) | |
| download | bitcoin-d04285430d1b54b3ce3d50ffa67b6098157e7c14.tar.xz | |
SQUASH "Implement watchonly support in fundrawtransaction"
| -rw-r--r-- | src/coincontrol.h | 2 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/coincontrol.h b/src/coincontrol.h index 74d524c0a2..bc965f9e19 100644 --- a/src/coincontrol.h +++ b/src/coincontrol.h @@ -14,7 +14,7 @@ public: CTxDestination destChange; //! If false, allows unselected inputs, but requires all selected inputs be used bool fAllowOtherInputs; - //! Includes watch only addresses which match the ISMINE_WATCH_PUBKEY criteria + //! Includes watch only addresses which match the ISMINE_WATCH_SOLVABLE criteria bool fAllowWatchOnly; CCoinControl() diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 5bc34f9ede..8b7231b6eb 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1526,7 +1526,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const (!coinControl || !coinControl->HasSelected() || coinControl->fAllowOtherInputs || coinControl->IsSelected((*it).first, i))) vCoins.push_back(COutput(pcoin, i, nDepth, ((mine & ISMINE_SPENDABLE) != ISMINE_NO) || - (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_PUBKEY) != ISMINE_NO))); + (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO))); } } } |