Andrew Poelstra
59aa4e1fba
Merge ad2952d17a into merged_master (Bitcoin PR #19604 )
2020-11-26 22:45:20 +00:00
Andrew Poelstra
12f11f8f70
Merge 2f71a1ea35 into merged_master (Bitcoin PR #18637 )
2020-11-26 20:30:20 +00:00
Andrew Poelstra
21f9f41bf4
Merge a1da180b1b into merged_master (Bitcoin PR #19589 )
2020-11-26 19:33:53 +00:00
Andrew Poelstra
e547a98b54
Merge ccef10261e into merged_master (Bitcoin PR #18044 )
2020-11-26 17:01:52 +00:00
Andrew Poelstra
f0f5ff0efe
Merge 1397afc5ec into merged_master (Bitcoin PR #19526 )
2020-11-26 15:55:30 +00:00
Andrew Poelstra
16a46e7c34
Merge 65a54d684f into merged_master (Bitcoin PR #18984 )
2020-11-26 14:41:58 +00:00
Andrew Poelstra
2efdcca333
Merge b26d62c49a into merged_master (Bitcoin PR #18990 )
2020-11-26 03:22:29 +00:00
Andrew Poelstra
7fabb1de9a
Merge 5ec19df687 into merged_master (Bitcoin PR #19277 )
2020-11-26 01:09:19 +00:00
Andrew Poelstra
8e770d3f21
Merge 915ac8a861 into merged_master (Bitcoin PR #19413 )
2020-11-26 01:09:19 +00:00
Andrew Poelstra
c473bf0bce
Merge bb588669f9 into merged_master (Bitcoin PR #19331 )
2020-11-26 01:09:16 +00:00
Andrew Poelstra
a4f01a718d
Merge 8edfc1715a into merged_master (Bitcoin PR #19204 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
99d485db22
Merge 39bd9ddb87 into merged_master (Bitcoin PR #19295 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
082754d60d
Merge 4b30c41b4e into merged_master (Bitcoin PR #18927 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
440e85cbdb
Merge 371a73e940 into merged_master (Bitcoin PR #19233 )
2020-11-26 01:09:02 +00:00
Andrew Poelstra
e92d54175b
Merge a79bca2f1f into merged_master (Bitcoin PR #19069 )
2020-11-26 01:09:01 +00:00
Andrew Poelstra
0a5760376f
Merge 1b90a7b61a into merged_master (Bitcoin PR #19005 )
2020-11-26 01:09:00 +00:00
Andrew Poelstra
f1891dd855
Merge 011fe009f9 into merged_master (Bitcoin PR #17994 )
2020-11-26 01:08:58 +00:00
Andrew Poelstra
ff4bfc81c9
Merge 584170a388 into merged_master (Bitcoin PR #19142 )
2020-11-26 01:08:58 +00:00
Andrew Poelstra
7ffe113cd9
Merge a1c0e5fce1 into merged_master (Bitcoin PR #19088 )
2020-11-26 01:08:57 +00:00
Andrew Poelstra
4d1d393cd6
Merge 9e8bd217cd into merged_master (Bitcoin PR #13204 )
2020-11-26 01:08:56 +00:00
Andrew Poelstra
531cdf3ca5
Merge 826fe9c667 into merged_master (Bitcoin PR #18807 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
29b17c1221
Merge 793e0ff22c into merged_master (Bitcoin PR #18698 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
0903cd4bc7
Merge d44dd51322 into merged_master (Bitcoin PR #18152 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
1d1a32e637
Merge 5b24f6084e into merged_master (Bitcoin PR #16224 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
028afdac4a
Merge e727c2bdca into merged_master (Bitcoin PR #18088 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
8c572c898e
Merge 42fd503819 into merged_master (Bitcoin PR #18786 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
0a22e1a6e6
Merge 64673b1037 into merged_master (Bitcoin PR #18780 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
e5f1b2cdaa
Merge 0ef0d33f75 into merged_master (Bitcoin PR #18038 )
2020-11-26 01:08:33 +00:00
Andrew Poelstra
22cee70001
Merge 9fac600aba into merged_master (Bitcoin PR #17383 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
89c3236c58
Merge 9e8e813df5 into merged_master (Bitcoin PR #18410 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
1b585cf0c3
Merge e16718a8b3 into merged_master (Bitcoin PR #18401 )
2020-11-26 01:08:21 +00:00
Andrew Poelstra
9ce236f051
Merge 10358a381a into merged_master (Bitcoin PR #17737 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
cf93edb0be
Merge 312d27b11c into merged_master (Bitcoin PR #17477 )
2020-11-26 01:07:59 +00:00
Andrew Poelstra
76d5966b9d
Merge 39497d1f32 into merged_master (Bitcoin PR #15283 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
c718f86e8f
Merge 9ed429c50a into merged_master (Bitcoin PR #18341 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
5b9f316537
Merge dcf2ccbfde into merged_master (Bitcoin PR #18115 )
...
I really like this PR, but it wound up being pretty nontrivial to merge.
The crux is that it pulls PSBT signing logic into scriptpubkey manager,
which is where it belongs, but for us this means reasoning about pegins
inside script/sign.cpp.
However, sign.cpp is part of libbitcoin_common, which does not include
anything for reasoning about PoW or RPC (lol) or anything heavy about
that. This means that some pegin validation had to remain split between
the wallet/rpc layer and sign.cpp. I added a new file script/pegins.cpp
which has the (one) method we actually need in sign.cpp.
Aside from that, this diff is very large but is mostly just moving our
code changes to wallet/psbtwallet.* into wallet/wallet.* where those
functions now live. As far as review, it's probably not worthwhile to
spend too much too much time on this since it's going to be change
again in #16528 and others. The test coverage is pretty extensive.
2020-11-26 01:07:51 +00:00
Andrew Poelstra
cc668250eb
Merge 97aadf98d0 into merged_master (Bitcoin PR #16117 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
0246b86872
Merge 54a7ef612a into merged_master (Bitcoin PR #17399 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
66204f061c
Merge c0e0e0a9d5 into merged_master (Elements PR #818 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
fdf8be76de
Merge 651e343888 into merged_master (Bitcoin PR #16974 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
3f3d6f9c98
Merge 2ed74a43a0 into merged_master (Bitcoin PR #16945 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
c4e2622681
Merge 3f8dbcd655 into merged_master (Bitcoin PR #16658 )
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
8746cbf50b
Merge a739d207a3 into merged_master (Bitcoin PR #17519 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
cfde15703a
Merge 99ab3a72c5 into merged_master (Bitcoin PR #15931 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
3f2190d870
Merge 7d14e35f3f into merged_master (Bitcoin PR #17342 )
2020-11-09 23:10:08 +00:00
Andrew Poelstra
85feb8aadb
Merge 40b6070ad7 into merged_master (Bitcoin PR #16805 )
2020-11-09 21:20:53 +00:00
Andrew Poelstra
c82f65f262
Merge 73b26e38d7 into merged_master (Bitcoin PR #17351 )
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
