James Dorfman
279eb338f2
Merge 1b0469199b into merged_master (Bitcoin PR bitcoin/bitcoin#25281 )
2024-09-10 23:50:55 +00:00
James Dorfman
7ef8f9380b
Merge 015717e2b8 into merged_master (Bitcoin PR bitcoin/bitcoin#25299 )
2024-09-10 23:50:51 +00:00
James Dorfman
941d1a4586
Merge 3b3c66f859 into merged_master (Bitcoin PR bitcoin/bitcoin#25392 )
2024-09-10 23:50:46 +00:00
James Dorfman
63c604b160
Merge 874529665c into merged_master (Bitcoin PR bitcoin/bitcoin#22380 )
2024-09-10 23:50:40 +00:00
James Dorfman
a77b61778e
Merge 7f2c983e1c into merged_master (Bitcoin PR bitcoin/bitcoin#24864 )
2024-09-10 23:50:36 +00:00
James Dorfman
45829a8913
Merge b0c8306349 into merged_master (Bitcoin PR bitcoin/bitcoin#24649 )
...
I commented out a new assertion on transaction size in test/functional/rpc_fundrawtransaction.py.
That calculation needs to be updated to work properly for elements.
2024-09-10 23:49:39 +00:00
James Dorfman
d12772b740
Merge 0ea92cad52 into merged_master (Bitcoin PR bitcoin/bitcoin#24356 )
2024-09-10 20:19:42 +00:00
James Dorfman
fe8d041f9f
Merge 489b587669 into merged_master (Bitcoin PR bitcoin/bitcoin#25215 )
2024-09-10 20:19:35 +00:00
James Dorfman
c24bc9e856
Merge faf25b09d9 into merged_master (Bitcoin PR bitcoin/bitcoin#25282 )
2024-09-10 20:19:30 +00:00
James Dorfman
ac7b05a27d
Merge 8035b5c80d into merged_master (Bitcoin PR bitcoin/bitcoin#25369 )
2024-09-10 20:10:06 +00:00
James Dorfman
2847b2bdbe
Merge d6832217ef into merged_master (Bitcoin PR bitcoin/bitcoin#25382 )
2024-09-10 20:10:02 +00:00
James Dorfman
bc4e2c0dbd
Merge 51eebe082d into merged_master (Bitcoin PR bitcoin/bitcoin#25368 )
2024-09-10 20:09:57 +00:00
James Dorfman
71c092dd08
Merge 6acba84603 into merged_master (Bitcoin PR bitcoin/bitcoin#25358 )
2024-09-10 20:09:40 +00:00
James Dorfman
e78152d6fb
Merge 26ec2f2d6b into merged_master (Bitcoin PR bitcoin-core/gui#618 )
2024-09-10 20:09:35 +00:00
James Dorfman
616633ec35
Merge a7a36590f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25223 )
2024-09-10 19:59:14 +00:00
James Dorfman
a95a6d31b2
Merge fa07ee165e into merged_master (Bitcoin PR bitcoin/bitcoin#25339 )
2024-09-10 19:20:49 +00:00
James Dorfman
d02360aec2
Merge 4c0d1fec16 into merged_master (Bitcoin PR bitcoin/bitcoin#25374 )
2024-09-10 19:20:39 +00:00
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
