diff --git a/src/omnicore/errors.h b/src/omnicore/errors.h index 6fa840c04b61e..62e3b410801e7 100644 --- a/src/omnicore/errors.h +++ b/src/omnicore/errors.h @@ -376,7 +376,7 @@ inline std::string error_str(int ec) { ec_str = "Sender has insufficient balance of property"; break; case PKT_ERROR_NFT -33: - ec_str = "Sender %s does not own the range being sent"; + ec_str = "Sender does not own the range being sent"; break; default: diff --git a/src/omnicore/tx.cpp b/src/omnicore/tx.cpp index 04589e1d2bcfb..3a463f8d56635 100644 --- a/src/omnicore/tx.cpp +++ b/src/omnicore/tx.cpp @@ -2477,6 +2477,7 @@ int CMPTransaction::logicMath_RevokeTokens(CBlockIndex* pindex) return (PKT_ERROR_TOKENS -22); } + if (isPropertyNonFungible(property)) { PrintToLog("%s(): rejected: property %d is of type non-fungible\n", __func__, property); return (PKT_ERROR_NFT -21); @@ -2546,9 +2547,11 @@ int CMPTransaction::logicMath_ChangeIssuer(CBlockIndex* pindex) return (PKT_ERROR_TOKENS -22); } - if (isPropertyNonFungible(property)) { - PrintToLog("%s(): rejected: property %d is of type non-fungible\n", __func__, property); - return (PKT_ERROR_NFT -21); + if (!IsFeatureActivated(FEATURE_NONFUNGIBLE_ISSUER, block)) { + if (isPropertyNonFungible(property)) { + PrintToLog("%s(): rejected: property %d is of type non-fungible\n", __func__, property); + return (PKT_ERROR_NFT -21); + } } if (!IsPropertyIdValid(property)) {