Commit graph

6530 commits

Author SHA1 Message Date
James Dorfman
cd43fbec87 Merge a57492f65d into merged_master (Bitcoin PR bitcoin/bitcoin#25370) 2024-09-10 19:09:20 +00:00
James Dorfman
115b62e5ec Merge ede9089096 into merged_master (Bitcoin PR bitcoin/bitcoin#25156) 2024-09-10 19:08:58 +00:00
James Dorfman
5073fee442 Merge 9e4fbebcc8 into merged_master (Bitcoin PR bitcoin/bitcoin#25306) 2024-09-10 18:47:36 +00:00
James Dorfman
63397a752c Merge a55606c3bd into merged_master (Bitcoin PR bitcoin/bitcoin#25356) 2024-09-10 18:37:30 +00:00
James Dorfman
041147b7c6 Merge 506d9b25a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24839)
This required some changes to various helper methods in the python
functional test framework. Please verify those.
2024-09-10 17:49:27 +00:00
James Dorfman
783f839f2e Merge 3340d46cd3 into merged_master (Bitcoin PR bitcoin/bitcoin#25352) 2024-09-10 01:00:47 +00:00
James Dorfman
4b197fbfb4 Merge c3daa321f9 into merged_master (Bitcoin PR bitcoin/bitcoin#25312) 2024-09-09 21:13:12 +00:00
James Dorfman
a1049ecfa8 Merge e3c08eb620 into merged_master (Bitcoin PR bitcoin/bitcoin#25307) 2024-09-09 21:13:08 +00:00
James Dorfman
e993380998 Merge 455780b1ae into merged_master (Bitcoin PR bitcoin/bitcoin#25294) 2024-09-09 21:12:59 +00:00
James Dorfman
b63c13e007 Merge b9416c3847 into merged_master (Bitcoin PR bitcoin/bitcoin#25096) 2024-09-09 19:51:32 +00:00
James Dorfman
791e673535 Merge 9dae9f5f1e into merged_master (Bitcoin PR bitcoin/bitcoin#25292) 2024-09-09 19:48:55 +00:00
James Dorfman
abdd702c0f Merge e282764e04 into merged_master (Bitcoin PR bitcoin/bitcoin#25228) 2024-09-09 19:39:17 +00:00
James Dorfman
57f4c62810 Merge f66633d9cb into merged_master (Bitcoin PR bitcoin/bitcoin#25288) 2024-09-09 17:47:06 +00:00
James Dorfman
d4a4f5d919 Merge 581e2bdbac into merged_master (Bitcoin PR bitcoin/bitcoin#24629) 2024-09-09 17:35:34 +00:00
James Dorfman
95d6ba74ad Merge 06ea2783a2 into merged_master (Bitcoin PR bitcoin/bitcoin#25220) 2024-09-09 17:22:47 +00:00
James Dorfman
033f17b1df Merge 00ce8543f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24171)
Please review the changes to src/net_processing.cpp carefully, I'm not sure
if I adapted new IBD logic to work properly for elements.
2024-09-09 16:33:14 +00:00
James Dorfman
b4201d89ce Merge 1f63b460a8 into merged_master (Bitcoin PR bitcoin/bitcoin#25267) 2024-09-09 16:30:10 +00:00
James Dorfman
fd8fa61417 Merge 1c7ef0abd1 into merged_master (Bitcoin PR bitcoin/bitcoin#25262) 2024-09-06 19:30:23 +00:00
James Dorfman
0d39470585 Merge 9cc010f5a9 into merged_master (Bitcoin PR bitcoin/bitcoin#25087) 2024-09-06 18:49:38 +00:00
James Dorfman
d66fc19e64 Merge beb18d3fbc into merged_master (Bitcoin PR bitcoin/bitcoin#25259) 2024-09-06 18:35:08 +00:00
James Dorfman
49b32361ba Merge d4d9daff7a into merged_master (Bitcoin PR bitcoin/bitcoin#25200) 2024-09-06 18:34:56 +00:00
James Dorfman
a0026906ad Merge 1f932de673 into merged_master (Bitcoin PR bitcoin/bitcoin#25253) 2024-09-06 18:31:39 +00:00
James Dorfman
1aff5fa9e9 Merge 5f65afff9c into merged_master (Bitcoin PR bitcoin/bitcoin#24178) 2024-09-06 18:21:45 +00:00
James Dorfman
fec3aaf01a Merge 269fa667f2 into merged_master (Bitcoin PR bitcoin/bitcoin#25044) 2024-09-06 18:10:08 +00:00
James Dorfman
b089fee4af Merge b6ab45ae5c into merged_master (Bitcoin PR bitcoin/bitcoin#25204) 2024-09-06 17:08:46 +00:00
James Dorfman
bf065f9c8a Merge 3ba6dd6f4b into merged_master (Bitcoin PR bitcoin/bitcoin#24408) 2024-09-06 16:21:04 +00:00
James Dorfman
1207659cdb Merge 77e125c486 into merged_master (Bitcoin PR bitcoin/bitcoin#25217) 2024-09-06 16:19:20 +00:00
James Dorfman
2baccdc1ce Merge 8c721fff3a into merged_master (Bitcoin PR bitcoin/bitcoin#25192) 2024-09-06 06:37:07 +00:00
James Dorfman
db3aa6dd4a Merge 7008087548 into merged_master (Bitcoin PR bitcoin/bitcoin#24410) 2024-09-06 06:21:07 +00:00
James Dorfman
858291e891 Merge fbb90c44ac into merged_master (Bitcoin PR bitcoin/bitcoin#25015) 2024-09-06 05:45:08 +00:00
James Dorfman
b7d70add65 Merge 5ebff43025 into merged_master (Bitcoin PR bitcoin/bitcoin#25122) 2024-08-13 22:28:47 +00:00
James Dorfman
9aaf787e72 Merge a7e3afb221 into merged_master (Bitcoin PR bitcoin/bitcoin#25171) 2024-08-13 17:44:38 +00:00
James Dorfman
c15526e3ca Merge 4a8709821e into merged_master (Bitcoin PR bitcoin/bitcoin#24830) 2024-08-13 06:54:30 +00:00
James Dorfman
95c566cd26 Merge d433f59f1e into merged_master (Bitcoin PR bitcoin/bitcoin#25173) 2024-08-13 06:33:25 +00:00
James Dorfman
0e02561a73 Merge fdb82a30be into merged_master (Bitcoin PR bitcoin/bitcoin#25147) 2024-08-13 05:07:06 +00:00
James Dorfman
0cf35ca80d Merge bb83aba6c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25161) 2024-08-13 04:30:55 +00:00
James Dorfman
addbcad66f Merge e016c00e98 into merged_master (Bitcoin PR bitcoin/bitcoin#25126) 2024-08-13 04:12:40 +00:00
James Dorfman
78628f6bbd Merge 139f789d7a into merged_master (Bitcoin PR bitcoin/bitcoin#25124) 2024-08-13 03:56:29 +00:00
James Dorfman
febb060594 Merge d5d40d59f8 into merged_master (Bitcoin PR bitcoin/bitcoin#23679) 2024-08-13 03:41:15 +00:00
James Dorfman
ab65a98a04 Merge dc0ee57373 into merged_master (Bitcoin PR bitcoin/bitcoin#20799) 2024-08-12 03:28:06 +00:00
James Dorfman
8cffafbe9d Merge b74a6dde8c into merged_master (Bitcoin PR bitcoin/bitcoin#25123) 2024-08-12 02:51:58 +00:00
James Dorfman
ec0e4e0aaa Merge 1d5325a8f9 into merged_master (Bitcoin PR bitcoin/bitcoin#25117) 2024-08-09 22:50:21 +00:00
James Dorfman
613804e4ee Merge fe1fcdc629 into merged_master (Bitcoin PR bitcoin/bitcoin#25121) 2024-08-09 22:31:44 +00:00
James Dorfman
3eb8d9b89e Merge 27d7b11e8c into merged_master (Bitcoin PR bitcoin/bitcoin#25106) 2024-08-09 17:48:02 +00:00
James Dorfman
46bad21aba Merge ed4eeafbb6 into merged_master (Bitcoin PR bitcoin/bitcoin#24793) 2024-08-09 17:46:34 +00:00
James Dorfman
bc38ea860b Merge a8098f2cef into merged_master (Bitcoin PR bitcoin/bitcoin#25091) 2024-08-09 16:54:00 +00:00
James Dorfman
170e9a67cf Merge 77a9997d97 into merged_master (Bitcoin PR bitcoin/bitcoin#25063) 2024-08-09 16:12:43 +00:00
James Dorfman
e0e41a0dae Merge c367736f85 into merged_master (Bitcoin PR bitcoin/bitcoin#24840) 2024-08-09 05:36:04 +00:00
James Dorfman
d69f2921b9 Merge 5e1aacab57 into merged_master (Bitcoin PR bitcoin/bitcoin#24933) 2024-08-09 04:43:43 +00:00
James Dorfman
ede65a76c3 Merge 0047d9b89b into merged_master (Bitcoin PR bitcoin/bitcoin#24993) 2024-08-09 04:20:20 +00:00