Commit graph

19537 commits

Author SHA1 Message Date
Andrew Poelstra
7895eae09d Merge 5c4911e7e7 into merged_master (Bitcoin PR #20568) 2021-06-11 17:20:15 +00:00
Andrew Poelstra
7a7791e879 Merge 03b1db6114 into merged_master (Bitcoin PR #18766) 2021-06-11 16:59:19 +00:00
Andrew Poelstra
84e93452f5 Merge 00f4dcd552 into merged_master (Bitcoin PR #20138) 2021-06-11 16:33:51 +00:00
Andrew Poelstra
d228e06487 Merge f3e17686b3 into merged_master (Bitcoin PR #20468) 2021-06-11 16:13:19 +00:00
Andrew Poelstra
ec8dc88631 Merge eab63b971d into merged_master (Bitcoin PR #19847) 2021-06-11 15:26:10 +00:00
Andrew Poelstra
fd819cc9f0 Merge 1a04f45fe9 into merged_master (Bitcoin PR #19832) 2021-06-11 15:05:23 +00:00
Andrew Poelstra
34db56ae3a Merge 9385549a31 into merged_master (Bitcoin PR #20581) 2021-06-11 13:09:57 +00:00
Andrew Poelstra
6d1ef33bf4 Merge c1604483d3 into merged_master (Bitcoin PR #20566) 2021-06-11 03:34:33 +00:00
Andrew Poelstra
90e6e0a67b Merge dca80ffb45 into merged_master (Bitcoin PR #20255) 2021-06-11 02:52:30 +00:00
Andrew Poelstra
77b76404ac Merge a0489f3472 into merged_master (Bitcoin PR #20221) 2021-06-11 01:14:28 +00:00
Andrew Poelstra
406e81efb5 Merge 0a13d15c14 into merged_master (Bitcoin PR #20530) 2021-06-10 23:32:14 +00:00
Andrew Poelstra
4f912b85f4 Merge c33662a0ea into merged_master (Bitcoin PR #18948) 2021-06-10 22:49:15 +00:00
Andrew Poelstra
f64501ffca Merge 7f0f01f0ab into merged_master (Bitcoin PR #20507) 2021-06-10 22:27:38 +00:00
Andrew Poelstra
0533e80b8c Merge 283f22cabb into merged_master (Bitcoin PR #20461) 2021-06-10 22:04:42 +00:00
Andrew Poelstra
2ec2763700 Merge 80d4231e16 into merged_master (Bitcoin PR #19980) 2021-06-10 21:23:06 +00:00
Andrew Poelstra
2d31b7300e Merge f17e8ba3a1 into merged_master (Bitcoin PR #20207) 2021-06-10 20:35:12 +00:00
Andrew Poelstra
dc1787367e Merge dfd0b70088 into merged_master (Bitcoin PR #20425) 2021-06-10 20:14:39 +00:00
Andrew Poelstra
b7dad02e88 Merge dcb7518067 into merged_master (Bitcoin PR #20496) 2021-06-10 19:31:16 +00:00
Andrew Poelstra
7fa3063497 Merge f2a673f15b into merged_master (Bitcoin PR bitcoin-core/gui#137) 2021-06-10 18:50:51 +00:00
Andrew Poelstra
f8af0d7192 Merge cd720337fe into merged_master (Bitcoin PR #20222) 2021-06-10 18:30:29 +00:00
Andrew Poelstra
1521881ad8 Merge 24e4857b29 into merged_master (Bitcoin PR #20494) 2021-06-10 18:09:55 +00:00
Andrew Poelstra
96df4cbd72 Merge ffd5e7a856 into merged_master (Bitcoin PR #20519) 2021-05-08 01:23:53 +00:00
Andrew Poelstra
9742f4a3b3 Merge 81d5af42f4 into merged_master (Bitcoin PR #20499) 2021-05-08 01:03:42 +00:00
Andrew Poelstra
7203c700e4 Merge 817aeca57a into merged_master (Bitcoin PR #20491) 2021-05-08 00:43:50 +00:00
Andrew Poelstra
74c14def62 Merge 854b36cfa2 into merged_master (Bitcoin PR bitcoin-core/gui#138) 2021-05-07 23:47:20 +00:00
Andrew Poelstra
2522ba9f6d Merge 1ae5758981 into merged_master (Bitcoin PR #20448) 2021-05-07 23:27:40 +00:00
Andrew Poelstra
407098393c Merge e2ff5e7b35 into merged_master (Bitcoin PR #20497) 2021-05-07 23:08:57 +00:00
Andrew Poelstra
e61e2353ae Merge 50091592dd into merged_master (Bitcoin PR #19337) 2021-05-07 22:50:26 +00:00
Andrew Poelstra
0673bc107b Merge 5c0aebfcd4 into merged_master (Bitcoin PR #19387) 2021-05-07 22:11:23 +00:00
Andrew Poelstra
8d52d54329 Merge afdfd3c8c1 into merged_master (Bitcoin PR #20403) 2021-05-07 21:52:40 +00:00
Andrew Poelstra
71c770f41d Merge 1e9e4b68f3 into merged_master (Bitcoin PR #20469) 2021-05-07 21:33:24 +00:00
Andrew Poelstra
d3321390c2 Merge ca4a784942 into merged_master (Bitcoin PR #20410) 2021-05-07 20:56:02 +00:00
Andrew Poelstra
ceac4f83ab Merge 9402159b9b into merged_master (Bitcoin PR #20472) 2021-05-07 20:01:35 +00:00
Andrew Poelstra
c9266f6d1c Merge 3a32b62fa7 into merged_master (Bitcoin PR #20462) 2021-05-07 19:41:18 +00:00
Andrew Poelstra
0a5257d126 Merge 86bf3ae3b5 into merged_master (Bitcoin PR #20202) 2021-05-07 17:19:00 +00:00
Andrew Poelstra
90fe881b8c Merge 1b75f2542d into merged_master (Bitcoin PR #20432) 2021-05-07 16:57:14 +00:00
Andrew Poelstra
d16f8ae480 Merge 816132e6eb into merged_master (Bitcoin PR #20426)
Needed to restore an #include in wallet/rpcwallet.cpp for several
functions (ChainActive, IsDynaFedActive, GetFeeMap and others)
2021-05-07 16:18:13 +00:00
Andrew Poelstra
a0f440e27a Merge d4159984c3 into merged_master (Bitcoin PR #20223) 2021-05-07 15:22:08 +00:00
Andrew Poelstra
ff371ab483 Merge 4c2ee5c855 into merged_master (Bitcoin PR #20424) 2021-05-07 14:39:18 +00:00
Andrew Poelstra
d9f59e1ce0 Merge 094663842d into merged_master (Bitcoin PR bitcoin-core/gui#13) 2021-05-07 14:18:41 +00:00
Andrew Poelstra
46ee0e1bd1 Merge c45e1d9aa7 into merged_master (Bitcoin PR bitcoin-core/gui#21) 2021-05-07 13:59:36 +00:00
Andrew Poelstra
9d9fec3785 Merge fdd068507d into merged_master (Bitcoin PR #20056) 2021-05-06 22:30:00 +00:00
Andrew Poelstra
575da3c422 Merge 46f0b2f976 into merged_master (Bitcoin PR #19851) 2021-05-06 22:22:51 +00:00
Andrew Poelstra
5fd99738b0 Merge 2878167c18 into merged_master (Bitcoin PR #20000) 2021-05-06 22:15:27 +00:00
Andrew Poelstra
436a1295e9 Merge 0a267f4eb8 into merged_master (Bitcoin PR bitcoin-core/gui#46) 2021-05-06 22:08:23 +00:00
Andrew Poelstra
74ec32907f Merge 848d66519c into merged_master (Bitcoin PR #20054) 2021-05-06 21:38:12 +00:00
Andrew Poelstra
1ecb6390d4 Merge 884bde510e into merged_master (Bitcoin PR #20291) 2021-05-06 21:31:08 +00:00
Andrew Poelstra
bd90341b97 Merge 7aa94569ce into merged_master (Bitcoin PR #20024) 2021-05-06 21:14:55 +00:00
Andrew Poelstra
ec8588c71e Merge 71d068db40 into merged_master (Bitcoin PR #18531)
(Mostly) mechanical RPC changes
2021-05-06 21:05:40 +00:00
Andrew Poelstra
620add9627 Merge 9ab9665c74 into merged_master (Bitcoin PR #15710) 2021-05-06 19:50:01 +00:00