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

corr add funding tx validation

Browse Source 
added amount check
This commit is contained in:
dimxy
2019-05-12 16:16:28 +05:00
parent 7933b7919f
commit 96bc964123
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cc/prices.cpp
View File

@@ -238,8 +238,11 @@ static bool ValidateBetTx(struct CCcontract_info *cp, Eval *eval, const CTransac
int16_t leverage; int16_t leverage;
CPubKey pk, pricespk; CPubKey pk, pricespk;
std::vector<uint16_t> vec; std::vector<uint16_t> vec;
// check payment cc config:
if ( ASSETCHAINS_EARLYTXIDCONTRACT == EVAL_PRICES && KOMODO_EARLYTXID_SCRIPTPUB.size() == 0 ) if ( ASSETCHAINS_EARLYTXIDCONTRACT == EVAL_PRICES && KOMODO_EARLYTXID_SCRIPTPUB.size() == 0 )
GetKomodoEarlytxidScriptPub(); GetKomodoEarlytxidScriptPub();
if (bettx.vout.size() < 5 || bettx.vout.size() > 6) if (bettx.vout.size() < 5 || bettx.vout.size() > 6)
return eval->Invalid("incorrect vout number for bet tx"); return eval->Invalid("incorrect vout number for bet tx");
@@ -260,7 +263,7 @@ static bool ValidateBetTx(struct CCcontract_info *cp, Eval *eval, const CTransac
return eval->Invalid("the fee was paid to wrong address."); return eval->Invalid("the fee was paid to wrong address.");
int64_t betamount = bettx.vout[2].nValue; int64_t betamount = bettx.vout[2].nValue;
if (betamount != (positionsize * 199) / 200) { if (betamount != PRICES_SUBREVSHAREFEE(positionsize)) {
return eval->Invalid("invalid position size in the opreturn"); return eval->Invalid("invalid position size in the opreturn");
} }
@@ -289,7 +292,11 @@ static bool ValidateAddFundingTx(struct CCcontract_info *cp, Eval *eval, const C
CPubKey pk, pricespk; CPubKey pk, pricespk;
vscript_t vintxOpret; vscript_t vintxOpret;
if (addfundingtx.vout.size() < 3 || addfundingtx.vout.size() > 4) // check payment cc config:
if (ASSETCHAINS_EARLYTXIDCONTRACT == EVAL_PRICES && KOMODO_EARLYTXID_SCRIPTPUB.size() == 0)
GetKomodoEarlytxidScriptPub();
if (addfundingtx.vout.size() < 4 || addfundingtx.vout.size() > 5)
return eval->Invalid("incorrect vout number for add funding tx"); return eval->Invalid("incorrect vout number for add funding tx");
vscript_t opret; vscript_t opret;
@@ -311,6 +318,11 @@ static bool ValidateAddFundingTx(struct CCcontract_info *cp, Eval *eval, const C
if (MakeCC1vout(cp->evalcode, addfundingtx.vout[1].nValue, pricespk) != addfundingtx.vout[1]) if (MakeCC1vout(cp->evalcode, addfundingtx.vout[1].nValue, pricespk) != addfundingtx.vout[1])
return eval->Invalid("cannot validate vout1 in add funding tx with global pk"); return eval->Invalid("cannot validate vout1 in add funding tx with global pk");
int64_t betamount = addfundingtx.vout[2].nValue;
if (betamount != PRICES_SUBREVSHAREFEE(amount)) {
return eval->Invalid("invalid position size in the opreturn");
}
return true; return true;
} }