Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-16 04:05:50 +00:00
Code Issues Projects Releases Wiki Activity

Script: Improve error reporting of CHECKSEQUENCEVERIFY.

Browse Source
This commit is contained in:
Nicola Atzei 2017-12-30 16:53:32 +01:00 committed by Andreas Schildbach
parent c927f0238b
commit 6cc02d24b1
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1457,11 +1457,10 @@ public class Script {
return; return;
// Compare the specified sequence number with the input. // Compare the specified sequence number with the input.
if (!checkSequence(nSequence, txContainingThis, index)) checkSequence(nSequence, txContainingThis, index);
throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Unsatisfied CHECKLOCKTIMEVERIFY lock time");
} }
private static boolean checkSequence(long nSequence, Transaction txContainingThis, int index) { private static void checkSequence(long nSequence, Transaction txContainingThis, int index) {
// Relative lock times are supported by comparing the passed // Relative lock times are supported by comparing the passed
// in operand to the sequence number of the input. // in operand to the sequence number of the input.
long txToSequence = txContainingThis.getInput(index).getSequenceNumber(); long txToSequence = txContainingThis.getInput(index).getSequenceNumber();
@ -1469,14 +1468,14 @@ public class Script {
// Fail if the transaction's version number is not set high // Fail if the transaction's version number is not set high
// enough to trigger BIP 68 rules. // enough to trigger BIP 68 rules.
if (txContainingThis.getVersion() < 2) if (txContainingThis.getVersion() < 2)
return false; throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Transaction version is < 2");
// Sequence numbers with their most significant bit set are not // Sequence numbers with their most significant bit set are not
// consensus constrained. Testing that the transaction's sequence // consensus constrained. Testing that the transaction's sequence
// number do not have this bit set prevents using this property // number do not have this bit set prevents using this property
// to get around a CHECKSEQUENCEVERIFY check. // to get around a CHECKSEQUENCEVERIFY check.
if ((txToSequence & TransactionInput.SEQUENCE_LOCKTIME_DISABLE_FLAG) != 0) if ((txToSequence & TransactionInput.SEQUENCE_LOCKTIME_DISABLE_FLAG) != 0)
return false; throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Sequence disable flag is set");
// Mask off any bits that do not have consensus-enforced meaning // Mask off any bits that do not have consensus-enforced meaning
// before doing the integer comparisons // before doing the integer comparisons
@ -1493,15 +1492,13 @@ public class Script {
// the nSequenceMasked in the transaction. // the nSequenceMasked in the transaction.
if (!((txToSequenceMasked < TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG && nSequenceMasked < TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG) || if (!((txToSequenceMasked < TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG && nSequenceMasked < TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG) ||
(txToSequenceMasked >= TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG && nSequenceMasked >= TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG))) { (txToSequenceMasked >= TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG && nSequenceMasked >= TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG))) {
return false; throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Relative locktime requirement type mismatch");
} }
// Now that we know we're comparing apples-to-apples, the // Now that we know we're comparing apples-to-apples, the
// comparison is a simple numeric one. // comparison is a simple numeric one.
if (nSequenceMasked > txToSequenceMasked) if (nSequenceMasked > txToSequenceMasked)
return false; throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Relative locktime requirement not satisfied");
return true;
} }
private static void executeCheckSig(Transaction txContainingThis, int index, Script script, LinkedList<byte[]> stack, private static void executeCheckSig(Transaction txContainingThis, int index, Script script, LinkedList<byte[]> stack,