Byron Hambly
df11e01f49
Merge d7995d8a56 into merged_master (Elements PR #1503 )
2026-01-06 16:08:54 +02:00
Tom Trevethan
d544fa0cf5
scale incremental relay feerates for rbf tests to account for discount
...
(cherry picked from commit fc899f1515e355428cd0592b7e7c6ef4c8c7db68)
2026-01-06 15:03:15 +02:00
Tom Trevethan
58c3d4b9f0
check non-fatal error for duplicate parameters passing
...
(cherry picked from commit da134715e17c525222e17ac6602d3b59184bfdd5)
2026-01-06 15:02:44 +02:00
Tom Trevethan
6e45724cd0
test_psbt_input_keys flaky tests now passing consistently with modified keys. taproot tests enabled without deserialisation
...
(cherry picked from commit 92a7343ee91421c0411f08cdc3021d86aa1da29c)
2026-01-06 15:02:04 +02:00
Tom Trevethan
7e6fc14025
resolve fixmes in wallet_migration.py: replaceable=True must be set explicitly in sendtoaddress as walletrbf=0 is set by default in the test_framework wallet config (test_framework/util.py:421)
...
(cherry picked from commit 860de3c99d8736113e47d3d45c2a0e0a5542e0bb)
2025-12-17 14:31:49 +02:00
Tom Trevethan
4bbee87c21
resolve fixmes in tool_wallet.py: wallet file shasum unchanged for both legacy and descriptor wallets. replaceable=True must be set explicitly in sendtoaddress as walletrbf=0 is set by default in the test_framework wallet config (test_framework/util.py:421)
...
(cherry picked from commit 445a913b19ee55cc7560e693445defd531b0b7d2)
2025-12-17 14:31:21 +02:00
Tom Trevethan
dd0b0f74a9
resolve fixme in p2p_segwit.py functional test: the bad-witness-merkle-match reject reason is due to the Elements-style witness structure added to the serialisation of BrokenCTransaction in https://github.com/ElementsProject/elements/pull/494 causing the CheckWitnessMalleation check to fail before reaching CheckMerkleRoot which would fail with a bad-txnmrklroot reason
...
(cherry picked from commit 30390606bc0f3ecaade6cf3694dc6bfa7b8faf0c)
2025-12-17 14:30:44 +02:00
Tom Trevethan
fe70c8b183
prevent intermittent failure in wallet_fundrawtransaction test
...
(cherry picked from commit 58d86d86cc6c6adfc3d70feb64a19c61c1bb146f)
2025-12-17 14:30:13 +02:00
Byron Hambly
f7bfef44d8
ci: fix for macos job boost 1.85
2025-12-11 15:47:17 +02:00
Byron Hambly
b9745af78e
ci: switch 32-bit job to rocky9
2025-12-11 15:47:17 +02:00
Byron Hambly
a801fa32e9
interpreter: add macos compat for htole32 and htole64
2025-12-11 15:47:12 +02:00
Byron Hambly
98f6d2e900
depends: use archive url for qt 5
2025-12-11 15:47:07 +02:00
merge-script
479b9908a9
Merge bitcoin/bitcoin#30913 : ci: Use macos-14 GHA image (x86_64-apple-darwin22.6.0 -> arm64-apple-darwin23.6.0)
...
fab932b421 ci: Remove incorrectly hardcoded HOST in mac_native task (MarcoFalke)
fa8f35d786 ci: Use macos-14 GHA image (MarcoFalke)
Pull request description:
There shouldn't be any downside, because XCode remains pinned to the same version.
However, builds are expected to be a bit faster with M1, which seems nice.
ACKs for top commit:
hebasto:
ACK fab932b421 .
willcl-ark:
ACK fab932b421
Tree-SHA512: 9719e05c67b8b5f3d59bd1a38eef00407b1ae5e123b18151c494b6d2dbf55bd2b0b5bb6c1a0469635c7b3bb5f23990d3bb2f339f56ce3955e8a1b97ac9f295d4
(cherry picked from commit a95e742b69 )
2025-12-11 14:46:31 +02:00
Byron Hambly
b489a41d50
ci: fuzz fixes
2025-12-08 15:01:09 +02:00
Byron Hambly
f76157f049
ci: increase timeout for tidy job
2025-12-08 09:38:24 +02:00
Byron Hambly
d2f9953b83
ci: use correct image for libbitcoinkernel job
2025-12-05 14:05:05 +02:00
Byron Hambly
5c60efbd8e
script_tests: fixme for bitcoinconsensus
2025-12-05 13:53:36 +02:00
Byron Hambly
bed5a93621
ci: cirrus remove persistent worker def for asan job
2025-12-05 09:43:36 +02:00
Byron Hambly
5477e96d25
ci: lint fixes
2025-12-05 09:39:59 +02:00
Byron Hambly
62bd9a63f9
ci: fix cirrus install rsync
2025-12-04 16:04:26 +02:00
Byron Hambly
e4b5c67786
Merge ab5dfdbec1 into merged_master (Bitcoin PR bitcoin/bitcoin#29579 )
2025-12-04 15:44:05 +02:00
Byron Hambly
0bc2250fe3
Merge 55bd5d8015 into merged_master (Bitcoin PR bitcoin/bitcoin#29561 )
2025-12-04 15:39:46 +02:00
Byron Hambly
0f57df2c31
Merge 6c77dbfd7e into merged_master (Bitcoin PR bitcoin/bitcoin#29529 )
2025-12-04 15:39:27 +02:00
Byron Hambly
cbc64320bc
Merge 0fa9f17332 into merged_master (Bitcoin PR bitcoin/bitcoin#29535 )
2025-12-04 15:39:25 +02:00
Byron Hambly
0eecfef996
Merge faff279fdc into merged_master (Bitcoin PR bitcoin/bitcoin#29541 )
2025-12-04 15:39:20 +02:00
Byron Hambly
3bcbddf376
Merge 11a1db8780 into merged_master (Bitcoin PR bitcoin/bitcoin#29547 )
2025-12-04 15:39:15 +02:00
Byron Hambly
46e018c13e
Merge ba1bf5322f into merged_master (Bitcoin PR bitcoin/bitcoin#29544 )
2025-12-04 15:37:14 +02:00
Byron Hambly
2a97b482a3
Merge 3763f20b29 into merged_master (Bitcoin PR bitcoin/bitcoin#29567 )
2025-12-04 15:37:11 +02:00
Byron Hambly
d7737b44d8
Merge 2b260eadf7 into merged_master (Bitcoin PR bitcoin/bitcoin#29502 )
2025-12-04 15:33:21 +02:00
Byron Hambly
c9b40bd050
Merge 98005b6a17 into merged_master (Bitcoin PR bitcoin/bitcoin#29548 )
2025-12-04 15:32:26 +02:00
Byron Hambly
03771e445b
Merge 3329b35e09 into merged_master (Bitcoin PR bitcoin/bitcoin#29546 )
2025-12-04 15:28:54 +02:00
Byron Hambly
6b2d33f64a
Merge 98f57cd198 into merged_master (Bitcoin PR bitcoin/bitcoin#29533 )
2025-12-04 15:25:49 +02:00
Byron Hambly
8dfb84eddd
Merge 776d48dd56 into merged_master (Bitcoin PR bitcoin-core/gui#801 )
2025-12-04 15:22:31 +02:00
Byron Hambly
b640af0021
Merge e60804f121 into merged_master (Bitcoin PR bitcoin/bitcoin#29524 )
2025-12-04 15:19:11 +02:00
Byron Hambly
7c5fbdb5c6
Merge fce53f132e into merged_master (Bitcoin PR bitcoin/bitcoin#29528 )
2025-12-04 15:15:59 +02:00
Byron Hambly
38eaa03dc6
Merge 8da62a1041 into merged_master (Bitcoin PR bitcoin/bitcoin#29263 )
2025-12-04 15:10:04 +02:00
Byron Hambly
ef200e1846
Merge ae4165f7bc into merged_master (Bitcoin PR bitcoin/bitcoin#29495 )
2025-12-04 15:01:56 +02:00
Byron Hambly
477828fd99
Merge d72cf823d4 into merged_master (Bitcoin PR bitcoin/bitcoin#29518 )
2025-12-04 14:58:46 +02:00
Byron Hambly
f1b642343a
Merge dfc35c9934 into merged_master (Bitcoin PR bitcoin/bitcoin#29407 )
2025-12-04 14:55:06 +02:00
Byron Hambly
26eeafe016
Merge be5399e785 into merged_master (Bitcoin PR bitcoin/bitcoin#29390 )
2025-12-04 11:52:08 +02:00
Byron Hambly
962239199c
Merge 9057598605 into merged_master (Bitcoin PR bitcoin/bitcoin#29516 )
2025-12-04 11:47:42 +02:00
Byron Hambly
70de4be566
Merge 22a5ccfb06 into merged_master (Bitcoin PR bitcoin/bitcoin#29510 )
2025-12-04 11:44:07 +02:00
Byron Hambly
ec194f27c8
Merge 61aa981b8c into merged_master (Bitcoin PR bitcoin/bitcoin#29511 )
2025-12-04 11:43:29 +02:00
Byron Hambly
c75430d439
Merge 2649e655b9 into merged_master (Bitcoin PR bitcoin/bitcoin#29412 )
2025-12-04 11:40:03 +02:00
Byron Hambly
82ca8e9a3a
Merge 8e894bec90 into merged_master (Bitcoin PR bitcoin/bitcoin#29504 )
2025-12-04 10:54:12 +02:00
Byron Hambly
861e0d6171
Merge dfbad09c60 into merged_master (Bitcoin PR bitcoin/bitcoin#29489 )
2025-12-04 10:54:03 +02:00
Byron Hambly
83084f2bc3
Merge d752831e64 into merged_master (Bitcoin PR bitcoin/bitcoin#29493 )
2025-12-04 10:53:52 +02:00
Byron Hambly
4db4b86859
Merge bbfddb3998 into merged_master (Bitcoin PR bitcoin/bitcoin#29484 )
2025-12-04 10:47:20 +02:00
Byron Hambly
a19afa9999
Merge 7859f4e4b9 into merged_master (Bitcoin PR bitcoin/bitcoin#29486 )
2025-12-04 10:46:57 +02:00
Byron Hambly
4bcd0119f8
Merge ba907f96ad into merged_master (Bitcoin PR bitcoin/bitcoin#29475 )
2025-12-04 10:46:15 +02:00