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

fix check for txid

This commit is contained in:
Ivan Socolsky 2017-09-08 12:46:46 -03:00
parent f81b5484c5
commit fd9a2ad839
No known key found for this signature in database
GPG Key ID: FAECE6A05FAA4F56
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/server.js
View File

@ -444,6 +444,9 @@ WalletService.prototype.getWalletFromIdentifier = function(opts, cb) {
return self.storage.fetchWallet(walletId, cb);
}
var re = /^[\da-f]+$/gi;
if (!re.test(opts.identifier)) return cb();
// Is identifier a txid form an incomming tx?
var coinNetworkPairs = [];
_.each(_.values(Constants.COINS), function(coin) {
@ -456,26 +459,24 @@ WalletService.prototype.getWalletFromIdentifier = function(opts, cb) {
});
async.detectSeries(coinNetworkPairs, function(coinNetwork, nextCoinNetwork) {
var bc = self._getBlockchainExplorer(coinNetwork.coin, coinNetwork.network);
if (!bc) return nextCoinNetwork(false);
bc.getTransaction(opts.identifier, function(err, tx) {
if (err || !tx) return nextCoinNetwork(err, false);
if (err || !tx) return nextCoinNetwork(false);
var outputs = _.first(self._normalizeTxHistory(tx)).outputs;
var toAddresses = _.pluck(outputs, 'address');
async.detect(toAddresses, function(addressStr, nextAddress) {
self.storage.fetchAddressByCoin(coinNetwork.coin, addressStr, function(err, address) {
if (err || !address) return nextAddress(err, false);
if (err || !address) return nextAddress(false);
walletId = address.walletId;
nextAddress(null, true);
nextAddress(true);
});
}, function(err) {
nextCoinNetwork(err, !!walletId);
}, function() {
nextCoinNetwork(!!walletId);
});
});
}, function(err) {
if (err) return cb(err);
if (walletId) {
}, function(walletId) {
if (!walletId) return cb();
return self.storage.fetchWallet(walletId, cb);
}
cb();
});
});
};
@ -1062,7 +1063,13 @@ WalletService.prototype._getBlockchainExplorer = function(coin, network) {
opts.coin = coin;
opts.network = network;
opts.userAgent = WalletService.getServiceVersion();
return new BlockchainExplorer(opts);
var bc;
try {
bc = new BlockchainExplorer(opts);
} catch (ex) {
log.warn('Could not instantiate blockchain explorer', ex);
}
return bc;
};
WalletService.prototype._getUtxos = function(coin, addresses, cb) {