aboutsummaryrefslogtreecommitdiff
path: root/src/script.h
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2013-09-24 00:48:00 +0200
committerPieter Wuille <sipa@ulyssis.org>2014-02-11 21:11:59 +0100
commit87fe71e1fc810ee120a10063fdd26c3245686d54 (patch)
tree193f73d99ddbd70a67b5aafdcf353174f2cf4a96 /src/script.h
parent9aea601b05b3541fcc7e0c45cba8fd2178224809 (diff)
Add HasCanonicalPushes(), and use it in IsStandardTx
Diffstat (limited to 'src/script.h')
-rw-r--r--src/script.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/script.h b/src/script.h
index a0a6cd1c44..335ddfb1b2 100644
--- a/src/script.h
+++ b/src/script.h
@@ -541,9 +541,12 @@ public:
bool IsPayToScriptHash() const;
- // Called by IsStandardTx
+ // Called by IsStandardTx and P2SH VerifyScript (which makes it consensus-critical).
bool IsPushOnly() const;
+ // Called by IsStandardTx.
+ bool HasCanonicalPushes() const;
+
// Returns whether the script is guaranteed to fail at execution,
// regardless of the initial stack. This allows outputs to be pruned
// instantly when entering the UTXO set.