Andrew Poelstra
7a8b5877f2
Merge 9cbd87d8ee into merged_master (Bitcoin PR #17518 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
6da00c1830
Merge 4effd67bf4 into merged_master (Bitcoin PR #17387 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
f1f5409705
Merge bb862d7864 into merged_master (Bitcoin PR #14384 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
9fdb7c094a
Merge 69a6f1ad1f into merged_master (Bitcoin PR #17513 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
01f4eb2404
Merge 5ff798c39b into merged_master (Bitcoin PR #17439 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
2720aad76b
Merge 3671c5721d into merged_master (Bitcoin PR #17532 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
db065548fc
Merge b4a1da9ef8 into merged_master (Bitcoin PR #17515 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
4cc150cd4a
Merge e1df922132 into merged_master (Bitcoin PR #17497 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
f9acc8330d
Merge ca1eeba0b0 into merged_master (Bitcoin PR #17488 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
21cb153472
Merge 24647a09e7 into merged_master (Bitcoin PR #17470 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
d0e2b032a8
Merge 422ec33d45 into merged_master (Bitcoin PR #17322 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
2b6199bf17
Merge c7709cbf4c into merged_master (Bitcoin PR #17469 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
19ad9587c8
Merge ccf6697e3b into merged_master (Elements PR #780 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
90d5425abf
Merge 8237889e8d into merged_master (Bitcoin PR #17435 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
bce97903cf
Merge 1028882eea into merged_master (Bitcoin PR #17437 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
3613ae283d
Merge f60e0684d1 into merged_master (Elements PR #773 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
9f605a7f7c
Merge 270616228b into merged_master (Bitcoin PR #17362 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
111ab7d824
Merge e65b4160e9 into merged_master (Bitcoin PR #17340 )
2020-11-09 23:10:08 +00:00
Andrew Poelstra
23e022906c
Merge 22a58811d4 into merged_master (Bitcoin PR #17353 )
2020-11-09 23:10:07 +00:00
Andrew Poelstra
1d3555cdaf
Merge b05b28183c into merged_master (Bitcoin PR #16899 )
2020-11-09 21:20:53 +00:00
Andrew Poelstra
132dcf17c7
Merge 54a337478d into merged_master (Bitcoin PR #17378 )
2020-11-09 21:20:52 +00:00
Andrew Poelstra
c3b2f1d8c0
Merge bdda137878 into merged_master (Bitcoin PR #16766 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
47f60c4e53
Merge bfc4c896d6 into merged_master (Bitcoin PR #17258 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
7494bc176f
Merge bc38bb9a60 into merged_master (Bitcoin PR #17288 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
00d30ddc6c
Merge 94a26b192f into merged_master (Bitcoin PR #17318 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
b9140de11e
Merge 6cb10c14c6 into merged_master (Bitcoin PR #17199 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
c82f65f262
Merge 73b26e38d7 into merged_master (Bitcoin PR #17351 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
3875efaaa2
Merge 6a7c40bee4 into merged_master (Bitcoin PR #15888 )
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
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
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
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
61e1882a27
Merge 1ff3a39d11 into merged_master (Elements PR #753 )
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
839ad47472
Merge 9ae468a6d5 into merged_master (Bitcoin PR #17192 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +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
42a1dc16a6
Merge a22b62481a into merged_master (Bitcoin PR #17070 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
605163ef88
Merge fc1040acc0 into merged_master (Bitcoin PR #17176 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
18bd84d6b6
Merge 88eff969c2 into merged_master (Bitcoin PR #17177 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
4f50591181
Merge 0d2832a6d1 into merged_master (Elements PR #741 )
...
To resolve the `ConstructTransaction` conflict I reverted to the existing code
then manually applied the diff (it adds a parameter then adds a giant pile of
code to the input loop).
2020-11-09 21:20:40 +00:00
Andrew Poelstra
f0526100b7
Merge b117eb4c25 into merged_master (Elements PR #747 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
2f310a3a3e
Merge 029c65e04c into merged_master (Bitcoin PR #17141 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
8e5a97e8f0
Merge 06209ba03d into merged_master (Elements PR #709 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
6823c31c7c
Merge d6f304a462 into merged_master (Elements PR #684 )
...
This PR reduced the minrelayfee for Elements, but also brought in some
changes from upstream which I mostly just didn't take (since we've
already brought them in, in earlier parts of this rebase).
2020-11-09 21:20:39 +00:00
Andrew Poelstra
47ac162bbc
Merge b33c03b0cb into merged_master (Bitcoin PR #17124 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
5574cf1730
Merge 6c7da0736d into merged_master (Bitcoin PR #17108 )
2020-11-09 21:20:38 +00:00
