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

Merge branch 'develop' into sandbox 

Conflicts:
	dist/ethereum-light.js
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js
	dist/ethereum.js.map
	dist/ethereum.min.js
	lib/web3/filter.js
This commit is contained in:
Marek Kotewicz 2015-03-25 14:47:04 +01:00
parent 91baec2396 b78dffaf8b
commit c065f174ee
7 changed files with 82 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dist/ethereum-light.js vendored
View File

@ -1134,8 +1134,7 @@ var web3Methods = function () {
var sha3 = new Method({
name: 'sha3',
call: 'web3_sha3',
params: 1,
inputFormatter:[utils.toHex]
params: 1
});
return [sha3];
@ -1632,11 +1631,6 @@ var putString = new Method({
params: 3
});
var putHex = new Method({
name: 'putHex',
call: 'db_putHex',
params: 3
});
var getString = new Method({
name: 'getString',
@ -1644,6 +1638,12 @@ var getString = new Method({
params: 2
});
var putHex = new Method({
name: 'putHex',
call: 'db_putHex',
params: 3
});
var getHex = new Method({
name: 'getHex',
call: 'db_getHex',
@ -1651,7 +1651,7 @@ var getHex = new Method({
});
var methods = [
putString, putHex, getString, getHex
putString, getString, putHex, getHex
];
module.exports = {
@ -2160,16 +2160,6 @@ var getOptions = function (options) {
options.toBlock = options.latest;
}
if (options.skip) {
console.warn('"skip" is deprecated, is "offset" instead');
options.offset = options.skip;
}
if (options.max) {
console.warn('"max" is deprecated, is "limit" instead');
options.limit = options.max;
}
// make sure topics, get converted to hex
if(options.topics instanceof Array) {
options.topics = options.topics.map(function(topic){
@ -2177,23 +2167,29 @@ var getOptions = function (options) {
});
}
var asBlockNumber = function (n) {
if (n === 'latest' || n === 'pending') {
return n;
}
return utils.toHex(n);
};
var filterOptions = {};
if(options.topics)
if (options.topics)
filterOptions.topics = options.topics;
if(options.to)
if (options.to)
filterOptions.to = options.to;
if(options.address)
if (options.address)
filterOptions.address = options.address;
if(typeof options.fromBlock !== 'undefined')
filterOptions.fromBlock = utils.toHex(options.fromBlock);
if (typeof options.fromBlock !== 'undefined')
filterOptions.fromBlock = asBlockNumber(options.fromBlock);
if(typeof options.toBlock !== 'undefined')
filterOptions.toBlock = utils.toHex(options.toBlock);
if (typeof options.toBlock !== 'undefined')
filterOptions.toBlock = asBlockNumber(options.toBlock);
return filterOptions;
};
@ -2214,11 +2210,15 @@ var filter = function(options, implementation, formatter) {
var filterId = implementation.newFilter(options);
// call the callbacks
var onMessages = function (messages) {
var onMessages = function (error, messages) {
if (error) {
return callback(error);
}
messages.forEach(function (message) {
message = formatter ? formatter(message) : message;
callbacks.forEach(function (callback) {
callback(message);
callback(null, message);
});
});
};
@ -3115,7 +3115,7 @@ RequestManager.prototype.poll = function () {
}).filter(function (result) {
return utils.isArray(result.result) && result.result.length > 0;
}).forEach(function (result) {
result.callback(null, result);
result.callback(null, result.result);
});
});
};

10
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

56
dist/ethereum.js vendored
View File

@ -1134,8 +1134,7 @@ var web3Methods = function () {
var sha3 = new Method({
name: 'sha3',
call: 'web3_sha3',
params: 1,
inputFormatter:[utils.toHex]
params: 1
});
return [sha3];
@ -1632,11 +1631,6 @@ var putString = new Method({
params: 3
});
var putHex = new Method({
name: 'putHex',
call: 'db_putHex',
params: 3
});
var getString = new Method({
name: 'getString',
@ -1644,6 +1638,12 @@ var getString = new Method({
params: 2
});
var putHex = new Method({
name: 'putHex',
call: 'db_putHex',
params: 3
});
var getHex = new Method({
name: 'getHex',
call: 'db_getHex',
@ -1651,7 +1651,7 @@ var getHex = new Method({
});
var methods = [
putString, putHex, getString, getHex
putString, getString, putHex, getHex
];
module.exports = {
@ -2160,16 +2160,6 @@ var getOptions = function (options) {
options.toBlock = options.latest;
}
if (options.skip) {
console.warn('"skip" is deprecated, is "offset" instead');
options.offset = options.skip;
}
if (options.max) {
console.warn('"max" is deprecated, is "limit" instead');
options.limit = options.max;
}
// make sure topics, get converted to hex
if(options.topics instanceof Array) {
options.topics = options.topics.map(function(topic){
@ -2177,23 +2167,29 @@ var getOptions = function (options) {
});
}
var asBlockNumber = function (n) {
if (n === 'latest' || n === 'pending') {
return n;
}
return utils.toHex(n);
};
var filterOptions = {};
if(options.topics)
if (options.topics)
filterOptions.topics = options.topics;
if(options.to)
if (options.to)
filterOptions.to = options.to;
if(options.address)
if (options.address)
filterOptions.address = options.address;
if(typeof options.fromBlock !== 'undefined')
filterOptions.fromBlock = utils.toHex(options.fromBlock);
if (typeof options.fromBlock !== 'undefined')
filterOptions.fromBlock = asBlockNumber(options.fromBlock);
if(typeof options.toBlock !== 'undefined')
filterOptions.toBlock = utils.toHex(options.toBlock);
if (typeof options.toBlock !== 'undefined')
filterOptions.toBlock = asBlockNumber(options.toBlock);
return filterOptions;
};
@ -2214,11 +2210,15 @@ var filter = function(options, implementation, formatter) {
var filterId = implementation.newFilter(options);
// call the callbacks
var onMessages = function (messages) {
var onMessages = function (error, messages) {
if (error) {
return callback(error);
}
messages.forEach(function (message) {
message = formatter ? formatter(message) : message;
callbacks.forEach(function (callback) {
callback(message);
callback(null, message);
});
});
};
@ -3115,7 +3115,7 @@ RequestManager.prototype.poll = function () {
}).filter(function (result) {
return utils.isArray(result.result) && result.result.length > 0;
}).forEach(function (result) {
result.callback(null, result);
result.callback(null, result.result);
});
});
};

10
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

30
lib/web3/filter.js
View File

@ -63,16 +63,6 @@ var getOptions = function (options) {
options.toBlock = options.latest;
}
if (options.skip) {
console.warn('"skip" is deprecated, is "offset" instead');
options.offset = options.skip;
}
if (options.max) {
console.warn('"max" is deprecated, is "limit" instead');
options.limit = options.max;
}
// make sure topics, get converted to hex
if(options.topics instanceof Array) {
options.topics = options.topics.map(function(topic){
@ -80,23 +70,29 @@ var getOptions = function (options) {
});
}
var asBlockNumber = function (n) {
if (n === 'latest' || n === 'pending') {
return n;
}
return utils.toHex(n);
};
var filterOptions = {};
if(options.topics)
if (options.topics)
filterOptions.topics = options.topics;
if(options.to)
if (options.to)
filterOptions.to = options.to;
if(options.address)
if (options.address)
filterOptions.address = options.address;
if(typeof options.fromBlock !== 'undefined')
filterOptions.fromBlock = utils.toHex(options.fromBlock);
if (typeof options.fromBlock !== 'undefined')
filterOptions.fromBlock = asBlockNumber(options.fromBlock);
if(typeof options.toBlock !== 'undefined')
filterOptions.toBlock = utils.toHex(options.toBlock);
if (typeof options.toBlock !== 'undefined')
filterOptions.toBlock = asBlockNumber(options.toBlock);
return filterOptions;
};