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
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
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
55abe4544f
Merge dc9d662683 into merged_master (Bitcoin PR bitcoin/bitcoin#25235 )
2024-11-01 16:18:43 +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
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
5104b4635b
Merge 93999a5fbe into merged_master (Bitcoin PR bitcoin/bitcoin#25642 )
2024-11-01 13:41:41 +02:00
Byron Hambly
257be0ced9
Merge deb7ad35e6 into merged_master (Bitcoin PR bitcoin/bitcoin#25813 )
2024-11-01 13:08:54 +02:00
Byron Hambly
09c66ca532
Merge f5e96ecef5 into merged_master (Bitcoin PR bitcoin/bitcoin#25616 )
2024-11-01 13:00:25 +02:00
Byron Hambly
a33b20f0ff
Merge a6fc293c0a into merged_master (Bitcoin PR bitcoin/bitcoin#25656 )
...
ReserveDestination::SetBlindingPubKey was removed since it was only used
in one place (in Wallet::GetNewChangeDestination), and after this change
it was silently breaking blinded change addresses by somehow replacing
the destination with CNoDestination...
2024-11-01 12:36:42 +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
04853f6ea8
Merge c012875b9d into merged_master (Bitcoin PR bitcoin/bitcoin#24564 )
2024-10-29 15:21:44 +02:00
Byron Hambly
1a2b86535c
Merge 9ff6adc43a into merged_master (Bitcoin PR bitcoin/bitcoin#25804 )
2024-10-29 14:46:30 +02:00
Byron Hambly
31269c3653
Merge a478c5350a into merged_master (Bitcoin PR bitcoin/bitcoin#25790 )
2024-10-29 14:34:49 +02:00
Byron Hambly
a4fa9c6ada
Merge 59bd6b6d37 into merged_master (Bitcoin PR bitcoin/bitcoin#24699 )
2024-10-29 14:19:22 +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
c544145c90
Merge 7d3817b29a into merged_master (Bitcoin PR bitcoin/bitcoin#25760 )
2024-10-25 13:41:22 +02:00
Byron Hambly
49d368ea6b
Merge 006740b6f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25721 )
2024-10-25 13:33:19 +02:00
Byron Hambly
5d174dc4d0
Merge e038605585 into merged_master (Bitcoin PR bitcoin/bitcoin#24662 )
2024-10-25 12:07:59 +02:00
Byron Hambly
a1f37eeae6
Merge e09ad284c7 into merged_master (Bitcoin PR bitcoin/bitcoin#24675 )
2024-10-25 11:37:05 +02:00
Byron Hambly
8e5b356a85
Merge 36c83b40bd into merged_master (Bitcoin PR bitcoin/bitcoin#25023 )
2024-10-25 11:11:26 +02:00
Byron Hambly
79d275ea14
Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527 )
2024-10-25 11:03:47 +02:00
Byron Hambly
9fb06e251c
Merge 4a4289e2c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25772 )
2024-10-25 10:04:49 +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
cefc4804f5
Merge de3c46c938 into merged_master (Bitcoin PR bitcoin/bitcoin#25272 )
2024-10-24 16:53:05 +02:00
Byron Hambly
c1f276a993
Merge 816ca01650 into merged_master (Bitcoin PR bitcoin/bitcoin#25736 )
2024-10-24 15:09:46 +02:00
Byron Hambly
f88268fb7c
Merge da23320998 into merged_master (Bitcoin PR bitcoin/bitcoin#25651 )
2024-10-24 14:21:48 +02:00
Byron Hambly
7f7e08be71
Merge f5eadcb148 into merged_master (Bitcoin PR bitcoin/bitcoin#25663 )
2024-10-24 14:04:27 +02:00
Byron Hambly
641fbe39e8
Merge c5ba1d92b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25610 )
2024-10-24 13:55:08 +02:00
Byron Hambly
b7cf83d442
Merge 28be13ec99 into merged_master (Bitcoin PR bitcoin/bitcoin#25739 )
2024-10-24 13:23:53 +02:00
Byron Hambly
50a5a78d8d
Merge 5215c80edc into merged_master (Bitcoin PR bitcoin/bitcoin#25709 )
2024-10-24 13:06:05 +02:00
Byron Hambly
52148abe10
Merge 5871b5b5ab into merged_master (Bitcoin PR bitcoin/bitcoin#25571 )
2024-10-24 12:30:38 +02:00
Byron Hambly
35cc1e213b
Merge b1c8ea45c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25683 )
2024-10-24 12:20:41 +02:00
Byron Hambly
f7b03ad72e
Merge 1abbae65eb into merged_master (Bitcoin PR bitcoin/bitcoin#24584 )
...
This should be reviewed carefully. The new availablecoins_test was
showing an intermittent error [1]. The test variants were split out into
their own test cases to work around the issue, but requires further
investigation.
[1]: https://github.com/ElementsProject/elements/issues/1370
2024-10-24 12:08:44 +02:00
Byron Hambly
e6e789d33f
Merge 41205bf442 into merged_master (Bitcoin PR bitcoin/bitcoin#25674 )
...
2 minor rbf tests commented out with ELEMENTS FIXME
2024-10-21 09:30:50 +02:00
Byron Hambly
47d770ae4e
Merge 62c864605a into merged_master (Bitcoin PR bitcoin/bitcoin#25723 )
2024-10-20 20:50:57 +02:00
Byron Hambly
da5b3cf786
Merge 9ba73758c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24697 )
...
Also removes the redundant redeclaration of CheckMinimalPush from
interpreter.h that was moved to script.h in f4e289f384
2024-10-20 20:19:04 +02:00