Byron Hambly
cefc4804f5
Merge de3c46c938 into merged_master (Bitcoin PR bitcoin/bitcoin#25272 )
2024-10-24 16:53:05 +02:00
Byron Hambly
d5e80e41bf
Merge 0043ec4e13 into merged_master (Bitcoin PR bitcoin/bitcoin#25687 )
2024-10-24 16:17:31 +02:00
Byron Hambly
ef964aaa35
Merge eb72f6323d into merged_master (Bitcoin PR bitcoin/bitcoin#25763 )
2024-10-24 16:06:03 +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
6ce2f1800c
Merge ce3b75690d into merged_master (Bitcoin PR bitcoin/bitcoin#25613 )
2024-10-24 15:02:42 +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
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
8669e19b82
Merge b3c7c023b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25719 )
2024-10-24 13:30:57 +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
a49deb7571
Merge 8e37afcb13 into merged_master (Bitcoin PR bitcoin/bitcoin#25484 )
2024-10-24 12:54:03 +02:00
Byron Hambly
2427e4a82c
Merge 6745e3693e into merged_master (Bitcoin PR bitcoin/bitcoin#25738 )
2024-10-24 12:46:57 +02:00
Byron Hambly
b8f629f19f
Merge ab3db34836 into merged_master (Bitcoin PR bitcoin/bitcoin#25713 )
2024-10-24 12:39:56 +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
80c47aa8aa
Merge 317ef0368b into merged_master (Bitcoin PR bitcoin/bitcoin#25670 )
...
related to the FIXME in #25625 , PSBT python class needs to be reworked
for elements
2024-10-21 11:06:06 +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
84dbf7c78d
Merge 207a228773 into merged_master (Bitcoin PR bitcoin/bitcoin#25697 )
2024-10-20 20:30:51 +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
Byron Hambly
52a1d72204
Merge 687aba8669 into merged_master (Bitcoin PR bitcoin/bitcoin#25708 )
2024-10-20 18:52:11 +02:00
Byron Hambly
3752705c6a
Merge 7f79746bf0 into merged_master (Bitcoin PR bitcoin/bitcoin#25705 )
2024-10-20 18:44:48 +02:00
Byron Hambly
5a53b496d2
Merge 5671217477 into merged_master (Bitcoin PR bitcoin/bitcoin#24974 )
2024-10-18 15:11:20 +02:00
Byron Hambly
593c724509
Merge c90f86e4c7 into merged_master (Bitcoin PR bitcoin/bitcoin#25694 )
2024-10-18 14:59:49 +02:00
Byron Hambly
8e0fa80abe
Merge 31c1b14754 into merged_master (Bitcoin PR bitcoin/bitcoin#25689 )
2024-10-18 14:52:40 +02:00
Byron Hambly
b9abd5638d
Merge a65f6d8cbb into merged_master (Bitcoin PR bitcoin/bitcoin#25699 )
2024-10-18 14:44:59 +02:00
Byron Hambly
07a088faf3
Merge 6078f91299 into merged_master (Bitcoin PR bitcoin/bitcoin#25701 )
2024-10-18 14:37:52 +02:00
Byron Hambly
fc7842e042
Merge aa22009887 into merged_master (Bitcoin PR bitcoin/bitcoin#25700 )
2024-10-18 14:29:24 +02:00
Byron Hambly
e33f17092c
Merge 5057adf22f into merged_master (Bitcoin PR bitcoin/bitcoin#25349 )
2024-10-18 14:18:20 +02:00
Byron Hambly
34a8aa2f32
Merge 73a0d6d0d4 into merged_master (Bitcoin PR bitcoin/bitcoin#25611 )
2024-10-18 14:09:35 +02:00
Byron Hambly
e228c836f1
Merge c991132b04 into merged_master (Bitcoin PR bitcoin/bitcoin#25693 )
2024-10-18 14:02:28 +02:00
Byron Hambly
bcb3d32074
Merge f27d5f6305 into merged_master (Bitcoin PR bitcoin/bitcoin#25691 )
2024-10-18 13:54:51 +02:00
Byron Hambly
042aadf957
Merge 194f6dc43c into merged_master (Bitcoin PR bitcoin-core/gui#629 )
2024-10-18 13:28:57 +02:00
Byron Hambly
cd56e507a9
Merge 6dc3084eec into merged_master (Bitcoin PR bitcoin/bitcoin#25668 )
2024-10-18 13:21:40 +02:00
Byron Hambly
28d35f619e
Merge 510ac41eac into merged_master (Bitcoin PR bitcoin/bitcoin#25331 )
2024-10-18 13:14:02 +02:00
Byron Hambly
65fbede59b
Merge 86133df7a2 into merged_master (Bitcoin PR bitcoin/bitcoin#25662 )
2024-10-18 12:35:26 +02:00
Byron Hambly
b52ce90422
Merge b8067cd435 into merged_master (Bitcoin PR bitcoin/bitcoin#22485 )
2024-10-18 12:25:30 +02:00
Byron Hambly
728096bcee
Merge d1e42659bb into merged_master (Bitcoin PR bitcoin/bitcoin#25543 )
2024-10-18 12:17:32 +02:00
Byron Hambly
6db4ca0b66
Merge d67f89bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25625 )
...
Commented out the change to the psbt test with a FIXME, due to
differences between PSBT/PSET
2024-10-18 12:05:54 +02:00
Byron Hambly
068f46b4f5
Merge 5c82ca3365 into merged_master (Bitcoin PR bitcoin/bitcoin#25493 )
2024-10-17 18:03:37 +02:00
Byron Hambly
715350d30c
Merge 1eedde157f into merged_master (Bitcoin PR bitcoin/bitcoin#25638 )
2024-10-17 17:43:57 +02:00
Byron Hambly
ad4ecee6c0
Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285 )
2024-10-17 17:33:20 +02:00
Byron Hambly
d71cdde1aa
Merge 0897b189e4 into merged_master (Bitcoin PR bitcoin/bitcoin#25308 )
2024-10-17 17:25:50 +02:00
Byron Hambly
21648b79ea
Merge 5560682a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25645 )
2024-10-17 17:15:38 +02:00
Byron Hambly
2081703f71
Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494 )
2024-10-17 17:06:13 +02:00
Byron Hambly
1efe52d8ac
Merge 6900162aea into merged_master (Bitcoin PR bitcoin/bitcoin#25513 )
2024-10-17 16:12:30 +02:00
