merge-script
6e7ea3cf2a
Merge bitcoin/bitcoin#33788: [29.x] Backport fixes for CVE-2025-46598
6f136cd3914b001752cce02adde00fccaed0ad48 tests: drop expect_disconnect behaviour for tx relay (Anthony Towns)
be0857745a5a0154d89a2aa9ddaa2a84e912598a validation: only check input scripts once (Anthony Towns)
65bcbbc538234957b1f7f76b2f21ad7c138efb87 net_processing: drop MaybePunishNodeForTx (Anthony Towns)
f24291bd96f92ecc0fc04317fd93747eeb2d557a qa: unit test sighash caching (Antoine Poinsot)
73d3ab8fc93119f14f72a6c5f3cdd9eedcb36a20 qa: simple differential fuzzing for sighash with/without caching (Antoine Poinsot)
ddfb9150b80c0c692c06b91cefa988c7773b15ff script: (optimization) introduce sighash midstate caching (Pieter Wuille)
354d46bc10c61c45140be7a425c5c29fed934d32 script: (refactor) prepare for introducing sighash midstate cache (Pieter Wuille)
5a0506eea03e423121dd2112c2ba5fb4320022e3 tests: add sighash caching tests to feature_taproot (Pieter Wuille)
020ed613bed1148888692cb37e3522202bfca44e validation: detect witness stripping without re-running Script checks (Antoine Poinsot)
56626300b80dced9e111a39d5c560b0b81276cb8 policy: introduce a helper to detect whether a transaction spends Segwit outputs (Antoine Poinsot)
97088fa75aa0af5355587ce3522320f459e35204 qa: test witness stripping in p2p_segwit (Antoine Poinsot)
Pull request description:
ACKs for top commit:
sipa:
Code review ACK 6f136cd3914b001752cce02adde00fccaed0ad48
glozow:
ACK 6f136cd3914b001752cce02adde00fccaed0ad48, looks correct
darosior:
ACK 6f136cd3914b001752cce02adde00fccaed0ad48
Tree-SHA512: 445d770ae10bf1c4766810f945a8e5d83bfa0869d346b0f93c237b91101c9af45d6c935414e79ebf5e0c7089599a9a5a96cff82d9703b1d9573ce9deb21971fd
2026-01-12 11:40:55 -08:00
..
2025-02-12 11:39:37 -05:00
2024-04-18 10:27:25 +01:00
2024-12-13 14:22:25 +01:00
2024-09-13 21:59:29 -04:00
2024-12-13 14:22:25 +01:00
2025-03-28 14:23:42 -04:00
2024-10-19 19:16:04 +02:00
2024-08-13 07:44:31 +02:00
2023-12-06 15:44:38 +01:00
2024-07-01 10:26:46 -04:00
2024-08-05 14:51:47 +02:00
2024-05-29 18:55:04 +02:00
2023-11-30 11:27:21 +01:00
2024-12-13 14:22:25 +01:00
2023-11-14 08:45:30 +10:00
2023-12-09 19:31:06 +01:00
2023-10-06 19:43:32 +02:00
2024-12-02 16:25:13 -05:00
2024-10-07 13:49:36 -04:00
2025-02-12 11:39:37 -05:00
2024-12-02 13:48:04 +01:00
2024-09-18 20:03:47 +02:00
2024-12-13 14:22:25 +01:00
2024-09-04 15:04:53 -04:00
2024-09-05 17:56:54 -03:00
2024-09-21 12:37:36 +02:00
2023-12-09 19:31:06 +01:00
2023-12-09 19:31:06 +01:00
2024-08-28 15:56:15 +01:00
2024-10-26 23:44:15 +02:00
2024-03-18 10:32:00 -04:00
2024-04-22 09:36:36 -04:00
2024-05-16 10:16:08 -05:00
2025-01-20 17:43:58 +01:00
2025-01-22 12:40:21 -05:00
2024-06-12 15:21:31 +02:00
2024-12-09 17:01:10 +00:00
2024-12-13 14:22:25 +01:00
2024-12-13 14:22:25 +01:00
2024-09-12 12:36:37 -04:00
2023-12-04 15:39:15 -04:00
2024-12-13 14:22:25 +01:00
2024-09-16 13:59:22 -04:00
2024-05-09 15:56:04 +02:00
2024-12-13 14:22:25 +01:00
2024-08-05 15:45:58 +01:00
2025-01-06 15:43:04 +00:00
2024-05-16 10:16:08 -05:00
2023-11-28 17:49:41 +01:00
2024-09-04 15:04:53 -04:00
2025-02-04 11:53:03 -05:00
2024-11-11 12:14:08 +01:00
2023-12-14 20:10:21 +00:00
2025-01-09 10:11:46 -05:00
2024-04-18 10:27:25 +01:00
2024-03-12 12:59:02 -04:00
2025-01-06 15:43:04 +00:00
2024-12-13 14:22:25 +01:00
2025-01-15 15:44:03 +01:00
2024-12-13 14:22:25 +01:00
2025-01-06 15:43:04 +00:00
2024-10-26 23:44:15 +02:00
2025-10-02 15:17:10 +01:00
2024-12-02 15:09:31 +01:00
2024-07-19 15:39:02 +02:00
2025-09-12 15:44:00 +01:00
2025-02-12 11:39:37 -05:00
2023-11-14 17:41:26 +01:00
2024-09-04 15:04:53 -04:00
2024-08-13 07:44:31 +02:00
2024-09-02 15:43:33 +01:00
2024-09-04 15:04:53 -04:00
2023-11-14 08:45:30 +10:00
2024-12-17 12:55:38 -05:00
2024-12-17 12:55:38 -05:00
2024-10-26 23:44:15 +02:00
2024-12-13 14:22:25 +01:00
2024-07-06 09:06:36 -04:00
2025-03-25 16:58:12 -04:00
2024-12-13 14:22:25 +01:00
2024-12-13 14:22:25 +01:00
2024-05-16 10:16:08 -05:00
2023-11-23 17:57:53 +01:00
2023-12-09 19:31:06 +01:00
2025-11-03 21:50:28 +00:00
2024-05-16 10:16:08 -05:00
2024-12-13 14:22:25 +01:00
2024-09-20 16:05:28 +01:00
2024-08-09 11:18:45 +01:00
2024-08-21 00:41:56 +02:00
2024-12-13 14:22:25 +01:00
2023-11-14 08:45:30 +10:00
2025-01-06 15:43:04 +00:00
2024-08-13 07:44:31 +02:00
2024-07-10 09:40:47 +02:00
2025-01-15 12:16:08 +01:00
2024-09-06 09:08:10 -04:00
2024-06-13 11:20:49 +01:00
2024-12-13 14:22:25 +01:00
2023-11-30 11:28:19 +01:00
2023-11-30 11:28:19 +01:00
2025-10-02 15:17:10 +01:00
2025-02-07 13:55:57 -05:00
2025-02-20 14:00:21 -05:00
2025-01-29 18:05:16 -05:00
2024-12-02 08:21:32 +01:00
2024-11-25 20:09:44 +01:00
2025-01-06 15:43:04 +00:00
2025-01-06 15:43:04 +00:00
2024-12-13 14:22:25 +01:00
2024-07-01 10:26:46 -04:00