Commit graph

5149 commits

Author SHA1 Message Date
Byron Hambly
6e6d5d7687 Merge 6cc136bbd3 into merged_master (Bitcoin PR bitcoin/bitcoin#27556) 2025-06-20 21:20:43 +02:00
Byron Hambly
d1fe2b52de Merge b34e19a2bf into merged_master (Bitcoin PR bitcoin/bitcoin#27665) 2025-06-20 15:48:43 +02:00
Byron Hambly
8b9efdd41d Merge d02df7db6b into merged_master (Bitcoin PR bitcoin/bitcoin#26715) 2025-06-20 15:44:24 +02:00
Byron Hambly
b1d470027d Merge c2f2abd0a4 into merged_master (Bitcoin PR bitcoin/bitcoin#27125) 2025-06-20 10:46:05 +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
cbd7b123d9 Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491) 2025-06-19 16:08:36 +02:00
Byron Hambly
5b856b6f5f Merge fa53611cf1 into merged_master (Bitcoin PR bitcoin/bitcoin#26076) 2025-05-16 11:10:32 +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
e22e1b9509 Merge ccd4db7d62 into merged_master (Bitcoin PR bitcoin/bitcoin#27570) 2025-05-16 10:32:57 +02:00
Byron Hambly
478129f30a Merge 0e70a1b625 into merged_master (Bitcoin PR bitcoin/bitcoin#26066) 2025-05-15 14:34:40 +02:00
Byron Hambly
1025535549 Merge da9f62f912 into merged_master (Bitcoin PR bitcoin/bitcoin#26094) 2025-05-15 13:12:44 +02:00
Byron Hambly
497b1cace4 Merge 3497df4c75 into merged_master (Bitcoin PR bitcoin/bitcoin#27195) 2025-05-15 10:30:40 +02:00
Byron Hambly
2774757c03 Merge 071308860a into merged_master (Bitcoin PR bitcoin/bitcoin#25680) 2025-05-14 14:30:47 +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
83370fca8a Merge 91ccb62faa into merged_master (Bitcoin PR bitcoin/bitcoin#25158) 2025-05-14 14:19:45 +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
2c3f2cde3d
Merge 395b932807 into merged_master (Bitcoin PR bitcoin/bitcoin#26720) 2025-05-08 14:49:47 +02:00
Byron Hambly
833eaacade
ci: use 24.04 instead of lunar for tidy and fuzz ci 2025-04-29 13:49:55 +02:00
Byron Hambly
979170fd2c
ci: asan fixes 2025-04-29 13:49:44 +02:00
Byron Hambly
0b1508bf01
ci: fix lint issues 2025-04-17 11:06:32 +02:00
Byron Hambly
d6703971c6 Merge 90bfa9d2d7 into merged_master (Bitcoin PR bitcoin/bitcoin#27308) 2025-04-14 08:20:10 +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
d5c13168a6 Merge 27dcc07c08 into merged_master (Bitcoin PR bitcoin/bitcoin#26699) 2025-04-12 15:13:11 +02:00
Byron Hambly
62a66c645b Merge 23a899b27c into merged_master (Bitcoin PR bitcoin/bitcoin#26832) 2025-04-12 12:37:57 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Byron Hambly
dfd55ffa24 Merge a0d37d1d23 into merged_master (Bitcoin PR bitcoin/bitcoin#27274) 2025-04-12 11:40:50 +02:00
Byron Hambly
e04de3e652 Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642) 2025-04-11 22:28:06 +02:00
Byron Hambly
bb3be3f31d Merge 381593c906 into merged_master (Bitcoin PR bitcoin/bitcoin#24845) 2025-04-11 22:04:03 +02:00
Byron Hambly
5444a46602 Merge fc7c21f664 into merged_master (Bitcoin PR bitcoin/bitcoin#27271) 2025-04-11 20:53:03 +02:00
Thomas Trevethan
9ab3f83b5f Merge 40e1c4d402 into merged_master (Bitcoin PR bitcoin/bitcoin#25666) 2025-04-11 14:30:24 +01:00
Byron Hambly
38d6b625c3 Merge 609c95d4a8 into merged_master (Bitcoin PR bitcoin/bitcoin#27227) 2025-04-10 09:28:08 +02:00
Byron Hambly
59a4dcb178 Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781) 2025-04-10 09:10:09 +02:00
Tom Trevethan
a4e12fd05b Merge 1ff135ca7f into merged_master (Bitcoin PR bitcoin/bitcoin#26194) 2025-04-09 19:00:05 +00:00
Tom Trevethan
8e8dabba5d Merge 69ba5727d5 into merged_master (Bitcoin PR bitcoin/bitcoin#27180) 2025-04-09 18:58:26 +00:00
Tom Trevethan
bff78b8a4e Merge 4ea3a8b71d into merged_master (Bitcoin PR bitcoin/bitcoin#25806) 2025-04-09 17:17:19 +00:00
Byron Hambly
2ce097b3c2 Merge dddc936d83 into merged_master (Bitcoin PR bitcoin/bitcoin#25491) 2025-04-09 13:21:50 +02: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
cfcac64fd8 Merge 5e55534586 into merged_master (Bitcoin PR bitcoin/bitcoin#27068) 2025-04-08 13:20:17 +00: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
10a48f98f1 Merge 94070029fb into merged_master (Bitcoin PR bitcoin/bitcoin#27053) 2025-04-08 11:36:10 +02:00
Byron Hambly
4ec18086ff Merge a245429d68 into merged_master (Bitcoin PR bitcoin/bitcoin#26940) 2025-04-07 10:05:17 +02:00
Byron Hambly
9fdd02a17b Merge 27772d8009 into merged_master (Bitcoin PR bitcoin/bitcoin#26889) 2025-04-07 08:11:43 +02:00
Byron Hambly
54d0589bdc Merge 73966f75f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25344) 2025-04-06 21:33:46 +02:00
Byron Hambly
c7bff919f0 Merge fb82d91a9c into merged_master (Bitcoin PR bitcoin/bitcoin#24149) 2025-04-05 22:44:14 +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
8df89b56d5 Merge 6e08e5cb5c into merged_master (Bitcoin PR bitcoin/bitcoin#17127) 2025-04-05 14:44:25 +02:00
Byron Hambly
c91e4c349e Merge d71b0e78eb into merged_master (Bitcoin PR bitcoin/bitcoin#25966) 2025-04-05 13:19:11 +02:00