LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues29 Pull requests1 Projects Releases32 Packages Wiki Activity

Merge : Add script tests for FindAndDelete in pre-segwit and segwit scripts

Browse source 
acf853d Add script tests for FindAndDelete in pre-segwit and segwit scripts (Johnson Lau)
This commit is contained in:
Wladimir J. van der Laan 2016-10-19 17:15:36 +02:00
commit 475d68252e
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
3 changed files with 51 additions and 2 deletions
src/script
interpreter.cpp

4
src/script/interpreter.cpp
View file

@ -890,7 +890,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
// Subset of script starting at the most recent codeseparator
CScript scriptCode(pbegincodehash, pend);
// Drop the signature, since there's no way for a signature to sign itself
// Drop the signature in pre-segwit scripts but not segwit scripts
if (sigversion == SIGVERSION_BASE) {
scriptCode.FindAndDelete(CScript(vchSig));
}
@ -951,7 +951,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
// Subset of script starting at the most recent codeseparator
CScript scriptCode(pbegincodehash, pend);
// Drop the signatures, since there's no way for a signature to sign itself
// Drop the signature in pre-segwit scripts but not segwit scripts
for (int k = 0; k < nSigsCount; k++)
{
valtype& vchSig = stacktop(-isig-k);