Merge version 0.2.5.13 from dev

Merge version 0.2.5.13 into Master

configure.ac

@@ -12,7 +12,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_REVISION, 5)
-define(_CLIENT_VERSION_BUILD, 12)  # version 99 here indicates an unreleased version
+define(_CLIENT_VERSION_BUILD, 13)  # version 99 here indicates an unreleased version
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

src/clientversion.h

@@ -34,7 +34,7 @@
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 2
 #define CLIENT_VERSION_REVISION 5
-#define CLIENT_VERSION_BUILD 12
+#define CLIENT_VERSION_BUILD 13
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/rpc/rpcserver.cpp

@@ -121,7 +121,45 @@ void RPCTypeCheckObj(const UniValue &o, const std::map<std::string, UniValue::VT
     }
 }
 
-CAmount AmountFromValue(const UniValue &value)
+
+const std::string TruncateDecimals(const std::string valstr)
+{
+    std::string fixedNum = "";
+    bool decimalFound = false;
+    int remainingPrecision = 6;
+    for(unsigned int pos = 0; pos < valstr.length(); pos++)
+    {
+        if(decimalFound)
+        {
+            remainingPrecision--;
+        }
+        if(valstr[pos] == '.')
+        {
+            decimalFound = true;
+        }
+        fixedNum = fixedNum + valstr[pos];
+        if(remainingPrecision <= 0)
+        {
+            break;
+        }
+    }
+    const std::string result = fixedNum;
+    return result;
+}
+
+CAmount AmountFromValue(const UniValue& value)
+{
+    if (!value.isNum() && !value.isStr())
+        throw JSONRPCError(RPC_TYPE_ERROR, "Amount is not a number or string");
+    CAmount amount;
+    if (!ParseFixedPoint(TruncateDecimals(value.getValStr()), 6, &amount))
+        throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount");
+    if (!MoneyRange(amount))
+        throw JSONRPCError(RPC_TYPE_ERROR, "Amount out of range");
+    return amount;
+}
+
+CAmount AmountFromValue_Original(const UniValue &value)
 {
     if (!value.isNum() && !value.isStr())
         throw JSONRPCError(RPC_TYPE_ERROR, "Amount is not a number or string");