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

438 commits

Author SHA1 Message Date
Andrew Poelstra
0903cd4bc7 Merge d44dd51322 into merged_master (Bitcoin PR #18152) 2020-11-26 01:08:46 +00:00
Andrew Poelstra
ebfbe923c7 Merge 00c1a4d9a9 into merged_master (Bitcoin PR #18809) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
222f2e2184 Merge 5e5dd9918e into merged_master (Bitcoin PR #17831) 2020-11-26 01:08:25 +00:00
Andrew Poelstra
86082b9846 Merge 244daa4821 into merged_master (Bitcoin PR #18607) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
f8b9066bb1 Merge 130b64415f into merged_master (Bitcoin PR #18493) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
9ce236f051 Merge 10358a381a into merged_master (Bitcoin PR #17737) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
5b8850461d Merge a840dab2a5 into merged_master (Bitcoin PR #18541) (Core 0.20 branch point) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
c8909955fa Merge 1b151e3ffc into merged_master (Bitcoin PR #18532) 2020-11-26 01:08:13 +00:00
Andrew Poelstra
6d39ef9f9a Merge 7eed413e72 into merged_master (Bitcoin PR #18398) 2020-11-26 01:08:03 +00:00
Andrew Poelstra
a4a5149034 Merge 5504703a9f into merged_master (Bitcoin PR #18396) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
80db97d6db Merge 25424cf57e into merged_master (Bitcoin PR #18346) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
1f5486574f Merge a64e5bed6b into merged_master (Bitcoin PR #18344) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
91b1e1b4ab Merge a71c34742c into merged_master (Bitcoin PR #17809) 
This was pretty-much as awful as it looks.
 2020-11-26 01:07:48 +00:00
Andrew Poelstra
0246b86872 Merge 54a7ef612a into merged_master (Bitcoin PR #17399) 2020-11-26 01:07:48 +00:00
Andrew Poelstra
e81fccc9a5 Merge 263f53e2d0 into merged_master (Bitcoin PR #18098) 2020-11-26 01:07:43 +00:00
Andrew Poelstra
433a5cf61e Merge f3e8ef2ac5 into merged_master (Elements PR #799) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
c7a29c2228 Merge f9fd3a27fd into merged_master (Bitcoin PR #17750) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
4219b6d7d9 Merge 48d64d73c0 into merged_master (Bitcoin PR #17564) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
37b9b15143 Merge a595011f5a into merged_master (Bitcoin PR #17728) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
fe9767f625 Merge d4b335c60a into merged_master (Bitcoin PR #17617) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
fcc3e6c04c Merge ae6943620a into merged_master (Bitcoin PR #17407) 2020-11-09 23:10:14 +00:00
Andrew Poelstra
f5036e8b4b Merge 45e65376ac into merged_master (Bitcoin PR #17382) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
1d3555cdaf Merge b05b28183c into merged_master (Bitcoin PR #16899) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
00d30ddc6c Merge 94a26b192f into merged_master (Bitcoin PR #17318) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
b607d68347 Merge 463eab5e14 into merged_master (Bitcoin PR #17285) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
bde84fefc4 Merge 3c40bc6726 into merged_master (Bitcoin PR #15921) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
34af974d28 Merge 471e5f8829 into merged_master (Bitcoin PR #16839) 2020-11-09 21:20:47 +00:00
Andrew Poelstra
e03eb1d06b Merge b334392946 into merged_master (Elements PR #758) 2020-11-09 21:20:47 +00:00
Andrew Poelstra
839ad47472 Merge 9ae468a6d5 into merged_master (Bitcoin PR #17192) 2020-11-09 21:20:46 +00:00
Andrew Poelstra
821f5256a5 Merge 46d6930f8c into merged_master (Bitcoin PR #16659) 2020-11-09 21:20:41 +00:00
Andrew Poelstra
e25e16c65e Merge ccaef6c28b into merged_master (Bitcoin PR #16908) 2020-11-09 21:20:33 +00:00
Andrew Poelstra
f2240a15bf Merge a6c8aed1f1 into merged_master (Bitcoin PR #16817) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
f90ae69f01 Merge 08bb4c3156 into merged_master (Bitcoin PR #16285) 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
206311142a Merge d8fc997913 into merged_master (Bitcoin PR #16695) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
4476f0cfa0 Merge a7be1cc92b into merged_master (Bitcoin PR #16728) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
6daf60610f Merge 70b12af87e into merged_master (Bitcoin PR #16647) 2020-11-09 21:20:16 +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
1e58aac3d1 Merge 8f604361eb into merged_master (Bitcoin PR #16194) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
f11c2f3dab Merge 357488f660 into merged_master (Bitcoin PR #16240) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
7bcd9637cf Merge 11de669d8b into merged_master (Bitcoin PR #16325) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
16a3be0fc8 Merge 2f717fb5cd into merged_master (Bitcoin PR #15427) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
25946f0bae Merge 431d81b61c into merged_master (Bitcoin PR #15991) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
daa130fe7b Merge ee642f5862 into merged_master (Elements PR #658) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
68d9951825 Merge d0f81a96d9 into merged_master (Bitcoin PR #16129) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
cb15f46946 Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
fb4ef2f8cf Merge 2d16fb7a2b into merged_master (Bitcoin PR #14984) 2020-10-29 17:36:56 +00:00
Andrew Poelstra
332ae826ae Merge e2371f842f into merged_master (Bitcoin PR #14802) 2020-10-29 16:38:07 +00:00