Byron Hambly
cd60150aa4
Merge c85688347e into merged_master (Bitcoin PR bitcoin/bitcoin#26021 )
2024-11-26 15:01:13 +02:00
Byron Hambly
b80b3aeff4
Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513 )
2024-11-26 14:42:49 +02:00
Byron Hambly
d7ccdef889
Merge 141540a71f into merged_master (Bitcoin PR bitcoin/bitcoin#25222 )
2024-11-26 13:55:27 +02:00
Byron Hambly
74fbf6f59a
Merge 94d17845d0 into merged_master (Bitcoin PR bitcoin/bitcoin#24991 )
2024-11-26 13:54:42 +02:00
Byron Hambly
1d5e0e2049
Merge e9e943cfb7 into merged_master (Bitcoin PR bitcoin/bitcoin#26069 )
2024-11-26 13:37:58 +02:00
Byron Hambly
d06e8b7c42
Merge 5558d2f549 into merged_master (Bitcoin PR bitcoin/bitcoin#26048 )
2024-11-26 13:19:38 +02:00
Byron Hambly
94e8dc0d5d
Merge 8ca51aa5fb into merged_master (Bitcoin PR bitcoin/bitcoin#26009 )
2024-11-26 13:09:53 +02:00
Byron Hambly
fbcc874167
Merge ef5bb742f0 into merged_master (Bitcoin PR bitcoin/bitcoin#26040 )
2024-11-26 13:09:29 +02:00
Byron Hambly
79c64f7721
Merge 19585eeb77 into merged_master (Bitcoin PR bitcoin/bitcoin#25853 )
2024-11-26 13:03:52 +02:00
Byron Hambly
7f9da80085
Merge 37095c7dc4 into merged_master (Bitcoin PR bitcoin/bitcoin#25678 )
2024-11-26 12:40:40 +02:00
Byron Hambly
d0c25fbba6
Merge fc44d1796e into merged_master (Bitcoin PR bitcoin/bitcoin#25983 )
2024-11-26 12:40:26 +02:00
Byron Hambly
053996ea05
Merge 124e75a41e into merged_master (Bitcoin PR bitcoin/bitcoin#26010 )
2024-11-26 12:40:11 +02:00
Byron Hambly
dcef84b6be
Merge 447f50e4ae into merged_master (Bitcoin PR bitcoin/bitcoin#25946 )
2024-11-26 12:39:48 +02:00
Byron Hambly
2d4094eb0b
Merge 5291933fed into merged_master (Bitcoin PR bitcoin/bitcoin#25768 )
2024-11-26 12:31:26 +02:00
Byron Hambly
5501bf04b8
Merge ea67232cdb into merged_master (Bitcoin PR bitcoin/bitcoin#25962 )
2024-11-26 11:34:14 +02:00
Byron Hambly
dad57e3dbf
Merge 7281fac2e0 into merged_master (Bitcoin PR bitcoin/bitcoin#25614 )
2024-11-26 11:22:35 +02:00
Byron Hambly
e1e241d410
Merge 7921026a24 into merged_master (Bitcoin PR bitcoin/bitcoin#19602 )
...
FIXME for test_other_watchonly in the new wallet migration test
2024-11-26 11:21:27 +02:00
Byron Hambly
41692b9515
Merge 36e1b52511 into merged_master (Bitcoin PR bitcoin/bitcoin#25951 )
2024-11-26 10:42:49 +02:00
Byron Hambly
779cbdf071
Merge 3118425ff9 into merged_master (Bitcoin PR bitcoin/bitcoin#25931 )
2024-11-26 10:21:31 +02:00
Byron Hambly
44e25e01cc
Merge f79d612fba into merged_master (Bitcoin PR bitcoin-core/gui#660 )
2024-11-26 10:21:20 +02:00
Byron Hambly
57c470f3b6
Merge fa5c224d44 into merged_master (Bitcoin PR bitcoin/bitcoin#25887 )
2024-11-26 10:12:47 +02:00
Byron Hambly
aaefeb21d4
Merge ccea0e11a2 into merged_master (Bitcoin PR bitcoin/bitcoin#25959 )
2024-11-26 10:05:39 +02:00
Byron Hambly
732bc962d4
Merge f821fc9813 into merged_master (Bitcoin PR bitcoin/bitcoin#25967 )
2024-11-26 09:57:56 +02:00
Byron Hambly
13283a60b1
Merge 6ab84709fc into merged_master (Bitcoin PR bitcoin/bitcoin#25960 )
2024-11-26 09:50:26 +02:00
Byron Hambly
187f6ed938
Merge b936123110 into merged_master (Bitcoin PR bitcoin/bitcoin#25963 )
2024-11-25 14:57:30 +02:00
Byron Hambly
68e38e5baf
Merge 01e1627e25 into merged_master (Bitcoin PR bitcoin/bitcoin#25872 )
2024-11-25 14:46:13 +02:00
Byron Hambly
01c6b7b6a6
Merge d16ef40441 into merged_master (Bitcoin PR bitcoin/bitcoin#25955 )
2024-11-25 14:36:23 +02:00
Byron Hambly
8645d021b0
Merge 52dcb1d2a3 into merged_master (Bitcoin PR bitcoin/bitcoin#25733 )
2024-11-22 14:27:36 +02:00
Byron Hambly
54b236050d
Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717 )
...
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
2024-11-22 14:26:38 +02:00
Byron Hambly
7fc66b1618
Merge cfda740b33 into merged_master (Bitcoin PR bitcoin/bitcoin#25174 )
2024-11-22 10:06:47 +02:00
Byron Hambly
54c19c2c63
Merge e191fac4f3 into merged_master (Bitcoin PR bitcoin/bitcoin#25922 )
2024-11-22 09:59:40 +02:00
Byron Hambly
8497f3e1ab
Merge 80da4be57b into merged_master (Bitcoin PR bitcoin/bitcoin#25896 )
2024-11-22 09:52:06 +02:00
Byron Hambly
77f3ebc498
Merge eed2bd37ef into merged_master (Bitcoin PR bitcoin/bitcoin#25355 )
2024-11-22 09:39:18 +02:00
Byron Hambly
76cb28e552
Merge bbbc26dcfc into merged_master (Bitcoin PR bitcoin/bitcoin#25924 )
2024-11-22 09:27:25 +02:00
Byron Hambly
6ddee36aac
Merge d36bec9b3b into merged_master (Bitcoin PR bitcoin/bitcoin#25905 )
2024-11-22 09:16:19 +02:00
Byron Hambly
c5086c4549
Merge 1420547ec3 into merged_master (Bitcoin PR bitcoin/bitcoin#25911 )
2024-11-22 09:09:14 +02:00
Byron Hambly
81ea455eef
Merge 2d83a20113 into merged_master (Bitcoin PR bitcoin/bitcoin#25863 )
2024-11-22 09:02:03 +02:00
Byron Hambly
29d37bc8e6
Merge c89fabff3d into merged_master (Bitcoin PR bitcoin/bitcoin#25879 )
2024-11-21 14:58:19 +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
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
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
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
