Andrew Poelstra
fa089ac717
Merge 99beda47f5 into merged_master (Bitcoin PR #16864 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
66135f7fc9
Merge 318890b1ee into merged_master (Bitcoin PR #16888 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
d3c16a64a8
Merge 796b713633 into merged_master (Bitcoin PR #16845 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
ce1470eb55
Merge cd737214ce into merged_master (Bitcoin PR #16737 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
31729410b6
Merge b0a7a76c9d into merged_master (Bitcoin PR #16873 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
183aea8254
Merge 4bfef0daeb into merged_master (Bitcoin PR #16866 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
8b487a91fb
Merge 3c8aacee72 into merged_master (Elements PR #712 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
e413b2ebbb
Merge ca97d292ce into merged_master (Bitcoin PR #16551 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
bc7f2f6de6
Merge 04d9939f46 into merged_master (Bitcoin PR #16850 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
87438de6c3
Merge 51c4ebbe81 into merged_master (Elements PR #706 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
2e67acfabe
Merge 2296fe65f5 into merged_master (Bitcoin PR #16251 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
74dba6e6ce
Merge d75d1f3331 into merged_master (Elements PR #704 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
3d7ed201af
Merge 335b34c30c into merged_master (Bitcoin PR #16725 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
8fa52e84b0
Merge 8af835a72d into merged_master (Bitcoin PR #16796 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
f90ae69f01
Merge 08bb4c3156 into merged_master (Bitcoin PR #16285 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
eebd0b7afa
Merge 189c19e012 into merged_master (Bitcoin PR #15759 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
5cca042772
Merge 0d20c42a01 into merged_master (Bitcoin PR #16421 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
9cc26a716a
Merge 5b2fe5563b into merged_master (Elements PR #642 )
...
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
29e73c226a
Merge 5e202382a9 into merged_master (Bitcoin PR #16624 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
2cdfea1aa4
Merge cbde2bc806 into merged_master (Bitcoin PR #16804 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
eb174d36e9
Merge 45be44cce4 into merged_master (Bitcoin PR #15257 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
eb92b1779c
Merge 761fe07ba9 into merged_master (Bitcoin PR #16768 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
d73a5a5a8d
Merge 33f9750b1b into merged_master (Bitcoin PR #16185 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
adceec0ffe
Merge a6878b8080 into merged_master (Elements PR #696 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
0bb6bd229c
Merge 495db72ee7 into merged_master (Bitcoin PR #16767 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
206311142a
Merge d8fc997913 into merged_master (Bitcoin PR #16695 )
2020-11-09 21:20:19 +00:00
Andrew Poelstra
39d8aa865c
Merge cc40b55da7 into merged_master (Bitcoin PR #16726 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
1613344366
Merge 119e97ae2d into merged_master (Bitcoin PR #16740 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
6e38c0cd4a
Merge 2d38950e5d into merged_master (Bitcoin PR #16742 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
58e5e4c784
Merge af4100cd6f into merged_master (Bitcoin PR #16404 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
9343f1e349
Merge 6dfa9efa3f into merged_master (Bitcoin PR #16656 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
6daf60610f
Merge 70b12af87e into merged_master (Bitcoin PR #16647 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
a191197ace
Merge 83112db129 into merged_master (Bitcoin PR #15864 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
e62e563c84
Merge 27ee0cc5a6 into merged_master (Bitcoin PR #16646 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
679f5eec05
Merge ed9a2a37c1 into merged_master (Bitcoin PR #16631 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
1b2ba86a9e
Merge e8a6d52724 into merged_master (Bitcoin PR #16542 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
d6c98c0663
Merge 7a960ba775 into merged_master (Bitcoin PR #15986 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
b81a29337a
Merge b80cdfec9a into merged_master (Bitcoin PR #16618 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
19def18ab9
Merge 0d65106dce into merged_master (Bitcoin PR #16383 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
5f280a6068
Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
028f2d94d1
Merge 85883a9f8e into merged_master (Bitcoin PR #16443 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
a825f2c9ef
Merge 8bd5e0af99 into merged_master (Bitcoin PR #16465 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
c7076b25b0
Merge e00501e00c into merged_master (Bitcoin PR #16561 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
d081803d89
Merge 67be6d7a17 into merged_master (Bitcoin PR #16248 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
0d445414a6
Merge 05ccbe9a29 into merged_master (Bitcoin PR #16598 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
52ce7ad684
Merge b725979a11 into merged_master (Bitcoin PR #16535 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
d576fc5aeb
Merge 62117f9f36 into merged_master (Bitcoin PR #16363 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
a93a689a14
Merge d5ea8f4bf3 into merged_master (Bitcoin PR #16509 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
84a62eb305
Merge c77f7cdbd1 into merged_master (Bitcoin PR #16197 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
868ec22ac4
Merge 6b6386e854 into merged_master (Bitcoin PR #16538 )
2020-11-09 21:20:12 +00:00