Commit graph

3029 commits

Author SHA1 Message Date
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
Andrew Poelstra
10eade5ba9 Merge b93c4244b9 into merged_master (Bitcoin PR #19464) 2020-11-26 02:44:00 +00:00
Andrew Poelstra
efaef30fdb Merge 631284f09a into merged_master (Bitcoin PR #19486) 2020-11-26 01:51:47 +00:00
Andrew Poelstra
74108c6a87 Merge 4db44acf2d into merged_master (Bitcoin PR #18202)
What a pain. Again, not naming names, but it was Sjors again.
2020-11-26 01:46:05 +00:00
Andrew Poelstra
d41cf5fe1c Merge 160800ac10 into merged_master (Bitcoin PR #19441) 2020-11-26 01:09:24 +00:00
Andrew Poelstra
7cd7baf583 Merge 5f96bce9b7 into merged_master (Bitcoin PR #18923) 2020-11-26 01:09:24 +00:00
Andrew Poelstra
52c243844d Merge ca055885c6 into merged_master (Bitcoin PR #19474) 2020-11-26 01:09:23 +00:00
Andrew Poelstra
aef7078adf Merge 107b8559c5 into merged_master (Bitcoin PR #18638) 2020-11-26 01:09:23 +00:00
Andrew Poelstra
37cb4fdaba Merge a4eb6a51a7 into merged_master (Bitcoin PR #19469) 2020-11-26 01:09:22 +00:00
Andrew Poelstra
874de6a557 Merge cc9d09e73d into merged_master (Bitcoin PR #19191) 2020-11-26 01:09:22 +00:00
Andrew Poelstra
1aa51f0c4c Merge b52e25cc1b into merged_master (Bitcoin PR #19328) 2020-11-26 01:09:20 +00:00
Andrew Poelstra
9942d6f945 Merge 171f4a516b into merged_master (Bitcoin PR #19324) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
d664527f5a Merge a24806c25d into merged_master (Bitcoin PR #19215) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
e96a115bab Merge f6072e601a into merged_master (Bitcoin PR #19368) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
357c4d5d39 Merge 5c3c7cc50c into merged_master (Bitcoin PR #19300) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
a4f01a718d Merge 8edfc1715a into merged_master (Bitcoin PR #19204) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
a2b426f3f9 Merge f32f7e907a into merged_master (Bitcoin PR #11413) 2020-11-26 01:09:13 +00:00