Byron Hambly
29d37bc8e6
Merge c89fabff3d into merged_master (Bitcoin PR bitcoin/bitcoin#25879 )
2024-11-21 14:58:19 +02:00
Byron Hambly
19eece4f40
Merge 3c1e75ef60 into merged_master (Bitcoin PR bitcoin/bitcoin#25865 )
2024-11-21 14:58:09 +02:00
Byron Hambly
bd875beb2a
Merge 713ea7a418 into merged_master (Bitcoin PR bitcoin/bitcoin#25906 )
2024-11-21 14:39:57 +02:00
Byron Hambly
f46275d011
Merge 2bd9aa5a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25647 )
...
This was a difficult merge as always with diffs that touch spend.cpp and
createtransactioninternal. Added a FIXME NB for fundrawtransaction with
external outputs, which MUST be fixed before a new release.
2024-11-21 14:29:21 +02:00
Byron Hambly
4df571b12d
Merge 92bb7001d8 into merged_master (Bitcoin PR bitcoin/bitcoin#25902 )
2024-11-04 15:47:50 +02:00
Byron Hambly
7a022fb75d
Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775 )
2024-11-04 15:04:48 +02:00
Byron Hambly
b07694187c
Merge 607d5a46aa into merged_master (Bitcoin PR bitcoin/bitcoin#23202 )
...
added a FIXME for the new bumpfee tests on non-owned inputs
2024-11-04 15:03:28 +02:00
Byron Hambly
fe1dbdc225
Merge e5a83141fa into merged_master (Bitcoin PR bitcoin/bitcoin#25883 )
2024-11-04 12:49:24 +02:00
Byron Hambly
3fd262a515
Merge 0f35f4ddf4 into merged_master (Bitcoin PR bitcoin/bitcoin#25786 )
2024-11-04 12:32:04 +02:00
Byron Hambly
5f2567f887
Merge 027b6729bc into merged_master (Bitcoin PR bitcoin/bitcoin#25888 )
2024-11-04 12:09:28 +02:00
Byron Hambly
fd5f2960c7
Merge c73c8d53fe into merged_master (Bitcoin PR bitcoin/bitcoin#25878 )
2024-11-04 12:02:20 +02:00
Byron Hambly
c76ddcea4d
Merge 6b56873b41 into merged_master (Bitcoin PR bitcoin/bitcoin#25784 )
2024-11-04 11:52:14 +02:00
Byron Hambly
70420df6e9
Merge 0f0508bc72 into merged_master (Bitcoin PR bitcoin/bitcoin#25869 )
2024-11-04 11:43:33 +02:00
Byron Hambly
1006327a13
Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707 )
2024-11-04 11:26:40 +02:00
Byron Hambly
e5b0d80b21
Merge d480586ecb into merged_master (Bitcoin PR bitcoin/bitcoin#25808 )
2024-11-04 11:25:04 +02:00
Byron Hambly
740179071b
Merge 02aefa169a into merged_master (Bitcoin PR bitcoin/bitcoin#25852 )
2024-11-04 11:12:04 +02:00
Byron Hambly
f9e2640d86
Merge 0425ce577f into merged_master (Bitcoin PR bitcoin/bitcoin#25679 )
...
fundrawtransaction.py can be a bit flaky, added a FIXME
2024-11-04 11:11:25 +02:00
Byron Hambly
367b7b253a
Merge 888628cee0 into merged_master (Bitcoin PR bitcoin/bitcoin#25827 )
2024-11-03 17:22:22 +02:00
Byron Hambly
06009b9841
Merge a8f69541ad into merged_master (Bitcoin PR bitcoin/bitcoin#25748 )
2024-11-03 16:54:57 +02:00
Byron Hambly
793d471d13
Merge a75b7796b7 into merged_master (Bitcoin PR bitcoin/bitcoin#25077 )
2024-11-03 16:10:34 +02:00
Byron Hambly
0f2eb6fd58
Merge aa774f3e11 into merged_master (Bitcoin PR bitcoin/bitcoin#25829 )
2024-11-03 15:50:57 +02:00
Byron Hambly
ef90df8f7e
Merge 0ae0aa251b into merged_master (Bitcoin PR bitcoin/bitcoin#24678 )
2024-11-03 14:56:05 +02:00
Byron Hambly
fd9ee039c0
Merge 95d4744f02 into merged_master (Bitcoin PR bitcoin/bitcoin#19391 )
2024-11-03 14:48:48 +02:00
Byron Hambly
ee6cc528c6
Merge 64f7a1940d into merged_master (Bitcoin PR bitcoin/bitcoin#25734 )
2024-11-03 14:28:09 +02:00
Byron Hambly
d6e6f35037
Merge c336f813b3 into merged_master (Bitcoin PR bitcoin/bitcoin#25504 )
2024-11-02 17:28:21 +02:00
Byron Hambly
c341afe4c0
Merge cf39913e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25803 )
2024-11-02 17:16:19 +02:00
Byron Hambly
1269611e85
Merge b63c24a509 into merged_master (Bitcoin PR bitcoin/bitcoin#25809 )
2024-11-02 17:08:58 +02:00
Byron Hambly
1a1b2d1d88
Merge 0f90b58686 into merged_master (Bitcoin PR bitcoin/bitcoin#25833 )
2024-11-02 16:56:56 +02:00
Byron Hambly
3aec1a9069
Merge 22d96d76ab into merged_master (Bitcoin PR bitcoin/bitcoin#25720 )
2024-11-02 16:49:35 +02:00
Byron Hambly
817dc4879a
Merge 6d4889a694 into merged_master (Bitcoin PR bitcoin-core/gui#598 )
2024-11-02 16:41:51 +02:00
Byron Hambly
2a846b6174
Merge 867f5fd1b3 into merged_master (Bitcoin PR bitcoin-core/gui#654 )
2024-11-01 17:37:20 +02:00
Byron Hambly
74215eab25
Merge a5d5569535 into merged_master (Bitcoin PR bitcoin/bitcoin#25850 )
2024-11-01 17:30:14 +02:00
Byron Hambly
ad7217481a
Merge d9cd8b419c into merged_master (Bitcoin PR bitcoin/bitcoin#25849 )
2024-11-01 17:22:09 +02:00
Byron Hambly
3d567c5346
Merge 2778cccf1c into merged_master (Bitcoin PR bitcoin/bitcoin#25836 )
2024-11-01 16:44:49 +02:00
Byron Hambly
551fd616f3
Merge cc1efe909e into merged_master (Bitcoin PR bitcoin/bitcoin#25838 )
2024-11-01 16:29:41 +02:00
Byron Hambly
55abe4544f
Merge dc9d662683 into merged_master (Bitcoin PR bitcoin/bitcoin#25235 )
2024-11-01 16:18:43 +02:00
Byron Hambly
57d129970e
Merge aca0200e94 into merged_master (Bitcoin PR bitcoin/bitcoin#25817 )
2024-11-01 16:11:10 +02:00
Byron Hambly
490ea8e5b1
Merge bf3f05f41d into merged_master (Bitcoin PR bitcoin/bitcoin#25785 )
2024-11-01 16:03:58 +02:00
Byron Hambly
3997d119e7
Merge 89b2194124 into merged_master (Bitcoin PR bitcoin/bitcoin#25814 )
2024-11-01 15:51:40 +02:00
Byron Hambly
14b8b74cef
Merge 27724c23f7 into merged_master (Bitcoin PR bitcoin/bitcoin#25677 )
2024-11-01 15:42:15 +02:00
Byron Hambly
dfd7755a16
Merge 5d294bccba into merged_master (Bitcoin PR bitcoin/bitcoin#25825 )
2024-11-01 15:34:32 +02:00
Byron Hambly
18aad6c418
Merge e5d8b65423 into merged_master (Bitcoin PR bitcoin/bitcoin#25815 )
2024-11-01 15:23:20 +02:00
Byron Hambly
52699c29d7
Merge e078ee9d9d into merged_master (Bitcoin PR bitcoin/bitcoin#25664 )
2024-11-01 15:14:19 +02:00
Byron Hambly
b30fd6f694
Merge 29c195cf6a into merged_master (Bitcoin PR bitcoin/bitcoin#25792 )
2024-11-01 15:07:02 +02:00
Byron Hambly
81b4ef626a
Merge 243d7bde78 into merged_master (Bitcoin PR bitcoin/bitcoin#25798 )
2024-11-01 14:26:52 +02:00
Byron Hambly
855577a763
Merge dd62721ba9 into merged_master (Bitcoin PR bitcoin/bitcoin#25820 )
2024-11-01 14:10:47 +02:00
Byron Hambly
024bf01b6c
Merge 0094ff3947 into merged_master (Bitcoin PR bitcoin/bitcoin#25812 )
2024-11-01 14:02:21 +02:00
Byron Hambly
ab0a256d56
Merge cd230f3281 into merged_master (Bitcoin PR bitcoin/bitcoin#25816 )
2024-11-01 13:55:01 +02:00
Byron Hambly
5104b4635b
Merge 93999a5fbe into merged_master (Bitcoin PR bitcoin/bitcoin#25642 )
2024-11-01 13:41:41 +02:00
Byron Hambly
891686a9c5
Merge 251c535800 into merged_master (Bitcoin PR bitcoin/bitcoin#25810 )
2024-11-01 13:25:11 +02:00
