Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Script: Include stack dump in exception messages in correctlySpends().

Browse Source
This commit is contained in:
Andreas Schildbach
2019-02-02 14:26:59 +01:00
parent c8caff20cd
commit 16c7d03e1f
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/bitcoinj/core/Utils.java
View File

@@ -609,4 +609,11 @@ public class Utils {
public static boolean isMac() {
return os == OS.MAC_OS;
}
public static String toString(List<byte[]> stack) {
List<String> parts = new ArrayList<String>(stack.size());
for (byte[] push : stack)
parts.add('[' + HEX.encode(push) + ']');
return SPACE_JOINER.join(parts);
}
}

10
core/src/main/java/org/bitcoinj/script/Script.java
View File

@@ -1567,9 +1567,11 @@ public class Script {
if (stack.size() == 0)
throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE, "Stack empty at end of script execution.");
List<byte[]> stackCopy = new LinkedList<byte[]>(stack);
if (!castToBool(stack.pollLast()))
throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE, "Script resulted in a non-true stack: " + stack);
throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE,
"Script resulted in a non-true stack: " + Utils.toString(stackCopy));
// P2SH is pay to script hash. It means that the scriptPubKey has a special form which is a valid
// program but it has "useless" form that if evaluated as a normal program always returns true.
@@ -1597,8 +1599,10 @@ public class Script {
if (p2shStack.size() == 0)
throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE, "P2SH stack empty at end of script execution.");
List<byte[]> p2shStackCopy = new LinkedList<byte[]>(p2shStack);
if (!castToBool(p2shStack.pollLast()))
throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE, "P2SH script execution resulted in a non-true stack");
throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE,
"P2SH script execution resulted in a non-true stack: " + Utils.toString(p2shStackCopy));
}
}