Commit graph

7438 commits

Author SHA1 Message Date
Tom Trevethan
0ab95ded19 Merge fc037c8c83 into merged_master (Bitcoin PR bitcoin/bitcoin#27150) 2025-04-09 17:42:19 +00:00
Tom Trevethan
afaddf1ba1 Merge 86bacd75e7 into merged_master (Bitcoin PR bitcoin/bitcoin#26742) 2025-04-09 17:24:46 +00:00
Byron Hambly
6ec7ce1641 Merge bb136aaf2c into merged_master (Bitcoin PR bitcoin/bitcoin#26533) 2025-04-09 12:28:27 +02:00
Byron Hambly
8db6b78170 Merge 82793f1984 into merged_master (Bitcoin PR bitcoin/bitcoin#27146)
Unrelated FIXME: moved transactiontime functional tests to extended
temporarily
2025-04-09 06:47:56 +02:00
Tom Trevethan
c222787622 Merge b7702bd546 into merged_master (Bitcoin PR bitcoin/bitcoin#25943) 2025-04-08 20:00:25 +00:00
Tom Trevethan
2b654a52ad Merge 32f9ce0f52 into merged_master (Bitcoin PR bitcoin/bitcoin#27124) 2025-04-08 17:06:29 +00:00
Tom Trevethan
e09c9ea798 Merge 832fa2d238 into merged_master (Bitcoin PR bitcoin/bitcoin#25574) 2025-04-08 17:05:26 +00:00
Tom Trevethan
9b8a5eacea Merge 9f6ef0c156 into merged_master (Bitcoin PR bitcoin/bitcoin#27143) 2025-04-08 13:40:24 +00:00
Tom Trevethan
cfcac64fd8 Merge 5e55534586 into merged_master (Bitcoin PR bitcoin/bitcoin#27068) 2025-04-08 13:20:17 +00:00
Tom Trevethan
adca9e22d5 Merge c6e65a102c into merged_master (Bitcoin PR bitcoin/bitcoin#27137) 2025-04-08 13:12:49 +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
fad4c02c57 Merge 0c579203d2 into merged_master (Bitcoin PR bitcoin/bitcoin#25867) 2025-04-08 12:33:05 +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
Tom Trevethan
e9a875af37 Merge e996219f9a into merged_master (Bitcoin PR bitcoin/bitcoin#27113) 2025-04-07 11:54:05 +00:00
Byron Hambly
77008add5a Merge 150cc8ef42 into merged_master (Bitcoin PR bitcoin/bitcoin#27128) 2025-04-07 10:36:55 +02:00
Byron Hambly
83fd716cd8 Merge 446c8f581c into merged_master (Bitcoin PR bitcoin/bitcoin#25950) 2025-04-07 10:29:44 +02:00
Byron Hambly
43317158c5 Merge f722a9bd13 into merged_master (Bitcoin PR bitcoin/bitcoin#20018) 2025-04-07 08:30:10 +02:00
Byron Hambly
85b79938ed Merge bc35c4f58c into merged_master (Bitcoin PR bitcoin/bitcoin#27106) 2025-04-06 21:33:50 +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
8a30767b7b Merge 437dfe1c26 into merged_master (Bitcoin PR bitcoin/bitcoin#26714) 2025-04-05 23:06:23 +02:00
Byron Hambly
51677516de Merge 3a68e194f5 into merged_master (Bitcoin PR bitcoin/bitcoin#26586) 2025-04-05 22:51:41 +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
7cc2c1a2cf Merge a65d2259f1 into merged_master (Bitcoin PR bitcoin/bitcoin#27035) 2025-04-05 18:55:37 +02:00
Byron Hambly
bdb3612cea Merge 1e0198b6c1 into merged_master (Bitcoin PR bitcoin/bitcoin#26153) 2025-04-05 18:42:18 +02:00
Byron Hambly
6e120a00c7 Merge 576e16e702 into merged_master (Bitcoin PR bitcoin/bitcoin#26184) 2025-04-05 17:39:40 +02:00
Byron Hambly
c40ebd7cba Merge af49d86dd7 into merged_master (Bitcoin PR bitcoin/bitcoin#27093) 2025-04-05 17:24:59 +02:00
Byron Hambly
207be66351 Merge d6ef44cccb into merged_master (Bitcoin PR bitcoin/bitcoin#27081) 2025-04-05 17:17:37 +02:00
Byron Hambly
bce39f3505 Merge a6316590d5 into merged_master (Bitcoin PR bitcoin/bitcoin#26970) 2025-04-05 16:33:34 +02:00
Byron Hambly
9c86751b14 Merge ffdf630790 into merged_master (Bitcoin PR bitcoin/bitcoin#27066) 2025-04-05 16:03:31 +02:00
Byron Hambly
91b85bf2cb Merge 51d51d3082 into merged_master (Bitcoin PR bitcoin/bitcoin#26507) 2025-04-05 15:17:12 +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
afdc8b0c3b Merge aff75463e2 into merged_master (Bitcoin PR bitcoin/bitcoin#27036) 2025-04-05 13:42:09 +02:00
Byron Hambly
b89c80d3a8 Merge e2ae5c349c into merged_master (Bitcoin PR bitcoin/bitcoin#27037) 2025-04-05 13:04:46 +02:00
Byron Hambly
58ed702325 Merge fdd363ebd9 into merged_master (Bitcoin PR bitcoin/bitcoin#26910) 2025-04-05 11:13:37 +02:00
Byron Hambly
a0428bac7c Merge 357d750cab into merged_master (Bitcoin PR bitcoin/bitcoin#26956) 2025-04-05 09:10:40 +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
e8e7aea876 Merge 37fea41bbf into merged_master (Bitcoin PR bitcoin/bitcoin#26982) 2025-04-04 14:42:54 +00:00
Tom Trevethan
1200d73ab4 Merge 835212cd1d into merged_master (Bitcoin PR bitcoin/bitcoin#25880) 2025-04-04 14:12:28 +00:00
Tom Trevethan
9b463f91c5 Merge ffc22b7d42 into merged_master (Bitcoin PR bitcoin/bitcoin#26923) 2025-04-04 13:45:02 +00:00
Byron Hambly
93f06bda12 Merge ab98673f05 into merged_master (Bitcoin PR bitcoin/bitcoin#26929) 2025-04-04 11:36:54 +02:00
Byron Hambly
64cc0b63ce Merge 0486148f75 into merged_master (Bitcoin PR bitcoin/bitcoin#26829) 2025-04-04 11:16:56 +02:00
Byron Hambly
cc8b65ee86 Merge 75e752f134 into merged_master (Bitcoin PR bitcoin/bitcoin#26954) 2025-04-04 09:59:21 +02:00
Byron Hambly
8c94853dce Merge bf9361d375 into merged_master (Bitcoin PR bitcoin/bitcoin#26941) 2025-04-04 08:47:38 +02:00
Byron Hambly
c50e1f3d44 Merge 250598a905 into merged_master (Bitcoin PR bitcoin/bitcoin#26906) 2025-04-03 20:58:25 +02:00
Byron Hambly
bf8f8812bb Merge 92dcbe9cc3 into merged_master (Bitcoin PR bitcoin/bitcoin#23395) 2025-04-03 11:51:23 +02:00
Byron Hambly
30170c6bd9 Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226) 2025-04-03 11:42:16 +02:00
Byron Hambly
a40bcf97bd Merge 89fb354f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26625) 2025-04-03 10:33:03 +02:00
Byron Hambly
73c2291915 Merge ccd3d8d2c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25093) 2025-04-03 09:49:56 +02:00
Byron Hambly
757fcf42b4 Merge 635f1900d0 into merged_master (Bitcoin PR bitcoin/bitcoin#26884)
Adds a FIXME for the spendzeroconfchange stuff in wallet_basic.py
2025-04-03 09:30:40 +02:00