Commit graph

2145 commits

Author SHA1 Message Date
James Dorfman
89333b6aad Merge 269dcad16e into merged_master (Bitcoin PR bitcoin/bitcoin#24789)
This commit adds a new argument '-reindex-chainstate',
Check if we want to prevent activating this in elements when
trim_headers is active.
2024-08-02 05:58:45 +00:00
James Dorfman
7ad79475b5 Merge 505ba39665 into merged_master (Bitcoin PR bitcoin/bitcoin#22910) 2024-08-01 21:06:05 +00:00
James Dorfman
d4aa6eba2f Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909) 2024-08-01 18:03:20 +00:00
James Dorfman
9589e4d604 Merge 2074d7df20 into merged_master (Bitcoin PR bitcoin/bitcoin#24837) 2024-08-01 00:59:25 +00:00
James Dorfman
847807539e Merge c5c4fb3182 into merged_master (Bitcoin PR bitcoin/bitcoin#24758) 2024-07-29 16:46:56 +00:00
James Dorfman
5896e751de Merge f421de5be6 into merged_master (Bitcoin PR bitcoin/bitcoin#24236) 2024-07-08 20:04:51 +00:00
James Dorfman
9c1d4cc8ff Merge a4d7ac7bbe into merged_master (Elements PR #1317) 2024-05-24 16:13:46 +00:00
Byron Hambly
c1661b251a
discount: introduce config args 2024-05-14 19:03:17 +02:00
James Dorfman
ff2e02aa4f Merge f10b24ad29 into merged_master (Bitcoin PR bitcoin/bitcoin#24672) 2024-03-19 20:21:01 +00:00
James Dorfman
e2f9ba794f Merge 56c8658700 into merged_master (Bitcoin PR bitcoin/bitcoin#24663) 2024-03-19 06:39:38 +00:00
Byron Hambly
b9f9528b7c Merge f0c9ba2b48 into merged_master (Bitcoin PR bitcoin/bitcoin#24205) 2024-02-02 14:57:29 +02:00
Byron Hambly
7629e72362 Merge 4a0ab355b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24626) 2024-02-02 11:54:04 +02:00
Byron Hambly
51288f4f73 Merge a7b3123fea into merged_master (Bitcoin PR bitcoin/bitcoin#24609) 2023-10-16 11:46:33 +00:00
Byron Hambly
0e30699e09 Merge f6d335e828 into merged_master (Bitcoin PR bitcoin/bitcoin#24468) 2023-10-13 10:12:42 +00:00
Byron Hambly
20fa7fa673 Merge 6687bb24ae into merged_master (Bitcoin PR bitcoin/bitcoin#24306) 2023-10-13 09:02:49 +00:00
Byron Hambly
1e1030496e Merge 7d9dade900 into merged_master (Elements PR #1256) 2023-08-29 11:32:50 +00:00
Pablo Greco
d6d8b6bd70 Fix bug enabling trim_headers 2023-08-08 09:28:13 -07:00
Byron Hambly
6f90a02548 Merge 30308cc380 into merged_master (Bitcoin PR bitcoin/bitcoin#20196) 2023-07-03 11:17:52 +00:00
Byron Hambly
1dc6ad6ea9 Merge ba11eb354b into merged_master (Bitcoin PR bitcoin/bitcoin#23542) 2023-07-03 09:44:18 +00:00
Byron Hambly
7d91422a87 Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834) 2023-07-03 09:33:46 +00:00
Byron Hambly
51fbed170b Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409) 2023-07-02 13:45:31 +00:00
Byron Hambly
5ec7209e95 Merge cf22191fd8 into merged_master (Bitcoin PR bitcoin/bitcoin#24072) 2023-07-01 07:59:26 +00:00
Byron Hambly
04cea6bf40 Merge 8c0f02c69d into merged_master (Bitcoin PR bitcoin/bitcoin#24265) 2023-06-30 11:33:00 +00:00
Byron Hambly
08e52d10c8 Merge 515200298b into merged_master (Bitcoin PR bitcoin/bitcoin#24250) 2023-06-30 08:06:50 +00:00
Byron Hambly
4988afcbc2 Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744) 2023-06-30 07:38:29 +00:00
Byron Hambly
7878ba47b9 Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497) 2023-06-19 09:28:31 +00:00
Byron Hambly
a14e05aac7 Merge 3917dff732 into merged_master (Bitcoin PR bitcoin/bitcoin#23855) 2023-06-15 11:07:17 +00:00
Byron Hambly
47626b5a64 Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912) 2023-06-14 15:44:11 +00:00
James Dorfman
67a5234365 Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280) 2023-06-12 17:58:49 +00:00
Byron Hambly
50957f3e4b Merge 26a1147ce5 into merged_master (Bitcoin PR bitcoin/bitcoin#23636) 2023-06-01 12:04:07 +00:00
Byron Hambly
32a72637f7 Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517) 2023-05-31 09:33:07 +00:00
Byron Hambly
3f0bf16b6a Merge 73ac195e29 into merged_master (Bitcoin PR bitcoin/bitcoin#23249) 2023-05-30 15:47:52 +00:00
Byron Hambly
c8c72768d0 Merge 7f0f853373 into merged_master (Bitcoin PR bitcoin/bitcoin#23005) 2023-05-25 08:59:33 +00:00
Byron Hambly
b951f8d198 Merge 8346004ac8 into merged_master (Bitcoin PR bitcoin/bitcoin#23077) 2023-05-17 12:13:27 +00:00
Byron Hambly
0486fef47e Merge 3fc3641043 into merged_master (Bitcoin PR bitcoin/bitcoin#22766) 2023-05-16 13:26:27 +00:00
Byron Hambly
2b8eef42dd Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937) 2023-05-11 12:38:50 +00:00
Byron Hambly
498907a233 Merge 816e15ee81 into merged_master (Bitcoin PR bitcoin/bitcoin#22951) 2023-05-09 11:50:39 +00:00
Byron Hambly
cca3f919f8 Merge 9e530c6352 into merged_master (Bitcoin PR bitcoin/bitcoin#20487) 2023-05-09 11:22:04 +00:00
Byron Hambly
b708aecb74 Merge 571bb94dfb into merged_master (Bitcoin PR bitcoin/bitcoin#23123) 2023-04-28 13:31:37 +00:00
Byron Hambly
c234cf81a4 Merge dbbb7fbcc0 into merged_master (Bitcoin PR bitcoin/bitcoin#23130) 2023-04-28 12:10:18 +00:00
Byron Hambly
eea9829aa6 Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976) 2023-04-24 11:40:49 +00:00
Byron Hambly
91812b0e0d Merge 8b523f2e55 into merged_master (Bitcoin PR bitcoin/bitcoin#23094) 2023-04-24 10:53:02 +00:00
Byron Hambly
14a2c59839 Merge 632be5514c into merged_master (Bitcoin PR bitcoin/bitcoin#23061) 2023-04-24 10:40:48 +00:00
Byron Hambly
8d89f4e102 Merge 71bdf0bff1 into merged_master (Bitcoin PR bitcoin/bitcoin#22626) 2023-04-21 12:36:24 +00:00
Byron Hambly
8d6c4da78c Merge 528e08119f into merged_master (Bitcoin PR bitcoin/bitcoin#22219) 2023-04-21 09:23:54 +00:00
Byron Hambly
6382bb18e8 Merge 053a5fc7d9 into merged_master (Bitcoin PR bitcoin/bitcoin#22762) 2023-04-21 07:24:43 +00:00
James Dorfman
5a22e7ab80 Merge 5446070418 into merged_master (Bitcoin PR bitcoin/bitcoin#22911) 2023-04-21 06:10:28 +00:00
James Dorfman
20e85cd2e1 Merge 896649996b into merged_master (Bitcoin PR bitcoin/bitcoin#22915) 2023-04-21 02:20:33 +00:00
James Dorfman
0627d9aacb Merge a8fdfea77b into merged_master (Bitcoin PR bitcoin/bitcoin#22791) 2023-04-20 22:19:30 +00:00
James Dorfman
0d8968cf61 Merge 61a843e43b into merged_master (Bitcoin PR bitcoin/bitcoin#22220) 2023-04-11 03:23:21 +00:00