diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-11-06 17:14:45 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-11-06 17:28:58 +0100 |
| commit | 976cc766c42889b6d1042e4cda39045d5001f406 (patch) | |
| tree | 38928f7ce775406e08107a1403032aa870aecbb5 /src/Makefile.leveldb.include | |
| parent | 6f4e2473579168dffd46d54fa1eedd287395200b (diff) | |
| parent | 05b224a175065aee4d6d9c471722bc4503f01fdf (diff) | |
Merge #17381: LegacyScriptPubKeyMan code cleanups
05b224a175065aee4d6d9c471722bc4503f01fdf Add missing SetupGeneration error handling in EncryptWallet (Russell Yanofsky)
bfd826a675445801adec86a469040f3ceb8172ee Clean up nested scope in GetReservedDestination (Russell Yanofsky)
491a599b37f3e3a648e52aebed677ca11b0615e2 Get rid of confusing LegacyScriptPubKeyMan::TopUpKeyPool method (Russell Yanofsky)
4a0abf694ee10cf186f25a67ca35c3fce0c10874 Pass CTxDestination to ScriptPubKeyMan::GetMetadata (Russell Yanofsky)
b07b07cd8779355ba1dd16e7eb4af42e0ae1c587 Add EnsureLegacyScriptPubKeyMan and use in rpcwallet.cpp (Russell Yanofsky)
Pull request description:
This PR implements suggested code cleanups from #17300 and #17304 review comments
ACKs for top commit:
Sjors:
re-ACK 05b224a
laanwj:
Code review ACK 05b224a175065aee4d6d9c471722bc4503f01fdf
Tree-SHA512: 12fd86637088515b744c028e0501c5d21a9cf9ee9c9cfd70e9cb65d44611ea5643abd5f6f101105caa5aff015d74de606f074f08af7dae8429f929d21288ab45
Diffstat (limited to 'src/Makefile.leveldb.include')
0 files changed, 0 insertions, 0 deletions