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

13642 commits

Author SHA1 Message Date
Andrew Poelstra
addd2da647 Merge 208406038c into merged_master (Bitcoin PR #15519) 2020-10-28 00:11:58 +00:00
Andrew Poelstra
56d472ec04 Merge e14cd04abb into merged_master (Bitcoin PR #15637) 2020-10-28 00:11:51 +00:00
Andrew Poelstra
da079d831f Merge 7b13c64645 into merged_master (Bitcoin PR #15642) 2020-10-28 00:11:29 +00:00
Andrew Poelstra
6ff9e5c32d Merge abd914ed34 into merged_master (Bitcoin PR #15614) 2020-10-28 00:10:57 +00:00
Andrew Poelstra
756aebfdd2 Merge 717fd58c4b into merged_master (Bitcoin PR #15625) 2020-10-28 00:10:51 +00:00
Andrew Poelstra
5f340cc9ac Merge 2607d960a0 into merged_master (Bitcoin PR #10973) 2020-10-28 00:10:27 +00:00
Andrew Poelstra
ae97dae708 Merge b3f82284ba into merged_master (Bitcoin PR #15597) 2020-10-28 00:10:01 +00:00
Andrew Poelstra
45dad5302b Merge 93623eea71 into merged_master (Bitcoin PR #15623) 2020-10-28 00:09:42 +00:00
Andrew Poelstra
3541a793f2 Merge 81f732bcaa into merged_master (Bitcoin PR #15617) 2020-10-28 00:09:17 +00:00
Andrew Poelstra
0a64319362 Merge e45b7f20e6 into merged_master (Bitcoin PR #15618) 2020-10-28 00:09:11 +00:00
Andrew Poelstra
7d93f137a0 Merge c033c4b5ce into merged_master (Bitcoin PR #13541) 2020-10-28 00:09:04 +00:00
Andrew Poelstra
4f65588d54 Merge 2c336a9ccd into merged_master (Bitcoin PR #15581) 2020-10-28 00:07:58 +00:00
Andrew Poelstra
aa93130e24 Merge 7ec7aea442 into merged_master (Bitcoin PR #15491) 2020-10-27 23:50:29 +00:00
Andrew Poelstra
19893de4c0 Merge 2f501fb5c6 into merged_master (Bitcoin PR #15522) 2020-10-27 23:50:09 +00:00
Andrew Poelstra
57ccf5a681 Merge 7fa1f6258c into merged_master (Bitcoin PR #15583) 2020-10-27 23:27:56 +00:00
Andrew Poelstra
32a1b86572 Merge 8e1704c015 into merged_master (Bitcoin PR #15559) 2020-10-27 23:27:48 +00:00
Andrew Poelstra
175b8550f8 Merge c3b1cb958f into merged_master (Bitcoin PR #15573) 2020-10-27 23:27:13 +00:00
Andrew Poelstra
760d7ce6f0 Merge c94852e791 into merged_master (Bitcoin PR #15564) 2020-10-27 23:23:30 +00:00
Andrew Poelstra
5ae23eb085 Merge 887f57eb72 into merged_master (Bitcoin PR #15566) 2020-10-27 23:22:22 +00:00
Andrew Poelstra
7fc78471cf Merge ff38148808 into merged_master (Bitcoin PR #15486) 2020-10-27 23:21:15 +00:00
Andrew Poelstra
4ce0b45eb7 Merge efed9809b4 into merged_master (Bitcoin PR #15532) 2020-10-27 23:20:29 +00:00
Andrew Poelstra
28aae7a4a2 Merge d211edb349 into merged_master (Bitcoin PR #15464) 2020-10-27 23:19:43 +00:00
Andrew Poelstra
987d3f5fbd Merge 726d0668ff into merged_master (Bitcoin PR #15530) 2020-10-27 23:19:10 +00:00
Andrew Poelstra
eef55250a7 Merge 3515612e06 into merged_master (Bitcoin PR #15473) 2020-10-27 23:07:51 +00:00
Andrew Poelstra
1851050699 Merge df36ddf9ce into merged_master (Bitcoin PR #15504) 2020-10-27 22:59:03 +00:00
Andrew Poelstra
81fb77635b Merge d8a62db8bf into merged_master (Bitcoin PR #15531) 2020-10-27 22:39:09 +00:00
Andrew Poelstra
edfdf46351 Merge 45f434f44d into merged_master (Bitcoin PR #15288) 2020-10-27 21:55:08 +00:00
Andrew Poelstra
1e375568af Merge 2d46f1be0c into merged_master (Bitcoin PR #15118) 2020-10-27 21:52:10 +00:00
Andrew Poelstra
a599a81d3a Merge 789b0bbf2a into merged_master (Bitcoin PR #15335) 2020-10-27 21:39:17 +00:00
Andrew Poelstra
b612189f3c Merge 9e3122de05 into merged_master (Bitcoin PR #15492) 2020-10-27 20:46:09 +00:00
Andrew Poelstra
a92e9a9509 Merge 37f236acc6 into merged_master (Bitcoin PR #15510) 2020-10-27 20:08:02 +00:00
Andrew Poelstra
9369666813 Merge a6d7026a45 into merged_master (Bitcoin PR #15497) 2020-10-27 19:54:52 +00:00
Andrew Poelstra
eeee02ab57 Merge a0d4e79b4d into merged_master (Bitcoin PR #15477) 2020-10-27 19:35:53 +00:00
Andrew Poelstra
773758d441 Merge a4f9c024c6 into merged_master (Bitcoin PR #15468) 2020-10-27 19:32:05 +00:00
Andrew Poelstra
9183ac7aba Merge 6f43ed4c5a into merged_master (Bitcoin PR #15462) 2020-10-27 19:17:45 +00:00
Andrew Poelstra
2b24674400 Merge d88f7f8764 into merged_master (Bitcoin PR #15471) 2020-10-27 19:13:32 +00:00
Andrew Poelstra
1b54a44e6b Merge b4fc5257b7 into merged_master (Bitcoin PR #15456) 2020-10-27 16:28:34 +00:00
Andrew Poelstra
3e41b646fc Merge 1a8a5ede9f into merged_master (Bitcoin PR #15401) 2020-10-27 16:19:25 +00:00
Andrew Poelstra
4489ede527 fix missing includes 2020-10-27 16:19:15 +00:00
Steven Roose
ee900196f6
Fixup after merge with master 
That test was moved and then removed in master, so it got added again
after merge.
 2019-05-29 14:32:21 +01:00
Steven Roose
619b438dab
Merge branch 'master' into catchup 2019-05-29 14:17:08 +01:00
Steven Roose
45c06d29d0
Fix Travis builds 2019-05-28 16:59:52 +01:00
Steven Roose
738a3c91a2
MERGE-FIX: Fix bitcoin-tx duplicate -h argument 2019-05-28 15:05:48 +01:00
Steven Roose
de81c0d97e
MERGE-FIX: Fix linter (mostly RPC help) 
I also moved some RPC methods that were not at the end of the file with
the other ELEMENTS RPC methods. This makes the diff on my machine look
crazy. Let's hope GitHub has more intelligent diffs..
 2019-05-27 17:40:16 +01:00
Steven Roose
efe4e8ff04
MERGE-FIX: Fix functional tests 2019-05-24 17:11:47 +01:00
Steven Roose
473e1e9ca1
MERGE-FIX: Fix compatibility functional tests 2019-05-22 16:54:46 +01:00
Steven Roose
3a01200e34
MERGE-FIX: Fix unit tests 2019-05-21 12:23:42 +01:00
Gregory Sanders
8591de929e kill useless mapPeginsSpentToTxid 2019-05-20 13:57:56 -04:00
Steven Roose
52f6f6905b
WIP: Fix compilation after merge 2019-05-20 16:22:05 +01:00
Steven Roose
de5dc03251
MERGE-FIX: Rebrand bitcoin-wallet to elements-wallet 2019-05-20 16:22:02 +01:00