Commit graph

40867 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
c6fee1dac3 Merge 38c63e3683 into merged_master (Bitcoin PR bitcoin/bitcoin#25338) 2024-09-10 18:55:20 +00:00
James Dorfman
e630ad44d6 Merge df933596e7 into merged_master (Bitcoin PR bitcoin/bitcoin#23611) 2024-09-10 18:53:44 +00:00
James Dorfman
6140a20552 Merge a05876619a into merged_master (Bitcoin PR bitcoin/bitcoin#25367) 2024-09-10 18:53:39 +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
40b938125f Merge 1557014378 into merged_master (Bitcoin PR bitcoin/bitcoin#25332) 2024-09-10 18:47:28 +00:00
James Dorfman
287ba3738d Merge c5fbcf5f8d into merged_master (Bitcoin PR bitcoin/bitcoin#25320) 2024-09-10 18:47:04 +00:00
James Dorfman
3dde891f8c Merge cccbc5fe3e into merged_master (Bitcoin PR bitcoin/bitcoin#25359) 2024-09-10 18:46:59 +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
1e24510c7e Merge b91055ea55 into merged_master (Bitcoin PR bitcoin/bitcoin#25251) 2024-09-10 18:10:02 +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
7d93a61eb3 Merge 5174a139c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25313) 2024-09-10 01:00:42 +00:00
James Dorfman
e69c4acdf8 Merge 37633d2f61 into merged_master (Bitcoin PR bitcoin-core/gui#602) 2024-09-10 00:50:29 +00:00
James Dorfman
149f9f27bd Merge 9ef180a0ab into merged_master (Bitcoin PR bitcoin-core/gui#608) 2024-09-10 00:36:47 +00:00
James Dorfman
fe6472cd64 Merge b71d37da2c into merged_master (Bitcoin PR bitcoin/bitcoin#25333) 2024-09-10 00:34:02 +00:00
James Dorfman
c472e94b84 Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931) 2024-09-09 21:13:17 +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
a731e95dc9 Merge 9edc5133d4 into merged_master (Bitcoin PR bitcoin/bitcoin#25303) 2024-09-09 21:13:04 +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
4f4566129d Merge 2e079c86ae into merged_master (Bitcoin PR bitcoin/bitcoin#24395) 2024-09-09 20:00:39 +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
abb51db9fa Merge bbf2a25044 into merged_master (Bitcoin PR bitcoin/bitcoin#25298) 2024-09-09 19:51:25 +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
aaf41fec40 Merge 79cabe3a5b into merged_master (Bitcoin PR bitcoin/bitcoin#25239) 2024-09-09 19:39:28 +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
1586451cf8 Merge d8ae504448 into merged_master (Bitcoin PR bitcoin/bitcoin#25245) 2024-09-09 19:19:40 +00:00
James Dorfman
841caf1c0f Merge 45d8b1e94a into merged_master (Bitcoin PR bitcoin/bitcoin#25286) 2024-09-09 19:19:33 +00:00
James Dorfman
caa3ef8844 Merge 2ab4a80480 into merged_master (Bitcoin PR bitcoin/bitcoin#25254)
This commit moved DEFAULT_MIN_RELAY_TX_FEE to a different file.
Please confirm that the new value is equal to the old one.
2024-09-09 18:21:18 +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
c643e814fd Merge e82d8069bc into merged_master (Bitcoin PR bitcoin/bitcoin#25276) 2024-09-09 17:20:47 +00:00
James Dorfman
d8162b5189 Merge fcde5d1300 into merged_master (Bitcoin PR bitcoin/bitcoin#25255) 2024-09-09 17:20:43 +00:00
James Dorfman
810ca44ebd Merge 1b2e1d179c into merged_master (Bitcoin PR bitcoin-core/gui#614) 2024-09-09 17:16:02 +00:00
James Dorfman
a52fff5abe Merge 695ca641a4 into merged_master (Bitcoin PR bitcoin/bitcoin#24860) 2024-09-09 17:06:48 +00:00
James Dorfman
5c24574c48 Merge aac9c259b0 into merged_master (Bitcoin PR bitcoin/bitcoin#25065) 2024-09-09 16:46:26 +00:00
James Dorfman
46234e6304 Merge 2cf8c2caea into merged_master (Bitcoin PR bitcoin/bitcoin#25256) 2024-09-09 16:33:43 +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
081f248300 Merge b11ab25afb into merged_master (Bitcoin PR bitcoin-core/gui#583) 2024-09-09 06:18:22 +00:00
James Dorfman
c9ff53f57d Merge da6792b2eb into merged_master (Bitcoin PR bitcoin-core/gui#613) 2024-09-09 06:16:16 +00:00
James Dorfman
ef7aeb3e50 Merge a100c42a13 into merged_master (Bitcoin PR bitcoin/bitcoin#24927) 2024-09-09 06:01:09 +00:00
James Dorfman
ae633bfd3b Merge 636991d0c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25264) 2024-09-06 19:31:45 +00:00
James Dorfman
e3a248b168 Merge 39ddd522c3 into merged_master (Bitcoin PR bitcoin/bitcoin#24531) 2024-09-06 19:31:35 +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
25c2ea0027 Merge 86cc31dab6 into merged_master (Bitcoin PR bitcoin/bitcoin#25249) 2024-09-06 19:20:19 +00:00
James Dorfman
1deb77b104 Merge b752dade04 into merged_master (Bitcoin PR bitcoin/bitcoin#25244) 2024-09-06 18:49:44 +00:00