Andrew Poelstra
7187ea2de7
Merge 3f1966ead6 into merged_master (Bitcoin PR #17705 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
f3ec9fa522
Merge 7da9e3a817 into merged_master (Bitcoin PR #17050 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
c9585d0fde
Merge 3d6752779f into merged_master (Bitcoin PR #17633 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
9709d02c23
Merge fae94785d9 into merged_master (Bitcoin PR #17524 )
...
lol converting the psbt test vector to a pset one was pretty brutal. Conversion to
hex using rust-bitcoin and then manual hex-editing in vim.
2020-11-14 16:51:56 +00:00
Andrew Poelstra
0f9ee77fe1
Merge 1189b6acab into merged_master (Bitcoin PR #17109 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
f68c3ea229
Merge 347dd76ec8 into merged_master (Bitcoin PR #17093 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
11487538e9
Merge df2b743759 into merged_master (Bitcoin PR #17675 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
c59a715d27
Merge cb11324a63 into merged_master (Bitcoin PR #17051 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
96822eee94
Merge 910a4301b1 into merged_master (Bitcoin PR #17522 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
0c0b496469
Merge 5aee0e2163 into merged_master (Bitcoin PR #17650 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
c7bf5baf96
Merge 526e802d69 into merged_master (Elements PR #755 )
...
This Elements PR includes components of Core PR #17211 , which since the
refactors to use effective value landed, no longer provides the right
error message when a user provides an unowned input from a wallet tx.
See https://github.com/bitcoin/bitcoin/pull/17211#pullrequestreview-528389011
This breaks a functional test which was included in this PR, but which
conveniently has been changed in the current version of the Core PR. I
fixed the behavior (commented, in SelectCoins) rather than updating the
test to the most recent version.
2020-11-14 16:51:53 +00:00
Andrew Poelstra
5a48ca16e3
Merge fee01bb053 into merged_master (Bitcoin PR #17517 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
fd78a12518
Merge 2949ea924f into merged_master (Elements PR #751 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
c3c860b38a
Merge 69ca6cdd66 into merged_master (Bitcoin PR #17599 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
05bbc1a822
Merge 2b6575d989 into merged_master (Bitcoin PR #17643 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
27de4bdecf
Merge 19698ac6bc into merged_master (Bitcoin PR #17568 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
b4d7d9d503
Merge 1f59885d27 into merged_master (Bitcoin PR #17361 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
6a5fc1dd58
Merge d8a66626d6 into merged_master (Bitcoin PR #17283 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
cc2097087c
Merge dd1478870c into merged_master (Elements PR #791 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
569c46ca22
Merge 6d00035cae into merged_master (Elements PR #778 )
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
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
