Skip to content

G
Geth-Modification
Commit de4ea8e6 authored by Marek Kotewicz's avatar Marek Kotewicz
Browse files
Options

Merge commit 'd876522bc0614fea3180a54be57bcb61784b352e' into ethereumjs

parents 6d02c0d3 2c36d5ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 40 deletions
dist/ethereum.js
View file @ de4ea8e6
...@@ -27,6 +27,8 @@ if ("build" !== 'build') {/* ...@@ -27,6 +27,8 @@ if ("build" !== 'build') {/*
var web3 = require('./web3'); // jshint ignore:line var web3 = require('./web3'); // jshint ignore:line
*/} */}
var BigNumber = require('bignumber.js');
// TODO: make these be actually accurate instead of falling back onto JS's doubles. // TODO: make these be actually accurate instead of falling back onto JS's doubles.
var hexToDec = function (hex) { var hexToDec = function (hex) {
return parseInt(hex, 16).toString(); return parseInt(hex, 16).toString();
...@@ -85,24 +87,26 @@ var namedType = function (name) { ...@@ -85,24 +87,26 @@ var namedType = function (name) {
var setupInputTypes = function () { 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
/// @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;
if (typeof value === 'number') { if (value instanceof BigNumber) {
if (value < 0) { if (value.lessThan(0))
value = new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(value).plus(1).toString(16);
// two's complement else
// TODO: fix big numbers support value = value.toString(16);
value = ((value) >>> 0).toString(16); }
return padLeft(value, padding, 'f'); else if (typeof value === 'number') {
} if (value < 0)
value = value.toString(16); value = new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(value).plus(1).toString(16);
else
value = new BigNumber(value).toString(16);
} }
else if (value.indexOf('0x') === 0) else if (value.indexOf('0x') === 0)
value = value.substr(2); value = value.substr(2);
else if (typeof value === 'string') else if (typeof value === 'string')
value = value.toHex(value); value = new BigNumber(value).toString(16);
else else
value = (+value).toString(16); value = (+value).toString(16);
return padLeft(value, padding); return padLeft(value, padding);
...@@ -172,7 +176,16 @@ var setupOutputTypes = function () { ...@@ -172,7 +176,16 @@ var setupOutputTypes = function () {
/// Formats input right-aligned input bytes to int /// Formats input right-aligned input bytes to int
/// @returns right-aligned input bytes formatted to int /// @returns right-aligned input bytes formatted to int
var formatInt = function (value) { var formatInt = function (value) {
return value.length <= 8 ? +parseInt(value, 16) : hexToDec(value); // check if it's negative number
// it it is, return two's complement
if (value.substr(0, 1).toLowerCase() === 'f') {
return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);
}
return new BigNumber(value, 16);
};
var formatUInt = function (value) {
return new BigNumber(value, 16);
}; };
/// @returns right-aligned input bytes formatted to hex /// @returns right-aligned input bytes formatted to hex
...@@ -196,7 +209,7 @@ var setupOutputTypes = function () { ...@@ -196,7 +209,7 @@ var setupOutputTypes = function () {
}; };
return [ return [
{ type: prefixedType('uint'), format: formatInt }, { type: prefixedType('uint'), format: formatUInt },
{ type: prefixedType('int'), format: formatInt }, { type: prefixedType('int'), format: formatInt },
{ type: prefixedType('hash'), format: formatHash }, { type: prefixedType('hash'), format: formatHash },
{ type: prefixedType('string'), format: formatString }, { type: prefixedType('string'), format: formatString },
...@@ -295,7 +308,7 @@ module.exports = { ...@@ -295,7 +308,7 @@ module.exports = {
}; };
},{}],2:[function(require,module,exports){ },{"bignumber.js":undefined}],2:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
......
dist/ethereum.js.map
View file @ de4ea8e6
This diff is collapsed.
dist/ethereum.min.js
View file @ de4ea8e6
This diff is collapsed.
example/balance.html
View file @ de4ea8e6
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<head> <head>
<script type="text/javascript" src="js/es6-promise/promise.min.js"></script> <script type="text/javascript" src="js/es6-promise/promise.min.js"></script>
<script type="text/javascript" src="../node_modules/bignumber.js/bignumber.min.js"></script>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/ethereum.js"></script>
<script type="text/javascript"> <script type="text/javascript">
......
gulpfile.js
View file @ de4ea8e6
...@@ -90,7 +90,7 @@ gulp.task('uglify', ['build'], function(){ ...@@ -90,7 +90,7 @@ gulp.task('uglify', ['build'], function(){
return uglifyFile('ethereum'); return uglifyFile('ethereum');
}); });
gulp.task('uglify', ['buildDev'], function(){ gulp.task('uglifyDev', ['buildDev'], function(){
return uglifyFile('ethereum'); return uglifyFile('ethereum');
}); });
...@@ -99,6 +99,6 @@ gulp.task('watch', function() { ...@@ -99,6 +99,6 @@ gulp.task('watch', function() {
}); });
gulp.task('release', ['bower', 'lint', 'build', 'uglify']); gulp.task('release', ['bower', 'lint', 'build', 'uglify']);
gulp.task('dev', ['bower', 'lint', 'buildDev', 'uglify']); gulp.task('dev', ['bower', 'lint', 'buildDev', 'uglifyDev']);
gulp.task('default', ['dev']); gulp.task('default', ['dev']);
lib/abi.js
View file @ de4ea8e6
...@@ -26,6 +26,8 @@ if (process.env.NODE_ENV !== 'build') { ...@@ -26,6 +26,8 @@ if (process.env.NODE_ENV !== 'build') {
var web3 = require('./web3'); // jshint ignore:line var web3 = require('./web3'); // jshint ignore:line
} }
var BigNumber = require('bignumber.js');
// TODO: make these be actually accurate instead of falling back onto JS's doubles. // TODO: make these be actually accurate instead of falling back onto JS's doubles.
var hexToDec = function (hex) { var hexToDec = function (hex) {
return parseInt(hex, 16).toString(); return parseInt(hex, 16).toString();
...@@ -84,24 +86,26 @@ var namedType = function (name) { ...@@ -84,24 +86,26 @@ var namedType = function (name) {
var setupInputTypes = function () { 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
/// @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;
if (typeof value === 'number') { if (value instanceof BigNumber) {
if (value < 0) { if (value.lessThan(0))
value = new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(value).plus(1).toString(16);
// two's complement else
// TODO: fix big numbers support value = value.toString(16);
value = ((value) >>> 0).toString(16); }
return padLeft(value, padding, 'f'); else if (typeof value === 'number') {
} if (value < 0)
value = value.toString(16); value = new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(value).plus(1).toString(16);
else
value = new BigNumber(value).toString(16);
} }
else if (value.indexOf('0x') === 0) else if (value.indexOf('0x') === 0)
value = value.substr(2); value = value.substr(2);
else if (typeof value === 'string') else if (typeof value === 'string')
value = value.toHex(value); value = new BigNumber(value).toString(16);
else else
value = (+value).toString(16); value = (+value).toString(16);
return padLeft(value, padding); return padLeft(value, padding);
...@@ -171,7 +175,16 @@ var setupOutputTypes = function () { ...@@ -171,7 +175,16 @@ var setupOutputTypes = function () {
/// Formats input right-aligned input bytes to int /// Formats input right-aligned input bytes to int
/// @returns right-aligned input bytes formatted to int /// @returns right-aligned input bytes formatted to int
var formatInt = function (value) { var formatInt = function (value) {
return value.length <= 8 ? +parseInt(value, 16) : hexToDec(value); // check if it's negative number
// it it is, return two's complement
if (value.substr(0, 1).toLowerCase() === 'f') {
return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);
}
return new BigNumber(value, 16);
};
var formatUInt = function (value) {
return new BigNumber(value, 16);
}; };
/// @returns right-aligned input bytes formatted to hex /// @returns right-aligned input bytes formatted to hex
...@@ -195,7 +208,7 @@ var setupOutputTypes = function () { ...@@ -195,7 +208,7 @@ var setupOutputTypes = function () {
}; };
return [ return [
{ type: prefixedType('uint'), format: formatInt }, { type: prefixedType('uint'), format: formatUInt },
{ type: prefixedType('int'), format: formatInt }, { type: prefixedType('int'), format: formatInt },
{ type: prefixedType('hash'), format: formatHash }, { type: prefixedType('hash'), format: formatHash },
{ type: prefixedType('string'), format: formatString }, { type: prefixedType('string'), format: formatString },
......
package.json
View file @ de4ea8e6
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
"dependencies": { "dependencies": {
"es6-promise": "*", "es6-promise": "*",
"ws": "*", "ws": "*",
"xmlhttprequest": "*" "xmlhttprequest": "*",
"bignumber.js": ">=2.0.0"
}, },
"devDependencies": { "devDependencies": {
"bower": ">=1.3.0", "bower": ">=1.3.0",
......
test/abi.parsers.js
View file @ de4ea8e6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment