Commit graph

28261 commits

Author SHA1 Message Date
Andrew Poelstra
64b8eac774 Merge 1a43cd3f74 into merged_master (Bitcoin PR #19709) 2020-11-27 20:00:03 +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
f3a6693ff5 Merge c0b1706964 into merged_master (Bitcoin PR #19568)
Reduction in duplicated code -and- in Elements/Bitcoin diff :)
2020-11-27 18:54:38 +00:00
Andrew Poelstra
5902895d0c Merge 31760bb7c9 into merged_master (Bitcoin PR #19528) 2020-11-27 18:39:01 +00:00
Andrew Poelstra
08378e5ad8 Merge 609ce2d0da into merged_master (Bitcoin PR #19644) 2020-11-27 18:05:45 +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
b2c4c2b2b4 Merge 1052b09031 into merged_master (Bitcoin PR #19011) 2020-11-27 17:29:41 +00:00
Andrew Poelstra
e3ce21f597 Merge 8a85377cd0 into merged_master (Bitcoin PR #18654) 2020-11-27 17:12:56 +00:00
Andrew Poelstra
c5777e4cb6 Merge 038a04eb80 into merged_master (Bitcoin PR #19688) 2020-11-27 16:46:55 +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
87a94621e7 Merge ce3bdd0ed1 into merged_master (Bitcoin PR #19316) 2020-11-27 16:20:25 +00:00
Andrew Poelstra
c98788b086 Merge cb1ee1551c into merged_master (Bitcoin PR #19674) 2020-11-27 14:17:51 +00:00
Andrew Poelstra
2e1ce0cd3f Merge 85fa648c85 into merged_master (Bitcoin PR #19596) 2020-11-27 05:38:22 +00:00
Andrew Poelstra
6ae18f374c Merge 6d5a9fec2d into merged_master (Bitcoin PR #19605) 2020-11-27 05:29:59 +00:00
Andrew Poelstra
aec9e50be8 Merge 04a0676b3f into merged_master (Bitcoin PR #17563) 2020-11-27 05:11:08 +00:00
Andrew Poelstra
fe83ae7795 Merge f306384f5a into merged_master (Bitcoin PR #19622) 2020-11-27 05:00:45 +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
419fd4f90d Merge b75f2ad72d into merged_master (Bitcoin PR #19660) 2020-11-27 04:05:36 +00:00
Andrew Poelstra
f92a3d1ed4 Merge 6ea7348122 into merged_master (Bitcoin PR #19638) 2020-11-27 03:15:08 +00:00
Andrew Poelstra
9b52615161 Merge e349eeeb2c into merged_master (Bitcoin PR #19672) 2020-11-27 03:08:06 +00:00
Andrew Poelstra
54668f0d50 Merge 4b705b1c98 into merged_master (Bitcoin PR #19098) 2020-11-27 02:59:49 +00:00
Andrew Poelstra
5f3c60ff97 Merge 6d8543504d into merged_master (Bitcoin PR #19620) 2020-11-27 02:47:54 +00:00
Andrew Poelstra
d124975ffd Merge 82127d27c9 into merged_master (Bitcoin PR #19667) 2020-11-27 02:41:18 +00:00
Andrew Poelstra
8a65a6f80e Merge 19f812c57b into merged_master (Bitcoin PR #19669) 2020-11-27 02:29:46 +00:00
Andrew Poelstra
1e421d01f4 Merge e3272ff290 into merged_master (Bitcoin PR #19614) 2020-11-27 02:23:43 +00:00
Andrew Poelstra
d9d1b5285b Merge 4644b13b44 into merged_master (Bitcoin PR #19632) 2020-11-27 02:13:28 +00:00
Andrew Poelstra
519f434cd7 Merge e4df534c60 into merged_master (Bitcoin PR #15382) 2020-11-27 01:48:55 +00:00
Andrew Poelstra
7f6b8f75e8 Merge 65e4ecabd5 into merged_master (Bitcoin PR #19654) 2020-11-27 01:26:49 +00:00
Andrew Poelstra
0d961c83a2 Merge 0f16212c59 into merged_master (Bitcoin PR #19340) 2020-11-27 01:03:20 +00:00
Andrew Poelstra
33545124d8 Merge 3c93623be2 into merged_master (Bitcoin PR #19489) 2020-11-27 00:53:07 +00:00
Andrew Poelstra
d427e80d48 Merge bb2a9f9c8c into merged_master (Bitcoin PR #19634) 2020-11-27 00:46:50 +00:00
Andrew Poelstra
54f2d85914 Merge 34eb236258 into merged_master (Bitcoin PR #19326) 2020-11-27 00:39:12 +00:00
Andrew Poelstra
9cbfabd2d6 Merge 14ceddd290 into merged_master (Bitcoin PR #18991) 2020-11-27 00:01:40 +00:00
Andrew Poelstra
97722173e4 Merge a78742830a into merged_master (Bitcoin PR #19639) 2020-11-26 23:42:52 +00:00
Andrew Poelstra
66b52025b1 Merge 8443fb11ad into merged_master (Bitcoin PR #19637) 2020-11-26 23:37:01 +00:00
Andrew Poelstra
0ddf4fafae Merge f7c73b03d9 into merged_master (Bitcoin PR #19569) 2020-11-26 23:15:28 +00:00
Andrew Poelstra
d8fbb60a17 Merge a63a26f042 into merged_master (Bitcoin PR #19585) 2020-11-26 23:09:01 +00:00
Andrew Poelstra
3eb3f6a2a9 Merge a4a279b4f3 into merged_master (Bitcoin PR #19617) 2020-11-26 23:02:52 +00:00
Andrew Poelstra
c1d416e56b Merge edec7f7c25 into merged_master (Bitcoin PR #19439) 2020-11-26 22:57:11 +00:00
Andrew Poelstra
59aa4e1fba Merge ad2952d17a into merged_master (Bitcoin PR #19604) 2020-11-26 22:45:20 +00:00
Andrew Poelstra
2942044881 Merge 62d137ac3b into merged_master (Bitcoin PR #19561) 2020-11-26 22:20:40 +00:00
Andrew Poelstra
f6c714b963 Merge 37b765b962 into merged_master (Bitcoin PR #19102) 2020-11-26 22:07:27 +00:00
Andrew Poelstra
68756cc75b Merge 17de75b028 into merged_master (Bitcoin PR #19590) 2020-11-26 21:49:46 +00:00
Andrew Poelstra
0f9a38732c Merge 4ebe2f6e75 into merged_master (Bitcoin PR #18011) 2020-11-26 21:44:11 +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