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

corr checking for owner pubkey in vins (is owner's or is other's)

Browse Source
This commit is contained in:
dimxy
2019-01-22 13:11:09 +05:00
parent 21ad10ac15
commit 56d68d8166
1 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/cc/heir.cpp
View File

@@ -400,6 +400,22 @@ uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, uint256 &f
return _DecodeHeirEitherOpRet(scriptPubKey, tokenid, dummyOwnerPubkey, dummyHeirPubkey, dummyInactivityTime, dummyHeirName, fundingTxidInOpret, hasHeirSpendingBegun, noLogging); return _DecodeHeirEitherOpRet(scriptPubKey, tokenid, dummyOwnerPubkey, dummyHeirPubkey, dummyInactivityTime, dummyHeirName, fundingTxidInOpret, hasHeirSpendingBegun, noLogging);
} }
// check if pubkey is in vins
void CheckVinPubkey(std::vector<CTxIn> vins, CPubKey pubkey, bool &hasPubkey, bool &hasOtherPubkey) {
hasPubkey = false;
hasOtherPubkey = false;
for (auto vin : vins) {
CPubKey vinPubkey = check_signing_pubkey(vin.scriptSig);
if (vinPubkey.IsValid()) {
if (vinPubkey == pubkey)
hasPubkey = true;
if (vinPubkey != pubkey)
hasOtherPubkey = true;
}
}
}
/** /**
* find the latest funding tx: it may be the first F tx or one of A or C tx's * find the latest funding tx: it may be the first F tx or one of A or C tx's
@@ -474,17 +490,13 @@ uint256 _FindLatestFundingTx(uint256 fundingtxid, uint8_t& funcId, uint256 &toke
if (blockHeight > maxBlockHeight) { if (blockHeight > maxBlockHeight) {
// check owner pubkey in vins // check owner pubkey in vins
bool hasVinOwner = false; bool isOwner = false;
for (auto vin : regtx.vin) { bool isNonOwner = false;
CPubKey vinPubkey = check_signing_pubkey(vin.scriptSig);
if (vinPubkey.IsValid() && vinPubkey == ownerPubkey) {
hasVinOwner = true;
break;
}
}
// we ignore 'donations' tx (non-owner fundings) for calculating if heir is allowed to spend: CheckVinPubkey(regtx.vin, ownerPubkey, isOwner, isNonOwner);
if (hasVinOwner) {
// we ignore 'donations' tx (with non-owner inputs) for calculating if heir is allowed to spend:
if (isOwner && !isNonOwner) {
hasHeirSpendingBegun = hasHeirSpendingBegunInOpret; hasHeirSpendingBegun = hasHeirSpendingBegunInOpret;
maxBlockHeight = blockHeight; maxBlockHeight = blockHeight;
latesttxid = txid; latesttxid = txid;
@@ -672,23 +684,19 @@ template <typename Helper> UniValue _HeirFund(int64_t txfee, int64_t amount, std
mtx.vout.push_back(Helper::makeUserVout(change, myPubkey)); mtx.vout.push_back(Helper::makeUserVout(change, myPubkey));
} }
// check my pubkey in vins // check owner pubkey in vins
bool notMypubkey = false; bool isMypubkey = false;
for (auto vin : mtx.vin) { bool isNotMypubkey = false;
CPubKey vinPubkey = check_signing_pubkey(vin.scriptSig);
if (vinPubkey.IsValid() && vinPubkey != myPubkey) { CheckVinPubkey(mtx.vin, myPubkey, isMypubkey, isNotMypubkey);
notMypubkey = true;
break; // for initial funding do not allow to sign by non-owner key:
} if (isNotMypubkey) {
}
// do not allow to sign non-owner vin:
if (notMypubkey) {
result.push_back(Pair("result", "error")); result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "not the owner's key in the wallet")); result.push_back(Pair("error", "using non-owner inputs not allowed"));
return result; return result;
} }
// add 1of2 vout validation pubkeys: // add 1of2 vout validation pubkeys:
std::vector<CPubKey> voutTokenPubkeys; std::vector<CPubKey> voutTokenPubkeys;
voutTokenPubkeys.push_back(myPubkey); voutTokenPubkeys.push_back(myPubkey);
@@ -782,22 +790,28 @@ template <class Helper> UniValue _HeirAdd(uint256 fundingtxid, int64_t txfee, in
mtx.vout.push_back(Helper::makeUserVout(change, myPubkey)); mtx.vout.push_back(Helper::makeUserVout(change, myPubkey));
} }
// check my pubkey in vins // check owner pubkey in vins
bool notMypubkey = false; bool isMypubkey = false;
for (auto vin : mtx.vin) { bool isNotMypubkey = false;
CPubKey vinPubkey = check_signing_pubkey(vin.scriptSig);
if (vinPubkey.IsValid() && vinPubkey != myPubkey) { CheckVinPubkey(mtx.vin, myPubkey, isMypubkey, isNotMypubkey);
notMypubkey = true;
break; // for additional funding do not allow to sign by both owner and non-owner keys (is this a donation or not?):
} if (isMypubkey && isNotMypubkey) {
}
// do not allow to sign non-owner vin:
if (notMypubkey) {
result.push_back(Pair("result", "error")); result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "not the owner's key in the wallet")); 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:
if (isNotMypubkey) {
result.push_back(Pair("result", "warning"));
result.push_back(Pair("warning", "you are about to make a donation to heir fund"));
}
else {
result.push_back(Pair("result", "success"));
}
// add 1of2 vout validation pubkeys - needed only for tokens: // add 1of2 vout validation pubkeys - needed only for tokens:
std::vector<CPubKey> voutTokenPubkeys; std::vector<CPubKey> voutTokenPubkeys;
voutTokenPubkeys.push_back(ownerPubkey); voutTokenPubkeys.push_back(ownerPubkey);
@@ -808,11 +822,11 @@ template <class Helper> UniValue _HeirAdd(uint256 fundingtxid, int64_t txfee, in
Helper::makeAddOpRet(tokenid, voutTokenPubkeys, fundingtxid, hasHeirSpendingBegun))); Helper::makeAddOpRet(tokenid, voutTokenPubkeys, fundingtxid, hasHeirSpendingBegun)));
if (!rawhextx.empty()) { if (!rawhextx.empty()) {
result.push_back(Pair("result", "success"));
result.push_back(Pair("hextx", rawhextx)); result.push_back(Pair("hextx", rawhextx));
} }
else { else {
std::cerr << "HeirAdd error in FinalizeCCtx" << std::endl; std::cerr << "HeirAdd error in FinalizeCCtx" << std::endl;
result.clear();
result.push_back(Pair("result", "error")); result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "sign error")); result.push_back(Pair("error", "sign error"));
} }