aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2020-09-30 14:09:37 +0200
committerWladimir J. van der Laan <laanwj@protonmail.com>2020-09-30 14:21:42 +0200
commit4f5ae52738f757d9a8e5bd8641d1ada0741ba9c9 (patch)
tree2a2c8c8c8ba4b4b151319400b2f8e7c616bbb3d4
parent5c435c78e36c543fe27d332523f157f714141226 (diff)
parentaf57766182013e17c23245671a33463f754ccd28 (diff)
Merge #20006: Fix misleading error message: Clean stack rule
af57766182013e17c23245671a33463f754ccd28 Fix misleading error message: Clean stack rule (sanket1729) Pull request description: Error messages in clean stack is misleading as it lets the user believe that there are extra elements on the stack which is incorrect if the stack is empty. Let me know if this requires additional test. ACKs for top commit: instagibbs: re-ACK https://github.com/bitcoin/bitcoin/pull/20006/commits/af57766182013e17c23245671a33463f754ccd28 gzhao408: reACK https://github.com/bitcoin/bitcoin/commit/af57766182013e17c23245671a33463f754ccd28 theStack: re-ACK af57766182013e17c23245671a33463f754ccd28 darosior: re ACK af57766182013e17c23245671a33463f754ccd28 Tree-SHA512: 88e77416e220b080246fec368f5552a891d102d072b7bee62ac560d5e31c4a8c2ee9cbe569740b253e9df177d21dc788d10d856b2a542ab47761bb81698e4082
-rw-r--r--src/script/script_error.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index 69e14803f1..3b383393f9 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -76,7 +76,7 @@ std::string ScriptErrorString(const ScriptError serror)
case SCRIPT_ERR_PUBKEYTYPE:
return "Public key is neither compressed or uncompressed";
case SCRIPT_ERR_CLEANSTACK:
- return "Extra items left on stack after execution";
+ return "Stack size must be exactly one after execution";
case SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH:
return "Witness program has incorrect length";
case SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY: