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

add tests

Browse source
This commit is contained in:
Ivan Socolsky 2014-10-22 16:57:29 -03:00 • committed by Matias Alejo Garcia
commit de5772112f
3 changed files with 159 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/controllers/transactions.js
View file

@ -51,6 +51,7 @@ angular.module('copayApp.controllers').controller('TransactionsController',
var w = $rootScope.wallet;
if (!w) return;
$scope.blockchain_txs = w.cached_txs || [];
$scope.loading = true;
w.getTransactionHistory(function(err, res) {
if (err) throw err;
@ -61,7 +62,7 @@ angular.module('copayApp.controllers').controller('TransactionsController',
return;
}
$scope.blockchain_txs = res;
$scope.blockchain_txs = w.cached_txs = res;
$scope.loading = false;
});
};

14
js/models/Wallet.js
View file

@ -2918,6 +2918,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
var satToUnit = 1 / self.settings.unitToSatoshi;
var addresses = _.pluck(self.getAddressesInfo(), 'addressStr');
if (addresses.length == 0) return cb();
function computeAmountIn(items) {
@ -2932,6 +2933,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
function computeAmountOut(items) {
var mine = _.filter(items, function(item) {
if (!item.scriptPubKey) return false;
// If classic multisig, ignore
if (item.scriptPubKey.addresses.length > 1) return false;
return _.contains(addresses, item.scriptPubKey.addresses[0]);
@ -2945,14 +2947,16 @@ Wallet.prototype.getTransactionHistory = function(cb) {
var amountIn = computeAmountIn(tx.vin);
var amountOut = computeAmountOut(tx.vout);
var fees = parseInt((tx.fees * bitcore.util.COIN).toFixed(0));
var amount = amountIn - amountOut - (amountIn > 0 ? fees : 0);
if (amount == 0) {
var amount;
if (amountIn == (amountOut + (amountIn > 0 ? fees : 0))) {
tx.action = 'moved';
} else if (amount > 0) {
tx.action = 'sent';
// TODO: subtract amount from change addresses
amount = amountOut;
} else {
tx.action = 'received';
amount = amountIn - amountOut - (amountIn > 0 ? fees : 0);
tx.action = amount > 0 ? 'sent' : 'received';
}
tx.amountSat = Math.abs(amount);
tx.amount = tx.amountSat * satToUnit;
};