Commit graph

8121 commits

Author SHA1 Message Date
Byron Hambly
ce47e10720
Merge 01bd9d7b99 into merged_master (Bitcoin PR bitcoin/bitcoin#28523) 2025-08-06 15:09:56 +02:00
Byron Hambly
1c8d695b4a
Merge 4e78834ec1 into merged_master (Bitcoin PR bitcoin/bitcoin#28304) 2025-08-06 15:09:36 +02:00
Byron Hambly
70ba481063
Merge 6f882e6f86 into merged_master (Bitcoin PR bitcoin/bitcoin#28331) 2025-08-06 15:02:59 +02:00
Byron Hambly
7fc909ab98
Merge e7b0004b37 into merged_master (Bitcoin PR bitcoin/bitcoin#27596)
ELEMENTS TODO assumeutxo for liquidv1
2025-08-06 14:33:15 +02:00
Byron Hambly
0c90c76985
Merge 8909667ab8 into merged_master (Bitcoin PR bitcoin/bitcoin#28176) 2025-08-05 15:23:15 +02:00
Byron Hambly
bf24d3692a
Merge 50f250a67d into merged_master (Bitcoin PR bitcoin/bitcoin#28542) 2025-08-05 15:21:35 +02:00
Byron Hambly
ac73fc5d12
Merge e3b052800f into merged_master (Bitcoin PR bitcoin/bitcoin#28227) 2025-08-04 15:42:20 +02:00
Byron Hambly
8ca4f285db
Merge 8b44d01118 into merged_master (Bitcoin PR bitcoin/bitcoin#28184) 2025-08-04 15:42:18 +02:00
Byron Hambly
147d64f1c2
Merge f66af92f1a into merged_master (Bitcoin PR bitcoin/bitcoin#28545) 2025-08-04 15:42:15 +02:00
Byron Hambly
5c976955f7
Merge 5bbf735def into merged_master (Bitcoin PR bitcoin/bitcoin#27653) 2025-08-04 15:42:09 +02:00
Byron Hambly
4b17ed4d0d
Merge 9d5150ac47 into merged_master (Bitcoin PR bitcoin/bitcoin#28540) 2025-08-04 15:39:42 +02:00
Byron Hambly
3b7fc214b4
Merge 19a7e608f9 into merged_master (Bitcoin PR bitcoin/bitcoin#28505) 2025-08-04 14:31:00 +02:00
Byron Hambly
c6356154e2
Merge 719cb301e6 into merged_master (Bitcoin PR bitcoin/bitcoin#28492) 2025-08-04 12:43:13 +02:00
Byron Hambly
9250f7cb6b
Merge 2303fd2f43 into merged_master (Bitcoin PR bitcoin/bitcoin#28471) 2025-08-04 10:23:30 +02:00
Byron Hambly
da0cb57786
Merge cf0711cac3 into merged_master (Bitcoin PR bitcoin/bitcoin#27934) 2025-08-04 10:11:49 +02:00
Byron Hambly
fb70e2a833
Merge 5027d41988 into merged_master (Bitcoin PR bitcoin/bitcoin#26366) 2025-08-04 10:11:44 +02:00
Byron Hambly
4b06261b48
Merge 8247a8db69 into merged_master (Bitcoin PR bitcoin/bitcoin#28154) 2025-08-04 10:11:28 +02:00
Byron Hambly
859684d18d
Merge ff564c75e7 into merged_master (Bitcoin PR bitcoin/bitcoin#27511) 2025-08-04 09:27:12 +02:00
Byron Hambly
1c95683b4f
Merge 3966b0a0b6 into merged_master (Bitcoin PR bitcoin/bitcoin#28472) 2025-08-04 09:26:56 +02:00
Byron Hambly
bca149e41a
Merge 1bf915db99 into merged_master (Bitcoin PR bitcoin/bitcoin#28470) 2025-08-01 14:02:57 +02:00
Byron Hambly
52015faa34
Merge abe4fedab7 into merged_master (Bitcoin PR bitcoin/bitcoin#28125) 2025-08-01 12:55:18 +02:00
Byron Hambly
34f8d7a3c4
Merge 53313c49d6 into merged_master (Bitcoin PR bitcoin/bitcoin#28246) 2025-08-01 12:40:43 +02:00
Byron Hambly
0aec781a49
Merge 459272d639 into merged_master (Bitcoin PR bitcoin/bitcoin#26152) 2025-08-01 09:39:10 +02:00
Byron Hambly
aa6edad0a2 Merge 541976b42e into merged_master (Bitcoin PR bitcoin/bitcoin#27850) 2025-07-21 15:12:58 +02:00
Byron Hambly
b5fa48988e Merge f1a9fd627b into merged_master (Bitcoin PR bitcoin/bitcoin#28251) 2025-07-21 13:58:00 +02:00
Byron Hambly
a6a540f173 Merge 8f9c74cb11 into merged_master (Bitcoin PR bitcoin/bitcoin#28414) 2025-07-21 11:57:54 +02:00
Byron Hambly
61fd69938d Merge 578f50fc48 into merged_master (Bitcoin PR bitcoin/bitcoin#28448) 2025-07-21 10:56:52 +02:00
Byron Hambly
bdcd9e6aba Merge c5a63ea56f into merged_master (Bitcoin PR bitcoin/bitcoin#27944) 2025-07-21 10:27:46 +02:00
Byron Hambly
21ed1add7c Merge 0354206a30 into merged_master (Bitcoin PR bitcoin/bitcoin#28412) 2025-07-21 09:40:58 +02:00
Byron Hambly
833114cc24 Merge b379bb2465 into merged_master (Elements PR #1459) 2025-07-18 11:45:30 +02:00
Byron Hambly
b379bb2465
Merge pull request #1459 from ElementsProject/simplicity
Update Simplicity integeration
2025-07-17 17:04:48 +02:00
Tom Trevethan
c4bc9fd5b4
Fix position of version argument in walletcreatefundedpsbt (#1474)
* fix position of version argument and add test

* add test for version number

---------

Co-authored-by: Tom Trevethan <ttrevethan@blockstream.com>
2025-07-11 12:27:43 +02:00
Byron Hambly
bd65b886f1 Merge 67cd78dbc2 into merged_master (Elements PR #1451) 2025-07-10 12:09:50 +02:00
Byron Hambly
ca65b633fc Merge 73760bae3e into merged_master (Elements PR #1471) 2025-07-10 11:46:09 +02:00
Byron Hambly
e34355c770 Merge 10a8e36813 into merged_master (Elements PR #1428) 2025-07-10 11:20:33 +02:00
Byron Hambly
67cd78dbc2
Merge pull request #1451 from tomt1664/v25+_cherry_pick
Selected Bitcoin v25 and onwards patches
2025-07-08 14:17:15 +02:00
Tom Trevethan
a9da179304 remove unused variable 2025-07-07 15:55:11 +01:00
Tom Trevethan
2f9eab6379 add solved_data to options for functional test 2025-07-07 15:55:11 +01:00
Byron Hambly
ff5f2bd383 Merge cf421820f5 into merged_master (Bitcoin PR bitcoin/bitcoin#28409) 2025-07-07 10:01:39 +02:00
Byron Hambly
bef3aeb383 Merge ecab855838 into merged_master (Bitcoin PR bitcoin/bitcoin#28195) 2025-07-07 09:45:43 +02:00
Byron Hambly
11d0a0194b Merge c004ba48f4 into merged_master (Bitcoin PR bitcoin/bitcoin#28386) 2025-07-05 20:33:32 +02:00
Byron Hambly
daa1c2efb7 Merge fb619e1bc3 into merged_master (Bitcoin PR bitcoin/bitcoin#28396) 2025-07-05 20:33:29 +02:00
Byron Hambly
6e7f491e72 Merge 337d6f35a2 into merged_master (Bitcoin PR bitcoin/bitcoin#28291) 2025-07-05 19:01:02 +02:00
Byron Hambly
2376883a9e Merge 5666966dff into merged_master (Bitcoin PR bitcoin/bitcoin#28364) 2025-07-05 18:25:36 +02:00
Byron Hambly
c06a8fa3cb Merge 1348454d82 into merged_master (Bitcoin PR bitcoin/bitcoin#28352) 2025-07-05 17:15:02 +02:00
Byron Hambly
fd8afcf05e Merge ab42b2ebdb into merged_master (Bitcoin PR bitcoin/bitcoin#28347) 2025-07-05 16:14:42 +02:00
Byron Hambly
30dc7b1d1f Merge c9273f68f6 into merged_master (Bitcoin PR bitcoin/bitcoin#28287) 2025-07-05 15:42:12 +02:00
Byron Hambly
33e45b316d Merge 7ee7c6d2c3 into merged_master (Bitcoin PR bitcoin/bitcoin#28332) 2025-07-05 11:00:36 +02:00
Byron Hambly
690b68494b Merge e8989f295d into merged_master (Bitcoin PR bitcoin/bitcoin#28325) 2025-07-05 10:52:33 +02:00
Byron Hambly
b72c8d64bd Merge e0ad847073 into merged_master (Bitcoin PR bitcoin/bitcoin#28321) 2025-07-05 10:52:25 +02:00