Merge 6a97e8a060 into merged_master (Bitcoin PR #17260) (multiple commits)

Browse source

This is the start of some nontrivial wallet refactoring by achow. See
https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Class-Structure-Changes
for a high-level design.

This PR moves some stuff out of CWallet into a dummy "box" LegacyScriptPubKeyMan
which is (currently) very tightly coulped to CWallet. Because of the coupling there
are currently null-checks that cannot fail, things which assume non-nullness which
will eventually be wrong, and a plethora of currently-equivalent ways to get from
a CWallet to a provider or back.

Our approach is basically to ignore the refactoring; leave the blinding key stuff
in CWallet and have it call into the wallet's provider when we are obtaining the
underlying keys.

Later, probably in a post-rebase PR, we should rethink how we manage blinding keys
to more closely match Core's "all keys go into providers" model.

...

This commit is contained in:

Andrew Poelstra 2020-11-09 21:20:47 +00:00

parent e03eb1d06b 6a97e8a060

commit e910b15aa8

24 changed files with 2218 additions and 1806 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1285

src/wallet/scriptpubkeyman.cpp Normal file

View file

File diff suppressed because it is too large Load diff