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

22639 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Poelstra
98f49da27e Merge cfc4cca1fd into merged_master (Elements PR #710) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
046f6550c3 Merge 884f7cc81b into merged_master (Bitcoin PR #16714) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
f818373174 Merge 4d9fa049af into merged_master (Elements PR #708) 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
03d9c45257 Merge 2324aa1dc4 into merged_master (Bitcoin PR #15529) 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
670b5e9c9b Merge 1985c4efda into merged_master (Bitcoin PR #16413) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
d25787210f Merge 750c2fbf26 into merged_master (Bitcoin PR #16680) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
5b89be04ff Merge 33c466a642 into merged_master (Bitcoin PR #16787) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
9b5f3303ae Merge 59681beb89 into merged_master (Bitcoin PR #16477) 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
59fe21f5ec Merge 5b4e6886e0 into merged_master (Bitcoin PR #16806) 2020-11-09 21:20:22 +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
be281ea46e Merge e4b974830e into merged_master (Bitcoin PR #16810) 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
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
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
0bb6bd229c Merge 495db72ee7 into merged_master (Bitcoin PR #16767) 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
4054833848 Merge de048a59ad into merged_master (Bitcoin PR #16760) 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