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

1685 commits

Author SHA1 Message Date
Andrew Poelstra
52c243844d Merge ca055885c6 into merged_master (Bitcoin PR #19474) 2020-11-26 01:09:23 +00:00
Andrew Poelstra
874de6a557 Merge cc9d09e73d into merged_master (Bitcoin PR #19191) 2020-11-26 01:09:22 +00:00
Andrew Poelstra
ceefa62cdb Merge abdfd2d0e3 into merged_master (Bitcoin PR #19219) 2020-11-26 01:09:20 +00:00
Andrew Poelstra
7fabb1de9a Merge 5ec19df687 into merged_master (Bitcoin PR #19277) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
8e770d3f21 Merge 915ac8a861 into merged_master (Bitcoin PR #19413) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
5fcf5348d9 Merge e1b20e2285 into merged_master (Bitcoin PR #19028) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
c473bf0bce Merge bb588669f9 into merged_master (Bitcoin PR #19331) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
34f4c80e84 Merge 057bd3189f into merged_master (Bitcoin PR #19197) 2020-11-26 01:09:08 +00:00
Andrew Poelstra
3aaeae55ea Merge f8364df250 into merged_master (Bitcoin PR #19176) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
f2abfdd2c4 Merge 41fb69404c into merged_master (Bitcoin PR #19192) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
30e68e5e34 Merge 399a0d9dc7 into merged_master (Bitcoin PR #19180) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
0a5760376f Merge 1b90a7b61a into merged_master (Bitcoin PR #19005) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
18a2a37ece Merge b1b1739944 into merged_master (Bitcoin PR #18968) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
195eb8a243 Merge 4ede05d421 into merged_master (Bitcoin PR #18758) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
b8d665f61a Merge b46fb5cb10 into merged_master (Bitcoin PR #19131) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
29b17c1221 Merge 793e0ff22c into merged_master (Bitcoin PR #18698) 2020-11-26 01:08:49 +00:00
Andrew Poelstra
51965ad1e6 Merge 25ad2c623a into merged_master (Bitcoin PR #18740) 2020-11-26 01:08:47 +00:00
Andrew Poelstra
0903cd4bc7 Merge d44dd51322 into merged_master (Bitcoin PR #18152) 2020-11-26 01:08:46 +00:00
Andrew Poelstra
947570a389 Merge 51825aea7f into merged_master (Bitcoin PR #18922) 2020-11-26 01:08:43 +00:00
Andrew Poelstra
66f47ea527 Merge 8da1e43b63 into merged_master (Bitcoin PR #18910) 2020-11-26 01:08:42 +00:00
Andrew Poelstra
9ac62395d7 Merge e45fb7e0d2 into merged_master (Bitcoin PR #18877) 2020-11-26 01:08:42 +00:00
Andrew Poelstra
1d1a32e637 Merge 5b24f6084e into merged_master (Bitcoin PR #16224) 2020-11-26 01:08:40 +00:00
Andrew Poelstra
8c572c898e Merge 42fd503819 into merged_master (Bitcoin PR #18786) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
7f37d52c1a Merge ae32e5ce3d into merged_master (Bitcoin PR #18669) 2020-11-26 01:08:31 +00:00
Andrew Poelstra
b6c2e38caa Merge acb4fa0741 into merged_master (Bitcoin PR #18665) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
2016bea80a Merge 544709763e into merged_master (Bitcoin PR #18571) 
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
 2020-11-26 01:08:20 +00:00
Andrew Poelstra
9ce236f051 Merge 10358a381a into merged_master (Bitcoin PR #17737) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
60616b4894 Merge 3347ca4881 into merged_master (Bitcoin PR #18526) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
50e2b06532 Merge c31bcaf203 into merged_master (Bitcoin PR #18458) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
8ec0f98505 Merge 08c4994969 into merged_master (Bitcoin PR #18503) 2020-11-26 01:08:09 +00:00
Andrew Poelstra
66dc94c10c Merge 6cfb3dbbdb into merged_master (Bitcoin PR #18391) 2020-11-26 01:08:04 +00:00
Andrew Poelstra
cf93edb0be Merge 312d27b11c into merged_master (Bitcoin PR #17477) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
72cf6e58ca Merge ce87d5613a into merged_master (Bitcoin PR #18289) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
fc64d8f534 Merge 95602ec21f into merged_master (Elements PR #834) 
Hadta bump the fee test in feature_confidential_transactions.py since our default
rangeproofs are now bigger.
 2020-11-26 01:07:58 +00:00
Andrew Poelstra
aa81dd6cf2 Merge ad27fddd1f into merged_master (Elements PR #796) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
5aa6af6fa3 Merge 8662387309 into merged_master (Bitcoin PR #17997) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
2d35bebf6b Merge 3516a31eaa into merged_master (Bitcoin PR #18234) 2020-11-26 01:07:50 +00:00
Andrew Poelstra
6b887e82dc Merge d0601e67f1 into merged_master (Bitcoin PR #17812) 2020-11-26 01:07:49 +00:00
Andrew Poelstra
0246b86872 Merge 54a7ef612a into merged_master (Bitcoin PR #17399) 2020-11-26 01:07:48 +00:00
Andrew Poelstra
dcc1b1a31e Merge 89a97a71f2 into merged_master (Bitcoin PR #17985) 2020-11-26 01:07:46 +00:00
Andrew Poelstra
66204f061c Merge c0e0e0a9d5 into merged_master (Elements PR #818) 2020-11-26 01:07:46 +00:00
Andrew Poelstra
70819cbab4 Merge 36f42e1bf4 into merged_master (Bitcoin PR #18037) 2020-11-26 01:07:43 +00:00
Andrew Poelstra
8388f8d515 Merge adea5e1b54 into merged_master (Bitcoin PR #18023) 2020-11-26 00:29:44 +00:00
Andrew Poelstra
2c846f5fa3 Merge da3611a580 into merged_master (Elements PR #808) 2020-11-26 00:29:43 +00:00
Andrew Poelstra
6f123becd3 Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115) 2020-11-14 19:07:24 +00:00
Andrew Poelstra
77c8e6c2f6 Merge 01fc5891fb into merged_master (Bitcoin PR #16702) 2020-11-14 16:52:13 +00:00
Andrew Poelstra
c78c45dfbf Merge fe3b58b959 into merged_master (Bitcoin PR #17992) 2020-11-14 16:52:11 +00:00
Andrew Poelstra
c3f29355e6 Merge 1ae46dce60 into merged_master (Bitcoin PR #17754) 2020-11-14 16:52:10 +00:00
Andrew Poelstra
25582da1e5 Merge a51aa2880d into merged_master (Bitcoin PR #17897) 2020-11-14 16:52:10 +00:00
Andrew Poelstra
20f6587a3b Merge 631df3ee87 into merged_master (Bitcoin PR #17916) 2020-11-14 16:52:09 +00:00