Commit graph

28129 commits

Author SHA1 Message Date
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
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
853b831d64 Merge 400f45ec9b into merged_master (Bitcoin PR #19525) 2020-11-26 20:56:20 +00:00
Andrew Poelstra
89581d6b4f Merge a76ccb01b9 into merged_master (Bitcoin PR #19534) 2020-11-26 20:35:25 +00:00
Andrew Poelstra
12f11f8f70 Merge 2f71a1ea35 into merged_master (Bitcoin PR #18637) 2020-11-26 20:30:20 +00:00
Andrew Poelstra
437d64390d Merge a41ae68053 into merged_master (Bitcoin PR #19613) 2020-11-26 20:09:57 +00:00
Andrew Poelstra
0c2b107a66 Merge 24ead1a923 into merged_master (Bitcoin PR #19519) 2020-11-26 20:04:04 +00:00
Andrew Poelstra
3719772b99 Merge e0ed4cc50d into merged_master (Bitcoin PR #19530) 2020-11-26 19:58:14 +00:00
Andrew Poelstra
8062fc59d0 Merge cea39fc268 into merged_master (Bitcoin PR #19595) 2020-11-26 19:52:02 +00:00
Andrew Poelstra
0681b9ea34 Merge 2979a7aff0 into merged_master (Bitcoin PR #19583) 2020-11-26 19:45:23 +00:00
Andrew Poelstra
21f9f41bf4 Merge a1da180b1b into merged_master (Bitcoin PR #19589) 2020-11-26 19:33:53 +00:00
Andrew Poelstra
50d06f59f3 Merge db9f1b9edc into merged_master (Elements PR #896) 2020-11-26 19:16:44 +00:00
Andrew Poelstra
64ebaceb2e Merge b62fbf9e1c into merged_master (Bitcoin PR #19593) 2020-11-26 18:58:42 +00:00
Andrew Poelstra
10dd44bce4 Merge 31d2b4098a into merged_master (Bitcoin PR #19508) 2020-11-26 18:36:10 +00:00
Andrew Poelstra
6d6a968f03 Merge 40a04814d1 into merged_master (Bitcoin PR #19472) 2020-11-26 18:28:47 +00:00
Andrew Poelstra
a1a5fbf2d4 Merge 007e15dcd7 into merged_master (Bitcoin PR #19565) 2020-11-26 18:17:42 +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
7297f932a0 Merge 9d4b3d86b6 into merged_master (Bitcoin PR #19334) 2020-11-26 17:07:31 +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
116bea9453 Merge 93decbc7a4 into merged_master (Bitcoin PR #19370) 2020-11-26 15:43:33 +00:00
Andrew Poelstra
f7ad032e2a Merge c7b4968552 into merged_master (Bitcoin PR #19553) 2020-11-26 15:37:03 +00:00
Andrew Poelstra
461829d58e Merge 2031aa92a3 into merged_master (Bitcoin PR #19562) 2020-11-26 15:26:04 +00:00
Andrew Poelstra
9280ac9ba9 Merge 597d2f905e into merged_master (Bitcoin PR #19548) 2020-11-26 15:20:28 +00:00
Andrew Poelstra
bcd5128dfe Merge c7007babb7 into merged_master (Bitcoin PR #18907) 2020-11-26 15:10:14 +00:00
Andrew Poelstra
ed9bb2f2bb Merge 2c0c3f8e8c into merged_master (Bitcoin PR #19217) 2020-11-26 14:59:40 +00:00
Andrew Poelstra
f1d46ae49d Merge edfeaf6836 into merged_master (Bitcoin PR #19552) 2020-11-26 14:53:46 +00:00
Andrew Poelstra
714447c7f1 Merge 910a8d9c6f into merged_master (Bitcoin PR #19560) 2020-11-26 14:48:13 +00:00
Andrew Poelstra
16a46e7c34 Merge 65a54d684f into merged_master (Bitcoin PR #18984) 2020-11-26 14:41:58 +00:00
Andrew Poelstra
3037b20323 Merge ea595d39f7 into merged_master (Bitcoin PR #19205) 2020-11-26 14:36:23 +00:00