Commit graph

1995 commits

Author SHA1 Message Date
Byron Hambly
69492d27da
Merge 08ea835220 into merged_master (Bitcoin PR bitcoin/bitcoin#28583) 2025-08-07 10:05:15 +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
bf24d3692a
Merge 50f250a67d into merged_master (Bitcoin PR bitcoin/bitcoin#28542) 2025-08-05 15:21:35 +02:00
Byron Hambly
f0b077e7ce
Merge 1d4846a844 into merged_master (Bitcoin PR bitcoin-core/gui#738) 2025-08-04 10:11:39 +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
b456503d27 Merge d2ccca253f into merged_master (Bitcoin PR bitcoin/bitcoin#26567)
Modified to keep using dummy signing until we can update to the
descriptor method introduced in this PR from upstream
2025-07-18 14:38:53 +02:00
Byron Hambly
ca14c27f1b Merge 00fc7cdc25 into merged_master (Bitcoin PR bitcoin/bitcoin#28200) 2025-07-05 07:45:03 +02:00
Byron Hambly
6a868386b5 Merge 7bf078f2b7 into merged_master (Bitcoin PR bitcoin/bitcoin#28237) 2025-07-04 21:24:50 +02:00
Byron Hambly
6c55760a2d Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244) 2025-07-04 17:24:18 +02:00
Byron Hambly
81083d47bf Merge 624333455a into merged_master (Bitcoin PR bitcoin/bitcoin#26296) 2025-07-03 20:38:42 +02:00
Byron Hambly
861d620a00 Merge 87e19b047c into merged_master (Bitcoin PR bitcoin/bitcoin#28038) 2025-07-01 11:18:57 +02:00
Byron Hambly
f5818115a7 Merge ecf3baffc0 into merged_master (Bitcoin PR bitcoin/bitcoin#27869) 2025-06-30 15:47:28 +02:00
Byron Hambly
489e4b0c3e Merge 7952a5934a into merged_master (Bitcoin PR bitcoin/bitcoin#27927) 2025-06-30 13:48:32 +02:00
Byron Hambly
2663ae44dd Merge d9c7c2fd3e into merged_master (Bitcoin PR bitcoin/bitcoin#24914) 2025-06-30 13:48:12 +02:00
Byron Hambly
459be075a1 Merge ee22ca59a2 into merged_master (Bitcoin PR bitcoin/bitcoin#26740) 2025-06-27 15:40:23 +02:00
Byron Hambly
3af56ffbe7 Merge 153a6882f4 into merged_master (Bitcoin PR bitcoin/bitcoin#27576) 2025-06-27 13:00:41 +02:00
Byron Hambly
625c697a2e Merge 83c7269965 into merged_master (Bitcoin PR bitcoin/bitcoin#27800) 2025-06-27 11:25:20 +02:00
Byron Hambly
2ad90bac11 Merge dfe658009d into merged_master (Bitcoin PR bitcoin/bitcoin#27759) 2025-06-25 10:11:41 +02:00
Byron Hambly
93356d4ab1 Merge 7d33ae755d into merged_master (Bitcoin PR bitcoin/bitcoin#27145) 2025-06-25 09:42:54 +02:00
Byron Hambly
c590a01aff Merge 10c4a4613f into merged_master (Bitcoin PR bitcoin/bitcoin#27469) 2025-06-25 09:17:16 +02:00
Byron Hambly
a40347d7f5 Merge e0a70c5b4f into merged_master (Bitcoin PR bitcoin/bitcoin#27605) 2025-06-20 09:50:22 +02:00
Byron Hambly
6d0400e7e2 Merge e460c0a24a into merged_master (Bitcoin PR bitcoin/bitcoin#27405) 2025-05-16 10:33:14 +02:00
Byron Hambly
db3df5936f Merge 5325a61167 into merged_master (Bitcoin PR bitcoin/bitcoin#27224) 2025-05-14 14:30:41 +02:00
Byron Hambly
551bc4868c Merge 2755aa5121 into merged_master (Bitcoin PR bitcoin/bitcoin#25939) 2025-05-14 11:26:51 +02:00
Byron Hambly
5ac82e15a9 Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419) 2025-05-09 11:47:45 +02:00
Byron Hambly
dbf777c321 Merge 6a167325f0 into merged_master (Bitcoin PR bitcoin/bitcoin#27279) 2025-04-12 17:24:00 +02:00
Byron Hambly
0d6796ec53 Merge cae0608ad4 into merged_master (Bitcoin PR bitcoin/bitcoin#27217) 2025-04-12 17:04:51 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Thomas Trevethan
9ab3f83b5f Merge 40e1c4d402 into merged_master (Bitcoin PR bitcoin/bitcoin#25666) 2025-04-11 14:30:24 +01:00
Tom Trevethan
8e8dabba5d Merge 69ba5727d5 into merged_master (Bitcoin PR bitcoin/bitcoin#27180) 2025-04-09 18:58:26 +00:00
Byron Hambly
d7c9767c01 Merge 710cab1d43 into merged_master (Bitcoin PR bitcoin/bitcoin#26032)
Moved the implementations of DummySignTx and DummySignInput from
spend.cpp to wallet.cpp, to more closely match upstream
2025-04-09 12:04:43 +02:00
Tom Trevethan
e86b323459 Merge 63893d5eab into merged_master (Bitcoin PR bitcoin/bitcoin#26595) 2025-04-08 12:53:15 +00:00
Tom Trevethan
03de06468f Merge 80f4979322 into merged_master (Bitcoin PR bitcoin/bitcoin#26347) 2025-04-08 12:12:39 +00:00
Byron Hambly
9fdd02a17b Merge 27772d8009 into merged_master (Bitcoin PR bitcoin/bitcoin#26889) 2025-04-07 08:11:43 +02:00
Byron Hambly
fa04c471ff Merge 2c1fe27bf3 into merged_master (Bitcoin PR bitcoin/bitcoin#27080) 2025-04-05 17:09:56 +02:00
Byron Hambly
58ed702325 Merge fdd363ebd9 into merged_master (Bitcoin PR bitcoin/bitcoin#26910) 2025-04-05 11:13:37 +02:00
Tom Trevethan
304269bcc3 Merge b1329b7523 into merged_master (Bitcoin PR bitcoin/bitcoin#26499) 2025-04-04 15:17:09 +00:00
Tom Trevethan
1435fb334b Merge 79e007d1d6 into merged_master (Bitcoin PR bitcoin/bitcoin#25296) 2025-04-04 13:36:08 +00:00
Byron Hambly
0bb52bcc79 Merge f1b5d6be57 into merged_master (Bitcoin PR bitcoin/bitcoin#26955) 2025-04-04 10:35:44 +02:00
Byron Hambly
f6fb703bc1 Merge a62231bca6 into merged_master (Bitcoin PR bitcoin/bitcoin#26690) 2025-04-04 09:43:16 +02:00
Byron Hambly
7539f63bef Merge fbe5e1220a into merged_master (Bitcoin PR bitcoin/bitcoin#26675) 2025-04-01 21:57:01 +02:00
Byron Hambly
feb8f8cf2b Merge 9887fc7898 into merged_master (Bitcoin PR bitcoin/bitcoin#26758) 2025-04-01 21:20:49 +02:00
Byron Hambly
16bc3a2027 Merge 4586ae2da1 into merged_master (Bitcoin PR bitcoin/bitcoin#26679) 2025-04-01 20:16:57 +02:00
Byron Hambly
620e49c665 Merge b4fb0a3255 into merged_master (Bitcoin PR bitcoin/bitcoin#26761) 2025-04-01 19:31:13 +02:00
Tom Trevethan
f890d5eb98 Merge 360e047a71 into merged_master (Bitcoin PR bitcoin/bitcoin#26747) 2025-04-01 15:06:14 +00:00
Tom Trevethan
147febdae3 Merge 65ecf24b5c into merged_master (Bitcoin PR bitcoin/bitcoin#26752) 2025-04-01 13:25:03 +00:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Tom Trevethan
3f43afa4b9 Merge 7d51560003 into merged_master (Bitcoin PR bitcoin/bitcoin#26298) 2025-03-25 12:09:21 +00:00
Tom Trevethan
bf45fb4395 Merge 8ccab65f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26238) 2025-03-18 11:09:37 +00:00