aboutsummaryrefslogtreecommitdiff
path: root/src/script.h
diff options
context:
space:
mode:
authorPeter Todd <pete@petertodd.org>2014-03-10 22:36:46 -0400
committerPeter Todd <pete@petertodd.org>2014-05-08 00:55:01 -0400
commitf80cffa213cce7d7f82aef7cf3a2f7308fbeb009 (patch)
tree09eaf78579af5f6d88c94726a3f13cb99f571e0a /src/script.h
parent6380180821917c22ecfd89128ee60aae6f4cac33 (diff)
downloadbitcoin-f80cffa213cce7d7f82aef7cf3a2f7308fbeb009.tar.xz
Do not trigger a DoS ban if SCRIPT_VERIFY_NULLDUMMY fails
Diffstat (limited to 'src/script.h')
-rw-r--r--src/script.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/script.h b/src/script.h
index 01779f550c..bbcdad159c 100644
--- a/src/script.h
+++ b/src/script.h
@@ -49,6 +49,9 @@ enum
// them to be valid. (but old blocks may not comply with) Currently just P2SH,
// but in the future other flags may be added, such as a soft-fork to enforce
// strict DER encoding.
+//
+// Failing one of these tests may trigger a DoS ban - see CheckInputs() for
+// details.
static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH;
// Standard script verification flags that standard transactions will comply
@@ -58,6 +61,9 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY
SCRIPT_VERIFY_STRICTENC |
SCRIPT_VERIFY_NULLDUMMY;
+// For convenience, standard but not mandatory verify flags.
+static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
+
enum txnouttype
{
TX_NONSTANDARD,