Andrew Poelstra
84bc0faf8f
Merge bbc9e4133c into merged_master (Bitcoin PR #17304 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
a2a3f277d9
Merge fba574c908 into merged_master (Bitcoin PR #17349 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
e9aed1d9c3
Merge def69e5a86 into merged_master (Bitcoin PR #17233 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
3cb664e64e
Merge 5933c6d924 into merged_master (Bitcoin PR #17228 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
c82f65f262
Merge 73b26e38d7 into merged_master (Bitcoin PR #17351 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
fd59ffef84
Merge 91fbcf41b3 into merged_master (Bitcoin PR #16110 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
7ad62f5527
Merge c4b8dd2060 into merged_master (Bitcoin PR #17297 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
b607d68347
Merge 463eab5e14 into merged_master (Bitcoin PR #17285 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
6baeb70134
Merge 9641366950 into merged_master (Bitcoin PR #17293 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
c89653aa74
Merge a5224be645 into merged_master (Bitcoin PR #17292 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
da284da31b
Merge 5021ef8d7f into merged_master (Bitcoin PR #17254 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
cd3935c4c9
Merge c737839471 into merged_master (Bitcoin PR #17309 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
9022af204b
Merge 3f8d95500d into merged_master (Bitcoin PR #17345 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
3875efaaa2
Merge 6a7c40bee4 into merged_master (Bitcoin PR #15888 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
878a2af564
Merge 0e6cae0248 into merged_master (Bitcoin PR #17284 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
5f236f427b
Merge bc3fcf3c0d into merged_master (Bitcoin PR #17327 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
ac3508f893
Merge 90a2341713 into merged_master (Bitcoin PR #17218 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
5a9ac1eebb
Merge ddd46293bd into merged_master (Bitcoin PR #17324 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
90385214cc
Merge b54666c849 into merged_master (Bitcoin PR #17286 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
971870ffd5
Merge 462fbcd212 into merged_master (Bitcoin PR #17325 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
a19375575a
Merge 222b7d0ca7 into merged_master (Bitcoin PR #17330 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
d472d58b7b
Merge 811c381ab6 into merged_master (Bitcoin PR #17329 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
751d0ac9f4
Merge 100fa0a62a into merged_master (Bitcoin PR #17300 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
aa35f89d18
Merge 1c5e0ccaba into merged_master (Bitcoin PR #17274 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
5a1affb94d
Merge feb1a8c03a into merged_master (Bitcoin PR #17308 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
9d15047222
Merge 08e2947312 into merged_master (Bitcoin PR #17316 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
1f56eedcbb
Merge a6abc94e93 into merged_master (Bitcoin PR #17281 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
bde84fefc4
Merge 3c40bc6726 into merged_master (Bitcoin PR #15921 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
cda20329e8
Merge cab94cc074 into merged_master (Bitcoin PR #16943 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
0aba8c6168
Merge 341e8d355d into merged_master (Bitcoin PR #17291 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
74509094d0
Merge edd9d0781b into merged_master (Bitcoin PR #17302 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
34af974d28
Merge 471e5f8829 into merged_master (Bitcoin PR #16839 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
d4adfa0935
Merge f129170b85 into merged_master (Bitcoin PR #17306 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
dae1f5cf3c
Merge 6daddc4495 into merged_master (Bitcoin PR #17282 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
578080081e
Merge 5728f88d64 into merged_master (Bitcoin PR #17280 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
938ab0a100
Merge ecad0a8019 into merged_master (Bitcoin PR #17299 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
e910b15aa8
Merge 6a97e8a060 into merged_master (Bitcoin PR #17260 ) (multiple commits)
...
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.
2020-11-09 21:20:47 +00:00
Andrew Poelstra
e03eb1d06b
Merge b334392946 into merged_master (Elements PR #758 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
fdb06a8ceb
Merge 4c1090c882 into merged_master (Bitcoin PR #17279 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
61e1882a27
Merge 1ff3a39d11 into merged_master (Elements PR #753 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
bb87204b71
Merge cfec3e01b4 into merged_master (Bitcoin PR #17266 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
e4c2f57d04
Merge 5e89a52087 into merged_master (Elements PR #754 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
13b40a4d10
Merge 1ab6c1267e into merged_master (Bitcoin PR #16986 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
5a84d5f5b5
Merge badca85e2c into merged_master (Bitcoin PR #16202 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
935460299b
Merge f8cc2b967b into merged_master (Bitcoin PR #17267 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
3d8a03ea9d
Merge a25945318f into merged_master (Bitcoin PR #17250 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
839ad47472
Merge 9ae468a6d5 into merged_master (Bitcoin PR #17192 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
8ced8eb1eb
Merge be50469217 into merged_master (Bitcoin PR #17257 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
3feea6cb08
Merge 9bd109b78d into merged_master (Bitcoin PR #17120 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
2ffbc7f993
Merge 3f875744cb into merged_master (Bitcoin PR #17249 )
2020-11-09 21:20:45 +00:00
