diff options
| author | Marian Oancea <contact@siteshop.ro> | 2014-11-10 20:07:06 +0800 |
|---|---|---|
| committer | Marian Oancea <contact@siteshop.ro> | 2014-11-10 20:07:06 +0800 |
| commit | c1b2595debc2475728b46c70c7703d4c863b8b95 (patch) | |
| tree | 85688bc267e377077eec2bbd7375582820166098 | |
| parent | c91e4afe6c94b46bb717951bf96fd491ca817d9b (diff) | |
| parent | 8ca991ecd200d6552a60d47ff4b358e167d41e1e (diff) | |
| download | dexon-c1b2595debc2475728b46c70c7703d4c863b8b95.tar.gz dexon-c1b2595debc2475728b46c70c7703d4c863b8b95.tar.zst dexon-c1b2595debc2475728b46c70c7703d4c863b8b95.zip | |
fix merge conflicts
| -rw-r--r-- | lib/main.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/main.js b/lib/main.js index 95581c2be..5655a762e 100644 --- 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: { |