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

504 commits

Author SHA1 Message Date
Andrew Poelstra
d89112072c Merge 3b8e4070c8 into merged_master (Elements PR #958) 
Conflicts due to change of error state formatting upstream.
 2021-03-26 00:21:11 +00:00
Steven Roose
14a42a0187
Add two missing dynafed fields to getblockchaininfo 2021-02-24 15:23:09 +00:00
Andrew Poelstra
7aa0fa112d Merge 867dbeba5f into merged_master (Bitcoin PR #20281) 2020-12-01 21:41:17 +00:00
Andrew Poelstra
e765fc93ea Merge 3caee16946 into merged_master (Bitcoin PR #19953) 
Taproot :D
 2020-12-01 02:54:57 +00:00
Andrew Poelstra
40ea75c22b Merge dde104963b into merged_master (Bitcoin PR #20064) 2020-11-30 06:33:14 +00:00
Andrew Poelstra
7a8f77d7ad Merge 9e217f5a6f into merged_master (Bitcoin PR #19572) 2020-11-29 19:44:31 +00:00
Andrew Poelstra
5c1a330c57 Merge d692d192cd into merged_master (Bitcoin PR #19849) 
More RPC cleanups. This one discovered that the `createpsbt` and
`rawblindrawtransaction` RPCs had incorrect argument lists :)
 2020-11-29 17:58:59 +00:00
Andrew Poelstra
d8ce9195a1 Merge 2583966130 into merged_master (Bitcoin PR #19478) 2020-11-29 01:52:23 +00:00
Andrew Poelstra
f34e214a0e Merge 197450f808 into merged_master (Bitcoin PR #19777) 2020-11-28 03:49:05 +00:00
Andrew Poelstra
d089ac0639 Merge 44f66d2f10 into merged_master (Bitcoin PR #19765) 2020-11-28 01:45:16 +00:00
Andrew Poelstra
5902895d0c Merge 31760bb7c9 into merged_master (Bitcoin PR #19528) 2020-11-27 18:39:01 +00:00
Andrew Poelstra
419fd4f90d Merge b75f2ad72d into merged_master (Bitcoin PR #19660) 2020-11-27 04:05:36 +00:00
Andrew Poelstra
d8fbb60a17 Merge a63a26f042 into merged_master (Bitcoin PR #19585) 2020-11-26 23:09:01 +00:00
Andrew Poelstra
0fb616ece5 Merge 834ac4c0f5 into merged_master (Bitcoin PR #19323) 2020-11-26 03:36:32 +00:00
Andrew Poelstra
52c243844d Merge ca055885c6 into merged_master (Bitcoin PR #19474) 2020-11-26 01:09:23 +00:00
Andrew Poelstra
1aa51f0c4c Merge b52e25cc1b into merged_master (Bitcoin PR #19328) 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
b431cfa2d7 Merge 532b134cb0 into merged_master (Bitcoin PR #19373) 2020-11-26 01:09:12 +00:00
Andrew Poelstra
440e85cbdb Merge 371a73e940 into merged_master (Bitcoin PR #19233) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
0a5760376f Merge 1b90a7b61a into merged_master (Bitcoin PR #19005) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
531cdf3ca5 Merge 826fe9c667 into merged_master (Bitcoin PR #18807) 2020-11-26 01:08:54 +00:00
Andrew Poelstra
5b9754580e Merge 55b4c65bd1 into merged_master (Bitcoin PR #16127) 2020-11-26 01:08:51 +00:00
Andrew Poelstra
cac993d7e9 Merge 13397dc78f into merged_master (Bitcoin PR #19056) 2020-11-26 01:08:50 +00:00
Andrew Poelstra
29b17c1221 Merge 793e0ff22c into merged_master (Bitcoin PR #18698) 2020-11-26 01:08:49 +00:00
Andrew Poelstra
d0b2badc94 Merge ad3a61c5f5 into merged_master (Bitcoin PR #18895) 2020-11-26 01:08:48 +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
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