aboutsummaryrefslogtreecommitdiff
path: root/src/script/script_error.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2014-11-08 09:32:29 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2014-11-20 15:29:26 +0100
commit98b135f97f16005687f420136114f80555bc8688 (patch)
tree2a7fc61b615881350b2a1d7a306b50137f10d9a0 /src/script/script_error.cpp
parent3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8 (diff)
downloadbitcoin-98b135f97f16005687f420136114f80555bc8688.tar.xz
Make STRICTENC invalid pubkeys fail the script rather than the opcode.
This turns STRICTENC turn into a softforking-safe change (even though it is not intended as a consensus rule), and as a result guarantee that using it for mempool validation only results in consensus-valid transactions in the mempool.
Diffstat (limited to 'src/script/script_error.cpp')
-rw-r--r--src/script/script_error.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index 793fc0da41..5d24ed98ba 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -61,6 +61,8 @@ const char* ScriptErrorString(const ScriptError serror)
return "Dummy CHECKMULTISIG argument must be zero";
case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS:
return "NOPx reserved for soft-fork upgrades";
+ case SCRIPT_ERR_PUBKEYTYPE:
+ return "Public key is neither compressed or uncompressed";
case SCRIPT_ERR_UNKNOWN_ERROR:
case SCRIPT_ERR_ERROR_COUNT:
default: break;