Commit graph

1950 commits

Author SHA1 Message Date
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
Tom Trevethan
edf22a74f8 Merge 2ce3d26757 into merged_master (Bitcoin PR bitcoin/bitcoin#26462) 2025-03-13 18:02:44 +00:00
Byron Hambly
073316ddaf Merge e334f7a545 into merged_master (Bitcoin PR bitcoin/bitcoin#26594) 2025-03-04 11:18:49 +02:00
Byron Hambly
07aebbf505
lint: fixes 2025-02-14 15:54:27 +02:00
Byron Hambly
ae2a8a49d6
Merge e9a914465d into merged_master (Elements PR #1385) 2025-02-11 14:35:51 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
8dabb73663
moneyrange: check asset type 2025-01-17 13:09:10 +02:00
Byron Hambly
a6f8dc6a86
tidy: fixes for clang tidy ci job 2024-12-04 14:16:45 +02:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
Byron Hambly
fb832dd2ca Merge 9f650062fc into merged_master (Bitcoin PR bitcoin/bitcoin#26005) 2024-11-27 11:36:17 +02:00
Byron Hambly
09e2cad10f Merge 08785aa75b into merged_master (Bitcoin PR bitcoin/bitcoin#25499) 2024-11-27 10:47:04 +02:00
Byron Hambly
21d8cd57f3 Merge 96f1b2d34f into merged_master (Bitcoin PR bitcoin/bitcoin#26091) 2024-11-26 20:18:09 +02:00
Byron Hambly
cd60150aa4 Merge c85688347e into merged_master (Bitcoin PR bitcoin/bitcoin#26021) 2024-11-26 15:01:13 +02:00
Byron Hambly
2d4094eb0b Merge 5291933fed into merged_master (Bitcoin PR bitcoin/bitcoin#25768) 2024-11-26 12:31:26 +02:00
Byron Hambly
e1e241d410 Merge 7921026a24 into merged_master (Bitcoin PR bitcoin/bitcoin#19602)
FIXME for test_other_watchonly in the new wallet migration test
2024-11-26 11:21:27 +02:00
Byron Hambly
8497f3e1ab Merge 80da4be57b into merged_master (Bitcoin PR bitcoin/bitcoin#25896) 2024-11-22 09:52:06 +02:00
Byron Hambly
c76ddcea4d Merge 6b56873b41 into merged_master (Bitcoin PR bitcoin/bitcoin#25784) 2024-11-04 11:52:14 +02:00