Byron Hambly
fc8637248f
Merge a56876e6b9 into merged_master (Bitcoin PR bitcoin/bitcoin#26024 )
2024-11-27 10:39:27 +02:00
Byron Hambly
21d8cd57f3
Merge 96f1b2d34f into merged_master (Bitcoin PR bitcoin/bitcoin#26091 )
2024-11-26 20:18:09 +02:00
Byron Hambly
eaf7efce1c
Merge 718304d222 into merged_master (Bitcoin PR bitcoin/bitcoin#26084 )
2024-11-26 20:17:51 +02:00
Byron Hambly
95fda73397
Merge 2e3cd26a1a into merged_master (Bitcoin PR bitcoin/bitcoin#26053 )
2024-11-26 20:17:39 +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
3564a2cee7
Merge bb378b6ccd into merged_master (Bitcoin PR bitcoin/bitcoin#26054 )
2024-11-26 13:11:47 +02:00
Byron Hambly
6ba135ce31
Merge dd3ada6ec4 into merged_master (Bitcoin PR bitcoin/bitcoin#25990 )
2024-11-26 13:04:39 +02:00
Byron Hambly
41633df3a3
Merge 013924aa6d into merged_master (Bitcoin PR bitcoin/bitcoin#26031 )
2024-11-26 13:04:05 +02:00
Byron Hambly
97ad6ea4d9
Merge 37f5386349 into merged_master (Bitcoin PR bitcoin/bitcoin#26038 )
2024-11-26 13:03:25 +02:00
Byron Hambly
c1cfac4527
Merge 2557429d2b into merged_master (Bitcoin PR bitcoin/bitcoin#26037 )
2024-11-26 13:01:46 +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
2d4094eb0b
Merge 5291933fed into merged_master (Bitcoin PR bitcoin/bitcoin#25768 )
2024-11-26 12:31:26 +02:00
Byron Hambly
19908caba3
Merge e864f2e4af into merged_master (Bitcoin PR bitcoin/bitcoin#25976 )
2024-11-26 12:29:21 +02:00
Byron Hambly
fd88f15036
Merge 0ebd4db32b into merged_master (Bitcoin PR bitcoin/bitcoin#25978 )
2024-11-26 11:57:13 +02:00
Byron Hambly
24fb3545af
Merge 604015ac79 into merged_master (Bitcoin PR bitcoin/bitcoin#25914 )
2024-11-26 11:46:40 +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
13283a60b1
Merge 6ab84709fc into merged_master (Bitcoin PR bitcoin/bitcoin#25960 )
2024-11-26 09:50:26 +02:00
Byron Hambly
1bf25ee8d9
Merge 8343420803 into merged_master (Bitcoin PR bitcoin/bitcoin#25915 )
2024-11-25 15:09:34 +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
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
54c19c2c63
Merge e191fac4f3 into merged_master (Bitcoin PR bitcoin/bitcoin#25922 )
2024-11-22 09:59:40 +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
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
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
fd5f2960c7
Merge c73c8d53fe into merged_master (Bitcoin PR bitcoin/bitcoin#25878 )
2024-11-04 12:02:20 +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
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
3aec1a9069
Merge 22d96d76ab into merged_master (Bitcoin PR bitcoin/bitcoin#25720 )
2024-11-02 16:49:35 +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
b30fd6f694
Merge 29c195cf6a into merged_master (Bitcoin PR bitcoin/bitcoin#25792 )
2024-11-01 15:07:02 +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
891686a9c5
Merge 251c535800 into merged_master (Bitcoin PR bitcoin/bitcoin#25810 )
2024-11-01 13:25:11 +02:00
Byron Hambly
ccdfcdc4f0
Merge f89ce1fdb5 into merged_master (Bitcoin PR bitcoin/bitcoin#25811 )
2024-11-01 13:16:01 +02:00
Byron Hambly
961b1d8851
Merge aac200801b into merged_master (Bitcoin PR bitcoin/bitcoin#25794 )
2024-10-30 10:07:37 +02:00
Byron Hambly
0288865bb6
Merge ebf094ff3a into merged_master (Bitcoin PR bitcoin/bitcoin#25731 )
2024-10-30 10:00:36 +02:00
Byron Hambly
85cd9e605d
Merge ac59112a6a into merged_master (Bitcoin PR bitcoin/bitcoin#23480 )
2024-10-30 09:49:14 +02:00
Byron Hambly
c80fe4de04
Merge e7ca8afef6 into merged_master (Bitcoin PR bitcoin/bitcoin#25782 )
2024-10-29 15:21:32 +02:00
Byron Hambly
16f25771a0
Merge 35305c759a into merged_master (Bitcoin PR bitcoin/bitcoin#22751 )
...
This PR introduced a new RPC "simulaterawtransaction". It has been modified from
upstream and from ElementsProject/elements#1016
to work correctly with Elements blinded transactions and issued assets.
2024-10-29 10:15:55 +02:00
Byron Hambly
b11cdfc92b
Merge 2c3115d4f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25773 )
2024-10-25 12:00:10 +02:00
Byron Hambly
48d663a3d6
Merge 9155f9b7af into merged_master (Bitcoin PR bitcoin/bitcoin#25379 )
2024-10-25 09:50:32 +02:00
Byron Hambly
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +02:00
Byron Hambly
f17a9fd322
Merge 2bca32b7c3 into merged_master (Bitcoin PR bitcoin/bitcoin#24799 )
2024-10-24 14:55:38 +02:00
Byron Hambly
080268f4dc
Merge eeb5a94e27 into merged_master (Bitcoin PR bitcoin/bitcoin#25528 )
2024-10-24 14:42:59 +02:00
Byron Hambly
641fbe39e8
Merge c5ba1d92b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25610 )
2024-10-24 13:55:08 +02:00
