mirror of https://github.com/status-im/web3.js.git
Whisperv5 (#902)
* added whisper api * added whisper api tests * fix lint errors
This commit is contained in:
Fabian Vogelsteller
GitHub
parent
db6efd5f23
commit
6d3e61a010
|
|
@ -2475,7 +2475,7 @@ module.exports = {
|
|||
|
||||
},{"./sha3.js":19,"bignumber.js":"bignumber.js","utf8":85}],21:[function(require,module,exports){
|
||||
module.exports={
|
||||
"version": "0.19.0"
|
||||
"version": "0.20.0"
|
||||
}
|
||||
|
||||
},{}],22:[function(require,module,exports){
|
||||
|
|
@ -2649,7 +2649,7 @@ module.exports = Web3;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file allevents.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2014
|
||||
|
|
@ -2711,7 +2711,7 @@ AllSolidityEvents.prototype.execute = function (options, callback) {
|
|||
|
||||
var o = this.encode(options);
|
||||
var formatter = this.decode.bind(this);
|
||||
return new Filter(this._requestManager, o, watches.eth(), formatter, callback);
|
||||
return new Filter(o, 'eth', this._requestManager, watches.eth(), formatter, callback);
|
||||
};
|
||||
|
||||
AllSolidityEvents.prototype.attachToContract = function (contract) {
|
||||
|
|
@ -3164,7 +3164,7 @@ module.exports = {
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file event.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2014
|
||||
|
|
@ -3235,7 +3235,7 @@ SolidityEvent.prototype.signature = function () {
|
|||
|
||||
/**
|
||||
* Should be used to encode indexed params and options to one final object
|
||||
*
|
||||
*
|
||||
* @method encode
|
||||
* @param {Object} indexed
|
||||
* @param {Object} options
|
||||
|
|
@ -3266,7 +3266,7 @@ SolidityEvent.prototype.encode = function (indexed, options) {
|
|||
if (value === undefined || value === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
if (utils.isArray(value)) {
|
||||
return value.map(function (v) {
|
||||
return '0x' + coder.encodeParam(i.type, v);
|
||||
|
|
@ -3288,17 +3288,17 @@ SolidityEvent.prototype.encode = function (indexed, options) {
|
|||
* @return {Object} result object with decoded indexed && not indexed params
|
||||
*/
|
||||
SolidityEvent.prototype.decode = function (data) {
|
||||
|
||||
|
||||
data.data = data.data || '';
|
||||
data.topics = data.topics || [];
|
||||
|
||||
var argTopics = this._anonymous ? data.topics : data.topics.slice(1);
|
||||
var indexedData = argTopics.map(function (topics) { return topics.slice(2); }).join("");
|
||||
var indexedParams = coder.decodeParams(this.types(true), indexedData);
|
||||
var indexedParams = coder.decodeParams(this.types(true), indexedData);
|
||||
|
||||
var notIndexedData = data.data.slice(2);
|
||||
var notIndexedParams = coder.decodeParams(this.types(false), notIndexedData);
|
||||
|
||||
|
||||
var result = formatters.outputLogFormatter(data);
|
||||
result.event = this.displayName();
|
||||
result.address = data.address;
|
||||
|
|
@ -3333,10 +3333,10 @@ SolidityEvent.prototype.execute = function (indexed, options, callback) {
|
|||
indexed = {};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var o = this.encode(indexed, options);
|
||||
var formatter = this.decode.bind(this);
|
||||
return new Filter(this._requestManager, o, watches.eth(), formatter, callback);
|
||||
return new Filter(o, 'eth', this._requestManager, watches.eth(), formatter, callback);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -3459,7 +3459,7 @@ var toTopic = function(value){
|
|||
/// This method should be called on options object, to verify deprecated properties && lazy load dynamic ones
|
||||
/// @param should be string or object
|
||||
/// @returns options string or object
|
||||
var getOptions = function (options) {
|
||||
var getOptions = function (options, type) {
|
||||
|
||||
if (utils.isString(options)) {
|
||||
return options;
|
||||
|
|
@ -3467,20 +3467,27 @@ var getOptions = function (options) {
|
|||
|
||||
options = options || {};
|
||||
|
||||
// make sure topics, get converted to hex
|
||||
options.topics = options.topics || [];
|
||||
options.topics = options.topics.map(function(topic){
|
||||
return (utils.isArray(topic)) ? topic.map(toTopic) : toTopic(topic);
|
||||
});
|
||||
|
||||
return {
|
||||
topics: options.topics,
|
||||
from: options.from,
|
||||
to: options.to,
|
||||
address: options.address,
|
||||
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
|
||||
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
|
||||
};
|
||||
switch(type) {
|
||||
case 'eth':
|
||||
|
||||
// make sure topics, get converted to hex
|
||||
options.topics = options.topics || [];
|
||||
options.topics = options.topics.map(function(topic){
|
||||
return (utils.isArray(topic)) ? topic.map(toTopic) : toTopic(topic);
|
||||
});
|
||||
|
||||
return {
|
||||
topics: options.topics,
|
||||
from: options.from,
|
||||
to: options.to,
|
||||
address: options.address,
|
||||
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
|
||||
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
|
||||
};
|
||||
case 'shh':
|
||||
return options;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -3488,7 +3495,7 @@ Adds the callback and sets up the methods, to iterate over the results.
|
|||
|
||||
@method getLogsAtStart
|
||||
@param {Object} self
|
||||
@param {funciton}
|
||||
@param {function} callback
|
||||
*/
|
||||
var getLogsAtStart = function(self, callback){
|
||||
// call getFilterLogs for the first watch callback start
|
||||
|
|
@ -3540,7 +3547,7 @@ var pollFilter = function(self) {
|
|||
|
||||
};
|
||||
|
||||
var Filter = function (requestManager, options, methods, formatter, callback, filterCreationErrorCallback) {
|
||||
var Filter = function (options, type, requestManager, methods, formatter, callback, filterCreationErrorCallback) {
|
||||
var self = this;
|
||||
var implementation = {};
|
||||
methods.forEach(function (method) {
|
||||
|
|
@ -3548,7 +3555,7 @@ var Filter = function (requestManager, options, methods, formatter, callback, fi
|
|||
method.attachToObject(implementation);
|
||||
});
|
||||
this.requestManager = requestManager;
|
||||
this.options = getOptions(options);
|
||||
this.options = getOptions(options, type);
|
||||
this.implementation = implementation;
|
||||
this.filterId = null;
|
||||
this.callbacks = [];
|
||||
|
|
@ -5485,8 +5492,8 @@ Eth.prototype.contract = function (abi) {
|
|||
return factory;
|
||||
};
|
||||
|
||||
Eth.prototype.filter = function (fil, callback, filterCreationErrorCallback) {
|
||||
return new Filter(this._requestManager, fil, watches.eth(), formatters.outputLogFormatter, callback, filterCreationErrorCallback);
|
||||
Eth.prototype.filter = function (options, callback, filterCreationErrorCallback) {
|
||||
return new Filter(options, 'eth', this._requestManager, watches.eth(), formatters.outputLogFormatter, callback, filterCreationErrorCallback);
|
||||
};
|
||||
|
||||
Eth.prototype.namereg = function () {
|
||||
|
|
@ -5693,8 +5700,9 @@ module.exports = Personal;
|
|||
*/
|
||||
/** @file shh.js
|
||||
* @authors:
|
||||
* Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
* Fabian Vogelsteller <fabian@ethereum.org>
|
||||
* Marek Kotewicz <marek@ethcore.io>
|
||||
* @date 2017
|
||||
*/
|
||||
|
||||
var Method = require('../method');
|
||||
|
|
@ -5707,55 +5715,113 @@ var Shh = function (web3) {
|
|||
|
||||
var self = this;
|
||||
|
||||
methods().forEach(function(method) {
|
||||
methods().forEach(function(method) {
|
||||
method.attachToObject(self);
|
||||
method.setRequestManager(self._requestManager);
|
||||
});
|
||||
};
|
||||
|
||||
Shh.prototype.filter = function (fil, callback) {
|
||||
return new Filter(this._requestManager, fil, watches.shh(), formatters.outputPostFormatter, callback);
|
||||
Shh.prototype.newMessageFilter = function (options, callback, filterCreationErrorCallback) {
|
||||
return new Filter(options, 'shh', this._requestManager, watches.shh(), null, callback, filterCreationErrorCallback);
|
||||
};
|
||||
|
||||
var methods = function () {
|
||||
|
||||
var post = new Method({
|
||||
name: 'post',
|
||||
call: 'shh_post',
|
||||
params: 1,
|
||||
inputFormatter: [formatters.inputPostFormatter]
|
||||
});
|
||||
|
||||
var newIdentity = new Method({
|
||||
name: 'newIdentity',
|
||||
call: 'shh_newIdentity',
|
||||
params: 0
|
||||
});
|
||||
|
||||
var hasIdentity = new Method({
|
||||
name: 'hasIdentity',
|
||||
call: 'shh_hasIdentity',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var newGroup = new Method({
|
||||
name: 'newGroup',
|
||||
call: 'shh_newGroup',
|
||||
params: 0
|
||||
});
|
||||
|
||||
var addToGroup = new Method({
|
||||
name: 'addToGroup',
|
||||
call: 'shh_addToGroup',
|
||||
params: 0
|
||||
});
|
||||
var methods = function () {
|
||||
|
||||
return [
|
||||
post,
|
||||
newIdentity,
|
||||
hasIdentity,
|
||||
newGroup,
|
||||
addToGroup
|
||||
new Method({
|
||||
name: 'version',
|
||||
call: 'shh_version',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'info',
|
||||
call: 'shh_info',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'setMaxMessageSize',
|
||||
call: 'shh_setMaxMessageSize',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'setMinPoW',
|
||||
call: 'shh_setMinPoW',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'markTrustedPeer',
|
||||
call: 'shh_markTrustedPeer',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'newKeyPair',
|
||||
call: 'shh_newKeyPair',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'addPrivateKey',
|
||||
call: 'shh_addPrivateKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'deleteKeyPair',
|
||||
call: 'shh_deleteKeyPair',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'hasKeyPair',
|
||||
call: 'shh_hasKeyPair',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getPublicKey',
|
||||
call: 'shh_getPublicKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getPrivateKey',
|
||||
call: 'shh_getPrivateKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'newSymKey',
|
||||
call: 'shh_newSymKey',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'addSymKey',
|
||||
call: 'shh_addSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'generateSymKeyFromPassword',
|
||||
call: 'shh_generateSymKeyFromPassword',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'hasSymKey',
|
||||
call: 'shh_hasSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getSymKey',
|
||||
call: 'shh_getSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'deleteSymKey',
|
||||
call: 'shh_deleteSymKey',
|
||||
params: 1
|
||||
}),
|
||||
|
||||
// subscribe and unsubscribe missing
|
||||
|
||||
new Method({
|
||||
name: 'post',
|
||||
call: 'shh_post',
|
||||
params: 1,
|
||||
inputFormatter: [null]
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -5987,35 +6053,28 @@ var eth = function () {
|
|||
|
||||
/// @returns an array of objects describing web3.shh.watch api methods
|
||||
var shh = function () {
|
||||
var newFilter = new Method({
|
||||
name: 'newFilter',
|
||||
call: 'shh_newFilter',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var uninstallFilter = new Method({
|
||||
name: 'uninstallFilter',
|
||||
call: 'shh_uninstallFilter',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var getLogs = new Method({
|
||||
name: 'getLogs',
|
||||
call: 'shh_getMessages',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var poll = new Method({
|
||||
name: 'poll',
|
||||
call: 'shh_getFilterChanges',
|
||||
params: 1
|
||||
});
|
||||
|
||||
return [
|
||||
newFilter,
|
||||
uninstallFilter,
|
||||
getLogs,
|
||||
poll
|
||||
new Method({
|
||||
name: 'newFilter',
|
||||
call: 'shh_newMessageFilter',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'uninstallFilter',
|
||||
call: 'shh_deleteMessageFilter',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getLogs',
|
||||
call: 'shh_getFilterMessages',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'poll',
|
||||
call: 'shh_getFilterMessages',
|
||||
params: 1
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -2475,7 +2475,7 @@ module.exports = {
|
|||
|
||||
},{"./sha3.js":19,"bignumber.js":"bignumber.js","utf8":84}],21:[function(require,module,exports){
|
||||
module.exports={
|
||||
"version": "0.19.0"
|
||||
"version": "0.20.0"
|
||||
}
|
||||
|
||||
},{}],22:[function(require,module,exports){
|
||||
|
|
@ -2649,7 +2649,7 @@ module.exports = Web3;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file allevents.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2014
|
||||
|
|
@ -2711,7 +2711,7 @@ AllSolidityEvents.prototype.execute = function (options, callback) {
|
|||
|
||||
var o = this.encode(options);
|
||||
var formatter = this.decode.bind(this);
|
||||
return new Filter(this._requestManager, o, watches.eth(), formatter, callback);
|
||||
return new Filter(o, 'eth', this._requestManager, watches.eth(), formatter, callback);
|
||||
};
|
||||
|
||||
AllSolidityEvents.prototype.attachToContract = function (contract) {
|
||||
|
|
@ -3164,7 +3164,7 @@ module.exports = {
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file event.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2014
|
||||
|
|
@ -3235,7 +3235,7 @@ SolidityEvent.prototype.signature = function () {
|
|||
|
||||
/**
|
||||
* Should be used to encode indexed params and options to one final object
|
||||
*
|
||||
*
|
||||
* @method encode
|
||||
* @param {Object} indexed
|
||||
* @param {Object} options
|
||||
|
|
@ -3266,7 +3266,7 @@ SolidityEvent.prototype.encode = function (indexed, options) {
|
|||
if (value === undefined || value === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
if (utils.isArray(value)) {
|
||||
return value.map(function (v) {
|
||||
return '0x' + coder.encodeParam(i.type, v);
|
||||
|
|
@ -3288,17 +3288,17 @@ SolidityEvent.prototype.encode = function (indexed, options) {
|
|||
* @return {Object} result object with decoded indexed && not indexed params
|
||||
*/
|
||||
SolidityEvent.prototype.decode = function (data) {
|
||||
|
||||
|
||||
data.data = data.data || '';
|
||||
data.topics = data.topics || [];
|
||||
|
||||
var argTopics = this._anonymous ? data.topics : data.topics.slice(1);
|
||||
var indexedData = argTopics.map(function (topics) { return topics.slice(2); }).join("");
|
||||
var indexedParams = coder.decodeParams(this.types(true), indexedData);
|
||||
var indexedParams = coder.decodeParams(this.types(true), indexedData);
|
||||
|
||||
var notIndexedData = data.data.slice(2);
|
||||
var notIndexedParams = coder.decodeParams(this.types(false), notIndexedData);
|
||||
|
||||
|
||||
var result = formatters.outputLogFormatter(data);
|
||||
result.event = this.displayName();
|
||||
result.address = data.address;
|
||||
|
|
@ -3333,10 +3333,10 @@ SolidityEvent.prototype.execute = function (indexed, options, callback) {
|
|||
indexed = {};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var o = this.encode(indexed, options);
|
||||
var formatter = this.decode.bind(this);
|
||||
return new Filter(this._requestManager, o, watches.eth(), formatter, callback);
|
||||
return new Filter(o, 'eth', this._requestManager, watches.eth(), formatter, callback);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -3459,7 +3459,7 @@ var toTopic = function(value){
|
|||
/// This method should be called on options object, to verify deprecated properties && lazy load dynamic ones
|
||||
/// @param should be string or object
|
||||
/// @returns options string or object
|
||||
var getOptions = function (options) {
|
||||
var getOptions = function (options, type) {
|
||||
|
||||
if (utils.isString(options)) {
|
||||
return options;
|
||||
|
|
@ -3467,20 +3467,27 @@ var getOptions = function (options) {
|
|||
|
||||
options = options || {};
|
||||
|
||||
// make sure topics, get converted to hex
|
||||
options.topics = options.topics || [];
|
||||
options.topics = options.topics.map(function(topic){
|
||||
return (utils.isArray(topic)) ? topic.map(toTopic) : toTopic(topic);
|
||||
});
|
||||
|
||||
return {
|
||||
topics: options.topics,
|
||||
from: options.from,
|
||||
to: options.to,
|
||||
address: options.address,
|
||||
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
|
||||
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
|
||||
};
|
||||
switch(type) {
|
||||
case 'eth':
|
||||
|
||||
// make sure topics, get converted to hex
|
||||
options.topics = options.topics || [];
|
||||
options.topics = options.topics.map(function(topic){
|
||||
return (utils.isArray(topic)) ? topic.map(toTopic) : toTopic(topic);
|
||||
});
|
||||
|
||||
return {
|
||||
topics: options.topics,
|
||||
from: options.from,
|
||||
to: options.to,
|
||||
address: options.address,
|
||||
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
|
||||
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
|
||||
};
|
||||
case 'shh':
|
||||
return options;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -3488,7 +3495,7 @@ Adds the callback and sets up the methods, to iterate over the results.
|
|||
|
||||
@method getLogsAtStart
|
||||
@param {Object} self
|
||||
@param {funciton}
|
||||
@param {function} callback
|
||||
*/
|
||||
var getLogsAtStart = function(self, callback){
|
||||
// call getFilterLogs for the first watch callback start
|
||||
|
|
@ -3540,7 +3547,7 @@ var pollFilter = function(self) {
|
|||
|
||||
};
|
||||
|
||||
var Filter = function (requestManager, options, methods, formatter, callback, filterCreationErrorCallback) {
|
||||
var Filter = function (options, type, requestManager, methods, formatter, callback, filterCreationErrorCallback) {
|
||||
var self = this;
|
||||
var implementation = {};
|
||||
methods.forEach(function (method) {
|
||||
|
|
@ -3548,7 +3555,7 @@ var Filter = function (requestManager, options, methods, formatter, callback, fi
|
|||
method.attachToObject(implementation);
|
||||
});
|
||||
this.requestManager = requestManager;
|
||||
this.options = getOptions(options);
|
||||
this.options = getOptions(options, type);
|
||||
this.implementation = implementation;
|
||||
this.filterId = null;
|
||||
this.callbacks = [];
|
||||
|
|
@ -5485,8 +5492,8 @@ Eth.prototype.contract = function (abi) {
|
|||
return factory;
|
||||
};
|
||||
|
||||
Eth.prototype.filter = function (fil, callback, filterCreationErrorCallback) {
|
||||
return new Filter(this._requestManager, fil, watches.eth(), formatters.outputLogFormatter, callback, filterCreationErrorCallback);
|
||||
Eth.prototype.filter = function (options, callback, filterCreationErrorCallback) {
|
||||
return new Filter(options, 'eth', this._requestManager, watches.eth(), formatters.outputLogFormatter, callback, filterCreationErrorCallback);
|
||||
};
|
||||
|
||||
Eth.prototype.namereg = function () {
|
||||
|
|
@ -5693,8 +5700,9 @@ module.exports = Personal;
|
|||
*/
|
||||
/** @file shh.js
|
||||
* @authors:
|
||||
* Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
* Fabian Vogelsteller <fabian@ethereum.org>
|
||||
* Marek Kotewicz <marek@ethcore.io>
|
||||
* @date 2017
|
||||
*/
|
||||
|
||||
var Method = require('../method');
|
||||
|
|
@ -5707,55 +5715,113 @@ var Shh = function (web3) {
|
|||
|
||||
var self = this;
|
||||
|
||||
methods().forEach(function(method) {
|
||||
methods().forEach(function(method) {
|
||||
method.attachToObject(self);
|
||||
method.setRequestManager(self._requestManager);
|
||||
});
|
||||
};
|
||||
|
||||
Shh.prototype.filter = function (fil, callback) {
|
||||
return new Filter(this._requestManager, fil, watches.shh(), formatters.outputPostFormatter, callback);
|
||||
Shh.prototype.newMessageFilter = function (options, callback, filterCreationErrorCallback) {
|
||||
return new Filter(options, 'shh', this._requestManager, watches.shh(), null, callback, filterCreationErrorCallback);
|
||||
};
|
||||
|
||||
var methods = function () {
|
||||
|
||||
var post = new Method({
|
||||
name: 'post',
|
||||
call: 'shh_post',
|
||||
params: 1,
|
||||
inputFormatter: [formatters.inputPostFormatter]
|
||||
});
|
||||
|
||||
var newIdentity = new Method({
|
||||
name: 'newIdentity',
|
||||
call: 'shh_newIdentity',
|
||||
params: 0
|
||||
});
|
||||
|
||||
var hasIdentity = new Method({
|
||||
name: 'hasIdentity',
|
||||
call: 'shh_hasIdentity',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var newGroup = new Method({
|
||||
name: 'newGroup',
|
||||
call: 'shh_newGroup',
|
||||
params: 0
|
||||
});
|
||||
|
||||
var addToGroup = new Method({
|
||||
name: 'addToGroup',
|
||||
call: 'shh_addToGroup',
|
||||
params: 0
|
||||
});
|
||||
var methods = function () {
|
||||
|
||||
return [
|
||||
post,
|
||||
newIdentity,
|
||||
hasIdentity,
|
||||
newGroup,
|
||||
addToGroup
|
||||
new Method({
|
||||
name: 'version',
|
||||
call: 'shh_version',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'info',
|
||||
call: 'shh_info',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'setMaxMessageSize',
|
||||
call: 'shh_setMaxMessageSize',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'setMinPoW',
|
||||
call: 'shh_setMinPoW',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'markTrustedPeer',
|
||||
call: 'shh_markTrustedPeer',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'newKeyPair',
|
||||
call: 'shh_newKeyPair',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'addPrivateKey',
|
||||
call: 'shh_addPrivateKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'deleteKeyPair',
|
||||
call: 'shh_deleteKeyPair',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'hasKeyPair',
|
||||
call: 'shh_hasKeyPair',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getPublicKey',
|
||||
call: 'shh_getPublicKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getPrivateKey',
|
||||
call: 'shh_getPrivateKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'newSymKey',
|
||||
call: 'shh_newSymKey',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'addSymKey',
|
||||
call: 'shh_addSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'generateSymKeyFromPassword',
|
||||
call: 'shh_generateSymKeyFromPassword',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'hasSymKey',
|
||||
call: 'shh_hasSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getSymKey',
|
||||
call: 'shh_getSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'deleteSymKey',
|
||||
call: 'shh_deleteSymKey',
|
||||
params: 1
|
||||
}),
|
||||
|
||||
// subscribe and unsubscribe missing
|
||||
|
||||
new Method({
|
||||
name: 'post',
|
||||
call: 'shh_post',
|
||||
params: 1,
|
||||
inputFormatter: [null]
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -5987,35 +6053,28 @@ var eth = function () {
|
|||
|
||||
/// @returns an array of objects describing web3.shh.watch api methods
|
||||
var shh = function () {
|
||||
var newFilter = new Method({
|
||||
name: 'newFilter',
|
||||
call: 'shh_newFilter',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var uninstallFilter = new Method({
|
||||
name: 'uninstallFilter',
|
||||
call: 'shh_uninstallFilter',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var getLogs = new Method({
|
||||
name: 'getLogs',
|
||||
call: 'shh_getMessages',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var poll = new Method({
|
||||
name: 'poll',
|
||||
call: 'shh_getFilterChanges',
|
||||
params: 1
|
||||
});
|
||||
|
||||
return [
|
||||
newFilter,
|
||||
uninstallFilter,
|
||||
getLogs,
|
||||
poll
|
||||
new Method({
|
||||
name: 'newFilter',
|
||||
call: 'shh_newMessageFilter',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'uninstallFilter',
|
||||
call: 'shh_deleteMessageFilter',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getLogs',
|
||||
call: 'shh_getFilterMessages',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'poll',
|
||||
call: 'shh_getFilterMessages',
|
||||
params: 1
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"version": "0.19.0"
|
||||
"version": "0.20.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file allevents.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2014
|
||||
|
|
@ -76,7 +76,7 @@ AllSolidityEvents.prototype.execute = function (options, callback) {
|
|||
|
||||
var o = this.encode(options);
|
||||
var formatter = this.decode.bind(this);
|
||||
return new Filter(this._requestManager, o, watches.eth(), formatter, callback);
|
||||
return new Filter(o, 'eth', this._requestManager, watches.eth(), formatter, callback);
|
||||
};
|
||||
|
||||
AllSolidityEvents.prototype.attachToContract = function (contract) {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file event.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2014
|
||||
|
|
@ -85,7 +85,7 @@ SolidityEvent.prototype.signature = function () {
|
|||
|
||||
/**
|
||||
* Should be used to encode indexed params and options to one final object
|
||||
*
|
||||
*
|
||||
* @method encode
|
||||
* @param {Object} indexed
|
||||
* @param {Object} options
|
||||
|
|
@ -116,7 +116,7 @@ SolidityEvent.prototype.encode = function (indexed, options) {
|
|||
if (value === undefined || value === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
if (utils.isArray(value)) {
|
||||
return value.map(function (v) {
|
||||
return '0x' + coder.encodeParam(i.type, v);
|
||||
|
|
@ -138,17 +138,17 @@ SolidityEvent.prototype.encode = function (indexed, options) {
|
|||
* @return {Object} result object with decoded indexed && not indexed params
|
||||
*/
|
||||
SolidityEvent.prototype.decode = function (data) {
|
||||
|
||||
|
||||
data.data = data.data || '';
|
||||
data.topics = data.topics || [];
|
||||
|
||||
var argTopics = this._anonymous ? data.topics : data.topics.slice(1);
|
||||
var indexedData = argTopics.map(function (topics) { return topics.slice(2); }).join("");
|
||||
var indexedParams = coder.decodeParams(this.types(true), indexedData);
|
||||
var indexedParams = coder.decodeParams(this.types(true), indexedData);
|
||||
|
||||
var notIndexedData = data.data.slice(2);
|
||||
var notIndexedParams = coder.decodeParams(this.types(false), notIndexedData);
|
||||
|
||||
|
||||
var result = formatters.outputLogFormatter(data);
|
||||
result.event = this.displayName();
|
||||
result.address = data.address;
|
||||
|
|
@ -183,10 +183,10 @@ SolidityEvent.prototype.execute = function (indexed, options, callback) {
|
|||
indexed = {};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var o = this.encode(indexed, options);
|
||||
var formatter = this.decode.bind(this);
|
||||
return new Filter(this._requestManager, o, watches.eth(), formatter, callback);
|
||||
return new Filter(o, 'eth', this._requestManager, watches.eth(), formatter, callback);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -49,7 +49,8 @@ var toTopic = function(value){
|
|||
/// This method should be called on options object, to verify deprecated properties && lazy load dynamic ones
|
||||
/// @param should be string or object
|
||||
/// @returns options string or object
|
||||
var getOptions = function (options) {
|
||||
var getOptions = function (options, type) {
|
||||
/*jshint maxcomplexity: 6 */
|
||||
|
||||
if (utils.isString(options)) {
|
||||
return options;
|
||||
|
|
@ -57,20 +58,27 @@ var getOptions = function (options) {
|
|||
|
||||
options = options || {};
|
||||
|
||||
// make sure topics, get converted to hex
|
||||
options.topics = options.topics || [];
|
||||
options.topics = options.topics.map(function(topic){
|
||||
return (utils.isArray(topic)) ? topic.map(toTopic) : toTopic(topic);
|
||||
});
|
||||
|
||||
return {
|
||||
topics: options.topics,
|
||||
from: options.from,
|
||||
to: options.to,
|
||||
address: options.address,
|
||||
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
|
||||
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
|
||||
};
|
||||
switch(type) {
|
||||
case 'eth':
|
||||
|
||||
// make sure topics, get converted to hex
|
||||
options.topics = options.topics || [];
|
||||
options.topics = options.topics.map(function(topic){
|
||||
return (utils.isArray(topic)) ? topic.map(toTopic) : toTopic(topic);
|
||||
});
|
||||
|
||||
return {
|
||||
topics: options.topics,
|
||||
from: options.from,
|
||||
to: options.to,
|
||||
address: options.address,
|
||||
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
|
||||
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
|
||||
};
|
||||
case 'shh':
|
||||
return options;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -78,7 +86,7 @@ Adds the callback and sets up the methods, to iterate over the results.
|
|||
|
||||
@method getLogsAtStart
|
||||
@param {Object} self
|
||||
@param {funciton}
|
||||
@param {function} callback
|
||||
*/
|
||||
var getLogsAtStart = function(self, callback){
|
||||
// call getFilterLogs for the first watch callback start
|
||||
|
|
@ -130,7 +138,7 @@ var pollFilter = function(self) {
|
|||
|
||||
};
|
||||
|
||||
var Filter = function (requestManager, options, methods, formatter, callback, filterCreationErrorCallback) {
|
||||
var Filter = function (options, type, requestManager, methods, formatter, callback, filterCreationErrorCallback) {
|
||||
var self = this;
|
||||
var implementation = {};
|
||||
methods.forEach(function (method) {
|
||||
|
|
@ -138,7 +146,7 @@ var Filter = function (requestManager, options, methods, formatter, callback, fi
|
|||
method.attachToObject(implementation);
|
||||
});
|
||||
this.requestManager = requestManager;
|
||||
this.options = getOptions(options);
|
||||
this.options = getOptions(options, type);
|
||||
this.implementation = implementation;
|
||||
this.filterId = null;
|
||||
this.callbacks = [];
|
||||
|
|
|
|||
|
|
@ -335,8 +335,8 @@ Eth.prototype.contract = function (abi) {
|
|||
return factory;
|
||||
};
|
||||
|
||||
Eth.prototype.filter = function (fil, callback, filterCreationErrorCallback) {
|
||||
return new Filter(this._requestManager, fil, watches.eth(), formatters.outputLogFormatter, callback, filterCreationErrorCallback);
|
||||
Eth.prototype.filter = function (options, callback, filterCreationErrorCallback) {
|
||||
return new Filter(options, 'eth', this._requestManager, watches.eth(), formatters.outputLogFormatter, callback, filterCreationErrorCallback);
|
||||
};
|
||||
|
||||
Eth.prototype.namereg = function () {
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
*/
|
||||
/** @file shh.js
|
||||
* @authors:
|
||||
* Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
* Fabian Vogelsteller <fabian@ethereum.org>
|
||||
* Marek Kotewicz <marek@ethcore.io>
|
||||
* @date 2017
|
||||
*/
|
||||
|
||||
var Method = require('../method');
|
||||
var formatters = require('../formatters');
|
||||
var Filter = require('../filter');
|
||||
var watches = require('./watches');
|
||||
|
||||
|
|
@ -30,55 +30,113 @@ var Shh = function (web3) {
|
|||
|
||||
var self = this;
|
||||
|
||||
methods().forEach(function(method) {
|
||||
methods().forEach(function(method) {
|
||||
method.attachToObject(self);
|
||||
method.setRequestManager(self._requestManager);
|
||||
});
|
||||
};
|
||||
|
||||
Shh.prototype.filter = function (fil, callback) {
|
||||
return new Filter(this._requestManager, fil, watches.shh(), formatters.outputPostFormatter, callback);
|
||||
Shh.prototype.newMessageFilter = function (options, callback, filterCreationErrorCallback) {
|
||||
return new Filter(options, 'shh', this._requestManager, watches.shh(), null, callback, filterCreationErrorCallback);
|
||||
};
|
||||
|
||||
var methods = function () {
|
||||
|
||||
var post = new Method({
|
||||
name: 'post',
|
||||
call: 'shh_post',
|
||||
params: 1,
|
||||
inputFormatter: [formatters.inputPostFormatter]
|
||||
});
|
||||
|
||||
var newIdentity = new Method({
|
||||
name: 'newIdentity',
|
||||
call: 'shh_newIdentity',
|
||||
params: 0
|
||||
});
|
||||
|
||||
var hasIdentity = new Method({
|
||||
name: 'hasIdentity',
|
||||
call: 'shh_hasIdentity',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var newGroup = new Method({
|
||||
name: 'newGroup',
|
||||
call: 'shh_newGroup',
|
||||
params: 0
|
||||
});
|
||||
|
||||
var addToGroup = new Method({
|
||||
name: 'addToGroup',
|
||||
call: 'shh_addToGroup',
|
||||
params: 0
|
||||
});
|
||||
var methods = function () {
|
||||
|
||||
return [
|
||||
post,
|
||||
newIdentity,
|
||||
hasIdentity,
|
||||
newGroup,
|
||||
addToGroup
|
||||
new Method({
|
||||
name: 'version',
|
||||
call: 'shh_version',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'info',
|
||||
call: 'shh_info',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'setMaxMessageSize',
|
||||
call: 'shh_setMaxMessageSize',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'setMinPoW',
|
||||
call: 'shh_setMinPoW',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'markTrustedPeer',
|
||||
call: 'shh_markTrustedPeer',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'newKeyPair',
|
||||
call: 'shh_newKeyPair',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'addPrivateKey',
|
||||
call: 'shh_addPrivateKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'deleteKeyPair',
|
||||
call: 'shh_deleteKeyPair',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'hasKeyPair',
|
||||
call: 'shh_hasKeyPair',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getPublicKey',
|
||||
call: 'shh_getPublicKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getPrivateKey',
|
||||
call: 'shh_getPrivateKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'newSymKey',
|
||||
call: 'shh_newSymKey',
|
||||
params: 0
|
||||
}),
|
||||
new Method({
|
||||
name: 'addSymKey',
|
||||
call: 'shh_addSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'generateSymKeyFromPassword',
|
||||
call: 'shh_generateSymKeyFromPassword',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'hasSymKey',
|
||||
call: 'shh_hasSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getSymKey',
|
||||
call: 'shh_getSymKey',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'deleteSymKey',
|
||||
call: 'shh_deleteSymKey',
|
||||
params: 1
|
||||
}),
|
||||
|
||||
// subscribe and unsubscribe missing
|
||||
|
||||
new Method({
|
||||
name: 'post',
|
||||
call: 'shh_post',
|
||||
params: 1,
|
||||
inputFormatter: [null]
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -75,35 +75,28 @@ var eth = function () {
|
|||
|
||||
/// @returns an array of objects describing web3.shh.watch api methods
|
||||
var shh = function () {
|
||||
var newFilter = new Method({
|
||||
name: 'newFilter',
|
||||
call: 'shh_newFilter',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var uninstallFilter = new Method({
|
||||
name: 'uninstallFilter',
|
||||
call: 'shh_uninstallFilter',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var getLogs = new Method({
|
||||
name: 'getLogs',
|
||||
call: 'shh_getMessages',
|
||||
params: 1
|
||||
});
|
||||
|
||||
var poll = new Method({
|
||||
name: 'poll',
|
||||
call: 'shh_getFilterChanges',
|
||||
params: 1
|
||||
});
|
||||
|
||||
return [
|
||||
newFilter,
|
||||
uninstallFilter,
|
||||
getLogs,
|
||||
poll
|
||||
new Method({
|
||||
name: 'newFilter',
|
||||
call: 'shh_newMessageFilter',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'uninstallFilter',
|
||||
call: 'shh_deleteMessageFilter',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'getLogs',
|
||||
call: 'shh_getFilterMessages',
|
||||
params: 1
|
||||
}),
|
||||
new Method({
|
||||
name: 'poll',
|
||||
call: 'shh_getFilterMessages',
|
||||
params: 1
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* jshint ignore:start */
|
||||
Package.describe({
|
||||
name: 'ethereum:web3',
|
||||
version: '0.19.0',
|
||||
version: '0.20.0',
|
||||
summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
|
||||
git: 'https://github.com/ethereum/ethereum.js',
|
||||
// By default, Meteor will default to using README.md for documentation.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "web3",
|
||||
"namespace": "ethereum",
|
||||
"version": "0.19.0",
|
||||
"version": "0.20.0",
|
||||
"description": "Ethereum JavaScript API, middleware to talk to a ethereum node over RPC",
|
||||
"main": "./index.js",
|
||||
"directories": {
|
||||
|
|
|
|||
|
|
@ -4,66 +4,33 @@ var web3 = new Web3();
|
|||
var assert = chai.assert;
|
||||
var FakeHttpProvider = require('./helpers/FakeHttpProvider');
|
||||
|
||||
var method = 'filter';
|
||||
var method = 'newMessageFilter';
|
||||
|
||||
var tests = [{
|
||||
args: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['0x324f5435', '0x564b4566f3453']
|
||||
symKeyID: '47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
sig: '0x55dd47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
minPow: 0.5,
|
||||
topics: ['0x32dd4f54', '0x564b4566'],
|
||||
allowP2P: false
|
||||
}],
|
||||
formattedArgs: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['0x324f5435', '0x564b4566f3453']
|
||||
symKeyID: '47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
sig: '0x55dd47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
minPow: 0.5,
|
||||
topics: ['0x32dd4f54', '0x564b4566'],
|
||||
allowP2P: false
|
||||
}],
|
||||
result: '0xf',
|
||||
formattedResult: '0xf',
|
||||
call: 'shh_newFilter'
|
||||
},
|
||||
{
|
||||
args: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['0x324f5435', ['0x564b4566f3453', '0x345345343453']]
|
||||
}],
|
||||
formattedArgs: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['0x324f5435', ['0x564b4566f3453', '0x345345343453']]
|
||||
}],
|
||||
result: '0xf',
|
||||
formattedResult: '0xf',
|
||||
call: 'shh_newFilter'
|
||||
},
|
||||
{
|
||||
args: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['0x324f5435', null, ['0x564b4566f3453', '0x345345343453']]
|
||||
}],
|
||||
formattedArgs: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['0x324f5435', null, ['0x564b4566f3453', '0x345345343453']]
|
||||
}],
|
||||
result: '0xf',
|
||||
formattedResult: '0xf',
|
||||
call: 'shh_newFilter'
|
||||
},
|
||||
{
|
||||
args: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['myString', 11, '23', null]
|
||||
}],
|
||||
formattedArgs: [{
|
||||
to: '0x47d33b27bb249a2dbab4c0612bf9caf4c1950855',
|
||||
topics: ['0x6d79537472696e67', '0x3131', '0x3233', null]
|
||||
}],
|
||||
result: '0xf',
|
||||
formattedResult: '0xf',
|
||||
call: 'shh_newFilter'
|
||||
call: 'shh_newMessageFilter'
|
||||
}];
|
||||
|
||||
describe('shh', function () {
|
||||
describe(method, function () {
|
||||
tests.forEach(function (test, index) {
|
||||
it('property test: ' + index, function () {
|
||||
|
||||
|
||||
// given
|
||||
var provider = new FakeHttpProvider();
|
||||
web3.setProvider(provider);
|
||||
|
|
@ -77,7 +44,7 @@ describe('shh', function () {
|
|||
|
||||
// call
|
||||
web3.shh[method].apply(web3.shh, test.args);
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
var chai = require('chai');
|
||||
var web3 = require('../index');
|
||||
var testMethod = require('./helpers/test.method.js');
|
||||
|
||||
var method = 'hasIdentity';
|
||||
|
||||
var tests = [{
|
||||
args: ['0x2dbab4c0612bf9caf4c195085547dc0612bf9caf4c1950855'],
|
||||
formattedArgs: ['0x2dbab4c0612bf9caf4c195085547dc0612bf9caf4c1950855'],
|
||||
result: true,
|
||||
formattedResult: true,
|
||||
call: 'shh_'+ method
|
||||
}];
|
||||
|
||||
testMethod.runTests('shh', method, tests);
|
||||
|
||||
|
|
@ -1,17 +1,31 @@
|
|||
var chai = require('chai');
|
||||
var assert = chai.assert;
|
||||
var assert = chai.assert;
|
||||
var Web3 = require('../index.js');
|
||||
var web3 = new Web3();
|
||||
var u = require('./helpers/test.utils.js');
|
||||
|
||||
describe('web3.shh', function() {
|
||||
describe('methods', function() {
|
||||
u.methodExists(web3.shh, 'version');
|
||||
u.methodExists(web3.shh, 'info');
|
||||
u.methodExists(web3.shh, 'setMaxMessageSize');
|
||||
u.methodExists(web3.shh, 'setMinPoW');
|
||||
u.methodExists(web3.shh, 'markTrustedPeer');
|
||||
u.methodExists(web3.shh, 'newKeyPair');
|
||||
u.methodExists(web3.shh, 'addPrivateKey');
|
||||
u.methodExists(web3.shh, 'deleteKeyPair');
|
||||
u.methodExists(web3.shh, 'hasKeyPair');
|
||||
u.methodExists(web3.shh, 'getPublicKey');
|
||||
u.methodExists(web3.shh, 'getPrivateKey');
|
||||
u.methodExists(web3.shh, 'newSymKey');
|
||||
u.methodExists(web3.shh, 'addSymKey');
|
||||
u.methodExists(web3.shh, 'generateSymKeyFromPassword');
|
||||
u.methodExists(web3.shh, 'hasSymKey');
|
||||
u.methodExists(web3.shh, 'getSymKey');
|
||||
u.methodExists(web3.shh, 'deleteSymKey');
|
||||
u.methodExists(web3.shh, 'newMessageFilter');
|
||||
u.methodExists(web3.shh, 'post');
|
||||
u.methodExists(web3.shh, 'newIdentity');
|
||||
u.methodExists(web3.shh, 'hasIdentity');
|
||||
u.methodExists(web3.shh, 'newGroup');
|
||||
u.methodExists(web3.shh, 'addToGroup');
|
||||
u.methodExists(web3.shh, 'filter');
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -7,39 +7,24 @@ var method = 'post';
|
|||
|
||||
var tests = [{
|
||||
args: [{
|
||||
from: '0x123123123',
|
||||
topics: ['hello_world'],
|
||||
symKeyID: '123123123ff',
|
||||
sig: '44ffdd55',
|
||||
topic: '0xffdd11',
|
||||
payload: web3.toHex('12345'),
|
||||
ttl: 100,
|
||||
workToProve: 101
|
||||
minPow: 0.5,
|
||||
powTarget: 3,
|
||||
padding: '0xffdd4455'
|
||||
}],
|
||||
formattedArgs: [{
|
||||
from: '0x123123123',
|
||||
topics: [web3.fromAscii('hello_world')],
|
||||
symKeyID: '123123123ff',
|
||||
sig: '44ffdd55',
|
||||
topic: '0xffdd11',
|
||||
payload: web3.toHex('12345'),
|
||||
ttl: web3.toHex('100'),
|
||||
workToProve: web3.toHex('101'),
|
||||
priority: '0x0'
|
||||
}],
|
||||
result: true,
|
||||
formattedResult: true,
|
||||
call: 'shh_'+ method
|
||||
}, {
|
||||
args: [{
|
||||
from: '0x21312',
|
||||
topics: ['hello_world'],
|
||||
payload: '0x12345',
|
||||
ttl: 0x100,
|
||||
workToProve: 0x101,
|
||||
priority: 0x15
|
||||
}],
|
||||
formattedArgs: [{
|
||||
from: '0x21312',
|
||||
topics: [web3.fromAscii('hello_world')],
|
||||
payload: '0x12345',
|
||||
ttl: '0x100',
|
||||
workToProve: '0x101',
|
||||
priority: '0x15'
|
||||
ttl: 100,
|
||||
minPow: 0.5,
|
||||
powTarget: 3,
|
||||
padding: '0xffdd4455'
|
||||
}],
|
||||
result: true,
|
||||
formattedResult: true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue