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

corrected call to DecodeHeirEitherOpRet in Heirinfo

Browse Source
This commit is contained in:
dimxy
2019-01-14 00:38:56 +05:00
parent 1a5999e0bd
commit 42a48b9653
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

@@ -446,7 +446,7 @@ uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, CPubKey& o
} }
// overload to decode opret in A and C heir tx: // overload to decode opret in A and C heir tx:
uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, uint256 &fundingTxidInOpret, uint8_t hasHeirSpendingBegun, bool noLogging) { uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, uint256 &fundingTxidInOpret, uint8_t &hasHeirSpendingBegun, bool noLogging) {
CPubKey dummyOwnerPubkey, dummyHeirPubkey; CPubKey dummyOwnerPubkey, dummyHeirPubkey;
int64_t dummyInactivityTime; int64_t dummyInactivityTime;
std::string dummyHeirName; std::string dummyHeirName;
@@ -1020,7 +1020,7 @@ UniValue HeirInfo(uint256 fundingtxid)
CScript opret = fundingtx.vout.size() > 0 ? fundingtx.vout[fundingtx.vout.size() - 1].scriptPubKey : CScript(); CScript opret = fundingtx.vout.size() > 0 ? fundingtx.vout[fundingtx.vout.size() - 1].scriptPubKey : CScript();
uint8_t funcId = DecodeHeirEitherOpret(opret, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, heirName, true); uint8_t funcId = DecodeHeirEitherOpRet(opret, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, heirName, true);
if (funcId == 0) { if (funcId == 0) {
std::cerr << "HeirInfo() this fundingtx is incorrect" << std::endl; std::cerr << "HeirInfo() this fundingtx is incorrect" << std::endl;
result.push_back(Pair("result", "error")); result.push_back(Pair("result", "error"));