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
6bc934c8a8
Merge 85c8a5ec48 into merged_master (Bitcoin PR bitcoin/bitcoin#29647 )
2026-02-16 16:43:56 +00:00
ivanlele
4336000656
Merge bf1b6383db into merged_master (Bitcoin PR bitcoin/bitcoin#29671 )
2026-02-16 16:28:51 +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
c374a8fdfa
Merge 0b96a1925e into merged_master (Bitcoin PR bitcoin/bitcoin#28955 )
2026-02-16 15:53:58 +00:00
ivanlele
87b03bbdc4
Merge 479ecc0515 into merged_master (Bitcoin PR bitcoin/bitcoin#29192 )
2026-02-16 15:26:47 +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
64055012d8
Merge aba9024c0c into merged_master (Bitcoin PR bitcoin/bitcoin#29659 )
2026-02-16 12:10:52 +00:00
ivanlele
3978fef63e
Merge 7af95afa8b into merged_master (Bitcoin PR bitcoin/bitcoin#29091 )
2026-02-16 12:03:55 +00:00
ivanlele
c9755224e8
Merge 55c6323434 into merged_master (Bitcoin PR bitcoin/bitcoin#29649 )
2026-02-16 11:04:52 +00:00
ivanlele
5f26dffc71
Merge ef6329f052 into merged_master (Bitcoin PR bitcoin/bitcoin#28193 )
2026-02-16 10:24:20 +00:00
ivanlele
8fe9bb76ba
Merge c38157b9b9 into merged_master (Bitcoin PR bitcoin/bitcoin#29606 )
2026-02-16 10:18:13 +00:00
ivanlele
67f972d29b
Merge 264ca9db24 into merged_master (Bitcoin PR bitcoin/bitcoin#29619 )
2026-02-16 10:11:49 +00:00
ivanlele
e893b7e6f9
Merge 0ed2c130e7 into merged_master (Bitcoin PR bitcoin/bitcoin#27375 )
2026-02-16 09:59:44 +00:00
Tom Trevethan
6be832470d
Merge 1105aa46dd into merged_master (Bitcoin PR #29633 )
2026-02-16 01:42:10 +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
ce9548da6a
Merge 31be1a4767 into merged_master (Bitcoin PR bitcoin/bitcoin#29236 )
2026-02-13 15:00:58 +02:00
Byron Hambly
730ebc99c6
Merge a945f09fa6 into merged_master (Bitcoin PR bitcoin/bitcoin#29007 )
2026-02-13 14:49:25 +02:00
ivanlele
40024cca2c
Merge 6dda050865 into merged_master (Bitcoin PR #29458 )
2026-02-12 17:52:17 +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
b466907492
Merge 5ebb406357 into merged_master (Bitcoin PR #26564 )
2026-02-12 17:11:16 +00:00
ivanlele
919f6e61b7
Merge 4cc99df44a into merged_master (Bitcoin PR #29569 )
2026-02-12 16:59:05 +00:00
ivanlele
bc33675652
Merge a78ca706f6 into merged_master (Bitcoin PR #29393 )
2026-02-12 16:52:57 +00:00
ivanlele
81a17ea31a
Merge c07935bcf5 into merged_master (Bitcoin PR #28960 )
2026-02-12 16:33:05 +00:00
Byron Hambly
a455ddeed6
Merge 67fb94ce42 into merged_master (Bitcoin PR #29577 )
2026-02-12 13:58:15 +02:00
Byron Hambly
74c502779f
Merge c2c6a7d1dc into merged_master (Bitcoin PR #803 )
2026-02-12 13:55:06 +02:00
Tom Trevethan
00550f3014
remove commented out redundant forward declaration
...
(cherry picked from commit 9565b6064dbbb3733107a0ee03c8a52881773487)
2026-02-12 12:22:04 +02:00
Tom Trevethan
25ef47d990
checked elements sighash flags
...
(cherry picked from commit 69d8fce408abf7e1a83d399ee4a7bccccb58d647)
2026-02-12 12:20:59 +02:00
Byron Hambly
9e5aaef647
Merge 7791d31bcf into merged_master (Elements PR #1499 )
2026-02-12 12:17:19 +02:00
Byron Hambly
655e5c1a1e
Merge 6bb916a57f into merged_master (Elements PR #1530 )
2026-02-11 15:17:07 +02:00
Byron Hambly
93159ee063
Merge e360a967b6 into merged_master (Elements PR #1518 )
2026-02-11 14:55:53 +02:00
Byron Hambly
dd57849ba7
Merge 6d29a59f61 into merged_master (Elements PR #1522 )
2026-02-11 14:50:19 +02:00
Byron Hambly
46ed5e2d73
Merge 9a74bc9e2d into merged_master (Elements PR #1519 )
2026-02-11 14:44:03 +02:00
merge-script
7791d31bcf
Merge ElementsProject/elements#1499 : ELIP 202: Implementation of optional sidechain peg-in subsidy and minimum peg-in amount
...
a18a88b31b grammar: prefer peg-in to pegin in messages (Byron Hambly)
90b2b3bbb0 test: add pegin subsidy functional test (Byron Hambly)
186bb25a08 validation: check for peg-in subsidy and minimum (Byron Hambly)
51c89c65d0 subsidy: implementation for claimpegin, createrawpegin, and RPCs (Byron Hambly)
94cde59dc3 subsidy: add chainparams and init (Byron Hambly)
f3b63f4b8c DecomposePeginWitness: fix deserialization flags for MerkleBlock proof (Byron Hambly)
Pull request description:
Implementation for [ELIP 202](https://github.com/ElementsProject/ELIPs/blob/main/elip-0202.mediawiki )
ACKs for top commit:
jsarenik:
Running ACK a18a88b
tomt1664:
Tested ACK a18a88b31b
Tree-SHA512: 984fe2aa32e6814e14c9535e9fea7e03d3b6cf7a35621ccfb2a081a6ebab01906c5e883c5b505ced53f254401d30b6e975cb05e88efc8d3fbedc79abd0be72a2
2026-02-09 09:14:44 -08:00
Byron Hambly
4c79d5a572
fix: use liquidnetwork or liquidtestnet for uri in elements mode
2026-01-30 10:54:24 +02:00
merge-script
e360a967b6
Merge ElementsProject/elements#1518 : Avoid Simplicity header dependency propogation
...
6c7788adf3 Avoid Simplicity header dependency propogation (Russell O'Connor)
Pull request description:
The problem with including <simplicity/elements/env.h> in interpreter.h is that now everyone who needs to include interpreter.h also needs access to Simplicity's header files too.
This commit breaks that dependency chain by using forward declarations. It will pay signifigant dividends when elements switches to CMake.
ACKs for top commit:
delta1:
ACK 6c7788a ; built and tested locally
apoelstra:
ACK 6c7788adf3 ; successfully ran local tests
Tree-SHA512: 78d043a094f0a2bb51e0f103313ae568b42ec2852d8fe9a3fbbcad9c0fbf6829ef1347f83bfd361547ec165c01965e7342188a38d8faacfcf90ef70c5b7001f6
2026-01-22 14:52:00 +02: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
Tom Trevethan
36e1efbe88
ApplyBumpFee only ever called for policyAsset (in wallet/spend.cpp). wallet_elements_regression_1259 test verifies bump fee is no applied for issued asset outputs.
...
(cherry picked from commit b83f46d3ebf70b5be3534d8daadf5d842013bac7)
2026-01-19 15:40:41 +02:00
Tom Trevethan
93cc3a7f31
Replaced check for initial memory allocations of coinscache with the updated upstream version, meaning dynamic memory usage (and difference on macos/clang) is not checked if not a common case (32/16). All other checks now pass on both macos, linux and windows.
...
(cherry picked from commit 6c3b0dab53db6b1b4683530435fb03d8664e2982)
2026-01-19 15:40:23 +02:00
Byron Hambly
a18a88b31b
grammar: prefer peg-in to pegin in messages
2026-01-15 18:10:52 +02:00
Byron Hambly
186bb25a08
validation: check for peg-in subsidy and minimum
2026-01-15 18:10:51 +02:00
Byron Hambly
51c89c65d0
subsidy: implementation for claimpegin, createrawpegin, and RPCs
2026-01-15 18:10:51 +02:00
Byron Hambly
94cde59dc3
subsidy: add chainparams and init
2026-01-15 18:10:50 +02:00