Commit graph

3088 commits

Author SHA1 Message Date
Andrew Poelstra
9a200a587e Merge 505b39e72b into merged_master (Bitcoin PR #19610) 2020-11-28 20:35:13 +00:00
Andrew Poelstra
ef13698934 Merge 48c1083632 into merged_master (Bitcoin PR #19105) 2020-11-28 20:18:13 +00:00
Andrew Poelstra
afe472121a Merge a1d14f522c into merged_master (Bitcoin PR #19671) 2020-11-28 19:48:53 +00:00
Andrew Poelstra
aba7e8ce09 Merge e796fdd4cb into merged_master (Bitcoin PR #19507) 2020-11-28 19:42:25 +00:00
Andrew Poelstra
ad7f014d11 Merge 89a8299a14 into merged_master (Bitcoin PR #19717) 2020-11-28 19:34:51 +00:00
Andrew Poelstra
55ff198606 Merge c1e0c2ad3b into merged_master (Bitcoin PR #19813) 2020-11-28 19:05:58 +00:00
Andrew Poelstra
5f6eb8ee3f Merge f98872f127 into merged_master (Bitcoin PR #18244) 2020-11-28 18:55:44 +00:00
Andrew Poelstra
f4b291f821 Merge 28f4e53e16 into merged_master (Bitcoin PR #19752) 2020-11-28 14:17:23 +00:00
Andrew Poelstra
244842d053 Merge 30568d3f1e into merged_master (Bitcoin PR #19778) 2020-11-28 14:10:06 +00:00
Andrew Poelstra
66ad009d69 Merge e80e5b3e4f into merged_master (Bitcoin PR #19760) 2020-11-28 13:25:26 +00:00
Andrew Poelstra
33ae4adbbd Merge 7f609f68d8 into merged_master (Bitcoin PR #19731) 2020-11-28 04:26:09 +00:00
Andrew Poelstra
d259272d65 Merge d254e6e795 into merged_master (Bitcoin PR #19722) 2020-11-28 03:42:57 +00:00
Andrew Poelstra
c3a261adfa Merge 27eeb0337b into merged_master (Bitcoin PR #19550) 2020-11-28 01:58:59 +00:00
Andrew Poelstra
d8cd6721bf Merge 70d7ddbcbb into merged_master (Bitcoin PR #19727) 2020-11-28 01:52:15 +00:00
Andrew Poelstra
ddd9b819bb Merge a2a250c7d0 into merged_master (Bitcoin PR #19743) 2020-11-28 00:53:18 +00:00
Andrew Poelstra
fa471ad724 Merge e6e277f9ed into merged_master (Bitcoin PR #19756)
lol
2020-11-28 00:31:20 +00:00
Andrew Poelstra
f197c02e18 Merge c831e105c5 into merged_master (Bitcoin PR #14582) 2020-11-27 23:36:05 +00:00
Andrew Poelstra
96355612d7 Merge a57af897ec into merged_master (Bitcoin PR #19564) 2020-11-27 21:49:18 +00:00
Andrew Poelstra
5282cc36d3 Merge 3ab2582c7f into merged_master (Bitcoin PR #19730) 2020-11-27 21:43:55 +00:00
Andrew Poelstra
e10dd69c55 Merge a0e75bd31d into merged_master (Bitcoin PR #15937) 2020-11-27 20:39:27 +00:00
Andrew Poelstra
e8b23b0198 Merge 4d4bd5ed74 into merged_master (Bitcoin PR #17204) 2020-11-27 19:53:57 +00:00
Andrew Poelstra
a67921c2c8 Merge dabab06a1a into merged_master (Bitcoin PR #19455) 2020-11-27 19:01:46 +00:00
Andrew Poelstra
5902895d0c Merge 31760bb7c9 into merged_master (Bitcoin PR #19528) 2020-11-27 18:39:01 +00:00
Andrew Poelstra
1aea27d291 Merge b4d0366b47 into merged_master (Bitcoin PR #19070) 2020-11-27 17:48:36 +00:00
Andrew Poelstra
b65e321035 Merge 6757b3ac8f into merged_master (Bitcoin PR #19655) 2020-11-27 17:35:58 +00:00
Andrew Poelstra
e3ce21f597 Merge 8a85377cd0 into merged_master (Bitcoin PR #18654) 2020-11-27 17:12:56 +00:00
Andrew Poelstra
3d9206fd10 Merge 13c4635a3e into merged_master (Bitcoin PR #19696) 2020-11-27 16:40:14 +00:00
Andrew Poelstra
ab8a5542cf Merge bd00d3b1f2 into merged_master (Bitcoin PR #19658) 2020-11-27 16:30:30 +00:00
Andrew Poelstra
c98788b086 Merge cb1ee1551c into merged_master (Bitcoin PR #19674) 2020-11-27 14:17:51 +00:00
Andrew Poelstra
c1b1cd2730 Merge be11f94e95 into merged_master (Bitcoin PR #19631) 2020-11-27 04:46:13 +00:00
Andrew Poelstra
b309341ae8 Merge 5e4fed9e58 into merged_master (Bitcoin PR #19657) 2020-11-27 04:21:24 +00:00
Andrew Poelstra
377df506c5 Merge 214e6655c3 into merged_master (Bitcoin PR #19649) 2020-11-27 04:13:32 +00:00
Andrew Poelstra
5f3c60ff97 Merge 6d8543504d into merged_master (Bitcoin PR #19620) 2020-11-27 02:47:54 +00:00
Andrew Poelstra
d9d1b5285b Merge 4644b13b44 into merged_master (Bitcoin PR #19632) 2020-11-27 02:13:28 +00:00
Andrew Poelstra
33545124d8 Merge 3c93623be2 into merged_master (Bitcoin PR #19489) 2020-11-27 00:53:07 +00:00
Andrew Poelstra
9cbfabd2d6 Merge 14ceddd290 into merged_master (Bitcoin PR #18991) 2020-11-27 00:01:40 +00:00
Andrew Poelstra
0ddf4fafae Merge f7c73b03d9 into merged_master (Bitcoin PR #19569) 2020-11-26 23:15:28 +00:00
Andrew Poelstra
c85a32bd02 Merge 2a784723f0 into merged_master (Bitcoin PR #19597)
Disabled a new non-working check (on the absent "fee" field of decodepsbt)
and also changed another check (exact number of coins selected) which had
been causing intermittent failures over the last several hundred PRs.
2020-11-26 21:31:17 +00:00
Andrew Poelstra
0c61562058 Merge 149eca433d into merged_master (Bitcoin PR #19599) 2020-11-26 21:15:20 +00:00
Andrew Poelstra
7131200c1e Merge 8db23349fe into merged_master (Bitcoin PR #19335) 2020-11-26 21:06:45 +00:00
Andrew Poelstra
50d06f59f3 Merge db9f1b9edc into merged_master (Elements PR #896) 2020-11-26 19:16:44 +00:00
Andrew Poelstra
e377f4f773 Merge f4cfa6d019 into merged_master (Bitcoin PR #15935) 2020-11-26 18:11:36 +00:00
Andrew Poelstra
db549ccf6f Merge 6ee36a263c into merged_master (Bitcoin PR #19473) 2020-11-26 17:18:17 +00:00
Andrew Poelstra
e547a98b54 Merge ccef10261e into merged_master (Bitcoin PR #18044) 2020-11-26 17:01:52 +00:00
Andrew Poelstra
f1d46ae49d Merge edfeaf6836 into merged_master (Bitcoin PR #19552) 2020-11-26 14:53:46 +00:00
Andrew Poelstra
3037b20323 Merge ea595d39f7 into merged_master (Bitcoin PR #19205) 2020-11-26 14:36:23 +00:00
Andrew Poelstra
4a5f6d253f Merge 19aaf7945e into merged_master (Bitcoin PR #19423) 2020-11-26 13:33:52 +00:00
Andrew Poelstra
c6cb7be640 Merge c57dc566b0 into merged_master (Bitcoin PR #16525) 2020-11-26 12:15:14 +00:00
Andrew Poelstra
69313c4329 Merge 21209c9cce into merged_master (Bitcoin PR #19512) 2020-11-26 05:14:51 +00:00
Andrew Poelstra
dfcb2cc697 Merge f4de89edfa into merged_master (Bitcoin PR #19429) 2020-11-26 03:52:41 +00:00