Commit graph

6441 commits

Author SHA1 Message Date
Byron Hambly
af71c2da7d Merge 2cc43de69b into merged_master (Bitcoin PR bitcoin/bitcoin#27516) 2025-05-14 11:55:26 +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
0b1508bf01
ci: fix lint issues 2025-04-17 11:06:32 +02:00
Byron Hambly
668be09bc4 Merge 811d835960 into merged_master (Elements PR #1439) 2025-04-16 12:04:15 +02:00
Byron Hambly
fcd6674243 Merge 3c1782e3ce into merged_master (Elements PR #1438) 2025-04-16 12:04:11 +02:00
Byron Hambly
6d9bfdcc3f Merge 0e644ad7ab into merged_master (Elements PR #1436) 2025-04-16 11:51:35 +02:00
Byron Hambly
e118b94887 Merge b63f7ab9b5 into merged_master (Elements PR #1433) 2025-04-16 11:48:02 +02:00
Byron Hambly
a41021b283 Merge abbc17048a into merged_master (Elements PR #1432) 2025-04-16 11:16:26 +02:00
Byron Hambly
1faa86f905 Merge 467fa89438 into merged_master (Bitcoin PR bitcoin/bitcoin#27477) 2025-04-14 08:58:40 +02:00
Byron Hambly
dffa8d3e5d Merge 54e07a05b2 into merged_master (Bitcoin PR bitcoin/bitcoin#27471) 2025-04-14 08:58:29 +02:00
Byron Hambly
ecf7719740 Merge e054b7390c into merged_master (Bitcoin PR bitcoin/bitcoin#27468) 2025-04-14 08:20:23 +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
99e05530f2 Merge 9ec30db888 into merged_master (Bitcoin PR bitcoin/bitcoin#27418) 2025-04-12 13:04:35 +02:00
Byron Hambly
6431ebbbd2 Merge 49b87bfe7e into merged_master (Bitcoin PR bitcoin/bitcoin#27389) 2025-04-12 12:30:40 +02:00
Byron Hambly
443b443230 Merge 88134fcee9 into merged_master (Bitcoin PR bitcoin/bitcoin#27378) 2025-04-12 12:06:18 +02:00
Byron Hambly
ae718000e9 Merge 328087d16f into merged_master (Bitcoin PR bitcoin/bitcoin#27350) 2025-04-12 11:14:26 +02:00
Byron Hambly
3c2668404a Merge d4833e9c49 into merged_master (Bitcoin PR bitcoin/bitcoin#26140) 2025-04-12 11:06:18 +02:00
Byron Hambly
a8c15ff245 Merge c0311b1dda into merged_master (Bitcoin PR bitcoin/bitcoin#27349) 2025-04-12 10:10:01 +02:00
Byron Hambly
a57edf9d11 Merge 68828288e5 into merged_master (Bitcoin PR bitcoin/bitcoin#27318) 2025-04-11 23:18:08 +02:00
Byron Hambly
e048a4bffd Merge 873a5062db into merged_master (Bitcoin PR bitcoin/bitcoin#27269) 2025-04-11 22:20:04 +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
997b75aaab Merge 483fb8d216 into merged_master (Bitcoin PR bitcoin/bitcoin#27287) 2025-04-11 21:35:55 +02:00
Byron Hambly
8c3af30453 Merge 8acfb1f8e0 into merged_master (Bitcoin PR bitcoin/bitcoin#18933) 2025-04-11 21:20:36 +02:00
Byron Hambly
5444a46602 Merge fc7c21f664 into merged_master (Bitcoin PR bitcoin/bitcoin#27271) 2025-04-11 20:53:03 +02:00
Byron Hambly
e268f3a7eb Merge a70911492f into merged_master (Bitcoin PR bitcoin/bitcoin#26749)
includes a FIXME for rpc_psbt.py that must have happened in the merge of
bitcoin/bitcoin#27200
2025-04-11 20:49:25 +02:00
Thomas Trevethan
c9d0126dab Merge 6e69fead2b into merged_master (Bitcoin PR bitcoin/bitcoin#27280) 2025-04-11 15:20:38 +01:00
Thomas Trevethan
b49bfac365 Merge 60f142e395 into merged_master (Bitcoin PR bitcoin/bitcoin#26531) 2025-04-11 14:45:16 +01:00
Thomas Trevethan
318636fd61 Merge 0973018067 into merged_master (Bitcoin PR bitcoin/bitcoin#27265) 2025-04-11 14:29:37 +01:00
Thomas Trevethan
c275de2fb6 Merge 50171df26c into merged_master (Bitcoin PR bitcoin/bitcoin#27212) 2025-04-11 13:32:48 +01:00
Thomas Trevethan
60542cc69a Merge db03248070 into merged_master (Bitcoin PR bitcoin/bitcoin#27199) 2025-04-11 13:31:01 +01:00
Thomas Trevethan
eb25e1f18f Merge 09e86d7a1a into merged_master (Bitcoin PR bitcoin/bitcoin#27200) 2025-04-11 12:56:43 +01:00
Byron Hambly
9111b218a7 Merge ebb15ea75a into merged_master (Bitcoin PR bitcoin/bitcoin#26207) 2025-04-10 09:39:45 +02:00
Byron Hambly
7787be135b Merge f50fb178c3 into merged_master (Bitcoin PR bitcoin/bitcoin#27235) 2025-04-10 07:55:55 +02:00
Byron Hambly
d69d8c5c42 Merge 73a9892bce into merged_master (Bitcoin PR bitcoin/bitcoin#26514) 2025-04-10 07:55:52 +02:00
Byron Hambly
f0a58bed97 Merge f088949fcf into merged_master (Bitcoin PR bitcoin/bitcoin#27221) 2025-04-10 07:22:14 +02:00
Byron Hambly
ff8ae274d7 Merge 99b64eec1b into merged_master (Bitcoin PR bitcoin/bitcoin#27232) 2025-04-10 06:39:41 +02:00
Tom Trevethan
8254cee16e Merge 3e7dd4ff33 into merged_master (Bitcoin PR bitcoin/bitcoin#27171) 2025-04-09 20:50:42 +00:00
Tom Trevethan
fe800396da Merge 6f5eb7a39e into merged_master (Bitcoin PR bitcoin/bitcoin#27226) 2025-04-09 20:49:41 +00:00
Tom Trevethan
7acb7e26fb Merge 6e662a8985 into merged_master (Bitcoin PR bitcoin/bitcoin#23813) 2025-04-09 20:45:38 +00:00
Tom Trevethan
48c917955e Merge 710fd571ff into merged_master (Bitcoin PR bitcoin/bitcoin#26996) 2025-04-09 19:00:45 +00:00
Tom Trevethan
a4e12fd05b Merge 1ff135ca7f into merged_master (Bitcoin PR bitcoin/bitcoin#26194) 2025-04-09 19:00:05 +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
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