Add OutputType and CPubKey parameters to KeepDestination

achow101 · achow101 · commit 65833a74076c · 2019-11-26T11:52:51.000-05:00
These need to be added so that LearnRelatedScripts can be called
from within KeepDestination later.
diff --git 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;
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -151,7 +151,7 @@ class ScriptPubKeyMan
     virtual isminetype IsMine(const CScript& script) const { return ISMINE_NO; }
 
     virtual bool GetReservedDestination(const OutputType type, bool internal, int64_t& index, CKeyPool& keypool) { return false; }
-    virtual void KeepDestination(int64_t index) {}
+    virtual void KeepDestination(int64_t index, const OutputType& type, const CPubKey& pubkey) {}
     virtual void ReturnDestination(int64_t index, bool internal, const CPubKey& pubkey) {}
 
     virtual bool TopUp(unsigned int size = 0) { return false; }
@@ -248,7 +248,7 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
     std::map<CKeyID, int64_t> m_pool_key_to_index;
 
     //! Fetches a key from the keypool
-    bool GetKeyFromPool(CPubKey &key, bool internal = false);
+    bool GetKeyFromPool(CPubKey &key, const OutputType type, bool internal = false);
 
     /**
      * Reserves a key from the keypool and sets nIndex to its index
@@ -274,7 +274,7 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
     bool EncryptKeys(CKeyingMaterial& vMasterKeyIn);
 
     bool GetReservedDestination(const OutputType type, bool internal, int64_t& index, CKeyPool& keypool) override;
-    void KeepDestination(int64_t index) override;
+    void KeepDestination(int64_t index, const OutputType& type, const CPubKey& pubkey) override;
     void ReturnDestination(int64_t index, bool internal, const CPubKey& pubkey) override;
 
     bool TopUp(unsigned int size = 0) override;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3317,7 +3317,7 @@ bool ReserveDestination::GetReservedDestination(CTxDestination& dest, bool inter
 void ReserveDestination::KeepDestination()
 {
     if (nIndex != -1) {
-        m_spk_man->KeepDestination(nIndex);
+        m_spk_man->KeepDestination(nIndex, type, vchPubKey);
         m_spk_man->LearnRelatedScripts(vchPubKey, type);
     }
     nIndex = -1;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ bool LegacyScriptPubKeyMan::GetNewDestination(const OutputType type, CTxDestinat`
`18`	`18`
`19`	`19`	`// Generate a new key that is added to wallet`
`20`	`20`	`CPubKey new_key;`
`21`		`- if (!GetKeyFromPool(new_key)) {`
	`21`	`+ if (!GetKeyFromPool(new_key, type)) {`
`22`	`22`	`error = "Error: Keypool ran out, please call keypoolrefill first";`
`23`	`23`	`return false;`
`24`	`24`	`}`
`@@ -1086,7 +1086,7 @@ void LegacyScriptPubKeyMan::AddKeypoolPubkeyWithDB(const CPubKey& pubkey, const`
`1086`	`1086`	`m_pool_key_to_index[pubkey.GetID()] = index;`
`1087`	`1087`	`}`
`1088`	`1088`
`1089`		`-void LegacyScriptPubKeyMan::KeepDestination(int64_t nIndex)`
	`1089`	`+void LegacyScriptPubKeyMan::KeepDestination(int64_t nIndex, const OutputType& type, const CPubKey& pubkey)`
`1090`	`1090`	`{`
`1091`	`1091`	`// Remove from key pool`
`1092`	`1092`	`WalletBatch batch(m_storage.GetDatabase());`
`@@ -1112,7 +1112,7 @@ void LegacyScriptPubKeyMan::ReturnDestination(int64_t nIndex, bool fInternal, co`
`1112`	`1112`	`WalletLogPrintf("keypool return %d\n", nIndex);`
`1113`	`1113`	`}`
`1114`	`1114`
`1115`		`-bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, bool internal)`
	`1115`	`+bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, const OutputType type, bool internal)`
`1116`	`1116`	`{`
`1117`	`1117`	`if (!CanGetAddresses(internal)) {`
`1118`	`1118`	`return false;`
`@@ -1128,7 +1128,7 @@ bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, bool internal)`
`1128`	`1128`	`result = GenerateNewKey(batch, internal);`
`1129`	`1129`	`return true;`
`1130`	`1130`	`}`
`1131`		`- KeepDestination(nIndex);`
	`1131`	`+ KeepDestination(nIndex, type, keypool.vchPubKey);`
`1132`	`1132`	`result = keypool.vchPubKey;`
`1133`	`1133`	`}`
`1134`	`1134`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -3317,7 +3317,7 @@ bool ReserveDestination::GetReservedDestination(CTxDestination& dest, bool inter`
`3317`	`3317`	`void ReserveDestination::KeepDestination()`
`3318`	`3318`	`{`
`3319`	`3319`	`if (nIndex != -1) {`
`3320`		`- m_spk_man->KeepDestination(nIndex);`
	`3320`	`+ m_spk_man->KeepDestination(nIndex, type, vchPubKey);`
`3321`	`3321`	`m_spk_man->LearnRelatedScripts(vchPubKey, type);`
`3322`	`3322`	`}`
`3323`	`3323`	`nIndex = -1;`