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
...
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
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
...
6c7788adf36c7788a6c7788adf3
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
Byron Hambly
f3b63f4b8c
DecomposePeginWitness: fix deserialization flags for MerkleBlock proof
...
In CreatePeginWitnessInner, the MerkleBlock is always serialized without
witness: PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS
In DecomposePeginWitness before this change, the MerkleBlock was
deserialized with witness: PROTOCOL_VERSION
This was only noticed as an issue in the pegin subsidy implementation,
in a failure in the feature_dynafed functional test. In the
test_transition_mempool_eject test case, the Merkle block proof is coming
from the same chain where we are creating a pegin.
See the comment: "hack: since we're not validating peg-ins in parent chain,
just make both the funding and claim tx on same chain (printing money)"
I haven't investigated enough to explain why this causes a
deserialization failure in this specific case, but presumably this change
is correct since we're always serializing without witness. Before this
DecomposePeginWitness was only used in src/psbt.cpp
2026-01-15 18:10:50 +02:00
Byron Hambly
4539002bee
Merge commit ' 87c0b44f78' into 2026-01-simplicity-update
2026-01-12 12:56:33 +02:00
Tom Trevethan
78f831139f
updated keypath spend test vectors for elements and re-enabled equility checks
...
(cherry picked from commit 4142ceabbe46b7ac68840d1a100fc0c6adfa86a0)
2026-01-09 15:03:59 +02:00
Byron Hambly
6908f27d8a
Merge 72f289d81c into merged_master (Elements PR #1507 )
2026-01-06 16:15:26 +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
Russell O'Connor
6c7788adf3
Avoid Simplicity header dependency propogation
...
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.
2025-12-24 09:50:30 -05:00
Byron Hambly
a801fa32e9
interpreter: add macos compat for htole32 and htole64
2025-12-11 15:47:12 +02:00
Byron Hambly
b489a41d50
ci: fuzz fixes
2025-12-08 15:01:09 +02:00
Byron Hambly
5c60efbd8e
script_tests: fixme for bitcoinconsensus
2025-12-05 13:53:36 +02:00
Byron Hambly
5477e96d25
ci: lint fixes
2025-12-05 09:39:59 +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
3bcbddf376
Merge 11a1db8780 into merged_master (Bitcoin PR bitcoin/bitcoin#29547 )
2025-12-04 15:39:15 +02:00
Byron Hambly
03771e445b
Merge 3329b35e09 into merged_master (Bitcoin PR bitcoin/bitcoin#29546 )
2025-12-04 15:28:54 +02:00
