diff options
author | Matt Corallo <git@bluematt.me> | 2015-08-08 09:26:07 -0700 |
---|---|---|
committer | Matt Corallo <git@bluematt.me> | 2015-08-08 09:30:53 -0700 |
commit | 428a898acd37e1c0afa21623a8fe5728859067be (patch) | |
tree | fb4ab1a072da52a0b557fa765e0f671b1b845955 /src/wallet/wallet_ismine.cpp | |
parent | 6bdb474dc9dd34e1a5b13ce9494a936cba77e027 (diff) | |
download | bitcoin-428a898acd37e1c0afa21623a8fe5728859067be.tar.xz |
SQUASH "Add have-pubkey distinction to ISMINE flags"
Diffstat (limited to 'src/wallet/wallet_ismine.cpp')
-rw-r--r-- | src/wallet/wallet_ismine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet_ismine.cpp b/src/wallet/wallet_ismine.cpp index 0303cbb2fb..d27b1531e3 100644 --- a/src/wallet/wallet_ismine.cpp +++ b/src/wallet/wallet_ismine.cpp @@ -41,7 +41,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey) txnouttype whichType; if (!Solver(scriptPubKey, whichType, vSolutions)) { if (keystore.HaveWatchOnly(scriptPubKey)) - return ISMINE_WATCH_NOPUBKEY; + return ISMINE_WATCH_UNSOLVABLE; return ISMINE_NO; } @@ -89,7 +89,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey) if (keystore.HaveWatchOnly(scriptPubKey)) { // TODO: This could be optimized some by doing some work after the above solver CScript scriptSig; - return ProduceSignature(DummySignatureCreator(&keystore), scriptPubKey, scriptSig) ? ISMINE_WATCH_PUBKEY : ISMINE_WATCH_NOPUBKEY; + return ProduceSignature(DummySignatureCreator(&keystore), scriptPubKey, scriptSig) ? ISMINE_WATCH_SOLVABLE : ISMINE_WATCH_UNSOLVABLE; } return ISMINE_NO; } |