Merge branch 'FSM' into jl777

2019-05-08 21:57:35 -11:00
parent 4bfdf5f7a4 aee9f1f1b5
commit 7ccf6ec3bb
2 changed files with 12 additions and 2 deletions
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -7339,9 +7339,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);
        }
    }