BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #245 from isocolsky/rm_bitcore_explorers 

Rm bitcore explorers
This commit is contained in:
Matias Alejo Garcia 2015-06-12 11:30:16 -03:00
parent 053573b44c a0b45b78f5
commit 6f13667912
7 changed files with 164 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
lib/blockchainexplorer.js
View File

@ -5,81 +5,35 @@ var $ = require('preconditions').singleton();
var log = require('npmlog');
log.debug = log.verbose;
var Explorers = require('bitcore-explorers');
var request = require('request');
var io = require('socket.io-client');
var Insight = require('./blockchainexplorers/insight');
var PROVIDERS = {
'insight': {
'livenet': 'https://insight.bitpay.com:443',
'testnet': 'https://test-insight.bitpay.com:443',
},
};
function BlockChainExplorer(opts) {
$.checkArgument(opts);
var provider = opts.provider || 'insight';
var network = opts.network || 'livenet';
var dfltUrl = network == 'livenet' ? 'https://insight.bitpay.com:443' :
'https://test-insight.bitpay.com:443';
var url = opts.url || dfltUrl;
var url;
$.checkState(PROVIDERS[provider], 'Provider ' + provider + ' not supported');
$.checkState(_.contains(_.keys(PROVIDERS[provider]), network), 'Network ' + network + ' not supported by this provider');
var url = opts.url || PROVIDERS[provider][network];
switch (provider) {
case 'insight':
var explorer = new Explorers.Insight(url, network);
explorer.getTransaction = _.bind(getTransactionInsight, explorer, url);
explorer.getTransactions = _.bind(getTransactionsInsight, explorer, url);
explorer.getAddressActivity = _.bind(getAddressActivityInsight, explorer, url);
explorer.initSocket = _.bind(initSocketInsight, explorer, url);
return explorer;
return new Insight({
network: network,
url: url
});
default:
throw new Error('Provider ' + provider + ' not supported');
throw new Error('Provider ' + provider + ' not supperted.');
};
};
function getTransactionInsight(url, txid, cb) {
var url = url + '/api/tx/' + txid;
var args = {
method: "GET",
url: url,
};
request(args, function(err, res, tx) {
if (err || res.statusCode != 200) return cb(err || res);
return cb(null, tx);
});
};
function getTransactionsInsight(url, addresses, from, to, cb) {
var qs = [];
if (_.isNumber(from)) qs.push('from=' + from);
if (_.isNumber(to)) qs.push('to=' + to);
var url = url + '/api/addrs/txs' + (qs.length > 0 ? '?' + qs.join('&') : '');
var args = {
method: "POST",
url: url,
json: {
addrs: [].concat(addresses).join(',')
},
};
request(args, function(err, res, txs) {
if (err || res.statusCode != 200) return cb(err || res);
// NOTE: Whenever Insight breaks communication with bitcoind, it returns invalid data but no error code.
if (!_.isArray(txs) || (txs.length != _.compact(txs).length)) return cb(new Error('Could not retrieve transactions from blockchain. Request was:' + JSON.stringify(args)));
return cb(null, txs);
});
};
function getAddressActivityInsight(url, addresses, cb) {
getTransactionsInsight(url, addresses, null, null, function(err, result) {
if (err) return cb(err);
return cb(null, result && result.length > 0);
});
};
function initSocketInsight(url) {
var socket = io.connect(url, {
'reconnection': true,
});
return socket;
};
module.exports = BlockChainExplorer;

111
lib/blockchainexplorers/insight.js Normal file
View File

