Skip to content

[BUG] Correct CCSV opcode handling in script evaluation #2532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
furszy merged 2 commits into from
Aug 26, 2021
Merged

[BUG] Correct CCSV opcode handling in script evaluation #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e916c0a
[BUG] Correct CCSV opcode handling in script evaluation
random-zebra Aug 25, 2021
50b9cb7
[Refactor] check scriptsig size in CheckBlockSignature
random-zebra Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/blocksignature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,17 @@ bool CheckBlockSignature(const CBlock& block)
// p2pk scriptsig only contains the signature and p2pkh scriptpubkey only contain the hash.
return false;
} else {
int start = 1 + (int) *txin.scriptSig.begin(); // skip sig
unsigned int start = 1 + (unsigned int) *txin.scriptSig.begin(); // skip sig
if (start >= txin.scriptSig.size() - 1) return false;
pubkey = CPubKey(txin.scriptSig.begin()+start+1, txin.scriptSig.end());
}
} else if (whichType == TX_COLDSTAKE) {
// pick the public key from the P2CS input
const CTxIn& txin = block.vtx[1]->vin[0];
int start = 1 + (int) *txin.scriptSig.begin(); // skip sig
unsigned int start = 1 + (unsigned int) *txin.scriptSig.begin(); // skip sig
if (start >= txin.scriptSig.size() - 1) return false;
start += 1 + (int) *(txin.scriptSig.begin()+start); // skip flag
if (start >= txin.scriptSig.size() - 1) return false;
pubkey = CPubKey(txin.scriptSig.begin()+start+1, txin.scriptSig.end());
}
}
Expand Down
10 changes: 8 additions & 2 deletions src/script/interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,14 +957,20 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&

case OP_CHECKCOLDSTAKEVERIFY:
{
return checker.CheckColdStake(false, script, stack, flags, serror);
if (!checker.CheckColdStake(false, script, stack, flags, serror)) {
// serror set
return false;
}
}
break;

case OP_CHECKCOLDSTAKEVERIFY_LOF:
{
// Allow last output script "free"
return checker.CheckColdStake(true, script, stack, flags, serror);
if (!checker.CheckColdStake(true, script, stack, flags, serror)) {
// serror set
return false;
}
}
break;

Expand Down