LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Fix broken test on previous checkin

Browse source
This commit is contained in:
Brannon King 2019-09-16 14:49:35 -06:00 committed by Anthony Fieroni
parent 3a1ebf8ac3
commit 83cef85cab
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/policy/policy.cpp
View file

@ -165,7 +165,7 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
const CTxOut& prev = mapInputs.AccessCoin(tx.vin[i].prevout).out; const CTxOut& prev = mapInputs.AccessCoin(tx.vin[i].prevout).out;
std::vector<std::vector<unsigned char> > vSolutions; std::vector<std::vector<unsigned char> > vSolutions;
const CScript& prevScript = prev.scriptPubKey; const CScript& prevScript = StripClaimScriptPrefix(prev.scriptPubKey);
txnouttype whichType = Solver(prevScript, vSolutions); txnouttype whichType = Solver(prevScript, vSolutions);
if (whichType == TX_NONSTANDARD) { if (whichType == TX_NONSTANDARD) {
return false; return false;

5
src/script/sign.cpp
View file

@ -105,7 +105,8 @@ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator
std::vector<unsigned char> sig; std::vector<unsigned char> sig;
std::vector<valtype> vSolutions; std::vector<valtype> vSolutions;
whichTypeRet = Solver(scriptPubKey, vSolutions); auto stripped = StripClaimScriptPrefix(scriptPubKey);
whichTypeRet = Solver(stripped, vSolutions);
switch (whichTypeRet) switch (whichTypeRet)
{ {
@ -195,7 +196,7 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
std::vector<valtype> result; std::vector<valtype> result;
txnouttype whichType; txnouttype whichType;
bool solved = SignStep(provider, creator, StripClaimScriptPrefix(fromPubKey), result, whichType, SigVersion::BASE, sigdata); bool solved = SignStep(provider, creator, fromPubKey, result, whichType, SigVersion::BASE, sigdata);
bool P2SH = false; bool P2SH = false;
CScript subscript; CScript subscript;
sigdata.scriptWitness.stack.clear(); sigdata.scriptWitness.stack.clear();