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

corr unmarshal retcode proc in _DecodeHeirEitherOpRet

Browse Source 
GetTokenBalance returns error always, obsolete
This commit is contained in:
dimxy
2019-01-13 23:07:31 +05:00
parent 97a030d05a
commit d41cd8b991
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cc/CCtokens.cpp
View File

@@ -661,7 +661,10 @@ int64_t GetTokenBalance(CPubKey pk, uint256 tokenid)
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
CTransaction tokentx;
if (GetTransaction(tokenid, tokentx, hashBlock, false) == 0)
CCerror = strprintf("obsolete, cannot return correct value without eval");
return 0;
/* if (GetTransaction(tokenid, tokentx, hashBlock, false) == 0)
{
fprintf(stderr, "cant find tokenid\n");
CCerror = strprintf("cant find tokenid");
@@ -670,7 +673,7 @@ int64_t GetTokenBalance(CPubKey pk, uint256 tokenid)
struct CCcontract_info *cp, C;
cp = CCinit(&C, EVAL_TOKENS);
return(AddTokenCCInputs(cp, mtx, pk, tokenid, 0, 0));
return(AddTokenCCInputs(cp, mtx, pk, tokenid, 0, 0)); */
}
UniValue TokenInfo(uint256 tokenid)

2
src/cc/heir.cpp
View File

@@ -423,7 +423,7 @@ uint8_t _DecodeHeirEitherOpret(CScript scriptPubKey, uint256 &tokenid, CPubKey&
// restore the second opret:
heirScript = CScript();
if (E_UNMARSHAL(vopretExtra, { ss >> vopretStripped; })) { //strip string size
if (!E_UNMARSHAL(vopretExtra, { ss >> vopretStripped; })) { //strip string size
if (!noLogging) std::cerr << "_DecodeHeirEitherOpret() could not unmarshal vopretStripped" << std::endl;
return (uint8_t)0;
}