diff options
author | Andrew Chow <achow101-github@achow101.com> | 2020-05-21 23:01:24 -0400 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2020-05-21 23:01:24 -0400 |
commit | d9cd095b5965fc20c09f401370e7ba99446663e3 (patch) | |
tree | bb636e1c40f3fca52652f365987a9d99b396b88d /src/wallet/wallet.h | |
parent | 0122fbab4c340b23ae56173de6c5ab866ba25ab8 (diff) | |
download | bitcoin-d9cd095b5965fc20c09f401370e7ba99446663e3.tar.xz |
Split SetActiveScriptPubKeyMan into Add/LoadActiveScriptPubKeyMan
Remove the memonly bool and follow the Add and Load pattern we use
everywhere else.
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r-- | src/wallet/wallet.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 9d312e8ee5..e55257bd5d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1252,12 +1252,17 @@ public: //! Instantiate a descriptor ScriptPubKeyMan from the WalletDescriptor and load it void LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc); - //! Sets the active ScriptPubKeyMan for the specified type and internal + //! Adds the active ScriptPubKeyMan for the specified type and internal. Writes it to the wallet file //! @param[in] id The unique id for the ScriptPubKeyMan //! @param[in] type The OutputType this ScriptPubKeyMan provides addresses for //! @param[in] internal Whether this ScriptPubKeyMan provides change addresses - //! @param[in] memonly Whether to record this update to the database. Set to true for wallet loading, normally false when actually updating the wallet. - void SetActiveScriptPubKeyMan(uint256 id, OutputType type, bool internal, bool memonly = false); + void AddActiveScriptPubKeyMan(uint256 id, OutputType type, bool internal); + + //! Loads an active ScriptPubKeyMan for the specified type and internal. (used by LoadWallet) + //! @param[in] id The unique id for the ScriptPubKeyMan + //! @param[in] type The OutputType this ScriptPubKeyMan provides addresses for + //! @param[in] internal Whether this ScriptPubKeyMan provides change addresses + void LoadActiveScriptPubKeyMan(uint256 id, OutputType type, bool internal); //! Create new DescriptorScriptPubKeyMans and add them to the wallet void SetupDescriptorScriptPubKeyMans(); |