Andrew Poelstra
a53cae00a0
Merge b3067f4338 into merged_master (Bitcoin PR #16865 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
eebd0b7afa
Merge 189c19e012 into merged_master (Bitcoin PR #15759 )
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
5115dbbf41
Merge 6519be6054 into merged_master (Bitcoin PR #13868 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
15cb8bddfc
Merge b7ff38972c into merged_master (Bitcoin PR #16752 )
2020-11-09 21:20:19 +00:00
Andrew Poelstra
228b8a9857
Merge efe1ee0d8d into merged_master (Bitcoin PR #16730 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
d8cfb81a7a
Merge 12f7147c89 into merged_master (Bitcoin PR #16570 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
3fd0c0af03
Merge 52b9797119 into merged_master (Bitcoin PR #16670 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
1b2ba86a9e
Merge e8a6d52724 into merged_master (Bitcoin PR #16542 )
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
d081803d89
Merge 67be6d7a17 into merged_master (Bitcoin PR #16248 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
da7a74f8ec
Merge a7aa809027 into merged_master (Bitcoin PR #16563 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
527d180369
Merge b799ebcc17 into merged_master (Bitcoin PR #16566 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
9c3480fea9
Merge 3a3d8b8357 into merged_master (Bitcoin PR #16097 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
473d47540c
Merge 39763b7555 into merged_master (Bitcoin PR #16433 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
3c6370a930
Merge c7b7cf299a into merged_master (Bitcoin PR #16422 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
9fbf23d6f2
Merge 3dd46d1730 into merged_master (Elements PR #675 )
2020-11-09 21:19:26 +00:00
Andrew Poelstra
a50b652932
Merge 735d6b57e7 into merged_master (Bitcoin PR #16227 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
18ed97642c
Merge 28d1353f48 into merged_master (Bitcoin PR #15649 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
0065d674a4
Merge 8d1286014c into merged_master (Bitcoin PR #16237 )
...
I'm sorry, this should have been a few commits, but it got away from me
as the scope of this refactoring was not immediately obvious. It essentially
just moves code around so hopefully is not too hard to review. --asp
2020-11-09 03:58:21 +00:00
Andrew Poelstra
fb10ea6389
Merge 38fbb575e2 into merged_master (Bitcoin PR #16294 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
19568c3891
Merge c6e42f1ca9 into merged_master (Bitcoin PR #14193 )
2020-11-09 03:58:18 +00:00
Andrew Poelstra
9274da2dfc
Merge 7400135b79 into merged_master (Bitcoin PR #16278 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
f81f984f36
Merge c52776e6ff into merged_master (Bitcoin PR #16252 )
2020-11-09 03:57:55 +00:00
Andrew Poelstra
f68fbc1a56
Merge fd333e15a5 into merged_master (Bitcoin PR #16226 )
2020-11-06 15:20:16 +00:00
Andrew Poelstra
9de7dbaae0
Merge 8777a80706 into merged_master (Bitcoin PR #12324 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
f2d74db77d
Merge 98958c81f5 into merged_master (Bitcoin PR #16225 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
413732c74d
Merge 47d981e827 into merged_master (Bitcoin PR #16186 )
2020-11-06 15:20:14 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
deea6fa65a
Merge fc6cbc31e9 into merged_master (Bitcoin PR #15689 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
6bcd777be0
Merge d936cf9eaf into merged_master (Bitcoin PR #15985 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
0267d06c6a
Merge 62efead8a8 into merged_master (Bitcoin PR #16046 )
2020-10-29 23:41:15 +00:00
Andrew Poelstra
120debdd2d
Merge 3001cc61cf into merged_master (Bitcoin PR #13555 )
2020-10-29 20:41:45 +00:00
Andrew Poelstra
3380f240b7
Merge 376638afcf into merged_master (Bitcoin PR #14047 )
2020-10-29 18:42:50 +00:00
Andrew Poelstra
24e3d9635c
Merge 6f4ba6492a into merged_master (Bitcoin PR #15988 )
2020-10-29 17:04:58 +00:00
Andrew Poelstra
f6f2aefae3
Merge 40c66bb3d1 into merged_master (Bitcoin PR #15855 )
2020-10-29 16:50:16 +00:00
Andrew Poelstra
e7b6c1c581
Merge 695141bf7a into merged_master (Bitcoin PR #15512 )
2020-10-29 15:37:45 +00:00
Andrew Poelstra
ff1c4012ad
Merge de5af41e35 into merged_master (Bitcoin PR #15452 )
2020-10-29 14:52:44 +00:00
Andrew Poelstra
c91184f6c2
Merge b2a6b02161 into merged_master (Bitcoin PR #15948 )
2020-10-29 02:36:55 +00:00
Andrew Poelstra
2d57dcb681
Merge d7d7d31506 into merged_master (Bitcoin PR #15141 )
2020-10-29 02:10:39 +00:00
Andrew Poelstra
44e5901b98
Merge 2c35fe6238 into merged_master (Bitcoin PR #15849 )
2020-10-29 02:06:12 +00:00
Andrew Poelstra
6674d9e91f
Merge 10ed4dff24 into merged_master (Bitcoin PR #15869 )
2020-10-29 02:06:04 +00:00
Andrew Poelstra
c4a1ce209a
Merge 5873e9a3e8 into merged_master (Bitcoin PR #15919 )
2020-10-29 02:04:39 +00:00
Andrew Poelstra
ad7eb71596
Merge 56376f3365 into merged_master (Bitcoin PR #15670 )
2020-10-28 20:53:16 +00:00
Andrew Poelstra
269feab9f6
Merge 693c743a32 into merged_master (Bitcoin PR #15843 )
2020-10-28 16:47:34 +00:00
Andrew Poelstra
52b8a8ee48
Merge e4beef611a into merged_master (Bitcoin PR #14121 )
2020-10-28 16:46:47 +00:00
Andrew Poelstra
1a69098698
Merge dae72998e8 into merged_master (Bitcoin PR #15779 )
2020-10-28 16:45:01 +00:00
Andrew Poelstra
e6343c7258
Merge 0c9de67f34 into merged_master (Bitcoin PR #15352 )
2020-10-28 16:43:51 +00:00
