status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Marian Oancea 2014-11-10 14:07:06 +02:00
parent c91e4afe6c 8ca991ecd2
commit c1b2595deb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/main.js
View File

@ -223,6 +223,8 @@
// Find termination // Find termination
var str = ""; var str = "";
var i = 0, l = hex.length; var i = 0, l = hex.length;
if (hex.substring(0, 2) == '0x')
i = 2;
for(; i < l; i+=2) { for(; i < l; i+=2) {
var code = hex.charCodeAt(i); var code = hex.charCodeAt(i);
if(code === 0) { if(code === 0) {
@ -244,7 +246,8 @@
var hex = this.toHex(str); var hex = this.toHex(str);
while(hex.length < pad*2) while(hex.length < pad*2)
hex += "00"; hex += "00";
return hex;
return "0x" + hex;
}, },
eth: { eth: {