fanquake 4ee8a58ce7
Merge #17373: wallet: Various fixes and cleanup to keypool handling in LegacyScriptPubKeyMan and CWallet
886f1731bec4393dd342403ac34069a3a4f95eea Key pool: Fix omitted pre-split count in GetKeyPoolSize (Andrew Chow)
386a994b853bc5b3a2ed0d812673465b8ffa4849 Key pool: Change ReturnDestination interface to take address instead of key (Andrew Chow)
ba41aa4969169cd73d6b4f57444ed7d8d875de10 Key pool: Move LearnRelated and GetDestination calls (Andrew Chow)
65833a74076cddf986037c6eb3b29a9b9dbe31c5 Add OutputType and CPubKey parameters to KeepDestination (Andrew Chow)
9fcf8ce7ae02bf170b9bf0c2887fd709d752cbf7 Rename Keep/ReturnKey to Keep/ReturnDestination and remove the wrapper (Andrew Chow)
596f6460f9fd8273665c8754ccd673d93a4f25f0 Key pool: Move CanGetAddresses call (Andrew Chow)

Pull request description:

  * The `pwallet->CanGetAddresses()` call in `ReserveDestination::GetReservedDestination` to `LegacyScriptPubKeyMan::GetReservedDestination` so that the sanity check results in a failure when a `ScriptPubKeyMan` individually cannot get a destination, not when any of the `ScriptPubKeyMan`s can't.
  * `ScriptPubKeyMan::GetReservedDestination` is changed to return the destination so that future `ScriptPubKeyMan`s can return destinations constructed in other ways. This is implemented for `LegacyScriptPubKeyMan` by moving key-to-destination code from `CWallet` to `LegacyScriptPubKeyMan`
  * In order for `ScriptPubKeyMan` to be generic and work with future `ScriptPubKeyMan`s, `ScriptPubKeyMan::ReturnDestination` is changed to take a `CTxDestination` instead of a `CPubKey`. Since `LegacyScriptPubKeyMan` still deals with keys internally, a new map `m_reserved_key_to_index` is added in order to track the keypool indexes that have been reserved.
  * A bug is fixed in how the total keypool size is calculated as it was omitting `set_pre_split_keypool` which is a bug.

  Split from #17261

ACKs for top commit:
  ryanofsky:
    Code review ACK 886f1731bec4393dd342403ac34069a3a4f95eea. Only change is moving earlier fix to a better commit (same end result).
  promag:
    Code review ACK 886f1731bec4393dd342403ac34069a3a4f95eea.
  instagibbs:
    code review re-ACK 886f1731be
  Sjors:
    Code review re-ACK 886f1731bec4393dd342403ac34069a3a4f95eea

Tree-SHA512: f4be290759f63fdc920d5c02bd0d09acc4b06a5f053787d4afcd3c921b2e35d2bd97617fadae015da853dc189f559fb8d2c6e58d53e4cabfac9af151cd97ad19
2019-12-06 13:37:30 -05:00
..
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-30 16:24:02 -04:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-09-25 20:56:38 +02:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-02-22 17:38:45 -08:00
2019-02-22 17:38:45 -08:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-11-04 04:22:53 -05:00
2019-10-02 10:39:14 -04:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-12-05 09:49:11 -08:00
2019-12-05 09:49:11 -08:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-09-25 10:56:00 -04:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00