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

2297 commits

Author SHA1 Message Date
Andrew Poelstra
0c1829049e Merge 9dd7bd47be into merged_master (Bitcoin PR #18034) 2020-11-26 01:07:44 +00:00
Andrew Poelstra
70819cbab4 Merge 36f42e1bf4 into merged_master (Bitcoin PR #18037) 2020-11-26 01:07:43 +00:00
Andrew Poelstra
8d6c3cd351 Merge 35b7a8e539 into merged_master (Bitcoin PR #18087) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
b734847060 Merge ceb3d45f7d into merged_master (Bitcoin PR #17947) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
9a8c2b0e3f Merge 8a56f79d49 into merged_master (Bitcoin PR #17482) 2020-11-26 01:07:40 +00:00
Andrew Poelstra
375008bf68 Merge 554d89fb29 into merged_master (Bitcoin PR #18029) 2020-11-26 00:29:44 +00:00
Andrew Poelstra
2c846f5fa3 Merge da3611a580 into merged_master (Elements PR #808) 2020-11-26 00:29:43 +00:00
Andrew Poelstra
6f123becd3 Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115) 2020-11-14 19:07:24 +00:00
Andrew Poelstra
7500590938 Merge 7fcaa8291c into merged_master (Bitcoin PR #18009) 2020-11-14 18:13:04 +00:00
Andrew Poelstra
d0366a3a8f Merge 0130abbdb7 into merged_master (Bitcoin PR #18018) 2020-11-14 18:08:09 +00:00
Andrew Poelstra
91e195d7cd Merge 2d6e76af24 into merged_master (Bitcoin PR #17261) 
Moved GetOnlinePakKey to the scriptpubkey manager; the other blinding
stuff remains in the CWallet. At some point after the rebase we should
consider whether there's a better separation to be had between the PAK
related stuff now that we have wallet boxes.
 2020-11-14 17:16:10 +00:00
Andrew Poelstra
0feee2ea2d Merge c1607b5df4 into merged_master (Bitcoin PR #17957) 2020-11-14 16:52:13 +00:00
Andrew Poelstra
77c8e6c2f6 Merge 01fc5891fb into merged_master (Bitcoin PR #16702) 2020-11-14 16:52:13 +00:00
Andrew Poelstra
d056afcbee Merge c434282d2c into merged_master (Bitcoin PR #18008) 2020-11-14 16:52:13 +00:00
Andrew Poelstra
77cefac5f9 Merge 2755b2b109 into merged_master (Bitcoin PR #18010) 2020-11-14 16:52:12 +00:00
Andrew Poelstra
c3f29355e6 Merge 1ae46dce60 into merged_master (Bitcoin PR #17754) 2020-11-14 16:52:10 +00:00
Andrew Poelstra
ec7afc81d7 Merge e45463a06a into merged_master (Bitcoin PR #17980) 2020-11-14 16:52:10 +00:00
Andrew Poelstra
6f1d11cd82 Merge daae6403d8 into merged_master (Bitcoin PR #17777) 2020-11-14 16:52:09 +00:00
Andrew Poelstra
1b7df1d514 Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691) 2020-11-14 16:52:08 +00:00
Andrew Poelstra
7c53615bb6 Merge af05bd9e1e into merged_master (Bitcoin PR #17891) 2020-11-14 16:52:07 +00:00
Andrew Poelstra
964e4aef5f Merge 7754cd3848 into merged_master (Elements PR #797) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
3f3d6f9c98 Merge 2ed74a43a0 into merged_master (Bitcoin PR #16945) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
75726e3bc3 Merge 40a495a38a into merged_master (Bitcoin PR #16975) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
d9db3e9012 Merge 17e14ac92f into merged_master (Bitcoin PR #17781) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
c4e2622681 Merge 3f8dbcd655 into merged_master (Bitcoin PR #16658) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
009bc2fdfb Merge 99813a9745 into merged_master (Bitcoin PR #17829) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
077355e651 Merge 6677be64f6 into merged_master (Bitcoin PR #17473) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
0e6f9042ec Merge 7df6a7ea98 into merged_master (Bitcoin PR #17758) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
6b5ef039c0 Merge 03dfa36641 into merged_master (Bitcoin PR #17229) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
7d5d0e9d6a Merge 94c6f2bba4 into merged_master (Bitcoin PR #17593) 2020-11-14 16:52:00 +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
c6c5243a64 Merge 806a2c602c into merged_master (Bitcoin PR #17071) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
ba2897d87a Merge 6b51cce65a into merged_master (Bitcoin PR #17753) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
dc8e2bcda2 Merge 995b6c83e1 into merged_master (Bitcoin PR #17721) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
c1ac820649 Merge 3914e877c4 into merged_master (Bitcoin PR #17511) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
f3ec9fa522 Merge 7da9e3a817 into merged_master (Bitcoin PR #17050) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
a959089a79 Merge ea756bc48c into merged_master (Bitcoin PR #17502) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
0f9ee77fe1 Merge 1189b6acab into merged_master (Bitcoin PR #17109) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
f68c3ea229 Merge 347dd76ec8 into merged_master (Bitcoin PR #17093) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
e12785c194 Merge 74c6ad3aab into merged_master (Bitcoin PR #17225) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
70dcb8d05c Merge bb03765e2d into merged_master (Bitcoin PR #17685) 2020-11-14 16:51:54 +00:00
Andrew Poelstra
c59a715d27 Merge cb11324a63 into merged_master (Bitcoin PR #17051) 2020-11-14 16:51:53 +00:00
Andrew Poelstra
5a48ca16e3 Merge fee01bb053 into merged_master (Bitcoin PR #17517) 2020-11-14 16:51:52 +00:00
Andrew Poelstra
1b4ef5d628 Merge 54b12e425b into merged_master (Bitcoin PR #17555) 2020-11-14 16:51:52 +00:00
Andrew Poelstra
255c478c5a Merge 1fdaa04ceb into merged_master (Bitcoin PR #17641) 2020-11-14 16:51:52 +00:00
Andrew Poelstra
f5606e5e2b Merge 35eda631ed into merged_master (Bitcoin PR #17634) 2020-11-14 16:51:51 +00:00
Andrew Poelstra
fcc3e6c04c Merge ae6943620a into merged_master (Bitcoin PR #17407) 2020-11-09 23:10:14 +00:00
Andrew Poelstra
ae457ceaeb Merge 30521302f9 into merged_master (Bitcoin PR #17136) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
061d0ea050 Merge f92e750eb4 into merged_master (Bitcoin PR #17480) 2020-11-09 23:10:11 +00:00