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
22867 commits 49 branches 359 tags 252 MiB
Commit graph

1654 commits

Author SHA1 Message Date
Andrew Poelstra
977162a889 Merge 981ec9b817 into merged_master (Bitcoin PR #15459) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
c5e90d0076 Merge 26a7437045 into merged_master (Bitcoin PR #16982) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
ecd17723f2 Merge 6288f15f50 into merged_master (Bitcoin PR #16968) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
52411627ed Merge 36604b4ef5 into merged_master (Bitcoin PR #16912) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
f4b0731eda Merge 587003d380 into merged_master (Bitcoin PR #16914) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
df8fcece9d Merge 72d30d668a into merged_master (Bitcoin PR #16512) 2020-11-09 21:20:26 +00:00
Andrew Poelstra
7f749bf004 Merge f18a9065e9 into merged_master (Bitcoin PR #16812) 2020-11-09 21:20:25 +00:00
Andrew Poelstra
dd3496415c Merge 19f301def7 into merged_master (Bitcoin PR #16871) 2020-11-09 21:20:25 +00:00
Andrew Poelstra
31729410b6 Merge b0a7a76c9d into merged_master (Bitcoin PR #16873) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
183aea8254 Merge 4bfef0daeb into merged_master (Bitcoin PR #16866) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
6be382597b Merge 102998ea03 into merged_master (Bitcoin PR #15584) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
d4f4703df7 Merge a199f75225 into merged_master (Bitcoin PR #16857) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
5b89be04ff Merge 33c466a642 into merged_master (Bitcoin PR #16787) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
d73a5a5a8d Merge 33f9750b1b into merged_master (Bitcoin PR #16185) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
206311142a Merge d8fc997913 into merged_master (Bitcoin PR #16695) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
7e0872f92c Merge fc5b756bae into merged_master (Bitcoin PR #16556) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
f48bcfe313 Merge 9546a78595 into merged_master (Bitcoin PR #16621) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
b24503fe4b Merge 085fe76299 into merged_master (Bitcoin PR #16461) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
a211435b8e Merge d21e8aa0a9 into merged_master (Bitcoin PR #16732) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
58e5e4c784 Merge af4100cd6f into merged_master (Bitcoin PR #16404) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
2bc7beced3 Merge db67101c74 into merged_master (Bitcoin PR #16665) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
66f2116668 Merge 910ff94cf5 into merged_master (Bitcoin PR #16690) 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
adb6d02fac Merge bd62f8d6ee into merged_master (Bitcoin PR #16645) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
543db1b024 Merge 48e5bfe224 into merged_master (Bitcoin PR #16643) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
19def18ab9 Merge 0d65106dce into merged_master (Bitcoin PR #16383) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
5f280a6068 Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
04a9709d23 Merge 286332495d into merged_master (Bitcoin PR #16605) 2020-11-09 21:20:13 +00:00
Andrew Poelstra
8d16afe159 Merge c3b605cf13 into merged_master (Bitcoin PR #16586) 2020-11-09 21:20:13 +00:00
Andrew Poelstra
2a7e400289 Merge ac3e65204a into merged_master (Bitcoin PR #16585) 2020-11-09 21:20:13 +00:00
Andrew Poelstra
c175966d12 Merge 32776276ef into merged_master (Bitcoin PR #16574) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
15b414d845 Merge fbe4b7665b into merged_master (Bitcoin PR #16530) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
808c6ab0f0 Merge 1063fc9cf9 into merged_master (Bitcoin PR #16536) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
db933991ff Merge 6841b01340 into merged_master (Bitcoin PR #16394) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
2d781b0565 Merge 25f0edd59f into merged_master (Bitcoin PR #16448) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
039e455324 Merge 3f288a1c05 into merged_master (Bitcoin PR #16504) 2020-11-09 21:20:10 +00:00
Andrew Poelstra
8dfba71046 Merge b21acab82f into merged_master (Bitcoin PR #15993) 
Just kept our version of Travis since I couldn't test it. We'll fix this after the fact.
 2020-11-09 21:20:09 +00:00
Andrew Poelstra
bfd57fbd09 Merge 29220250c1 into merged_master (Bitcoin PR #16441) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
e29f1987af Merge fe001925f8 into merged_master (Bitcoin PR #16455) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
431c7dce23 Merge ad4391ca38 into merged_master (Bitcoin PR #16430) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
dcd3f9fd69 Merge 59ce537a49 into merged_master (Bitcoin PR #16152) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
b57516e11a Merge 24dbcf3808 into merged_master (Bitcoin PR #15891) 
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
 2020-11-09 21:20:06 +00:00
Andrew Poelstra
a50b652932 Merge 735d6b57e7 into merged_master (Bitcoin PR #16227) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
473365d335 Merge d1fc827300 into merged_master (Bitcoin PR #16270) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
b1bb63f321 Merge 5859b7dc6f into merged_master (Bitcoin PR #16338) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
843c77a2ff Merge 983c84844c into merged_master (Bitcoin PR #16352) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
8e3404b818 Merge e1a8d76aff into merged_master (Bitcoin PR #16347) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
1d9458e988 Merge 2b465195e0 into merged_master (Bitcoin PR #16339) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
2687bdb94a Merge 584168c7f9 into merged_master (Bitcoin PR #16326) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
969b50e413 Merge 1212808762 into merged_master (Bitcoin PR #16257) 2020-11-09 03:58:17 +00:00