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

corr call to IsTokenVout in heir

Browse Source
This commit is contained in:
dimxy
2019-01-17 19:42:02 +05:00
parent 0455243118
commit 9dc403f331
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cc/heir.cpp
View File

@@ -588,7 +588,6 @@ template <class Helper> int64_t LifetimeHeirContractFunds(struct CCcontract_info
uint256 tokenid; uint256 tokenid;
uint256 fundingTxidInOpret; uint256 fundingTxidInOpret;
uint8_t hasHeirSpendingBegunDummy; uint8_t hasHeirSpendingBegunDummy;
std::vector<CPubKey> vinPubkeysEmpty;
const int32_t ivout = 0; const int32_t ivout = 0;
CScript heirScript = (heirtx.vout.size() > 0) ? heirtx.vout[heirtx.vout.size() - 1].scriptPubKey : CScript(); // check boundary CScript heirScript = (heirtx.vout.size() > 0) ? heirtx.vout[heirtx.vout.size() - 1].scriptPubKey : CScript(); // check boundary
@@ -599,7 +598,7 @@ template <class Helper> int64_t LifetimeHeirContractFunds(struct CCcontract_info
if (funcId != 0 && if (funcId != 0 &&
(txid == fundingtxid || fundingTxidInOpret == fundingtxid) && (txid == fundingtxid || fundingTxidInOpret == fundingtxid) &&
isMyFuncId(funcId) && !isSpendingTx(funcId) && isMyFuncId(funcId) && !isSpendingTx(funcId) &&
(typeid(Helper) != typeid(TokenHelper) || IsTokensvout(true, true, cp, nullptr, heirtx, ivout, tokenid, vinPubkeysEmpty) > 0) && (typeid(Helper) != typeid(TokenHelper) || IsTokensvout(true, true, cp, nullptr, heirtx, ivout, tokenid) > 0) &&
!myIsutxo_spentinmempool(txid, ivout)) // exclude tx in mempool !myIsutxo_spentinmempool(txid, ivout)) // exclude tx in mempool
{ {
total += it->second; // dont do this: tx.vout[ivout].nValue; // in vin[0] always is the pay to 1of2 addr (funding or change) total += it->second; // dont do this: tx.vout[ivout].nValue; // in vin[0] always is the pay to 1of2 addr (funding or change)