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

Merge pull request #81 from jl777/jl777

Browse Source 
Jl777
This commit is contained in:
blackjok3rtt
2019-05-14 08:41:48 +08:00
committed by GitHub
parent a27618c6d2 72944d8da2
commit dc3bc1e89a
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/CCtokens.cpp
View File

@@ -937,6 +937,12 @@ UniValue TokenInfo(uint256 tokenid)
result.push_back(Pair("error", "cant find tokenid"));
return(result);
}
if (hashBlock.IsNull()) {
result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "the transaction is still in mempool"));
return(result);
}
if (tokenbaseTx.vout.size() > 0 && DecodeTokenCreateOpRet(tokenbaseTx.vout[tokenbaseTx.vout.size() - 1].scriptPubKey, origpubkey, name, description, oprets) != 'c')
{
LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "TokenInfo() passed tokenid isnt token creation txid" << std::endl);

8
src/wallet/rpcwallet.cpp
View File

@@ -7352,9 +7352,13 @@ UniValue tokencreate(const UniValue& params, bool fHelp)
if (params.size() == 4) {
nonfungibleData = ParseHex(params[3].get_str());
if (nonfungibleData.size() > 10000) // opret limit
if (nonfungibleData.size() > IGUANA_MAXSCRIPTSIZE) // opret limit
{
ERR_RESULT("Non-fungible data must be <= 10000");
ERR_RESULT("Non-fungible data size must be <= " + std::to_string(IGUANA_MAXSCRIPTSIZE));
return(result);
}
if( nonfungibleData.empty() ) {
ERR_RESULT("Non-fungible data incorrect");
return(result);
}
}