compute balance for all wallets
This commit is contained in:
Ivan Socolsky
Matias Alejo Garcia
parent
0ff67f69ef
commit
1f45ecfdc8
3 changed files with 78 additions and 52 deletions
|
|
@ -81,7 +81,18 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
|
|||
$scope.walletSelection = false;
|
||||
controllerUtils.setFocusedWallet(wid);
|
||||
};
|
||||
|
||||
$scope.toggleWalletSelection = function() {
|
||||
$scope.walletSelection = !$scope.walletSelection;
|
||||
$scope.wallets = [];
|
||||
var wids = _.pluck($rootScope.iden.listWallets(), 'id');
|
||||
_.each(wids, function(wid) {
|
||||
if (controllerUtils.isFocusedWallet(wid)) return;
|
||||
var w = $rootScope.iden.getOpenWallet(wid);
|
||||
$scope.wallets.push(w);
|
||||
controllerUtils.updateBalance(w, function(err, res) {
|
||||
if (err) return;
|
||||
});
|
||||
});
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -244,74 +244,88 @@ angular.module('copayApp.services')
|
|||
delete _balanceCache[w.getId()];
|
||||
};
|
||||
|
||||
|
||||
root._computeBalance = function(w, cb) {
|
||||
cb = cb || function() {};
|
||||
var satToUnit = 1 / w.settings.unitToSatoshi;
|
||||
var COIN = bitcore.util.COIN;
|
||||
|
||||
w.getBalance(function(err, balanceSat, balanceByAddrSat, safeBalanceSat) {
|
||||
if (err) return cb(err);
|
||||
|
||||
var r = {};
|
||||
r.totalBalance = balanceSat * satToUnit;
|
||||
r.totalBalanceBTC = (balanceSat / COIN);
|
||||
r.availableBalance = safeBalanceSat * satToUnit;
|
||||
r.availableBalanceBTC = (safeBalanceSat / COIN);
|
||||
|
||||
r.lockedBalance = (balanceSat - safeBalanceSat) * satToUnit;
|
||||
r.lockedBalanceBTC = (balanceSat - safeBalanceSat) / COIN;
|
||||
|
||||
r.balanceByAddr = _.map(balanceByAddrSat, function(bSat) {
|
||||
return bSat * satToUnit;
|
||||
});
|
||||
|
||||
rateService.whenAvailable(function() {
|
||||
r.totalBalanceAlternative = rateService.toFiat(balanceSat, w.settings.alternativeIsoCode);
|
||||
r.alternativeIsoCode = w.settings.alternativeIsoCode;
|
||||
r.lockedBalanceAlternative = rateService.toFiat(balanceSat - safeBalanceSat, w.settings.alternativeIsoCode);
|
||||
r.alternativeConversionRate = rateService.toFiat(100000000, w.settings.alternativeIsoCode);
|
||||
return cb(null, r)
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
root._updateScope = function(w, data, $scope, cb) {
|
||||
$scope.totalBalance = data.totalBalance;
|
||||
$scope.totalBalanceBTC = data.totalBalanceBTC;
|
||||
$scope.availableBalance = data.availableBalance;
|
||||
$scope.availableBalanceBTC = data.availableBalanceBTC;
|
||||
|
||||
$scope.lockedBalance = data.lockedBalance;
|
||||
$scope.lockedBalanceBTC = data.lockedBalanceBTC;
|
||||
|
||||
$scope.balanceByAddr = data.balanceByAddr;
|
||||
|
||||
// rateService.whenAvailable(function() {
|
||||
$scope.totalBalanceAlternative = data.totalBalanceAlternative;
|
||||
$scope.alternativeIsoCode = data.alternativeIsoCode;
|
||||
$scope.lockedBalanceAlternative = data.lockedBalanceAlternative;
|
||||
$scope.alternativeConversionRate = data.alternativeConversionRate;
|
||||
|
||||
if (cb) return cb();
|
||||
};
|
||||
|
||||
root.updateBalance = function(w, cb) {
|
||||
function updateScope(w, data, cb2) {
|
||||
var satToUnit = 1 / w.settings.unitToSatoshi;
|
||||
var COIN = bitcore.util.COIN;
|
||||
|
||||
var balanceSat = data.balanceSat;
|
||||
var balanceByAddrSat = data.balanceByAddrSat;
|
||||
var safeBalanceSat = data.safeBalanceSat;
|
||||
|
||||
if (root.isFocusedWallet(w.getId())) {
|
||||
$rootScope.balanceByAddr = {};
|
||||
|
||||
$rootScope.totalBalance = balanceSat * satToUnit;
|
||||
$rootScope.totalBalanceBTC = (balanceSat / COIN);
|
||||
$rootScope.availableBalance = safeBalanceSat * satToUnit;
|
||||
$rootScope.availableBalanceBTC = (safeBalanceSat / COIN);
|
||||
|
||||
$rootScope.lockedBalance = (balanceSat - safeBalanceSat) * satToUnit;
|
||||
$rootScope.lockedBalanceBTC = (balanceSat - safeBalanceSat) / COIN;
|
||||
|
||||
var balanceByAddr = {};
|
||||
for (var ii in balanceByAddrSat) {
|
||||
balanceByAddr[ii] = balanceByAddrSat[ii] * satToUnit;
|
||||
}
|
||||
$rootScope.balanceByAddr = balanceByAddr;
|
||||
|
||||
rateService.whenAvailable(function() {
|
||||
$rootScope.totalBalanceAlternative = rateService.toFiat(balanceSat, w.settings.alternativeIsoCode);
|
||||
$rootScope.alternativeIsoCode = w.settings.alternativeIsoCode;
|
||||
$rootScope.lockedBalanceAlternative = rateService.toFiat(balanceSat - safeBalanceSat, w.settings.alternativeIsoCode);
|
||||
$rootScope.alternativeConversionRate = rateService.toFiat(100000000, w.settings.alternativeIsoCode);
|
||||
return cb2 ? cb2() : null;
|
||||
});
|
||||
} else {
|
||||
// TODO
|
||||
console.log('TODO: balance updated of a unfocused wallet');
|
||||
}
|
||||
};
|
||||
|
||||
w = w || $rootScope.wallet;
|
||||
if (!w) return root.onErrorDigest();
|
||||
if (!w.isReady()) return;
|
||||
console.log('## Updating balance of:' + w.id)
|
||||
|
||||
w.balanceInfo = {};
|
||||
var scope = root.isFocusedWallet(w.id) ? $rootScope : w.balanceInfo;
|
||||
|
||||
root.updateAddressList();
|
||||
|
||||
var wid = w.getId();
|
||||
|
||||
if (_balanceCache[wid]) {
|
||||
updateScope(w, _balanceCache[wid]);
|
||||
setTimeout(function() {
|
||||
$rootScope.$digest();
|
||||
}, 1);
|
||||
root._updateScope(w, _balanceCache[wid], scope, function() {
|
||||
if (root.isFocusedWallet(w.id)) {
|
||||
setTimeout(function() {
|
||||
$rootScope.$digest();
|
||||
}, 1);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
$rootScope.updatingBalance = true;
|
||||
scope.updatingBalance = true;
|
||||
}
|
||||
|
||||
w.getBalance(function(err, balanceSat, balanceByAddrSat, safeBalanceSat) {
|
||||
root._computeBalance(w, function(err, res) {
|
||||
if (err) throw err;
|
||||
|
||||
_balanceCache[wid] = {
|
||||
balanceSat: balanceSat,
|
||||
balanceByAddrSat: balanceByAddrSat,
|
||||
safeBalanceSat: safeBalanceSat,
|
||||
};
|
||||
|
||||
updateScope(w, _balanceCache[wid], function() {
|
||||
$rootScope.updatingBalance = false;
|
||||
_balanceCache[wid] = res;
|
||||
root._updateScope(w, _balanceCache[wid], scope, function() {
|
||||
scope.updatingBalance = false;
|
||||
if (cb) cb();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -35,15 +35,16 @@
|
|||
|
||||
<div ng-if="walletSelection">
|
||||
<ul class="side-nav wallets">
|
||||
<li data-ng-repeat="item in $root.iden.listWallets() track by $index" class="nav-item" ng-if="item.id != $root.wallet.id">
|
||||
<li data-ng-repeat="item in wallets track by $index" class="nav-item" ng-if="item.id != $root.wallet.id">
|
||||
<div class="avatar-wallet m10r">
|
||||
<span>P</span>
|
||||
</div>
|
||||
<a class="size-12 wallet-item" ng-click="switchWallet(item.id)">
|
||||
<p class="m0 size-14">{{item.name || item.id}} </p>
|
||||
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
|
||||
<span ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
|
||||
<span class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</span>
|
||||
<span ng-if="item.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
|
||||
<span ng-if="!item.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
|
||||
<b class="m5r">{{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}}</b>
|
||||
<span class="alt-currency">{{item.balanceInfo.totalBalanceAlternative |noFractionNumber:2}} {{item.balanceInfo.alternativeIsoCode}}</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue