From d3354c52d7c0c6446cad4074c1d0e04bb1b3d84e Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 9 Jun 2015 23:36:36 -0700 Subject: Add have-pubkey distinction to ISMINE flags This indicates that, eg, we have a public key for a key which may be used as a pay-to-pubkey-hash. It generally means that we can create a valid scriptSig except for missing private key(s) with which to create signatures. --- src/wallet/wallet_ismine.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/wallet/wallet_ismine.h') diff --git a/src/wallet/wallet_ismine.h b/src/wallet/wallet_ismine.h index 5b9b0e0841..12afad1751 100644 --- a/src/wallet/wallet_ismine.h +++ b/src/wallet/wallet_ismine.h @@ -16,8 +16,12 @@ class CScript; enum isminetype { ISMINE_NO = 0, - ISMINE_WATCH_ONLY = 1, - ISMINE_SPENDABLE = 2, + //! Indicates that we dont know how to create a scriptSig that would solve this if we were given the appropriate private keys + ISMINE_WATCH_NOPUBKEY = 1, + //! Indicates that we know how to create a scriptSig that would solve this if we were given the appropriate private keys + ISMINE_WATCH_PUBKEY = 2, + ISMINE_WATCH_ONLY = ISMINE_WATCH_NOPUBKEY | ISMINE_WATCH_PUBKEY, + ISMINE_SPENDABLE = 4, ISMINE_ALL = ISMINE_WATCH_ONLY | ISMINE_SPENDABLE }; /** used for bitflags of isminetype */ -- cgit v1.2.3 From 428a898acd37e1c0afa21623a8fe5728859067be Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sat, 8 Aug 2015 09:26:07 -0700 Subject: SQUASH "Add have-pubkey distinction to ISMINE flags" --- src/wallet/wallet_ismine.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/wallet/wallet_ismine.h') diff --git a/src/wallet/wallet_ismine.h b/src/wallet/wallet_ismine.h index 12afad1751..ec9dcddd5a 100644 --- a/src/wallet/wallet_ismine.h +++ b/src/wallet/wallet_ismine.h @@ -17,10 +17,10 @@ enum isminetype { ISMINE_NO = 0, //! Indicates that we dont know how to create a scriptSig that would solve this if we were given the appropriate private keys - ISMINE_WATCH_NOPUBKEY = 1, + ISMINE_WATCH_UNSOLVABLE = 1, //! Indicates that we know how to create a scriptSig that would solve this if we were given the appropriate private keys - ISMINE_WATCH_PUBKEY = 2, - ISMINE_WATCH_ONLY = ISMINE_WATCH_NOPUBKEY | ISMINE_WATCH_PUBKEY, + ISMINE_WATCH_SOLVABLE = 2, + ISMINE_WATCH_ONLY = ISMINE_WATCH_SOLVABLE | ISMINE_WATCH_UNSOLVABLE, ISMINE_SPENDABLE = 4, ISMINE_ALL = ISMINE_WATCH_ONLY | ISMINE_SPENDABLE }; -- cgit v1.2.3