Andrew Poelstra
2d35bebf6b
Merge 3516a31eaa into merged_master (Bitcoin PR #18234 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
60e037bb94
Merge 45cdcd47d9 into merged_master (Bitcoin PR #18126 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
cad0fb9200
Merge a2a77ba34f into merged_master (Bitcoin PR #18056 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
cdeb19ce22
Merge 088604221b into merged_master (Bitcoin PR #18253 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
47d76259bf
Merge 22d11187ee into merged_master (Bitcoin PR #17398 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
a0298bba14
Merge 02fafdd12c into merged_master (Bitcoin PR #18060 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
ea713d1c99
Merge f05c1ac444 into merged_master (Bitcoin PR #17937 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
33564b8849
Merge cadb9d3342 into merged_master (Bitcoin PR #18036 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
7500590938
Merge 7fcaa8291c into merged_master (Bitcoin PR #18009 )
2020-11-14 18:13:04 +00:00
Andrew Poelstra
91e195d7cd
Merge 2d6e76af24 into merged_master (Bitcoin PR #17261 )
...
Moved GetOnlinePakKey to the scriptpubkey manager; the other blinding
stuff remains in the CWallet. At some point after the rebase we should
consider whether there's a better separation to be had between the PAK
related stuff now that we have wallet boxes.
2020-11-14 17:16:10 +00:00
Andrew Poelstra
1b7df1d514
Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
bf82cc6a32
Merge e7f8450357 into merged_master (Bitcoin PR #16688 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
a936f8e538
Merge 816464198c into merged_master (Bitcoin PR #17851 )
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
f3ec9fa522
Merge 7da9e3a817 into merged_master (Bitcoin PR #17050 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
b4d7d9d503
Merge 1f59885d27 into merged_master (Bitcoin PR #17361 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
7a8b5877f2
Merge 9cbd87d8ee into merged_master (Bitcoin PR #17518 )
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
23e022906c
Merge 22a58811d4 into merged_master (Bitcoin PR #17353 )
2020-11-09 23:10:07 +00:00
Andrew Poelstra
00d30ddc6c
Merge 94a26b192f into merged_master (Bitcoin PR #17318 )
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
d472d58b7b
Merge 811c381ab6 into merged_master (Bitcoin PR #17329 )
2020-11-09 21:20:49 +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
605163ef88
Merge fc1040acc0 into merged_master (Bitcoin PR #17176 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
cf2b6f2fb7
Merge 556820ee57 into merged_master (Bitcoin PR #17009 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
6a5ea9af4e
Merge 2fe6c185a6 into merged_master (Bitcoin PR #16988 )
...
Massive automated translation-update PR. I just blindly took Core's updates for
everything. We should re-run this after the rebase to add translations for all
the new Elements stuff.
2020-11-09 21:20:30 +00:00
Andrew Poelstra
065f0f7e86
Merge 4c4ff4911a into merged_master (Bitcoin PR #16961 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
e7e7cff7c7
Merge 04321494ae into merged_master (Bitcoin PR #16921 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
b11de4e489
Merge cfcaa9759e into merged_master (Bitcoin PR #16907 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
eb174d36e9
Merge 45be44cce4 into merged_master (Bitcoin PR #15257 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
eb92b1779c
Merge 761fe07ba9 into merged_master (Bitcoin PR #16768 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
0bb6bd229c
Merge 495db72ee7 into merged_master (Bitcoin PR #16767 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
39d8aa865c
Merge cc40b55da7 into merged_master (Bitcoin PR #16726 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
b81a29337a
Merge b80cdfec9a into merged_master (Bitcoin PR #16618 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
a825f2c9ef
Merge 8bd5e0af99 into merged_master (Bitcoin PR #16465 )
2020-11-09 21:20:14 +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
f245eedfcc
Merge 345f42a9e3 into merged_master (Bitcoin PR #14505 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
15f0fb459f
Merge 4882040182 into merged_master (Bitcoin PR #16291 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
13fa126076
Merge 1088b90cba into merged_master (Bitcoin PR #16327 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
f68fbc1a56
Merge fd333e15a5 into merged_master (Bitcoin PR #16226 )
2020-11-06 15:20:16 +00:00
Andrew Poelstra
e33ff205ee
Merge 1a274bce4b into merged_master (Bitcoin PR #16205 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
413732c74d
Merge 47d981e827 into merged_master (Bitcoin PR #16186 )
2020-11-06 15:20:14 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
aa14b2afe0
Merge d3a1c2502b into merged_master (Bitcoin PR #16124 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
2de107dab3
Merge bb291b50f2 into merged_master (Bitcoin PR #16021 )
2020-10-29 20:24:37 +00:00
Andrew Poelstra
c1dde3c8f8
Merge 41f4c63b38 into merged_master (Bitcoin PR #16036 )
2020-10-29 17:58:13 +00:00
Andrew Poelstra
2ec1b95fe8
Merge 67caf2d1db into merged_master (Bitcoin PR #15920 )
2020-10-29 02:04:54 +00:00
