web3: regression. Fixes #1613

9 years ago · a33726b7db
parent ac10c9352e
commit a33726b7db
1 changed files with 2 additions and 2 deletions
--- a/jsre/ethereum_js.go
+++ b/jsre/ethereum_js.go
@ -1137,10 +1137,10 @@ var toHex = function (val) {
    if (isString(val)) {
        if (val.indexOf('-0x') === 0)
            return fromDecimal(val);
-        else if (!isFinite(val))
-            return fromAscii(val);
        else if(val.indexOf('0x') === 0)
            return val;
+        else if (!isFinite(val))
+            return fromAscii(val);
    }

    return fromDecimal(val);