ivanlele
144b862d02
Merge 10bd32a1c9 into merged_master (Bitcoin PR bitcoin/bitcoin#29933 )
2026-02-18 13:16:27 +00:00
ivanlele
2714ab3565
Merge b3106be84f into merged_master (Bitcoin PR bitcoin/bitcoin#29898 )
2026-02-18 12:58:17 +00:00
ivanlele
f04eabf1a2
Merge 04c90f1059 into merged_master (Bitcoin PR bitcoin/bitcoin#27679 )
2026-02-18 12:33:34 +00:00
ivanlele
cc18eeeb23
Merge 67c0d93982 into merged_master (Bitcoin PR bitcoin/bitcoin#29827 )
2026-02-18 12:21:33 +00:00
ivanlele
92e9094856
Merge 8cd9475321 into merged_master (Bitcoin PR bitcoin/bitcoin#29893 )
2026-02-18 11:15:16 +00:00
ivanlele
33ab2ef7d2
Merge 312f54278f into merged_master (Bitcoin PR bitcoin/bitcoin#29726 )
2026-02-18 10:56:40 +00:00
ivanlele
dd05e9ee32
Merge 07720b1cdd into merged_master (Bitcoin PR bitcoin/bitcoin#29869 )
2026-02-18 10:33:16 +00:00
ivanlele
ac5bd25774
Merge df609a344e into merged_master (Bitcoin PR bitcoin/bitcoin#29699 )
2026-02-18 10:26:39 +00:00
ivanlele
dc380374a9
Merge bdb33ec519 into merged_master (Bitcoin PR bitcoin/bitcoin#29735 )
2026-02-18 09:40:49 +00:00
Tom Trevethan
70626e7d1d
Merge a160a6a081 into merged_master (Bitcoin PR bitcoin/bitcoin#29498 )
2026-02-17 22:22:30 +00:00
ivanlele
975659a62a
Merge f0794cbd40 into merged_master (Bitcoin PR bitcoin/bitcoin#29822 )
2026-02-17 18:31:22 +00:00
ivanlele
77b21e9b6d
Merge 03e94f8b90 into merged_master (Bitcoin PR bitcoin/bitcoin#29791 )
2026-02-17 18:25:01 +00:00
ivanlele
b0e2d0d192
Merge 1d8a5f0d9b into merged_master (Bitcoin PR bitcoin/bitcoin#29750 )
2026-02-17 13:16:22 +00:00
ivanlele
cd72d5377f
Merge 23ba39470c into merged_master (Bitcoin PR bitcoin/bitcoin#29753 )
2026-02-17 13:10:14 +00:00
ivanlele
fd63311b9c
Merge 8d19d688f4 into merged_master (Bitcoin PR bitcoin/bitcoin#29738 )
2026-02-17 10:41:54 +00:00
ivanlele
d585152878
Merge 4373414d26 into merged_master (Bitcoin PR bitcoin/bitcoin#29130 )
2026-02-17 10:07:57 +00:00
ivanlele
b92a1dd970
Merge c8e3978114 into merged_master (Bitcoin PR bitcoin/bitcoin#27307 )
2026-02-17 10:01:46 +00:00
Tom Trevethan
827354c697
Merge b44f9e4645 into merged_master (Bitcoin PR bitcoin/bitcoin#28928 )
2026-02-16 22:24:44 +00:00
Tom Trevethan
16c494c081
Merge f22bca6473 into merged_master (Bitcoin PR #29636
2026-02-16 21:49:32 +00:00
ivanlele
09403d5a37
Merge c1223188e0 into merged_master (Bitcoin PR bitcoin/bitcoin#29672 )
2026-02-16 17:10:14 +00:00
ivanlele
f3ab17230b
Merge 2795e89cc5 into merged_master (Bitcoin PR bitcoin/bitcoin#28998 )
2026-02-16 17:03:56 +00:00
ivanlele
88709a259d
Merge a175efe768 into merged_master (Bitcoin PR bitcoin/bitcoin#29704 )
2026-02-16 16:57:37 +00:00
ivanlele
b0960347f6
Merge b50554babd into merged_master (Bitcoin PR bitcoin/bitcoin#29370 )
2026-02-16 16:28:40 +00:00
ivanlele
af7e42fc56
Merge 69ddee6f39 into merged_master (Bitcoin PR bitcoin/bitcoin#27039 )
2026-02-16 16:01:12 +00:00
ivanlele
951e190d91
Merge 3d216baf91 into merged_master (Bitcoin PR bitcoin/bitcoin#29279 )
2026-02-16 15:32:54 +00:00
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
