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
Andrew Poelstra
f545456f6b
Merge e9f73b839a into merged_master (Bitcoin PR #17135 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
466ecf5506
Merge d91af4768c into merged_master (Bitcoin PR #17165 )
...
This commit removes BIP70 support. Since this was the only thing our
payment sernver supported (we had previously dropped support for
bitcoin: urls) I also dropped all the paymentrequest logic.
2020-11-09 21:20:45 +00:00
Andrew Poelstra
b4f4ae8546
Merge 25d7e2e781 into merged_master (Bitcoin PR #17251 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
b934ca85dd
Merge 693e40090a into merged_master (Bitcoin PR #17083 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
88a7e99a91
Merge 48cb468ce3 into merged_master (Bitcoin PR #17242 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
40ecb1c962
Merge 37855ec9df into merged_master (Bitcoin PR #17220 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
234994b810
Merge 90ed98ae9a into merged_master (Bitcoin PR #17080 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
6dd1fa4d71
Merge 366753e46e into merged_master (Bitcoin PR #17231 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
c6f0d807b0
Merge fce7c75422 into merged_master (Bitcoin PR #16851 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
a5b17734e9
Merge 773026044f into merged_master (Bitcoin PR #17212 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
e876859985
Merge 4af0447169 into merged_master (Bitcoin PR #17240 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
1f76aeb999
Merge d7134ead84 into merged_master (Bitcoin PR #17239 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
70b8b429e4
Merge d53828cb79 into merged_master (Bitcoin PR #17235 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
79f0419cae
Merge 205cffaf38 into merged_master (Bitcoin PR #17226 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
fc2108d672
Merge 8a191148db into merged_master (Bitcoin PR #17154 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
50b581188b
Merge c5ac7af779 into merged_master (Bitcoin PR #17206 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
24ca3f2864
Merge deb2327b43 into merged_master (Bitcoin PR #17018 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
6490a104e1
Merge 8f14d2002b into merged_master (Bitcoin PR #17183 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
da8069b810
Merge a884b32854 into merged_master (Bitcoin PR #16911 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
667108ad77
Merge ceda6e8b74 into merged_master (Bitcoin PR #17180 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
371868fdac
Merge 4258fd7377 into merged_master (Bitcoin PR #17091 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
a608f9840c
Merge 9dd6bbba61 into merged_master (Bitcoin PR #17209 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
c20d5e8e7a
Merge 4aaeb04497 into merged_master (Bitcoin PR #17205 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
42a1dc16a6
Merge a22b62481a into merged_master (Bitcoin PR #17070 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
2655d0f951
Merge a75cb122ed into merged_master (Bitcoin PR #17195 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
605163ef88
Merge fc1040acc0 into merged_master (Bitcoin PR #17176 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
4455342bfc
Merge 0d6b6b7c65 into merged_master (Bitcoin PR #17191 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
c08bbefb33
Merge 0d7e8d66c4 into merged_master (Bitcoin PR #17203 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
1c54f0daf5
Merge b8f041af2d into merged_master (Bitcoin PR #17157 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
db225166af
Merge b6e34afe97 into merged_master (Bitcoin PR #17184 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
ea1bb86ec7
Merge fd3b4e422d into merged_master (Bitcoin PR #16949 )
2020-11-09 21:20:42 +00:00
