diff options
author | Andrew Chow <achow101-github@achow101.com> | 2019-07-11 20:21:05 -0400 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2019-07-11 20:24:42 -0400 |
commit | ab28e31c9563bd2cd1e4a088ffd2479517dc83f2 (patch) | |
tree | 1b907f31bdd3a9c1d6a5b8b4d01a869e774044bc /src/wallet/wallet.cpp | |
parent | 7400135b7918df9c34206bead744c496e07b0e78 (diff) | |
download | bitcoin-ab28e31c9563bd2cd1e4a088ffd2479517dc83f2.tar.xz |
Change ImportScriptPubKeys' internal to apply_label
The internal bool was only to indicate whether the given label should
be applied as things that are internal should not have a label. To make
this clearer, we change internal to apply_label and invert its usage
so things that have labels set this to true in order to have their labels
applied.
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r-- | src/wallet/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 16366a0c23..2b4819c981 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1717,7 +1717,7 @@ bool CWallet::ImportPubKeys(const std::vector<CKeyID>& ordered_pubkeys, const st return true; } -bool CWallet::ImportScriptPubKeys(const std::string& label, const std::set<CScript>& script_pub_keys, const bool have_solving_data, const bool internal, const int64_t timestamp) +bool CWallet::ImportScriptPubKeys(const std::string& label, const std::set<CScript>& script_pub_keys, const bool have_solving_data, const bool apply_label, const int64_t timestamp) { WalletBatch batch(*database); for (const CScript& script : script_pub_keys) { @@ -1728,7 +1728,7 @@ bool CWallet::ImportScriptPubKeys(const std::string& label, const std::set<CScri } CTxDestination dest; ExtractDestination(script, dest); - if (!internal && IsValidDestination(dest)) { + if (apply_label && IsValidDestination(dest)) { SetAddressBookWithDB(batch, dest, label, "receive"); } } |