Andrew Poelstra
70b8b429e4
Merge d53828cb79 into merged_master (Bitcoin PR #17235 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
50b581188b
Merge c5ac7af779 into merged_master (Bitcoin PR #17206 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
24ca3f2864
Merge deb2327b43 into merged_master (Bitcoin PR #17018 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
6490a104e1
Merge 8f14d2002b into merged_master (Bitcoin PR #17183 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
4749945d77
Merge 0ff7cd7d0c into merged_master (Bitcoin PR #16889 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
d68011a751
Merge 4f42284fc0 into merged_master (Bitcoin PR #17140 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
c704a02e4e
Merge c34b88620d into merged_master (Bitcoin PR #17095 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
7af0d61ecd
Merge 1f6638630e into merged_master (Bitcoin PR #17113 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
7e94ecf8cc
Merge b544eb6370 into merged_master (Bitcoin PR #17086 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
6823c31c7c
Merge d6f304a462 into merged_master (Elements PR #684 )
...
This PR reduced the minrelayfee for Elements, but also brought in some
changes from upstream which I mostly just didn't take (since we've
already brought them in, in earlier parts of this rebase).
2020-11-09 21:20:39 +00:00
Andrew Poelstra
cf2b6f2fb7
Merge 556820ee57 into merged_master (Bitcoin PR #17009 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
f3f736f76d
Merge befdef8aee into merged_master (Bitcoin PR #16887 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
f553b708e2
Merge 2352aec9fc into merged_master (Bitcoin PR #17076 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
55b110cabc
Merge c08bf2b574 into merged_master (Bitcoin PR #15437 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
382e167ab3
Merge 520d140e6e into merged_master (Bitcoin PR #17056 )
...
Recreated addresses for functional tests using `hal elements address create --script`
with the given script from data/rpc_bip67.json, taking the P2SH output
2020-11-09 21:20:35 +00:00
Andrew Poelstra
8dee814a17
Merge febc31c641 into merged_master (Bitcoin PR #17069 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
5836ff48b8
Merge b658ca71b3 into merged_master (Bitcoin PR #16931 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
8926bc044b
Merge 9edb2b6550 into merged_master (Bitcoin PR #16953 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
14552b9725
Merge b1c36a8ba6 into merged_master (Elements PR #719 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
9b0e31e130
Merge ab765c2ec7 into merged_master (Bitcoin PR #16577 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
ca7b7f3810
Merge feb162d500 into merged_master (Bitcoin PR #14696 )
2020-11-09 21:20:26 +00:00
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
