status-im/web3.js
2
0
Fork 0
mirror of https://github.com/status-im/web3.js.git synced 2025-02-23 11:38:12 +00:00
Code Issues Projects Releases Wiki Activity

merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop

Browse Source 
Conflicts:
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js.map
	dist/ethereum.min.js
This commit is contained in:
Marek Kotewicz 2015-03-28 14:42:16 +01:00
commit 8c39acc571
8 changed files with 12 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dist/ethereum-light.js vendored
View File

@ -1745,7 +1745,7 @@ var call = new Method({
name: 'call',
call: 'eth_call',
params: 2,
inputFormatter: [formatters.inputCallFormatter, formatters.inputDefaultBlockNumberFormatter]
inputFormatter: [formatters.inputTransactionFormatter, formatters.inputDefaultBlockNumberFormatter]
});
var compileSolidity = new Method({
@ -2168,24 +2168,6 @@ var outputTransactionFormatter = function (tx){
return tx;
};
/**
* Formats the input of a call and converts all values to HEX
*
* @method inputCallFormatter
* @param {Object} transaction options
* @returns object
*/
var inputCallFormatter = function (options){
// make code -> data
if (options.code) {
options.data = options.code;
delete options.code;
}
return options;
};
/**
* Formats the output of a block to its proper values
*
@ -2287,7 +2269,6 @@ var outputPostFormatter = function(post){
module.exports = {
inputDefaultBlockNumberFormatter: inputDefaultBlockNumberFormatter,
inputTransactionFormatter: inputTransactionFormatter,
inputCallFormatter: inputCallFormatter,
inputPostFormatter: inputPostFormatter,
outputBigNumberFormatter: outputBigNumberFormatter,
outputTransactionFormatter: outputTransactionFormatter,

6
dist/ethereum-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
dist/ethereum.js vendored
View File

@ -1745,7 +1745,7 @@ var call = new Method({
name: 'call',
call: 'eth_call',
params: 2,
inputFormatter: [formatters.inputCallFormatter, formatters.inputDefaultBlockNumberFormatter]
inputFormatter: [formatters.inputTransactionFormatter, formatters.inputDefaultBlockNumberFormatter]
});
var compileSolidity = new Method({
@ -2168,24 +2168,6 @@ var outputTransactionFormatter = function (tx){
return tx;
};
/**
* Formats the input of a call and converts all values to HEX
*
* @method inputCallFormatter
* @param {Object} transaction options
* @returns object
*/
var inputCallFormatter = function (options){
// make code -> data
if (options.code) {
options.data = options.code;
delete options.code;
}
return options;
};
/**
* Formats the output of a block to its proper values
*
@ -2287,7 +2269,6 @@ var outputPostFormatter = function(post){
module.exports = {
inputDefaultBlockNumberFormatter: inputDefaultBlockNumberFormatter,
inputTransactionFormatter: inputTransactionFormatter,
inputCallFormatter: inputCallFormatter,
inputPostFormatter: inputPostFormatter,
outputBigNumberFormatter: outputBigNumberFormatter,
outputTransactionFormatter: outputTransactionFormatter,

6
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/web3/eth.js
View File

@ -171,7 +171,7 @@ var call = new Method({
name: 'call',
call: 'eth_call',
params: 2,
inputFormatter: [formatters.inputCallFormatter, formatters.inputDefaultBlockNumberFormatter]
inputFormatter: [formatters.inputTransactionFormatter, formatters.inputDefaultBlockNumberFormatter]
});
var compileSolidity = new Method({

19
lib/web3/formatters.js
View File

@ -77,24 +77,6 @@ var outputTransactionFormatter = function (tx){
return tx;
};
/**
* Formats the input of a call and converts all values to HEX
*
* @method inputCallFormatter
* @param {Object} transaction options
* @returns object
*/
var inputCallFormatter = function (options){
// make code -> data
if (options.code) {
options.data = options.code;
delete options.code;
}
return options;
};
/**
* Formats the output of a block to its proper values
*
@ -196,7 +178,6 @@ var outputPostFormatter = function(post){
module.exports = {
inputDefaultBlockNumberFormatter: inputDefaultBlockNumberFormatter,
inputTransactionFormatter: inputTransactionFormatter,
inputCallFormatter: inputCallFormatter,
inputPostFormatter: inputPostFormatter,
outputBigNumberFormatter: outputBigNumberFormatter,
outputTransactionFormatter: outputTransactionFormatter,