fix merge conflicts

10 years ago · c1b2595deb
parent c91e4afe6c 8ca991ecd2
commit c1b2595deb
1 changed files with 4 additions and 1 deletions
--- a/lib/main.js
+++ b/lib/main.js
@ -223,6 +223,8 @@
            // Find termination
            var str = "";
            var i = 0, l = hex.length;
+            if (hex.substring(0, 2) == '0x')
+                i = 2;
            for(; i < l; i+=2) {
                var code = hex.charCodeAt(i);
                if(code === 0) {
@ -244,7 +246,8 @@
            var hex = this.toHex(str);
            while(hex.length < pad*2)
                hex += "00";
-            return hex;
+
+            return "0x" + hex;
        },

        eth: {