@ -0,0 +1,111 @@
'use strict';
var _ = require('lodash');
var $ = require('preconditions').singleton();
var log = require('npmlog');
log.debug = log.verbose;
var request = require('request');
var io = require('socket.io-client');
function Insight(opts) {
$.checkArgument(opts);
$.checkArgument(_.contains(['livenet', 'testnet'], opts.network));
$.checkArgument(opts.url);
this.network = opts.network || 'livenet';
this.url = opts.url;
};
Insight.prototype.getConnectionInfo = function() {
return 'Insight (' + this.network + ') @ ' + this.url;
};
/**
* Retrieve a list of unspent outputs associated with an address or set of addresses
*/
Insight.prototype.getUnspentUtxos = function(addresses, cb) {
var url = this.url + '/api/addrs/utxo';
var args = {
method: 'POST',
url: url,
json: {
addrs: [].concat(addresses).join(',')
},
};
request(args, function(err, res, unspent) {
if (err || res.statusCode !== 200) return cb(err || res);
return cb(null, unspent);
});
};
/**
* Broadcast a transaction to the bitcoin network
*/
Insight.prototype.broadcast = function(rawTx, cb) {
var url = this.url + '/api/tx/send';
var args = {
method: 'POST',
url: url,
json: {
rawtx: rawTx
},
};
request(args, function(err, res, body) {
if (err || res.statusCode !== 200) return cb(err || res);
return cb(null, body ? body.txid : null);
});
};
Insight.prototype.getTransaction = function(txid, cb) {
var url = this.url + '/api/tx/' + txid;
var args = {
method: 'GET',
url: url,
};
request(args, function(err, res, tx) {
if (err || res.statusCode != 200) return cb(err || res);
return cb(null, tx);
});
};
Insight.prototype.getTransactions = function(addresses, from, to, cb) {
var qs = [];
if (_.isNumber(from)) qs.push('from=' + from);
if (_.isNumber(to)) qs.push('to=' + to);
var url = this.url + '/api/addrs/txs' + (qs.length > 0 ? '?' + qs.join('&') : '');
var args = {
method: 'POST',
url: url,
json: {
addrs: [].concat(addresses).join(',')
},
};
request(args, function(err, res, txs) {
if (err || res.statusCode != 200) return cb(err || res);
// NOTE: Whenever Insight breaks communication with bitcoind, it returns invalid data but no error code.
if (!_.isArray(txs) || (txs.length != _.compact(txs).length)) return cb(new Error('Could not retrieve transactions from blockchain. Request was:' + JSON.stringify(args)));
return cb(null, txs);
});
};
Insight.prototype.getAddressActivity = function(addresses, cb) {
this.getTransactions(addresses, null, null, function(err, result) {
if (err) return cb(err);
return cb(null, result && result.length > 0);
});
};
Insight.prototype.initSocket = function() {
var socket = io.connect(this.url, {
'reconnection': true,
});
return socket;
};
module.exports = Insight;

51
lib/blockchainmonitor.js
View File

