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

29478 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Poelstra
ef2ff70784 Merge 95bde34a71 into merged_master (Bitcoin PR #20237) 2020-12-02 02:03:47 +00:00
Andrew Poelstra
31e4afc89e Merge 218fe60d91 into merged_master (Bitcoin PR #20290) 2020-12-02 01:57:20 +00:00
Andrew Poelstra
1a2796e9cb Merge 5174b534da into merged_master (Bitcoin PR #20289) 2020-12-02 01:50:49 +00:00
Andrew Poelstra
00119482a0 Merge 8387f832d6 into merged_master (Bitcoin PR #20187) 2020-12-02 01:34:05 +00:00
Andrew Poelstra
0a4ca5becf Merge ca18860563 into merged_master (Bitcoin PR #20263) 2020-12-02 01:27:52 +00:00
Andrew Poelstra
d009849f95 Merge ef4c7c4e0b into merged_master (Bitcoin PR #18788) 
This one was pretty brutal, but ultimately nothing too surprising.
Just had to keep track of which wallets owned which blinding keys,
and in wallet_importprunedfunds.py I had to manually create a
Liquid address.
 2020-12-02 01:21:09 +00:00
Andrew Poelstra
c876734d93 Merge b6a00e76ab into merged_master (Bitcoin PR #20279) 2020-12-01 22:04:54 +00:00
Andrew Poelstra
aff3d057d5 Merge c5ec0367d7 into merged_master (Bitcoin PR #20165) 2020-12-01 21:54:11 +00:00
Andrew Poelstra
7aa0fa112d Merge 867dbeba5f into merged_master (Bitcoin PR #20281) 2020-12-01 21:41:17 +00:00
Andrew Poelstra
6a6ed8d6f1 Merge 26d7941224 into merged_master (Bitcoin PR #20230) 2020-12-01 21:22:22 +00:00
Andrew Poelstra
b90d5752f9 Merge f1fcbdea25 into merged_master (Bitcoin PR #20271) 2020-12-01 21:16:07 +00:00
Andrew Poelstra
a01ffb9d0c Merge 0c2eb7f8de into merged_master (Bitcoin PR #20262) 2020-12-01 21:09:44 +00:00
Andrew Poelstra
02fc69464f Merge 5a6f3c5a01 into merged_master (Bitcoin PR #20080) 2020-12-01 21:02:21 +00:00
Andrew Poelstra
9ce2c21435 Merge 42b66a6b81 into merged_master (Bitcoin PR #20186) 2020-12-01 20:37:50 +00:00
Andrew Poelstra
2c9485fd10 Merge 8e9e190ea5 into merged_master (Bitcoin PR #20257) 
Updates libsecp. A no-op since we just did this.
 2020-12-01 19:32:01 +00:00
Andrew Poelstra
d77603c55f Merge 5b82f253b6 into merged_master (Bitcoin PR #20195) 2020-12-01 19:13:21 +00:00
Andrew Poelstra
56bb454243 Merge 2e24197117 into merged_master (Bitcoin PR #20115) 2020-12-01 19:06:05 +00:00
Andrew Poelstra
f3afbf3d85 Merge f3727fd735 into merged_master (Bitcoin PR #20156) 2020-12-01 18:41:26 +00:00
Andrew Poelstra
8c3388f038 Merge 924a4ff7eb into merged_master (Bitcoin PR #20242) 2020-12-01 18:34:13 +00:00
Andrew Poelstra
3fde0f012f Merge 6196cf77e5 into merged_master (Bitcoin PR #19753) 2020-12-01 18:26:43 +00:00
Andrew Poelstra
11d75a53ed Merge 3f512f3d56 into merged_master (Bitcoin PR #20258) 2020-12-01 18:07:02 +00:00
Andrew Poelstra
ec01e32371 Merge db26eeba71 into merged_master (Bitcoin PR #19877) 2020-12-01 17:59:59 +00:00
Andrew Poelstra
b1573fdfe8 Merge 488b77f72e into merged_master (Bitcoin PR #20256) 2020-12-01 17:53:14 +00:00
Andrew Poelstra
71593ae083 Merge 55b1ffcd25 into merged_master (Bitcoin PR bitcoin-core/gui#116) 2020-12-01 17:39:24 +00:00
Andrew Poelstra
10ea7f1e54 Merge 83363f7b62 into merged_master (Bitcoin PR #20167) 2020-12-01 17:32:41 +00:00
Andrew Poelstra
f0eb108f94 Merge c1564baf3b into merged_master (Bitcoin PR #19124) 2020-12-01 17:12:01 +00:00
Andrew Poelstra
d80e17c203 Merge 67d4643a1a into merged_master (Bitcoin PR #20152) 2020-12-01 17:05:26 +00:00
Andrew Poelstra
d2c3e1aed0 Merge fa463f1163 into merged_master (Bitcoin PR #20247) 2020-12-01 16:52:05 +00:00
Andrew Poelstra
c257b0d178 Merge d67883d01e into merged_master (Bitcoin PR bitcoin-core/gui#43) 2020-12-01 16:45:22 +00:00
Andrew Poelstra
6682a291c2 Merge 49984b44cf into merged_master (Bitcoin PR bitcoin-core/gui#71) 2020-12-01 16:38:45 +00:00
Andrew Poelstra
fb9e54e0f8 Merge 9af7c1993b into merged_master (Bitcoin PR #20216) 2020-12-01 16:30:35 +00:00
Andrew Poelstra
7af2bdc594 Merge 9453fbf5a0 into merged_master (Bitcoin PR bitcoin-core/gui#20) 2020-12-01 16:27:14 +00:00
Andrew Poelstra
1254d1081d Merge 88271184e8 into merged_master (Bitcoin PR #20112) 2020-12-01 16:10:09 +00:00
Andrew Poelstra
797a5bf283 Merge 7012db2a6b into merged_master (Bitcoin PR #20176) 2020-12-01 16:03:26 +00:00
Andrew Poelstra
f1188d79e4 Merge 1cb4e339f9 into merged_master (Bitcoin PR #20039) 2020-12-01 15:56:21 +00:00
Andrew Poelstra
5a0577ecb6 Merge dda18e7310 into merged_master (Bitcoin PR #20214) 2020-12-01 15:16:21 +00:00
Andrew Poelstra
bd9d811281 Merge b46f37ba5e into merged_master (Bitcoin PR #20198) 2020-12-01 14:56:40 +00:00
Andrew Poelstra
6f267e338a Merge 47fc883106 into merged_master (Bitcoin PR #19967) 2020-12-01 14:36:58 +00:00
Andrew Poelstra
eebfc818d0 Merge 0f86e7f128 into merged_master (Bitcoin PR #20157) 2020-12-01 14:25:00 +00:00
Andrew Poelstra
9eb2afd7ff Merge f5bd46a4cc into merged_master (Bitcoin PR #20125) 2020-12-01 14:13:32 +00:00
Andrew Poelstra
21a16c8199 Merge 45385018e1 into merged_master (Bitcoin PR #20162) 2020-12-01 06:56:01 +00:00
Andrew Poelstra
8258a74157 Merge 4f807348af into merged_master (Bitcoin PR #20185) 2020-12-01 06:49:23 +00:00
Andrew Poelstra
dad417577a Merge 4769942d90 into merged_master (Bitcoin PR #19624) 2020-12-01 06:42:52 +00:00
Andrew Poelstra
86062499f5 Merge d9d9a29352 into merged_master (Bitcoin PR #20179) 2020-12-01 06:36:26 +00:00
Andrew Poelstra
5ca702b5d9 Merge 152ddb3197 into merged_master (Bitcoin PR #20180) 2020-12-01 06:29:15 +00:00
Andrew Poelstra
3d291dba91 Merge 62af467ff0 into merged_master (Bitcoin PR #20082) 2020-12-01 06:22:43 +00:00
Andrew Poelstra
f515eab2f2 Merge a1e0359618 into merged_master (Bitcoin PR #19986) 2020-12-01 06:10:23 +00:00
Andrew Poelstra
60ebf8a17a Merge c92aa8357c into merged_master (Bitcoin PR #19911) 2020-12-01 05:53:59 +00:00
Andrew Poelstra
251361078d Merge 80c8a02f1b into merged_master (Bitcoin PR #20159) 2020-12-01 05:47:16 +00:00
Andrew Poelstra
ce4acf6ba9 Merge 5d644778da into merged_master (Bitcoin PR #20169) 2020-12-01 05:40:44 +00:00