ivanlele
8fed4c27b5
Merge 9f2609de09 into merged_master (Bitcoin PR bitcoin/bitcoin#29639 )
2026-02-16 15:09:53 +00:00
ivanlele
f4c50a5539
Merge 0f89e86516 into merged_master (Bitcoin PR bitcoin/bitcoin#29667 )
2026-02-16 15:09:17 +00:00
ivanlele
1e1ba55cfb
Merge 5d045c31a5 into merged_master (Bitcoin PR bitcoin/bitcoin#28950 )
2026-02-16 12:56:07 +00:00
ivanlele
6302a4cdf6
Merge 3d255dfb67 into merged_master (Bitcoin PR bitcoin/bitcoin#29459 )
2026-02-16 11:38:58 +00:00
ivanlele
e9597e6547
Merge 6850d72174 into merged_master (Bitcoin PR bitcoin/bitcoin#29497 )
2026-02-16 11:11:08 +00:00
ivanlele
f8688a0d17
Merge a85e5a7c9a into merged_master (Bitcoin PR bitcoin/bitcoin#29478 )
2026-02-16 10:57:45 +00:00
ivanlele
e893b7e6f9
Merge 0ed2c130e7 into merged_master (Bitcoin PR bitcoin/bitcoin#27375 )
2026-02-16 09:59:44 +00:00
Tom Trevethan
d6ba7f08d6
Merge bde3db40f6 into merged_master (Bitcoin PR #26415 )
2026-02-16 01:41:42 +00:00
ivanlele
8866e81d96
Merge bef99176e6 into merged_master (Bitcoin PR #27114 )
2026-02-13 17:25:19 +00:00
ivanlele
a03c3c9da5
Merge 12dae637a4 into merged_master (Bitcoin PR #29306 )
2026-02-13 16:53:25 +00:00
Byron Hambly
730ebc99c6
Merge a945f09fa6 into merged_master (Bitcoin PR bitcoin/bitcoin#29007 )
2026-02-13 14:49:25 +02:00
ivanlele
6bd239e851
Merge 02c7fd8df4 into merged_master (Bitcoin PR #29483 )
2026-02-12 17:45:50 +00:00
ivanlele
711e86714a
Merge b4a05751b6 into merged_master (Bitcoin PR #29586 )
2026-02-12 17:32:36 +00:00
ivanlele
c26d4df02c
Merge 4a903741b0 into merged_master (Bitcoin PR #28120 )
2026-02-12 17:26:09 +00:00
ivanlele
18c5869c41
Merge 10d7b6e201 into merged_master (Bitcoin PR #29514 )
2026-02-12 17:19:56 +00:00
ivanlele
bc33675652
Merge a78ca706f6 into merged_master (Bitcoin PR #29393 )
2026-02-12 16:52:57 +00:00
Byron Hambly
cc4655509e
Merge 59567d7b9a into merged_master (Bitcoin PR #29576 )
2026-02-12 13:48:29 +02:00
Tom Trevethan
a1bb0dd675
Added RAW_OP_TRUE miniwallet mode serialization size
...
(cherry picked from commit 1f13810a73afab07b78d24f3093da6b2cde7e587)
2026-02-12 12:21:33 +02:00
Tom Trevethan
98d0025a9e
remove debug prints
...
(cherry picked from commit 35e463a3b515cfbe769ad4c617a9afcea6c24c8e)
2026-02-12 12:20:21 +02:00
Byron Hambly
9e5aaef647
Merge 7791d31bcf into merged_master (Elements PR #1499 )
2026-02-12 12:17:19 +02:00
Byron Hambly
dd57849ba7
Merge 6d29a59f61 into merged_master (Elements PR #1522 )
2026-02-11 14:50:19 +02:00
merge-script
7791d31bcf
Merge ElementsProject/elements#1499 : ELIP 202: Implementation of optional sidechain peg-in subsidy and minimum peg-in amount
...
a18a88b31b90b2b3bbb0186bb25a0851c89c65d094cde59dc3f3b63f4b8chttps://github.com/ElementsProject/ELIPs/blob/main/elip-0202.mediawiki )
ACKs for top commit:
jsarenik:
Running ACK a18a88ba18a88b31b
2026-02-09 09:14:44 -08:00
Byron Hambly
5d64e8945d
rpc!: change tweakfedpegscript to output P2WSH address
...
Changes tweakfedpegscript to return both p2wsh and p2shwsh version of
the tweaked address.
"address" has been removed from the result and replaced with "p2wsh" and
"p2shwsh".
2026-01-20 15:03:08 +02:00
Byron Hambly
a18a88b31b
grammar: prefer peg-in to pegin in messages
2026-01-15 18:10:52 +02:00
Byron Hambly
90b2b3bbb0
test: add pegin subsidy functional test
2026-01-15 18:10:51 +02:00
Byron Hambly
2ec510dac9
ci: lint fixes
2026-01-09 15:31:49 +02:00
Byron Hambly
6908f27d8a
Merge 72f289d81c into merged_master (Elements PR #1507 )
2026-01-06 16:15:26 +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
5477e96d25
ci: lint fixes
2025-12-05 09:39:59 +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
b640af0021
Merge e60804f121 into merged_master (Bitcoin PR bitcoin/bitcoin#29524 )
2025-12-04 15:19:11 +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
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
4bcd0119f8
Merge ba907f96ad into merged_master (Bitcoin PR bitcoin/bitcoin#29475 )
2025-12-04 10:46:15 +02:00
Byron Hambly
5c9a08609d
Merge 5c6d900a27 into merged_master (Bitcoin PR bitcoin/bitcoin#29358 )
2025-12-04 10:46:02 +02:00
Byron Hambly
97ccabbf40
Merge 60b6ff5ac0 into merged_master (Bitcoin PR bitcoin/bitcoin#29467 )
2025-12-04 10:13:19 +02:00
Byron Hambly
049e564993
Merge edefcd51f7 into merged_master (Bitcoin PR bitcoin/bitcoin#29470 )
2025-12-04 09:56:34 +02:00
Byron Hambly
9f4e671ad0
Merge 88b1229c13 into merged_master (Bitcoin PR bitcoin/bitcoin#29400 )
2025-12-04 09:44:12 +02:00
Byron Hambly
619d67ad18
Merge 2ac41ef15f into merged_master (Bitcoin PR bitcoin/bitcoin#29460 )
2025-12-04 09:39:16 +02:00
Byron Hambly
a8fa0d7b5e
Merge c265aad5b5 into merged_master (Bitcoin PR bitcoin/bitcoin#29434 )
2025-12-04 09:03:33 +02:00
Tom Trevethan
042cd89c84
Merge f83565db45 into merged_master (Bitcoin PR bitcoin/bitcoin#29394 )
2025-12-04 00:22:43 +00:00
Tom Trevethan
ed5c5ba8e3
Merge 37fdf5a492 into merged_master (Bitcoin PR bitcoin/bitcoin#29424 )
2025-12-04 00:21:39 +00:00
Tom Trevethan
96fab6cb7f
Merge 3054416f62 into merged_master (Bitcoin PR bitcoin/bitcoin#29425 )
2025-12-03 23:45:54 +00:00
Tom Trevethan
c2d8f099b1
Merge 6ff0aa089c into merged_master (Bitcoin PR bitcoin/bitcoin#28987 )
2025-12-03 23:34:15 +00:00
