Commit graph

2979 commits

Author SHA1 Message Date
Andrew Poelstra
a9956489b2 Merge c54295c1a2 into merged_master (Bitcoin PR #18641) 2020-11-26 01:08:24 +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
a1367df7d3 Merge c2e53ff064 into merged_master (Bitcoin PR #18467) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
7acaa0481b Merge c189bfd260 into merged_master (Bitcoin PR #17824) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
bc49e22548 Merge f0d97cdf70 into merged_master (Elements PR #861) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
fd4ce54b94 Merge 661e8df1b6 into merged_master (Bitcoin PR #18653) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
c63e500dfd Merge 20c0e2e0f0 into merged_master (Bitcoin PR #18628) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
0dc35ccd83 Merge 6110ae8326 into merged_master (Bitcoin PR #18451) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
3ad3ea7e75 Merge e28e5353c4 into merged_master (Bitcoin PR #18545) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
c67b9f0c92 Merge d9fd7b5a67 into merged_master (Bitcoin PR #18596) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
0f61201649 Merge 4d26312c17 into merged_master (Bitcoin PR #18597) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
bea14c785a Merge c49971f3c9 into merged_master (Bitcoin PR #18584) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
79067914d8 Merge a2b282c9d0 into merged_master (Bitcoin PR #18609) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
9146c7899d Merge 59d6249290 into merged_master (Bitcoin PR #18593) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
5f85d5672b Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
f3fc8e9b77 Merge 6ab96ec546 into merged_master (Bitcoin PR #18574) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
63a52d3633 Merge 29893ec875 into merged_master (Bitcoin PR #18454) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
8078d38fd4 Merge 081dcbde66 into merged_master (Bitcoin PR #18561) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
10f14d1162 Merge 87374d80a7 into merged_master (Bitcoin PR #18566) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
0a87d878fa Merge 63dad67348 into merged_master (Bitcoin PR #18546) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
d4beddb515 Merge abc145c9a4 into merged_master (Bitcoin PR #18543) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
886accd6fa Merge 54d5ba3d9c into merged_master (Bitcoin PR #18540) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
1ff8f7acff Merge c0b389b335 into merged_master (Bitcoin PR #18484) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
9280951289 Merge 425a7f900e into merged_master (Bitcoin PR #18516) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
3e35839fe6 Merge 299544f9c5 into merged_master (Bitcoin PR #18534) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
f3f386ffee Merge cf21293ef7 into merged_master (Bitcoin PR #18515) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
da30c131c3 Merge 94fd4a56ed into merged_master (Bitcoin PR #18496) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
4fd24473ed Merge 490ae0e87b into merged_master (Bitcoin PR #18520) 2020-11-26 01:08:09 +00:00
Andrew Poelstra
9e86b25395 Merge a3b61cf641 into merged_master (Bitcoin PR #18509) 2020-11-26 01:08:09 +00:00
Andrew Poelstra
61b65dbb0c Merge ff53433fe4 into merged_master (Bitcoin PR #18494) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
44f30e687f Merge 6bdd515ccf into merged_master (Bitcoin PR #16923) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
87d0e26d18 Merge 67a72466e1 into merged_master (Bitcoin PR #18247) 2020-11-26 01:08:06 +00:00
Andrew Poelstra
15d1e10a14 Merge d2db25233c into merged_master (Bitcoin PR #18474) 2020-11-26 01:08:06 +00:00
Andrew Poelstra
b67e35ae94 Merge 72ef366564 into merged_master (Bitcoin PR #18472) 2020-11-26 01:08:06 +00:00
Andrew Poelstra
f8e3be6cb7 Merge d52ba21dff into merged_master (Bitcoin PR #18481) 2020-11-26 01:08:06 +00:00
Andrew Poelstra
4192a98947 Merge 965c0c37d5 into merged_master (Bitcoin PR #18420) 2020-11-26 01:08:05 +00:00
Andrew Poelstra
9587ad280d Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334) 2020-11-26 01:08:05 +00:00
Andrew Poelstra
0f623aede0 Merge 210b533a11 into merged_master (Bitcoin PR #18447) 2020-11-26 01:08:03 +00:00
Andrew Poelstra
6a5b5f13ec Merge b53af72b82 into merged_master (Bitcoin PR #18416) 2020-11-26 01:08:03 +00:00
Andrew Poelstra
bdd87dc5fa Merge 694f4cbd78 into merged_master (Bitcoin PR #18312) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
5b3e849748 Merge 2e97d80017 into merged_master (Bitcoin PR #18134) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
477c4a5c58 Merge ac5a435247 into merged_master (Elements PR #838) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
ff1454245a Merge d478a737db into merged_master (Bitcoin PR #18392) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
169fbf8221 Merge 57a8fa9c3b into merged_master (Bitcoin PR #18406) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
e1f1d5dc40 Merge 67de1ee8bc into merged_master (Bitcoin PR #18378) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
acec4e75af Merge 5c9d408b2d into merged_master (Bitcoin PR #18300) 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
42372ae3a5 Merge ad04f0d8a5 into merged_master (Bitcoin PR #17319) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
cc259f1835 Merge 71d00ba8df into merged_master (Elements PR #835) 2020-11-26 01:07:57 +00:00