@ -17,10 +17,6 @@ function BlockchainMonitor() {};
BlockchainMonitor.prototype.start = function(opts, cb) {
opts = opts || {};
$.checkArgument(opts.blockchainExplorerOpts);
$.checkArgument(opts.storageOpts);
$.checkArgument(opts.messageBrokerOpts);
$.checkArgument(opts.lockOpts);
var self = this;
@ -28,21 +24,39 @@ BlockchainMonitor.prototype.start = function(opts, cb) {
function(done) {
self.explorers = _.map(['livenet', 'testnet'], function(network) {
var config = opts.blockchainExplorerOpts[network] || {};
return self._initExplorer(config.provider, network, config.url);
var explorer;
if (opts.blockchainExplorers) {
explorer = opts.blockchainExplorers[network];
} else {
var config = opts.blockchainExplorerOpts[network] || {};
var explorer = new BlockchainExplorer({
provider: config.provider,
network: network,
url: config.url,
});
}
$.checkState(explorer);
self._initExplorer(explorer);
return explorer;
});
done();
},
function(done) {
self.storage = new Storage();
self.storage.connect(opts.storageOpts, done);
if (opts.storage) {
self.storage = opts.storage;
done();
} else {
self.storage = new Storage();
self.storage.connect(opts.storageOpts, done);
}
},
function(done) {
self.messageBroker = new MessageBroker(opts.messageBrokerOpts);
self.messageBroker = opts.messageBroker || new MessageBroker(opts.messageBrokerOpts);
self.messageBroker.onMessage(_.bind(self.sendEmail, self));
done();
},
function(done) {
self.lock = new Lock(opts.lockOpts);
self.lock = opts.lock || new Lock(opts.lockOpts);
done();
},
], function(err) {
@ -53,30 +67,21 @@ BlockchainMonitor.prototype.start = function(opts, cb) {
});
};
BlockchainMonitor.prototype._initExplorer = function(provider, network, url) {
$.checkArgument(provider == 'insight', 'Blockchain monitor ' + provider + ' not supported');
BlockchainMonitor.prototype._initExplorer = function(explorer) {
$.checkArgument(explorer.provider == 'insight', 'Blockchain monitor ' + provider + ' not supported');
var self = this;
var explorer = new BlockchainExplorer({
provider: provider,
network: network,
url: url,
});
var socket = explorer.initSocket();
var connectionInfo = provider + ' (' + network + ') @ ' + url;
socket.on('connect', function() {
log.info('Connected to ' + connectionInfo);
log.info('Connected to ' + explorer.getConnectionInfo());
socket.emit('subscribe', 'inv');
});
socket.on('connect_error', function() {
log.error('Error connecting to ' + connectionInfo);
log.error('Error connecting to ' + explorer.getConnectionInfo());
});
socket.on('tx', _.bind(self._handleIncommingTx, self));
return explorer;
};
BlockchainMonitor.prototype._handleIncommingTx = function(data) {

6
lib/emailservice.js
View File

@ -63,11 +63,7 @@ EmailService.prototype.start = function(opts, cb) {
}
},
function(done) {
if (opts.messageBroker) {
self.messageBroker = opts.messageBroker;
} else {
self.messageBroker = new MessageBroker(opts.messageBrokerOpts);
}
self.messageBroker = opts.messageBroker || new MessageBroker(opts.messageBrokerOpts);
self.messageBroker.onMessage(_.bind(self.sendEmail, self));
done();
},

4
lib/server.js
View File

@ -585,8 +585,8 @@ WalletService.prototype._getUtxos = function(cb) {
log.error('Could not fetch unspent outputs', err);
return cb(new ClientError('BLOCKCHAINERROR', 'Could not fetch unspent outputs'));
}
var utxos = _.map(inutxos, function(i) {
return _.pick(i.toObject(), ['txid', 'vout', 'address', 'scriptPubKey', 'amount', 'satoshis']);
var utxos = _.map(inutxos, function(utxo) {
return _.pick(utxo, ['txid', 'vout', 'address', 'scriptPubKey', 'amount', 'satoshis']);
});
self.getPendingTxs({}, function(err, txps) {
if (err) return cb(err);

1
package.json
View File

@ -20,7 +20,6 @@
"dependencies": {
"async": "^0.9.0",
"bitcore": "^0.11.6",
"bitcore-explorers": "^0.10.3",
"bitcore-wallet-utils": "0.0.13",
"body-parser": "^1.11.0",
"coveralls": "^2.11.2",

7
test/blockchainexplorer.js
View File

@ -9,17 +9,18 @@ var BlockchainExplorer = require('../lib/blockchainexplorer');
describe('Blockchain explorer', function() {
describe('#constructor', function() {
it('should return a blockchain explorer with basic methods', function() {
var exp = BlockchainExplorer({
var exp = new BlockchainExplorer({
provider: 'insight',
network: 'testnet',
});
should.exist(exp);
exp.should.respondTo('broadcast');
exp.should.respondTo('getUnspentUtxos');
exp.should.respondTo('getTransactions');
exp.should.respondTo('getAddressActivity');
exp.should.respondTo('getUnspentUtxos');
exp.should.respondTo('initSocket');
var exp = BlockchainExplorer({
var exp = new BlockchainExplorer({
provider: 'insight',
network: 'livenet',
});
@ -27,7 +28,7 @@ describe('Blockchain explorer', function() {
});
it('should fail on unsupported provider', function() {
(function() {
var exp = BlockchainExplorer({
var exp = new BlockchainExplorer({
provider: 'dummy',
});
}).should.throw('not supported');