fixed checking first bit for parsing int output

pull/272/merge
Marek Kotewicz 10 years ago
parent 774e9d24a1
commit a1c0bb68dd
  1. 7
      dist/ethereum.js
  2. 4
      dist/ethereum.js.map
  3. 2
      dist/ethereum.min.js
  4. 7
      lib/abi.js

7
dist/ethereum.js vendored

@ -90,7 +90,7 @@ var setupInputTypes = function () {
/// Formats input value to byte representation of int /// Formats input value to byte representation of int
/// If value is negative, return it's two's complement /// If value is negative, return it's two's complement
/// If the value is floating point, it rounds it down /// If the value is floating point, round it down
/// @returns right-aligned byte representation of int /// @returns right-aligned byte representation of int
var formatInt = function (value) { var formatInt = function (value) {
var padding = 32 * 2; var padding = 32 * 2;
@ -178,12 +178,15 @@ var setupOutputTypes = function () {
var formatInt = function (value) { var formatInt = function (value) {
// check if it's negative number // check if it's negative number
// it it is, return two's complement // it it is, return two's complement
if (value.substr(0, 1).toLowerCase() === 'f') { var firstBit = new BigNumber(value.substr(0, 1), 16).toString(2).substr(0, 1);
if (firstBit === '1') {
return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1); return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);
} }
return new BigNumber(value, 16); return new BigNumber(value, 16);
}; };
/// Formats big right-aligned input bytes to uint
/// @returns right-aligned input bytes formatted to uint
var formatUInt = function (value) { var formatUInt = function (value) {
return new BigNumber(value, 16); return new BigNumber(value, 16);
}; };

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -89,7 +89,7 @@ var setupInputTypes = function () {
/// Formats input value to byte representation of int /// Formats input value to byte representation of int
/// If value is negative, return it's two's complement /// If value is negative, return it's two's complement
/// If the value is floating point, it rounds it down /// If the value is floating point, round it down
/// @returns right-aligned byte representation of int /// @returns right-aligned byte representation of int
var formatInt = function (value) { var formatInt = function (value) {
var padding = 32 * 2; var padding = 32 * 2;
@ -177,12 +177,15 @@ var setupOutputTypes = function () {
var formatInt = function (value) { var formatInt = function (value) {
// check if it's negative number // check if it's negative number
// it it is, return two's complement // it it is, return two's complement
if (value.substr(0, 1).toLowerCase() === 'f') { var firstBit = new BigNumber(value.substr(0, 1), 16).toString(2).substr(0, 1);
if (firstBit === '1') {
return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1); return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);
} }
return new BigNumber(value, 16); return new BigNumber(value, 16);
}; };
/// Formats big right-aligned input bytes to uint
/// @returns right-aligned input bytes formatted to uint
var formatUInt = function (value) { var formatUInt = function (value) {
return new BigNumber(value, 16); return new BigNumber(value, 16);
}; };

Loading…
Cancel
Save