DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

corr vintx validation for add tx

Browse Source
This commit is contained in:
dimxy
2019-04-26 01:46:25 +05:00
parent 1141ce95d8
commit 50adff8b8c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cc/prices.cpp
View File

@@ -216,14 +216,16 @@ static bool ValidateAddFundingTx(struct CCcontract_info *cp, Eval *eval, const C
return eval->Invalid("cannot decode opreturn for add funding tx"); return eval->Invalid("cannot decode opreturn for add funding tx");
pricespk = GetUnspendable(cp, 0); pricespk = GetUnspendable(cp, 0);
uint8_t funcId; uint8_t vintxFuncId = CheckPricesOpret(vintx, vintxOpret);
if ((funcId=CheckPricesOpret(vintx, vintxOpret)) != 'B') { // if vintx is bettx if (vintxFuncId != 'A' && vintxFuncId != 'B') { // if vintx is bettx
std::cerr << "ValidateBetTx() " << "bad funcId=" << (funcId?funcId:'0') << std::endl; std::cerr << "ValidateAddFundingTx() " << "bad vintx funcId=" << (char)(vintxFuncId ? vintxFuncId :'0') << std::endl;
//return eval->Invalid("incorrect bettx funcid"); //return eval->Invalid("incorrect vintx funcid");
} }
if (vintx.GetHash() != bettxid) // if vintx is bettx if (vintxFuncId == 'B' && vintx.GetHash() != bettxid) {// if vintx is bettx
return eval->Invalid("incorrect bet txid in opreturn"); //return eval->Invalid("incorrect bet txid in opreturn");
std::cerr << "ValidateAddFundingTx() " << "incorrect net txid" << std::endl;
}
if (MakeCC1vout(cp->evalcode, addfundingtx.vout[0].nValue, pk) != addfundingtx.vout[0]) if (MakeCC1vout(cp->evalcode, addfundingtx.vout[0].nValue, pk) != addfundingtx.vout[0])
return eval->Invalid("cannot validate vout0 in add funding tx with pk from opreturn"); return eval->Invalid("cannot validate vout0 in add funding tx with pk from opreturn");