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

better var naming for check vin's pubkey algo

Browse Source
This commit is contained in:
dimxy
2019-01-22 15:03:52 +05:00
parent 92ab8dd7d8
commit 2d20276606
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cc/heir.cpp
View File

@@ -687,13 +687,13 @@ template <typename Helper> UniValue _HeirFund(int64_t txfee, int64_t amount, std
} }
// check owner pubkey in vins // check owner pubkey in vins
bool isMypubkey = false; bool hasMypubkey = false;
bool isNotMypubkey = false; bool hasNotMypubkey = false;
CheckVinPubkey(mtx.vin, myPubkey, isMypubkey, isNotMypubkey); CheckVinPubkey(mtx.vin, myPubkey, hasMypubkey, hasNotMypubkey);
// for initial funding do not allow to sign by non-owner key: // for initial funding do not allow to sign by non-owner key:
if (isNotMypubkey) { if (hasNotMypubkey) {
result.push_back(Pair("result", "error")); result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "using non-owner inputs not allowed")); result.push_back(Pair("error", "using non-owner inputs not allowed"));
return result; return result;
@@ -793,20 +793,20 @@ template <class Helper> UniValue _HeirAdd(uint256 fundingtxid, int64_t txfee, in
} }
// check owner pubkey in vins // check owner pubkey in vins
bool isMypubkey = false; bool hasMypubkey = false;
bool isNotMypubkey = false; bool hasNotMypubkey = false;
CheckVinPubkey(mtx.vin, myPubkey, isMypubkey, isNotMypubkey); CheckVinPubkey(mtx.vin, myPubkey, hasMypubkey, hasNotMypubkey);
// for additional funding do not allow to sign by both owner and non-owner keys (is this a donation or not?): // for additional funding do not allow to sign by both owner and non-owner keys (is this a donation or not?):
if (isMypubkey && isNotMypubkey) { if (hasMypubkey && hasNotMypubkey) {
result.push_back(Pair("result", "error")); result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "using both owner and non-owner inputs is not allowed")); result.push_back(Pair("error", "using both owner and non-owner inputs is not allowed"));
return result; return result;
} }
// warn the user he's making a donation if this is all non-owner keys: // warn the user he's making a donation if this is all non-owner keys:
if (isNotMypubkey) { if (hasNotMypubkey) {
result.push_back(Pair("result", "warning")); result.push_back(Pair("result", "warning"));
result.push_back(Pair("warning", "you are about to make a donation to heir fund")); result.push_back(Pair("warning", "you are about to make a donation to heir fund"));
} }
@@ -1118,7 +1118,7 @@ UniValue HeirInfo(uint256 fundingtxid)
std::ostringstream stream; std::ostringstream stream;
std::string msg; std::string msg;
sleep(10); //sleep(10);
result.push_back(Pair("fundingtxid", fundingtxid.GetHex())); result.push_back(Pair("fundingtxid", fundingtxid.GetHex()));
result.push_back(Pair("name", heirName.c_str())); result.push_back(Pair("name", heirName.c_str()));