poanetwork
/
web3.js
mirror of https://github.com/poanetwork/web3.js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make sure the old behaviour is valued in toHex

This commit is contained in:
Fabian Vogelsteller 2017-05-09 11:42:24 +02:00
parent 74bff8f0c6
commit f8aa391351
No known key found for this signature in database
GPG Key ID: E51EADA77F1A4124
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/utils/utils.js
View File

@ -39,7 +39,7 @@ var sha3 = require('./sha3.js');
var utf8 = require('utf8');
var unitMap = {
'noether': '0',
'noether': '0',
'wei': '1',
'kwei': '1000',
'Kwei': '1000',
@ -259,7 +259,7 @@ var toHex = function (val) {
if (isBigNumber(val))
return fromDecimal(val);
if (isObject(val))
if (typeof val === 'object')
return fromUtf8(JSON.stringify(val));
// if its a negative number, pass it through fromDecimal
@ -420,18 +420,18 @@ var isAddress = function (address) {
* @param {String} address the given HEX adress
* @return {Boolean}
*/
var isChecksumAddress = function (address) {
var isChecksumAddress = function (address) {
// Check each case
address = address.replace('0x','');
var addressHash = sha3(address.toLowerCase());
for (var i = 0; i < 40; i++ ) {
for (var i = 0; i < 40; i++ ) {
// the nth letter should be uppercase if the nth digit of casemap is 1
if ((parseInt(addressHash[i], 16) > 7 && address[i].toUpperCase() !== address[i]) || (parseInt(addressHash[i], 16) <= 7 && address[i].toLowerCase() !== address[i])) {
return false;
}
}
return true;
return true;
};
@ -443,15 +443,15 @@ var isChecksumAddress = function (address) {
* @param {String} address the given HEX adress
* @return {String}
*/
var toChecksumAddress = function (address) {
var toChecksumAddress = function (address) {
if (typeof address === 'undefined') return '';
address = address.toLowerCase().replace('0x','');
var addressHash = sha3(address);
var checksumAddress = '0x';
for (var i = 0; i < address.length; i++ ) {
// If ith character is 9 to f then make it uppercase
for (var i = 0; i < address.length; i++ ) {
// If ith character is 9 to f then make it uppercase
if (parseInt(addressHash[i], 16) > 7) {
checksumAddress += address[i].toUpperCase();
} else {
@ -575,7 +575,7 @@ var isBloom = function (bloom) {
return false;
} else if (/^(0x)?[0-9a-f]{512}$/.test(bloom) || /^(0x)?[0-9A-F]{512}$/.test(bloom)) {
return true;
}
}
return false;
};
@ -591,7 +591,7 @@ var isTopic = function (topic) {
return false;
} else if (/^(0x)?[0-9a-f]{64}$/.test(topic) || /^(0x)?[0-9A-F]{64}$/.test(topic)) {
return true;
}
}
return false;
};