Commit graph

30022 commits

Author SHA1 Message Date
Andrew Poelstra
0cf76ce682 Merge 335d27d081 into merged_master (Bitcoin PR #20512) 2021-06-10 19:11:03 +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
3473a5279a Merge 2e1336dbfe into merged_master (Bitcoin PR #20471) 2021-05-08 00:24:41 +00:00
Andrew Poelstra
4240c083aa Merge 7ae86b3c68 into merged_master (Bitcoin PR #20522) 2021-05-08 00:06:07 +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
580d34fdf9 Merge 19b8071eae into merged_master (Bitcoin PR #20489) 2021-05-07 22:30:20 +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
3fff08ad6a Merge efd4cdb81f into merged_master (Bitcoin PR #20456) 2021-05-07 21:14:51 +00:00
Andrew Poelstra
d3321390c2 Merge ca4a784942 into merged_master (Bitcoin PR #20410) 2021-05-07 20:56:02 +00:00
Andrew Poelstra
7431522779 Merge 31c9987976 into merged_master (Bitcoin PR #20447) 2021-05-07 20:21:55 +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
40cd7deb8b Merge 6f9dac5ede into merged_master (Bitcoin PR #20473) 2021-05-07 19:21:36 +00:00
Andrew Poelstra
61978189ab Merge 7ebbee551d into merged_master (Bitcoin PR #19764) 2021-05-07 19:01:59 +00:00
Andrew Poelstra
607eeb9d7a Merge cb89e18845 into merged_master (Bitcoin PR #19179) 2021-05-07 18:43:16 +00:00
Andrew Poelstra
a9e2850a58 Merge 2ee954daae into merged_master (Bitcoin PR #20458) 2021-05-07 18:18:43 +00:00
Andrew Poelstra
0ecb5364be Merge 555b5d1bf9 into merged_master (Bitcoin PR #20419) 2021-05-07 17:59:54 +00:00
Andrew Poelstra
4008c6f872 Merge b0c9024a7c into merged_master (Bitcoin PR #20449) 2021-05-07 17:39:27 +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
b3133ca99c Merge e9a1c9fbde into merged_master (Bitcoin PR #19867) 2021-05-07 16:38:15 +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
9068fbf10e Merge ea460291f9 into merged_master (Bitcoin PR #20430) 2021-05-07 14:59:39 +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
1357911374 Merge 3d632c3f49 into merged_master (Bitcoin PR #20428) 2021-05-06 22:59:14 +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
516ffe8400 Merge db58b857f7 into merged_master (Bitcoin PR #20329) 2021-05-06 22:01:12 +00:00
Andrew Poelstra
00e18636bf Merge 04670ef81e into merged_master (Bitcoin PR #20385) 2021-05-06 21:53:52 +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
82faa689f1 Merge c4d1e24f54 into merged_master (Bitcoin PR #20047) 2021-05-06 21:24:00 +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