Andrew Poelstra
2c846f5fa3
Merge da3611a580 into merged_master (Elements PR #808 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
6f123becd3
Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115 )
2020-11-14 19:07:24 +00:00
Andrew Poelstra
77c8e6c2f6
Merge 01fc5891fb into merged_master (Bitcoin PR #16702 )
2020-11-14 16:52:13 +00:00
Andrew Poelstra
b00e322143
Merge 04f78b818f into merged_master (Bitcoin PR #17887 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
89471dda35
Merge e258ce792a into merged_master (Bitcoin PR #17907 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
bf82cc6a32
Merge e7f8450357 into merged_master (Bitcoin PR #16688 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
ebc31a85a2
Merge 190a4051fd into merged_master (Bitcoin PR #17762 )
2020-11-14 16:52:03 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
077355e651
Merge 6677be64f6 into merged_master (Bitcoin PR #17473 )
2020-11-14 16:52:01 +00:00
Andrew Poelstra
6b5ef039c0
Merge 03dfa36641 into merged_master (Bitcoin PR #17229 )
2020-11-14 16:52:00 +00:00
Andrew Poelstra
ba2897d87a
Merge 6b51cce65a into merged_master (Bitcoin PR #17753 )
2020-11-14 16:51:59 +00:00
Andrew Poelstra
dc8e2bcda2
Merge 995b6c83e1 into merged_master (Bitcoin PR #17721 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
84702646f3
Merge 23cecd6cd5 into merged_master (Bitcoin PR #17604 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
328949db01
Merge 6d4b97cb1c into merged_master (Bitcoin PR #17450 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
35020e3a32
Merge a7aec7ad97 into merged_master (Bitcoin PR #15934 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
b607d68347
Merge 463eab5e14 into merged_master (Bitcoin PR #17285 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
bde84fefc4
Merge 3c40bc6726 into merged_master (Bitcoin PR #15921 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
578080081e
Merge 5728f88d64 into merged_master (Bitcoin PR #17280 )
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
fdb06a8ceb
Merge 4c1090c882 into merged_master (Bitcoin PR #17279 )
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
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
db225166af
Merge b6e34afe97 into merged_master (Bitcoin PR #17184 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
4749945d77
Merge 0ff7cd7d0c into merged_master (Bitcoin PR #16889 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
f3f736f76d
Merge befdef8aee into merged_master (Bitcoin PR #16887 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
00efae6802
Merge b67ca4ee73 into merged_master (Bitcoin PR #17085 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
c32120ef8a
Merge 2f174498d6 into merged_master (Bitcoin PR #17073 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
c7dea73134
Merge 4715037796 into merged_master (Bitcoin PR #17038 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
e25e16c65e
Merge ccaef6c28b into merged_master (Bitcoin PR #16908 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
05d7c28bbc
Merge 6e4f655391 into merged_master (Bitcoin PR #16984 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
0003c1dd27
Merge 6e431296da into merged_master (Bitcoin PR #16745 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
3fd0c0af03
Merge 52b9797119 into merged_master (Bitcoin PR #16670 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
a191197ace
Merge 83112db129 into merged_master (Bitcoin PR #15864 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
f7d178679f
Merge 21a165325e into merged_master (Bitcoin PR #16620 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
527d180369
Merge b799ebcc17 into merged_master (Bitcoin PR #16566 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
9c3480fea9
Merge 3a3d8b8357 into merged_master (Bitcoin PR #16097 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
62ce823f8f
Merge c67ef2938c into merged_master (Elements PR #600 )
...
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
Andrew Poelstra
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
9fbf23d6f2
Merge 3dd46d1730 into merged_master (Elements PR #675 )
2020-11-09 21:19:26 +00:00
Andrew Poelstra
15f0fb459f
Merge 4882040182 into merged_master (Bitcoin PR #16291 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
f7cb3a9645
Merge f373beebbc into merged_master (Bitcoin PR #16344 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b
Merge 8c69fae944 into merged_master (Bitcoin PR #15457 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
969b50e413
Merge 1212808762 into merged_master (Bitcoin PR #16257 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
1c4217c939
Merge 935cd6b1ec into merged_master (Bitcoin PR #16300 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
e33ff205ee
Merge 1a274bce4b into merged_master (Bitcoin PR #16205 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
0267d06c6a
Merge 62efead8a8 into merged_master (Bitcoin PR #16046 )
2020-10-29 23:41:15 +00:00
