Merge #1125: Pay exact amount for indivisible tokens

babf9f0 Pay exact amount for divisible tokens (Peter Bushnell) Pull request description: Tree-SHA512: 880a6ba1278b5138cbd8ecfbb835f961a014dda9a3cdc5c295cdd67cdf622e1d6be1eefabdecaeb29dcfc6326c9c7f7524bf96a7569ee1ff4c5c4dbcbaff38d6
OmniLayer · May 5, 2020 · b42db31 · b42db31
2 parents 44c1100 + babf9f0
commit b42db31
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/omnicore/rpctx.cpp b/src/omnicore/rpctx.cpp
@@ -718,7 +718,11 @@ static UniValue omni_senddexpay(const JSONRPCRequest& request)
         const CAmount amountToPayInBTC = calculateDesiredBTC(acceptOffer->getOfferAmountOriginal(), acceptOffer->getBTCDesiredOriginal(), amountAccepted);
 
         if (nAmount > amountToPayInBTC) {
-            throw JSONRPCError(RPC_MISC_ERROR, strprintf("Paying more than required: %lld BTC to pay for %lld tokens", FormatMoney(amountToPayInBTC), FormatMoney(amountAccepted)));
+            throw JSONRPCError(RPC_MISC_ERROR, strprintf("Paying more than required: %lld BTC to pay for %lld tokens", FormatMoney(amountToPayInBTC), FormatMP(propertyId, amountAccepted)));
+        }
+
+        if (!isPropertyDivisible(propertyId) && nAmount < amountToPayInBTC) {
+            throw JSONRPCError(RPC_MISC_ERROR, strprintf("Paying less than required: %lld BTC to pay for %lld tokens", FormatMoney(amountToPayInBTC), FormatMP(propertyId, amountAccepted)));
         }
     }