diff options
author | Andrew Chow <achow101-github@achow101.com> | 2019-11-26 11:52:51 -0500 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2019-11-26 11:52:51 -0500 |
commit | 65833a74076cddf986037c6eb3b29a9b9dbe31c5 (patch) | |
tree | 785a8a3f8ed8369d8954fd38d6ba2369753cb8f1 /src/wallet/scriptpubkeyman.cpp | |
parent | 9fcf8ce7ae02bf170b9bf0c2887fd709d752cbf7 (diff) | |
download | bitcoin-65833a74076cddf986037c6eb3b29a9b9dbe31c5.tar.xz |
Add OutputType and CPubKey parameters to KeepDestination
These need to be added so that LearnRelatedScripts can be called
from within KeepDestination later.
Diffstat (limited to 'src/wallet/scriptpubkeyman.cpp')
-rw-r--r-- | src/wallet/scriptpubkeyman.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 76a678d06a..f7153a751f 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -18,7 +18,7 @@ bool LegacyScriptPubKeyMan::GetNewDestination(const OutputType type, CTxDestinat // Generate a new key that is added to wallet CPubKey new_key; - if (!GetKeyFromPool(new_key)) { + if (!GetKeyFromPool(new_key, type)) { error = "Error: Keypool ran out, please call keypoolrefill first"; return false; } @@ -1086,7 +1086,7 @@ void LegacyScriptPubKeyMan::AddKeypoolPubkeyWithDB(const CPubKey& pubkey, const m_pool_key_to_index[pubkey.GetID()] = index; } -void LegacyScriptPubKeyMan::KeepDestination(int64_t nIndex) +void LegacyScriptPubKeyMan::KeepDestination(int64_t nIndex, const OutputType& type, const CPubKey& pubkey) { // Remove from key pool WalletBatch batch(m_storage.GetDatabase()); @@ -1112,7 +1112,7 @@ void LegacyScriptPubKeyMan::ReturnDestination(int64_t nIndex, bool fInternal, co WalletLogPrintf("keypool return %d\n", nIndex); } -bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, bool internal) +bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, const OutputType type, bool internal) { if (!CanGetAddresses(internal)) { return false; @@ -1128,7 +1128,7 @@ bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, bool internal) result = GenerateNewKey(batch, internal); return true; } - KeepDestination(nIndex); + KeepDestination(nIndex, type, keypool.vchPubKey); result = keypool.vchPubKey; } return true; |