Andrew Poelstra
5bbbba1ce1
Merge 4d80274b99 into merged_master (Bitcoin PR #18241 )
2020-11-26 01:07:50 +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
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
bf7738a5c8
Merge 6196e93001 into merged_master (Bitcoin PR #16963 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
c7a29c2228
Merge f9fd3a27fd into merged_master (Bitcoin PR #17750 )
2020-11-14 16:52:00 +00:00
Andrew Poelstra
4219b6d7d9
Merge 48d64d73c0 into merged_master (Bitcoin PR #17564 )
2020-11-14 16:51:59 +00:00
Andrew Poelstra
ba08079170
Merge 0aa72061e5 into merged_master (Bitcoin PR #16944 )
2020-11-14 16:51:47 +00:00
Andrew Poelstra
9239882c43
Merge 8aac85d71e into merged_master (Bitcoin PR #17371 )
2020-11-14 16:51:41 +00:00
Andrew Poelstra
c1d327d827
Merge 4a3b6f47cd into merged_master (Bitcoin PR #17354 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
cfde15703a
Merge 99ab3a72c5 into merged_master (Bitcoin PR #15931 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
7ad62f5527
Merge c4b8dd2060 into merged_master (Bitcoin PR #17297 )
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
34af974d28
Merge 471e5f8829 into merged_master (Bitcoin PR #16839 )
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
3d8a03ea9d
Merge a25945318f into merged_master (Bitcoin PR #17250 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
fc2108d672
Merge 8a191148db into merged_master (Bitcoin PR #17154 )
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
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
2640e37921
Merge a3af5b5c13 into merged_master (Bitcoin PR #17138 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
a7df99d033
Merge e180be49d7 into merged_master (Bitcoin PR #17098 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
1b3ae6c58b
Merge fecc1be231 into merged_master (Bitcoin PR #16884 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
046f6550c3
Merge 884f7cc81b into merged_master (Bitcoin PR #16714 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
f3a64d1877
Merge b5a8d0cff1 into merged_master (Bitcoin PR #15450 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
29e73c226a
Merge 5e202382a9 into merged_master (Bitcoin PR #16624 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
7ce3241549
Merge 66c5045d5a into merged_master (Elements PR #693 )
...
Fixes bug I mentioned when merging Bitcoin #16415
2020-11-09 21:20:20 +00:00
Andrew Poelstra
028f2d94d1
Merge 85883a9f8e into merged_master (Bitcoin PR #16443 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
766d79d33f
Merge 9ab9d63569 into merged_master (Bitcoin PR #16503 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
84f1ef4b01
Merge 31d98584f3 into merged_master (Bitcoin PR #16497 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
c14d13f7fe
Merge be0e8b4bff into merged_master (Bitcoin PR #15713 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
293823aa7a
Merge 7821821a23 into merged_master (Bitcoin PR #16452 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
0888ad0cf3
Merge 1139e3cb76 into merged_master (Bitcoin PR #16415 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
4619326139
Merge 67923d6b3c into merged_master (Bitcoin PR #16366 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
152198061a
Merge 459baa1756 into merged_master (Bitcoin PR #16208 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
a50b652932
Merge 735d6b57e7 into merged_master (Bitcoin PR #16227 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
0065d674a4
Merge 8d1286014c into merged_master (Bitcoin PR #16237 )
...
I'm sorry, this should have been a few commits, but it got away from me
as the scope of this refactoring was not immediately obvious. It essentially
just moves code around so hopefully is not too hard to review. --asp
2020-11-09 03:58:21 +00:00
Andrew Poelstra
f245eedfcc
Merge 345f42a9e3 into merged_master (Bitcoin PR #14505 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
f68fbc1a56
Merge fd333e15a5 into merged_master (Bitcoin PR #16226 )
2020-11-06 15:20:16 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
cb15f46946
Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
c6ad410dd9
Merge a6beb256ed into merged_master (Elements PR #629 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
5ecb077261
Merge 65c4bbe629 into merged_master (Bitcoin PR #16034 )
2020-10-29 21:44:47 +00:00
Andrew Poelstra
4c663b631a
Merge f3d27d126b into merged_master (Bitcoin PR #16033 )
2020-10-29 19:10:55 +00:00
Andrew Poelstra
5cb1c16c7d
Merge d5931f3676 into merged_master (Bitcoin PR #15870 )
2020-10-29 18:02:26 +00:00
Andrew Poelstra
f6f2aefae3
Merge 40c66bb3d1 into merged_master (Bitcoin PR #15855 )
2020-10-29 16:50:16 +00:00
Andrew Poelstra
c91184f6c2
Merge b2a6b02161 into merged_master (Bitcoin PR #15948 )
2020-10-29 02:36:55 +00:00
Andrew Poelstra
4c22d34cd1
Merge 0936f35f65 into merged_master (Bitcoin PR #15842 )
2020-10-29 02:07:15 +00:00
Andrew Poelstra
ad0dc00fc2
Merge 3356799ee3 into merged_master (Bitcoin PR #15778 )
2020-10-28 23:22:29 +00:00
Andrew Poelstra
ad7eb71596
Merge 56376f3365 into merged_master (Bitcoin PR #15670 )
2020-10-28 20:53:16 +00:00
Andrew Poelstra
1c4e3cbb5f
Merge 4f4ef3138b into merged_master (Bitcoin PR #15557 )
...
This restricts the `bumpfee` RPC, when given a feerate target, to unblinded
transactions, because this is the only way I could figure out quickly to
allow adding inputs to an already-created transaction. It appears to be the
strategy used by the `fundrawtransaction` RPC which has similar behaviour.
This should be fixed in a followup PR.
2020-10-28 15:36:05 +00:00
