Amount Fix

Parse 8 decimals and roundint64 without losing value
TrezarCoin · Jan 22, 2019 · ca0c7de · ca0c7de
1 parent 9f1e9a5
commit ca0c7de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -376,10 +376,10 @@ static CAmount AmountFromValue(const UniValue& value)
 {
     if (!value.isNum() && !value.isStr())
         throw runtime_error("Amount is not a number or string");
-    double dAmount = value.get_real();
-    if (dAmount <= 0.0 || dAmount > MAX_MONEY)
+    CAmount amount;
+    if (!ParseFixedPoint(value.getValStr(), 8, &amount))
         throw runtime_error("Invalid amount");
-    CAmount amount = roundint64(dAmount * COIN);
+    amount = roundint64(amount * COIN);
     if (!MoneyRange(amount))
         throw runtime_error("Amount out of range");
     return amount;

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
@@ -121,10 +121,10 @@ CAmount AmountFromValue(const UniValue& value)
 {
     if (!value.isNum() && !value.isStr())
         throw JSONRPCError(RPC_TYPE_ERROR, "Amount is not a number or string");
-    double dAmount = value.get_real();
-    if (dAmount <= 0.0 || dAmount > MAX_MONEY)
+    CAmount amount;
+    if (!ParseFixedPoint(value.getValStr(), 8, &amount))
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount");
-    CAmount amount = roundint64(dAmount * COIN);
+    amount = roundint64(amount * COIN);
     if (!MoneyRange(amount))
         throw JSONRPCError(RPC_TYPE_ERROR, "Amount out of range");
     return amount;