GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22598 commits 49 branches 359 tags 252 MiB
Commit graph

14878 commits

Author SHA1 Message Date
Andrew Poelstra
5b89be04ff Merge 33c466a642 into merged_master (Bitcoin PR #16787) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
5253addec0 Merge d8fe24cbfb into merged_master (Bitcoin PR #16489) 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
de9cc92f1a Merge 4c329d43a5 into merged_master (Bitcoin PR #16826) 2020-11-09 21:20:22 +00:00
Andrew Poelstra
f90ae69f01 Merge 08bb4c3156 into merged_master (Bitcoin PR #16285) 2020-11-09 21:20:22 +00:00
Andrew Poelstra
37bc5b5804 Merge 91fcb9ff66 into merged_master (Bitcoin PR #16830) 2020-11-09 21:20:22 +00:00
Andrew Poelstra
efbf6851cc Merge 410b745fe0 into merged_master (Bitcoin PR #16735) 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
f3a64d1877 Merge b5a8d0cff1 into merged_master (Bitcoin PR #15450) 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
15573b7a25 Merge 46494b08e2 into merged_master (Bitcoin PR #16798) 2020-11-09 21:20:22 +00:00
Andrew Poelstra
14b98224c3 Merge ae3e3bd151 into merged_master (Bitcoin PR #16793) 2020-11-09 21:20:21 +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
f8386055b5 Merge 5667b0d758 into merged_master (Bitcoin PR #16792) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
67fb9aed22 Merge 7c302d2bc4 into merged_master (Elements PR #702) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
bbfa3115a1 Merge 8e00a68552 into merged_master (Bitcoin PR #16774) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
0003c1dd27 Merge 6e431296da into merged_master (Bitcoin PR #16745) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
7ce3241549 Merge 66c5045d5a into merged_master (Elements PR #693) 
Fixes bug I mentioned when merging Bitcoin #16415
 2020-11-09 21:20:20 +00:00
Andrew Poelstra
78c61d1471 Merge d3e672119e into merged_master (Bitcoin PR #16788) 2020-11-09 21:20:20 +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
5115dbbf41 Merge 6519be6054 into merged_master (Bitcoin PR #13868) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
1265558273 Merge 7d6f63cc2c into merged_master (Bitcoin PR #16720) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
fd1ee6632c Merge e9ef1b2c2e into merged_master (Bitcoin PR #16716) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
018326915c Merge f5db3f2128 into merged_master (Bitcoin PR #16758) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
6e9332432f Merge a8ecd0dada into merged_master (Bitcoin PR #16753) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
9bc6c21097 Merge 74da99e010 into merged_master (Bitcoin PR #14862) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
a31c404f98 Merge bcf7004a89 into merged_master (Bitcoin PR #16707) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
206311142a Merge d8fc997913 into merged_master (Bitcoin PR #16695) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
4cb31d74b9 Merge 75142ece6b into merged_master (Bitcoin PR #16706) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
5deb2c636f Merge 1f8378508a into merged_master (Bitcoin PR #15615) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
9f37eba7d1 Merge d20d171f26 into merged_master (Bitcoin PR #16701) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
15cb8bddfc Merge b7ff38972c into merged_master (Bitcoin PR #16752) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
231a485846 Merge aca76b9ee8 into merged_master (Bitcoin PR #16708) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
504ea9a48d Merge 93305e6d46 into merged_master (Bitcoin PR #14879) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
4476f0cfa0 Merge a7be1cc92b into merged_master (Bitcoin PR #16728) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
228b8a9857 Merge efe1ee0d8d into merged_master (Bitcoin PR #16730) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
1f49034706 Merge adff8fe321 into merged_master (Bitcoin PR #16629) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
366d398349 Merge d86a906a88 into merged_master (Bitcoin PR #16694) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
e7e5429fd2 Merge d72758c3f6 into merged_master (Bitcoin PR #16677) 2020-11-09 21:20:17 +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
d9b8570aca Merge 868a8cea15 into merged_master (Bitcoin PR #16674) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
afcb871f55 Merge 01ebaa05a4 into merged_master (Bitcoin PR #16572) 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
cd9e8398ce Merge e00ecb3d7a into merged_master (Bitcoin PR #16611) 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
329bba6d40 Merge 1d74693e8a into merged_master (Bitcoin PR #16555) 2020-11-09 21:20:16 +00:00