aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
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/main.cpp
parent9aea601b05b3541fcc7e0c45cba8fd2178224809 (diff)
downloadbitcoin-87fe71e1fc810ee120a10063fdd26c3245686d54.tar.xz
Add HasCanonicalPushes(), and use it in IsStandardTx
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index d33ad2fa95..1df9a24d55 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -442,6 +442,10 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
reason = "scriptsig-not-pushonly";
return false;
}
+ if (!txin.scriptSig.HasCanonicalPushes()) {
+ reason = "non-canonical-push";
+ return false;
+ }
}
unsigned int nDataOut = 0;