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

corr "is token" check in HeirInfo

Browse Source
This commit is contained in:
dimxy
2019-01-14 13:23:08 +05:00
parent d3c804c50c
commit 08c0a5a8c6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/heir.cpp
View File

@@ -603,7 +603,7 @@ template <class Helper> int64_t Add1of2AddressInputs(struct CCcontract_info* cp,
//(voutValue = IsHeirFundingVout<Helper>(cp, heirtx, voutIndex, ownerPubkey, heirPubkey)) > 0 && // heir contract vout validation logic - not used since we moved to 2-eval vouts //(voutValue = IsHeirFundingVout<Helper>(cp, heirtx, voutIndex, ownerPubkey, heirPubkey)) > 0 && // heir contract vout validation logic - not used since we moved to 2-eval vouts
!myIsutxo_spentinmempool(txid, voutIndex)) !myIsutxo_spentinmempool(txid, voutIndex))
{ {
std::cerr << "Add1of2AddressInputs() voutValue=" << voutValue << " satoshis=" << it->second.satoshis << '\n'; std::cerr << "Add1of2AddressInputs() satoshis=" << it->second.satoshis << std::endl;
if (total != 0 && maxinputs != 0) if (total != 0 && maxinputs != 0)
mtx.vin.push_back(CTxIn(txid, voutIndex, CScript())); mtx.vin.push_back(CTxIn(txid, voutIndex, CScript()));
nValue = it->second.satoshis; nValue = it->second.satoshis;
@@ -1062,7 +1062,7 @@ UniValue HeirInfo(uint256 fundingtxid)
stream.clear(); stream.clear();
int64_t total; int64_t total;
if (tokenid != zeroid) if (tokenid == zeroid)
total = LifetimeHeirContractFunds<CoinHelper>(cp, fundingtxid, ownerPubkey, heirPubkey); total = LifetimeHeirContractFunds<CoinHelper>(cp, fundingtxid, ownerPubkey, heirPubkey);
else else
total = LifetimeHeirContractFunds<TokenHelper>(cp, fundingtxid, ownerPubkey, heirPubkey); total = LifetimeHeirContractFunds<TokenHelper>(cp, fundingtxid, ownerPubkey, heirPubkey);