anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

added a user friendly message when insight doesnt work

Browse source
This commit is contained in:
Mario Colque 2014-05-21 18:03:11 -03:00
commit 6c973d7f88
3 changed files with 62 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/models/core/Wallet.js
View file

@ -501,7 +501,11 @@ Wallet.prototype.getBalance = function(cb) {
var balanceByAddr = {};
var COIN = bitcore.util.COIN;
this.getUnspent(function(safeUnspent, unspent) {
this.getUnspent(function(err, safeUnspent, unspent) {
if (err) {
return cb(err);
}
for (var i = 0; i < unspent.length; i++) {
var u = unspent[i];
var amt = u.amount * COIN;
@ -520,14 +524,19 @@ Wallet.prototype.getBalance = function(cb) {
var amt = u.amount * COIN;
safeBalance += amt;
}
safeBalance = safeBalance / COIN;
return cb(balance, balanceByAddr, safeBalance);
return cb(null, balance, balanceByAddr, safeBalance);
});
};
Wallet.prototype.getUnspent = function(cb) {
var self = this;
this.blockchain.getUnspent(this.getAddressesStr(), function(unspentList) {
this.blockchain.getUnspent(this.getAddressesStr(), function(err, unspentList) {
if (err) {
return cb(err);
}
var safeUnspendList = [];
var maxRejectCount = self.totalCopayers - self.requiredCopayers;
@ -537,7 +546,8 @@ Wallet.prototype.getUnspent = function(cb) {
if (uu.indexOf(unspentList[i].txid) === -1)
safeUnspendList.push(unspentList[i]);
}
return cb(safeUnspendList, unspentList);
return cb(null, safeUnspendList, unspentList);
});
};
@ -554,7 +564,7 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
opts.spendUnconfirmed = this.spendUnconfirmed;
}
self.getUnspent(function(safeUnspent) {
this.getUnspent(function(err, safeUnspent) {
var ntxid = self.createTxSync(toAddress, amountSatStr, safeUnspent, opts);
if (ntxid) {
self.sendPublicKeyRing();