James Dorfman
088bedeff2
Merge 01e9e2d1ca into merged_master (Bitcoin PR bitcoin/bitcoin#25451 )
2024-09-16 05:06:23 +00:00
James Dorfman
7efc15101d
Merge bc83710fdc into merged_master (Bitcoin PR bitcoin-core/gui#623 )
2024-09-16 05:06:18 +00:00
James Dorfman
ab7e4a7e86
Merge b9122e95f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25444 )
2024-09-16 05:06:15 +00:00
James Dorfman
c54c954e0e
Merge ddd7a39aa9 into merged_master (Bitcoin PR bitcoin/bitcoin#25414 )
2024-09-16 05:06:09 +00:00
James Dorfman
d923eab56e
Merge 0808c88d7b into merged_master (Bitcoin PR bitcoin/bitcoin#25443 )
2024-09-16 05:05:56 +00:00
James Dorfman
94c443f2bf
Merge a085a55491 into merged_master (Bitcoin PR bitcoin/bitcoin#25428 )
2024-09-16 05:05:52 +00:00
James Dorfman
7b3b3b21a0
Merge b1a824dd06 into merged_master (Bitcoin PR bitcoin/bitcoin#24291 )
2024-09-16 05:05:47 +00:00
James Dorfman
717b8a980b
Merge e3b06e8dd8 into merged_master (Bitcoin PR bitcoin/bitcoin#25440 )
2024-09-16 04:56:09 +00:00
James Dorfman
fa1a985ef3
Merge 1b71c76886 into merged_master (Bitcoin PR bitcoin/bitcoin#25435 )
2024-09-16 04:45:07 +00:00
James Dorfman
69d34657d2
Merge a4e066af85 into merged_master (Bitcoin PR bitcoin/bitcoin#24352 )
2024-09-16 04:28:39 +00:00
James Dorfman
15267d650b
Merge 58b9d6cf9e into merged_master (Bitcoin PR bitcoin-core/gui#620 )
2024-09-16 04:27:32 +00:00
James Dorfman
055d7ba185
Merge 174b821e64 into merged_master (Bitcoin PR bitcoin/bitcoin#25427 )
2024-09-16 04:09:24 +00:00
James Dorfman
5218e5f117
Merge 7377ed778c into merged_master (Bitcoin PR bitcoin/bitcoin#25389 )
2024-09-16 04:08:52 +00:00
James Dorfman
b134c36610
Merge c3a41ad980 into merged_master (Bitcoin PR bitcoin/bitcoin#25314 )
2024-09-16 04:08:47 +00:00
James Dorfman
e612f4a416
Merge 34869114a7 into merged_master (Bitcoin PR bitcoin/bitcoin#25394 )
2024-09-16 04:08:43 +00:00
James Dorfman
0c2f436c2a
Merge 5884a47c36 into merged_master (Bitcoin PR bitcoin/bitcoin#25422 )
2024-09-16 04:08:05 +00:00
James Dorfman
321cb9477b
Merge 18d9189cc9 into merged_master (Bitcoin PR bitcoin-core/gui#612 )
...
I think this is correct, please double check.
2024-09-16 03:57:58 +00:00
James Dorfman
b816bdc2f3
Merge b178807265 into merged_master (Bitcoin PR bitcoin/bitcoin#25430 )
2024-09-16 03:45:20 +00:00
James Dorfman
3c5be32752
Merge 1d39c9ca06 into merged_master (Bitcoin PR bitcoin/bitcoin#25425 )
2024-09-16 03:42:13 +00:00
James Dorfman
0ef6a812f1
Merge 09a76e43fd into merged_master (Bitcoin PR bitcoin-core/gui#615 )
2024-09-16 03:32:53 +00:00
James Dorfman
44d189f389
Merge e16f644104 into merged_master (Bitcoin PR bitcoin/bitcoin#25378 )
2024-09-16 03:32:50 +00:00
James Dorfman
93484b300f
Merge 6c6cc7989c into merged_master (Bitcoin PR bitcoin/bitcoin#25424 )
2024-09-16 03:32:45 +00:00
James Dorfman
034a29075f
Merge bc28ca3afb into merged_master (Bitcoin PR bitcoin/bitcoin#25118 )
...
Please review this commit carefully. It touched wallet code.
2024-09-16 03:30:10 +00:00
James Dorfman
f28609b3de
Merge 57a491bee1 into merged_master (Bitcoin PR bitcoin/bitcoin#25388 )
2024-09-16 00:47:14 +00:00
James Dorfman
6d638f8e4d
Merge a09033e22c into merged_master (Bitcoin PR bitcoin/bitcoin#25409 )
2024-09-16 00:03:15 +00:00
James Dorfman
12817e2b14
Merge 8e7eeb5971 into merged_master (Bitcoin PR bitcoin/bitcoin#25410 )
2024-09-15 22:03:13 +00:00
James Dorfman
8ebf20fe8e
Merge 8be652e439 into merged_master (Bitcoin PR bitcoin/bitcoin#25005 )
...
These changes affect the wallet. Please double check them, since I'm not
confident that I merged them correctly.
2024-09-15 22:01:42 +00:00
James Dorfman
7c166369af
Merge f8586b25f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25289 )
...
These changes to the functional test framework are pretty simple,
but please verify that I did them correctly. I'm not certain about them.
2024-09-11 16:10:03 +00:00
James Dorfman
fa20095180
Merge e5df0ba0d9 into merged_master (Bitcoin PR bitcoin/bitcoin#25360 )
2024-09-10 23:50:58 +00:00
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
