merge-script
b1f8a13702
Merge bitcoin/bitcoin#33624 : test: P2SH sig ops are only counted with SCRIPT_VERIFY_P2SH
...
3a10d700bc test: P2SH sig ops are only counted with `SCRIPT_VERIFY_P2SH` flag (brunoerg)
Pull request description:
This PR adds a test case for `GetTransactionSigOpCost` to check that P2SH sig ops are only counted when `SCRIPT_VERIFY_P2SH` flag is set.
Kills the following [mutant](https://corecheck.dev/mutation/src/consensus/tx_verify.cpp#L150 ):
```diff
diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
index 9d09872597..cc7cdaaf8f 100644
--- a/src/consensus/tx_verify.cpp
+++ b/src/consensus/tx_verify.cpp
@@ -147,7 +147,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
if (tx.IsCoinBase())
return nSigOps;
- if (flags & SCRIPT_VERIFY_P2SH) {
+ if (1==1) {
nSigOps += GetP2SHSigOpCount(tx, inputs) * WITNESS_SCALE_FACTOR;
}
```
ACKs for top commit:
l0rinc:
Tested ACK 3a10d700bc
maflcko:
re-lgtm ACK 3a10d700bc
instagibbs:
ACK 3a10d700bc
janb84:
tested ACK 3a10d700bc
Tree-SHA512: f560b4f9f2ce5c5fdd0a86e7e1f8ea27a8c6fda0327a6186a0c21e2c06ef13beeb017686db1688cace68812a01701abe46e8e1a095afefc6f2aed6ed96ba8288
2025-10-15 09:55:49 +01:00
..
2025-10-07 14:51:22 -07:00
2025-09-25 14:36:40 -07:00
2025-09-16 06:26:01 -04:00
2025-08-14 10:17:32 +10:00
2025-08-07 09:27:25 +01:00
2025-09-08 18:39:55 +01:00
2025-09-07 17:28:31 +02:00
2025-09-17 04:57:09 -04:00
2025-09-17 04:57:09 -04:00
2025-10-10 21:20:50 +00:00
2025-09-11 13:46:20 -07:00
2025-05-30 16:51:49 +01:00
2025-02-21 10:43:01 +01:00
2025-05-13 18:07:47 +01:00
2025-09-25 08:18:20 -04:00
2025-10-07 14:51:22 -07:00
2025-08-11 16:47:51 +01:00
2025-09-10 12:26:58 +01:00
2025-10-07 14:51:22 -07:00
2025-10-14 16:25:52 -04:00
2025-07-22 09:35:01 +01:00
2025-05-23 10:09:39 +01:00
2025-10-15 09:55:49 +01:00
2025-07-23 13:29:07 -07:00
2025-09-30 15:59:09 -07:00
2025-10-14 16:25:52 -04:00
2025-08-11 16:47:43 +01:00
2025-06-03 15:13:54 +02:00
2025-07-10 11:24:40 +02:00
2024-07-30 14:06:58 -04:00
2025-03-23 21:58:39 +01:00
2024-09-20 12:55:22 -04:00
2024-11-11 12:47:53 -03:00
2024-11-11 12:47:53 -03:00
2025-01-09 10:11:46 -05:00
2025-09-11 16:50:26 +02:00
2025-07-25 09:50:50 +02:00
2025-05-19 16:40:33 +01:00
2025-06-03 15:13:54 +02:00
2025-03-12 19:46:54 +01:00
2025-06-03 15:13:57 +02:00
2025-06-03 15:13:57 +02:00
2025-06-03 19:56:55 +02:00
2025-03-12 19:46:54 +01:00
2025-09-05 15:46:44 +01:00
2025-06-10 15:14:24 +02:00
2025-08-04 15:33:25 -06:00
2025-06-10 15:14:24 +02:00
2025-06-10 15:14:24 +02:00
2025-05-17 09:36:25 +02:00
2025-06-10 15:14:24 +02:00
2025-01-15 12:15:40 +01:00
2025-06-10 15:14:24 +02:00
2025-05-09 15:07:04 +02:00
2025-09-17 04:57:09 -04:00
2025-06-10 15:14:24 +02:00
2025-09-17 04:57:09 -04:00
2025-08-27 03:33:32 +10:00
2025-08-27 03:33:32 +10:00
2024-05-16 10:16:08 -05:00
2025-10-02 10:34:12 -04:00
2025-08-13 00:08:37 -03:00
2025-07-25 09:50:50 +02:00
2025-06-03 15:13:57 +02:00
2024-11-14 13:41:02 -05:00
2025-09-03 11:23:30 +01:00
2025-05-19 22:06:48 +00:00
2025-05-20 09:30:41 +01:00
2025-05-29 11:18:36 +01:00
2025-10-11 17:25:09 -04:00
2025-09-17 04:57:09 -04:00
2024-12-04 14:09:05 -05:00
2025-06-03 15:13:57 +02:00
2025-03-12 19:46:54 +01:00
2024-11-26 20:47:08 -05:00
2025-04-22 13:16:54 +01:00
2025-01-22 17:31:22 -05:00
2025-05-19 16:40:33 +01:00
2025-08-06 15:46:18 -07:00
2025-07-22 10:26:15 -07:00
2025-04-30 14:51:21 +02:00
2025-08-14 10:17:30 +10:00
2025-02-21 10:41:27 +01:00
2025-01-21 00:38:03 +10:00
2025-07-25 09:50:50 +02:00
2024-08-13 07:44:31 +02:00
2025-06-16 15:33:19 +02:00
2024-07-24 09:39:35 +02:00
2025-03-12 19:46:54 +01:00
2025-03-12 19:46:54 +01:00
2025-09-02 11:59:48 +01:00
2025-08-11 16:47:43 +01:00
2025-07-03 06:26:23 -04:00
2025-09-16 06:26:01 -04:00
2024-11-04 17:08:21 +01:00
2025-06-09 14:17:33 +02:00
2025-06-09 14:17:33 +02:00
2025-09-30 15:23:20 -07:00
2025-01-16 21:06:21 +00:00
2025-06-03 15:13:57 +02:00
2025-10-14 16:25:52 -04:00
2025-09-30 11:06:43 -07:00
2025-08-12 11:28:36 -04:00
2025-08-12 11:28:36 -04:00
2025-09-08 11:18:51 +02:00
2025-07-17 12:43:04 -04:00
2024-11-04 18:46:40 +01:00
2025-08-11 15:53:34 +01:00
2025-08-11 16:47:51 +01:00
2025-09-30 11:06:43 -07:00
2025-10-14 16:25:52 -04:00
2024-05-16 10:16:08 -05:00
2025-02-21 10:41:27 +01:00
2025-10-03 23:45:17 +01:00
2025-09-22 10:46:26 +10:00
2024-05-20 16:48:19 +00:00
2024-07-08 11:12:01 +02:00
2025-10-06 12:43:14 -04:00
2025-10-06 12:43:14 -04:00
2025-06-03 08:09:21 +01:00
2025-03-12 19:46:54 +01:00
2025-09-16 06:26:01 -04:00
2025-08-04 13:38:26 -04:00
2025-07-25 09:50:50 +02:00
2025-07-25 09:50:50 +02:00
2025-06-18 18:11:28 -03:00
2025-06-18 18:11:28 -03:00
2025-04-22 17:11:24 +10:00
2025-06-03 15:13:57 +02:00
2025-07-25 16:23:37 -07:00
2025-07-08 20:00:51 +01:00
2025-07-08 20:00:51 +01:00
2025-09-30 11:06:43 -07:00
2025-09-30 11:06:43 -07:00
2025-09-30 11:06:09 -07:00
2025-09-30 11:06:09 -07:00
2025-07-25 09:50:50 +02:00
2025-07-16 13:19:18 -07:00
2025-05-08 16:49:58 +01:00
2025-08-11 16:26:35 +01:00
2025-06-16 18:09:14 +00:00
2025-05-10 03:31:30 +00:00
2025-07-29 16:25:47 -07:00
2025-08-14 10:17:32 +10:00
2025-03-12 19:46:54 +01:00
2025-07-16 14:33:07 -07:00
2025-07-16 14:33:07 -07:00
2025-08-22 14:25:39 +00:00
2025-08-22 14:25:39 +00:00
2025-05-08 20:13:46 +00:00
2025-01-15 12:16:08 +01:00
2025-05-13 12:09:40 +02:00
2025-05-13 12:09:40 +02:00
2025-04-07 15:59:41 +02:00
2025-01-15 15:44:55 +01:00
2025-10-11 17:46:43 -04:00
2025-10-11 17:25:09 -04:00
2025-08-27 03:33:32 +10:00
2025-08-27 03:33:32 +10:00
2025-07-23 15:01:18 +01:00
2025-07-23 15:01:18 +01:00
2025-04-09 15:59:59 +01:00
2025-04-09 15:59:59 +01:00
2025-10-07 14:51:22 -07:00
2025-10-07 14:51:22 -07:00
2025-08-01 15:12:37 +02:00
2025-08-01 15:12:37 +02:00
2025-01-21 00:38:03 +10:00
2025-04-30 14:51:21 +02:00
2025-04-30 14:51:21 +02:00
2024-07-08 11:12:01 +02:00