BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make unit configurable in settings. update after @cmgustavo comments

This commit is contained in:
Matias Alejo Garcia 2014-06-16 12:44:18 -03:00
parent 12b45fcfb9
commit 00ca9f1c32
14 changed files with 358 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.js
View File

@ -1,8 +1,12 @@
'use strict'; 'use strict';
var defaultConfig = { var defaultConfig = {
// livenet or testnet // DEFAULT network (livenet or testnet)
networkName: 'testnet', networkName: 'testnet',
// DEFAULT unit: Bit
unitName: 'bits',
unitToSatoshi: 100,
// wallet limits // wallet limits
limits: { limits: {
totalCopayers: 12, totalCopayers: 12,
@ -21,7 +25,7 @@ var defaultConfig = {
*/ */
// Use this to connect to bitpay's PeerJS server // Use this to connect to bitpay's PeerJS server
key: 'satoshirocks', key: 'satoshirocks',
host: '162.242.219.26', host: '162.242.219.26',
port: 10000, port: 10000,
path: '/', path: '/',
@ -107,7 +111,7 @@ var defaultConfig = {
// local encryption/security config // local encryption/security config
passphrase: { passphrase: {
iterations: 100, iterations: 100,
storageSalt: 'mjuBtGybi/4=', storageSalt: 'mjuBtGybi/4=',
}, },
// theme list // theme list

54
index.html
View File

@ -35,7 +35,7 @@
<span ng-if="$root.updatingBalance"> <span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span> </span>
<span ng-if="!$root.updatingBalance" tooltip="{{totalBalanceBTC}} BTC" tooltip-trigger="mouseenter" tooltip-placement="bottom">{{totalBalance || 0 |number}} bits <span ng-if="!$root.updatingBalance" tooltip="{{totalBalanceBTC}} BTC" tooltip-trigger="mouseenter" tooltip-placement="bottom">{{totalBalance || 0 |number}} {{$root.unitName}}
</span> </span>
</div> </div>
<div class="large-4 medium-4 columns"> <div class="large-4 medium-4 columns">
@ -43,7 +43,7 @@
<span ng-if="$root.updatingBalance"> <span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span> </span>
<span ng-show="!$root.updatingBalance" tooltip="{{availableBalanceBTC}} BTC" tooltip-trigger="mouseenter" tooltip-placement="bottom">{{availableBalance || 0|number}} bits <span ng-show="!$root.updatingBalance" tooltip="{{availableBalanceBTC}} BTC" tooltip-trigger="mouseenter" tooltip-placement="bottom">{{availableBalance || 0|number}} {{$root.unitName}}
</span> </span>
</div> </div>
@ -381,11 +381,11 @@
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span> </span>
<span ng-if="!$root.updatingBalance"> <span ng-if="!$root.updatingBalance">
{{$root.balanceByAddr[addr.address] || 0|number}} bits {{$root.balanceByAddr[addr.address] || 0|number}} {{$root.unitName}}
</span> </span>
</span> </span>
<span ng-if="addrWithFund != addr.address"> <span ng-if="addrWithFund != addr.address">
{{addr.balance || 0|number}} bits {{addr.balance || 0|number}} {{$root.unitName}}
</span> </span>
</span> </span>
</a> </a>
@ -408,7 +408,7 @@
</span> </span>
<span ng-if="addrWithFund != selectedAddr.address" style="word-wrap: break-word;"> <span ng-if="addrWithFund != selectedAddr.address" style="word-wrap: break-word;">
{{selectedAddr.address}}<br/> {{selectedAddr.address}}<br/>
{{selectedAddr.balance || 0|number}} bits {{selectedAddr.balance || 0|number}} {{$root.unitName}}
</span> </span>
</strong> </strong>
</p> </p>
@ -439,7 +439,7 @@
<div class="txheader row m10"> <div class="txheader row m10">
<div class="large-8 medium-8 small-12 columns"> <div class="large-8 medium-8 small-12 columns">
<div class="row" ng-repeat="out in tx.outs"> <div class="row" ng-repeat="out in tx.outs">
<div class="large-3 medium-3 small-3 columns ellipsis"> {{out.value | number}} bits</div> <div class="large-3 medium-3 small-3 columns ellipsis"> {{out.value | number}} {{$root.unitName}}</div>
<div class="large-1 medium-1 small-2 columns fi-arrow-right size-24"> </div> <div class="large-1 medium-1 small-2 columns fi-arrow-right size-24"> </div>
<div class="large-8 medium-8 small-7 columns ellipsis"> {{out.address}} </div> <div class="large-8 medium-8 small-7 columns ellipsis"> {{out.address}} </div>
</div> </div>
@ -521,7 +521,7 @@
<p class="text-gray m5b" ng-show="!tx.finallyRejected && tx.missingSignatures>1"> <p class="text-gray m5b" ng-show="!tx.finallyRejected && tx.missingSignatures>1">
{{tx.missingSignatures}} signatures missing</p> {{tx.missingSignatures}} signatures missing</p>
<div class="ellipsis small text-gray"> <div class="ellipsis small text-gray">
<strong>Fee:</strong> {{tx.fee|number}} bits <strong>Fee:</strong> {{tx.fee|number}} {{$root.unitName}}
<strong>Proposal ID:</strong> {{tx.ntxid}} <strong>Proposal ID:</strong> {{tx.ntxid}}
</div> </div>
</div> </div>
@ -565,7 +565,7 @@
<div class="row"> <div class="row">
<div class="large-5 medium-5 small-5 columns"> <div class="large-5 medium-5 small-5 columns">
<div ng-repeat="vin in btx.vinSimple"> <div ng-repeat="vin in btx.vinSimple">
<small class="right m5t">{{vin.value| number}} bits</small> <small class="right m5t">{{vin.value| number}} {{$root.unitName}}</small>
<p class="ellipsis text-gray size-12"> {{vin.addr}} </p> <p class="ellipsis text-gray size-12"> {{vin.addr}} </p>
</div> </div>
</div> </div>
@ -574,7 +574,7 @@
</div> </div>
<div class="large-6 medium-6 small-6 columns"> <div class="large-6 medium-6 small-6 columns">
<div ng-repeat="vout in btx.voutSimple"> <div ng-repeat="vout in btx.voutSimple">
<small class="right m5t">{{vout.value| number}} bits</small> <small class="right m5t">{{vout.value| number}} {{$root.unitName}}</small>
<p class="ellipsis text-gray size-12"> {{vout.addr}} </p> <p class="ellipsis text-gray size-12"> {{vout.addr}} </p>
</div> </div>
</div> </div>
@ -582,9 +582,9 @@
</div> </div>
<div class="m10 size-12 text-gray"> <div class="m10 size-12 text-gray">
<div class="row"> <div class="row">
<div class="large-4 medium-4 small-4 columns">Fees: {{btx.fees | number}} bits</div> <div class="large-4 medium-4 small-4 columns">Fees: {{btx.fees | number}} {{$root.unitName}}</div>
<div class="large-4 medium-4 small-4 columns text-center">Confirmations: {{btx.confirmations || 0}}</div> <div class="large-4 medium-4 small-4 columns text-center">Confirmations: {{btx.confirmations || 0}}</div>
<div class="large-4 medium-4 small-4 columns text-right">Total: {{btx.valueOut| number}} bits</div> <div class="large-4 medium-4 small-4 columns text-right">Total: {{btx.valueOut| number}} {{$root.unitName}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -646,11 +646,11 @@
<div class="row collapse"> <div class="row collapse">
<label for="amount">Amount <label for="amount">Amount
<small ng-hide="!sendForm.amount.$pristine">required</small> <small ng-hide="!sendForm.amount.$pristine">required</small>
<small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">valid!</small> <small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">Valid</small>
<small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount"> <small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount">
not valid Not valid
</small> </small>
<small ng-show="notEnoughAmount">Insufficient funds!</small> <small ng-show="notEnoughAmount" class="has-error">Insufficient funds</small>
</label> </label>
<div class="small-9 columns"> <div class="small-9 columns">
<input type="number" id="amount" ng-disabled="loading" <input type="number" id="amount" ng-disabled="loading"
@ -660,7 +660,7 @@
> >
</div> </div>
<div class="small-3 columns"> <div class="small-3 columns">
<span class="postfix">bits</span> <span class="postfix">{{$root.unitName}}</span>
</div> </div>
</div> </div>
</div> </div>
@ -669,13 +669,13 @@
Total amount for this transaction: Total amount for this transaction:
</small> </small>
<div class="totalAmount"> <div class="totalAmount">
<b>{{amount + defaultFee |number}}</b> bits <b>{{amount + defaultFee |number}}</b> {{$root.unitName}}
<small> <small>
{{((amount + defaultFee)/1e6).toFixed(3) |number}} BTC {{ ((amount + defaultFee) * unitToBtc) |number}} BTC
</small> </small>
</div> </div>
<small> <small>
Including fee of {{defaultFee|number}} bits Including fee of {{defaultFee|number}} {{$root.unitName}}
</small> </small>
</div> </div>
</div> </div>
@ -750,6 +750,17 @@
<input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="livenet" ng-false-value="testnet" class="form-control"> <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="livenet" ng-false-value="testnet" class="form-control">
<label for="network-name">Livenet</label> <label for="network-name">Livenet</label>
</fieldset> </fieldset>
<fieldset>
<legend>Wallet Unit</legend>
<select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" required>
</select>
<label for="settingsUnit">Prefered Unit for Wallet</label>
</fieldset>
<fieldset>
<legend>Videoconferencing</legend>
<input id="disableVideo-opt" type="checkbox" ng-model="disableVideo" class="form-control">
<label for="disableVideo-opt">Enable videoconferencing (only for fast Networks)</label>
</fieldset>
<fieldset> <fieldset>
<legend>Insight API server</legend> <legend>Insight API server</legend>
<label for="insight-host">Host</label> <label for="insight-host">Host</label>
@ -768,13 +779,6 @@
<input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control" disabled="disabled"> <input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control" disabled="disabled">
<label for="peerjs-secure">Use SSL (disabled)</label> <label for="peerjs-secure">Use SSL (disabled)</label>
</fieldset> </fieldset>
<fieldset>
<legend>Videoconferencing</legend>
<input id="disableVideo-opt" type="checkbox" ng-model="disableVideo" class="form-control">
<label for="disableVideo-opt">Enable videoconferencing (only for fast Networks)</label>
</fieldset>
</div> </div>
<div class="row"> <div class="row">
<div class="large-12 columns line-dashed"> <div class="large-12 columns line-dashed">

1
js/controllers/header.js
View File

@ -32,6 +32,7 @@ angular.module('copayApp.controllers').controller('HeaderController',
} }
}); });
$rootScope.unitName = config.unitName;
// Initialize alert notification (not show when init wallet) // Initialize alert notification (not show when init wallet)
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;

6
js/controllers/send.js
View File

@ -5,7 +5,9 @@ angular.module('copayApp.controllers').controller('SendController',
function($scope, $rootScope, $window, $location, $timeout) { function($scope, $rootScope, $window, $location, $timeout) {
$scope.title = 'Send'; $scope.title = 'Send';
$scope.loading = false; $scope.loading = false;
$scope.defaultFee = bitcore.TransactionBuilder.FEE_PER_1000B_SAT / bitcore.util.BIT; var satToUnit = 1 / config.unitToSatoshi;
$scope.defaultFee = bitcore.TransactionBuilder.FEE_PER_1000B_SAT * satToUnit;
$scope.unitToBtc = config.unitToSatoshi / bitcore.util.COIN;
// TODO this shouldnt be on a particular controller. // TODO this shouldnt be on a particular controller.
// Detect mobile devices // Detect mobile devices
@ -49,7 +51,7 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.loading = true; $scope.loading = true;
var address = form.address.$modelValue; var address = form.address.$modelValue;
var amount = (form.amount.$modelValue * 100) | 0; var amount = (form.amount.$modelValue * config.unitToSatoshi) | 0;
var commentText = form.comment.$modelValue; var commentText = form.comment.$modelValue;
var w = $rootScope.wallet; var w = $rootScope.wallet;

58
js/controllers/settings.js
View File

@ -11,10 +11,35 @@ angular.module('copayApp.controllers').controller('SettingsController',
$scope.networkHost = config.network.host; $scope.networkHost = config.network.host;
$scope.networkPort = config.network.port; $scope.networkPort = config.network.port;
$scope.networkSecure = config.network.secure || false; $scope.networkSecure = config.network.secure || false;
$scope.disableVideo = config.disableVideo || true; $scope.disableVideo = config.disableVideo || true;
$scope.unitOpts = [{
name: 'Satoshis (100,000,000 bits = 1BTC)',
shortName: 'SAT',
value: 1
}, {
name: 'bits (1,000,000 bits = 1BTC)',
shortName: 'bits',
value: 100
}, {
name: 'mBTC (1,000 mBTC = 1BTC)',
shortName: 'mBTC',
value: 100000
}, {
name: 'BTC',
shortName: 'BTC',
value: 100000000
}];
for (var ii in $scope.unitOpts) {
if (config.unitName === $scope.unitOpts[ii].shortName) {
$scope.selectedUnit = $scope.unitOpts[ii];
break;
}
}
$scope.$watch('networkName', function(net) { $scope.$watch('networkName', function(net) {
$scope.insightHost = net === 'testnet' ? 'test.insight.is' : 'live.insight.is'; $scope.insightHost = net === 'testnet' ? 'test.insight.is' : 'live.insight.is';
}); });
$scope.save = function() { $scope.save = function() {
@ -25,20 +50,21 @@ angular.module('copayApp.controllers').controller('SettingsController',
network.secure = $scope.networkSecure; network.secure = $scope.networkSecure;
localStorage.setItem('config', JSON.stringify({ localStorage.setItem('config', JSON.stringify({
networkName: $scope.networkName, networkName: $scope.networkName,
blockchain: { blockchain: {
host: $scope.insightHost, host: $scope.insightHost,
port: $scope.insightPort port: $scope.insightPort
}, },
socket: { socket: {
host: $scope.insightHost, host: $scope.insightHost,
port: $scope.insightPort port: $scope.insightPort
}, },
network: network, network: network,
disableVideo: $scope.disableVideo, disableVideo: $scope.disableVideo,
}) unitName: $scope.selectedUnit.shortName,
); unitToSatoshi: $scope.selectedUnit.value,
}));
$window.location.href= $window.location.origin + $window.location.pathname; $window.location.href = $window.location.origin + $window.location.pathname;
}; };
}); });

74
js/controllers/transactions.js
View File

@ -13,9 +13,11 @@ angular.module('copayApp.controllers').controller('TransactionsController',
$scope.txpItemsPerPage = 4; $scope.txpItemsPerPage = 4;
$scope.blockchain_txs = []; $scope.blockchain_txs = [];
$scope.update = function () { var satToUnit = 1 / config.unitToSatoshi;
$scope.update = function() {
$scope.loading = false; $scope.loading = false;
var from = ($scope.txpCurrentPage-1) * $scope.txpItemsPerPage; var from = ($scope.txpCurrentPage - 1) * $scope.txpItemsPerPage;
var opts = { var opts = {
onlyPending: $scope.onlyPending, onlyPending: $scope.onlyPending,
skip: !$scope.onlyPending ? [from, from + $scope.txpItemsPerPage] : null skip: !$scope.onlyPending ? [from, from + $scope.txpItemsPerPage] : null
@ -24,10 +26,10 @@ angular.module('copayApp.controllers').controller('TransactionsController',
$rootScope.$digest(); $rootScope.$digest();
}; };
$scope.show = function (onlyPending) { $scope.show = function(onlyPending) {
$scope.loading=true; $scope.loading = true;
$scope.onlyPending = onlyPending; $scope.onlyPending = onlyPending;
setTimeout(function(){ setTimeout(function() {
$scope.update(); $scope.update();
}, 10); }, 10);
}; };
@ -41,19 +43,19 @@ angular.module('copayApp.controllers').controller('TransactionsController',
var tmp = {}; var tmp = {};
var u = 0; var u = 0;
for(var i=0; i < l; i++) { for (var i = 0; i < l; i++) {
var notAddr = false; var notAddr = false;
// non standard input // non standard input
if (items[i].scriptSig && !items[i].addr) { if (items[i].scriptSig && !items[i].addr) {
items[i].addr = 'Unparsed address [' + u++ + ']'; items[i].addr = 'Unparsed address [' + u+++']';
items[i].notAddr = true; items[i].notAddr = true;
notAddr = true; notAddr = true;
} }
// non standard output // non standard output
if (items[i].scriptPubKey && !items[i].scriptPubKey.addresses) { if (items[i].scriptPubKey && !items[i].scriptPubKey.addresses) {
items[i].scriptPubKey.addresses = ['Unparsed address [' + u++ + ']']; items[i].scriptPubKey.addresses = ['Unparsed address [' + u+++']'];
items[i].notAddr = true; items[i].notAddr = true;
notAddr = true; notAddr = true;
} }
@ -76,62 +78,64 @@ angular.module('copayApp.controllers').controller('TransactionsController',
} }
tmp[addr].isSpent = items[i].spentTxId; tmp[addr].isSpent = items[i].spentTxId;
tmp[addr].doubleSpentTxID = tmp[addr].doubleSpentTxID || items[i].doubleSpentTxID; tmp[addr].doubleSpentTxID = tmp[addr].doubleSpentTxID || items[i].doubleSpentTxID;
tmp[addr].doubleSpentIndex = tmp[addr].doubleSpentIndex || items[i].doubleSpentIndex; tmp[addr].doubleSpentIndex = tmp[addr].doubleSpentIndex || items[i].doubleSpentIndex;
tmp[addr].unconfirmedInput += items[i].unconfirmedInput; tmp[addr].unconfirmedInput += items[i].unconfirmedInput;
tmp[addr].dbError = tmp[addr].dbError || items[i].dbError; tmp[addr].dbError = tmp[addr].dbError || items[i].dbError;
tmp[addr].valueSat += (items[i].value * bitcore.util.COIN)|0; tmp[addr].valueSat += parseInt((items[i].value * bitcore.util.COIN).toFixed(0));
tmp[addr].items.push(items[i]); tmp[addr].items.push(items[i]);
tmp[addr].notAddr = notAddr; tmp[addr].notAddr = notAddr;
tmp[addr].count++; tmp[addr].count++;
} }
angular.forEach(tmp, function(v) { angular.forEach(tmp, function(v) {
v.value = (v.valueSat|0) / bitcore.util.BIT; v.value = (parseInt(v.valueSat || 0).toFixed(0)) * satToUnit;
ret.push(v); ret.push(v);
}); });
return ret; return ret;
}; };
$scope.toogleLast = function () { $scope.toogleLast = function() {
$scope.lastShowed = !$scope.lastShowed; $scope.lastShowed = !$scope.lastShowed;
if ($scope.lastShowed) { if ($scope.lastShowed) {
$scope.getTransactions(); $scope.getTransactions();
} }
}; };
$scope.send = function (ntxid,cb) { $scope.send = function(ntxid, cb) {
$scope.loading = true; $scope.loading = true;
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = $rootScope.wallet; var w = $rootScope.wallet;
w.sendTx(ntxid, function(txid) { w.sendTx(ntxid, function(txid) {
$rootScope.$flashMessage = txid $rootScope.$flashMessage = txid ? {
? {type:'success', message: 'Transaction broadcasted. txid: ' + txid} type: 'success',
: {type:'error', message: 'There was an error sending the Transaction'} message: 'Transaction broadcasted. txid: ' + txid
; } : {
if (cb) return cb(); type: 'error',
else $scope.update(); message: 'There was an error sending the Transaction'
};
if (cb) return cb();
else $scope.update();
}); });
}; };
$scope.sign = function (ntxid) { $scope.sign = function(ntxid) {
$scope.loading = true; $scope.loading = true;
var w = $rootScope.wallet; var w = $rootScope.wallet;
w.sign(ntxid, function(ret){ w.sign(ntxid, function(ret) {
if (!ret) { if (!ret) {
$rootScope.$flashMessage = { $rootScope.$flashMessage = {
type:'error', type: 'error',
message: 'There was an error signing the Transaction', message: 'There was an error signing the Transaction',
}; };
$scope.update(); $scope.update();
} else { } else {
var p = w.txProposals.getTxProposal(ntxid); var p = w.txProposals.getTxProposal(ntxid);
if (p.builder.isFullySigned()) { if (p.builder.isFullySigned()) {
$scope.send(ntxid, function() { $scope.send(ntxid, function() {
$scope.update(); $scope.update();
}); });
} } else
else
$scope.update(); $scope.update();
} }
}); });
@ -144,20 +148,19 @@ angular.module('copayApp.controllers').controller('TransactionsController',
var addresses = w.getAddressesStr(); var addresses = w.getAddressesStr();
if (addresses.length > 0) { if (addresses.length > 0) {
$scope.blockchain_txs = []; $scope.blockchain_txs = [];
w.blockchain.getTransactions(addresses, function(txs) { w.blockchain.getTransactions(addresses, function(txs) {
$timeout(function() { $timeout(function() {
for (var i=0; i<txs.length;i++) { for (var i = 0; i < txs.length; i++) {
txs[i].vinSimple = _aggregateItems(txs[i].vin); txs[i].vinSimple = _aggregateItems(txs[i].vin);
txs[i].voutSimple = _aggregateItems(txs[i].vout); txs[i].voutSimple = _aggregateItems(txs[i].vout);
txs[i].valueOut = ((txs[i].valueOut * bitcore.util.COIN)|0) / bitcore.util.BIT; txs[i].valueOut = ((txs[i].valueOut * bitcore.util.COIN).toFixed(0)) * satToUnit;
txs[i].fees = ((txs[i].fees * bitcore.util.COIN)|0) / bitcore.util.BIT; txs[i].fees = ((txs[i].fees * bitcore.util.COIN).toFixed(0)) * satToUnit;
$scope.blockchain_txs.push(txs[i]); $scope.blockchain_txs.push(txs[i]);
} }
$scope.loading = false; $scope.loading = false;
}, 10); }, 10);
}); });
} } else {
else {
$timeout(function() { $timeout(function() {
$scope.loading = false; $scope.loading = false;
$scope.lastShowed = false; $scope.lastShowed = false;
@ -167,15 +170,18 @@ angular.module('copayApp.controllers').controller('TransactionsController',
}; };
$scope.getShortNetworkName = function() { $scope.getShortNetworkName = function() {
return config.networkName.substring(0,4); return config.networkName.substring(0, 4);
}; };
$scope.reject = function (ntxid) { $scope.reject = function(ntxid) {
$scope.loading = true; $scope.loading = true;
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = $rootScope.wallet; var w = $rootScope.wallet;
w.reject(ntxid); w.reject(ntxid);
$rootScope.$flashMessage = {type:'warning', message: 'Transaction rejected by you'}; $rootScope.$flashMessage = {
type: 'warning',
message: 'Transaction rejected by you'
};
$scope.loading = false; $scope.loading = false;
}; };

62
js/directives.js
View File

@ -23,7 +23,7 @@ angular.module('copayApp.directives')
}; };
} }
]) ])
.directive('notification', ['$rootScope', .directive('notification', ['$rootScope',
function($rootScope) { function($rootScope) {
return { return {
restrict: 'A', restrict: 'A',
@ -45,8 +45,8 @@ angular.module('copayApp.directives')
require: 'ngModel', require: 'ngModel',
link: function(scope, element, attrs, ctrl) { link: function(scope, element, attrs, ctrl) {
var val = function(value) { var val = function(value) {
var availableBalanceNum = ($rootScope.availableBalance * bitcore.util.COIN).toFixed(0); var availableBalanceNum = ($rootScope.availableBalance * config.unitToSatoshi).toFixed(0);
var vNum = Number((value * bitcore.util.COIN).toFixed(0)) + feeSat; var vNum = Number((value * config.unitToSatoshi).toFixed(0)) + feeSat;
if (typeof vNum == "number" && vNum > 0) { if (typeof vNum == "number" && vNum > 0) {
if (availableBalanceNum < vNum) { if (availableBalanceNum < vNum) {
ctrl.$setValidity('enoughAmount', false); ctrl.$setValidity('enoughAmount', false);
@ -72,7 +72,7 @@ angular.module('copayApp.directives')
require: 'ngModel', require: 'ngModel',
link: function(scope, elem, attrs, ctrl) { link: function(scope, elem, attrs, ctrl) {
var validator = function(value) { var validator = function(value) {
ctrl.$setValidity('walletSecret', Boolean(walletFactory.decodeSecret(value))); ctrl.$setValidity('walletSecret', Boolean(walletFactory.decodeSecret(value)));
return value; return value;
}; };
@ -88,7 +88,7 @@ angular.module('copayApp.directives')
var a = element.html(); var a = element.html();
var text = attr.loading; var text = attr.loading;
element.on('click', function() { element.on('click', function() {
element.html('<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i> ' + text + '...'); element.html('<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i> ' + text + '...');
}); });
$scope.$watch('loading', function(val) { $scope.$watch('loading', function(val) {
if (!val) { if (!val) {
@ -126,9 +126,11 @@ angular.module('copayApp.directives')
return { return {
restrict: 'A', restrict: 'A',
link: function(scope, element, attrs) { link: function(scope, element, attrs) {
scope.$watch(attrs.highlightOnChange, function (newValue, oldValue) { scope.$watch(attrs.highlightOnChange, function(newValue, oldValue) {
element.addClass('highlight'); element.addClass('highlight');
setTimeout(function() { element.removeClass('highlight'); }, 500); setTimeout(function() {
element.removeClass('highlight');
}, 500);
}); });
} }
} }
@ -142,7 +144,7 @@ angular.module('copayApp.directives')
var strength = { var strength = {
messages: ['very weak', 'weak', 'weak', 'medium', 'strong'], messages: ['very weak', 'weak', 'weak', 'medium', 'strong'],
colors: ['#c0392b', '#e74c3c', '#d35400', '#f39c12', '#27ae60'], colors: ['#c0392b', '#e74c3c', '#d35400', '#f39c12', '#27ae60'],
mesureStrength: function (p) { mesureStrength: function(p) {
var force = 0; var force = 0;
var regex = /[$-/:-?{-~!"^_`\[\]]/g; var regex = /[$-/:-?{-~!"^_`\[\]]/g;
var lowerLetters = /[a-z]+/.test(p); var lowerLetters = /[a-z]+/.test(p);
@ -150,37 +152,51 @@ angular.module('copayApp.directives')
var numbers = /[0-9]+/.test(p); var numbers = /[0-9]+/.test(p);
var symbols = regex.test(p); var symbols = regex.test(p);
var flags = [lowerLetters, upperLetters, numbers, symbols]; var flags = [lowerLetters, upperLetters, numbers, symbols];
var passedMatches = flags.filter(function (el) { return !!el; }).length; var passedMatches = flags.filter(function(el) {
return !!el;
}).length;
force = 2 * p.length + (p.length >= 10 ? 1 : 0); force = 2 * p.length + (p.length >= 10 ? 1 : 0);
force += passedMatches * 10; force += passedMatches * 10;
// penality (short password) // penality (short password)
force = (p.length <= 6) ? Math.min(force, 10) : force; force = (p.length <= 6) ? Math.min(force, 10) : force;
// penality (poor variety of characters) // penality (poor variety of characters)
force = (passedMatches == 1) ? Math.min(force, 10) : force; force = (passedMatches == 1) ? Math.min(force, 10) : force;
force = (passedMatches == 2) ? Math.min(force, 20) : force; force = (passedMatches == 2) ? Math.min(force, 20) : force;
force = (passedMatches == 3) ? Math.min(force, 40) : force; force = (passedMatches == 3) ? Math.min(force, 40) : force;
return force; return force;
}, },
getColor: function (s) { getColor: function(s) {
var idx = 0; var idx = 0;
if (s <= 10) { idx = 0; } if (s <= 10) {
else if (s <= 20) { idx = 1; } idx = 0;
else if (s <= 30) { idx = 2; } } else if (s <= 20) {
else if (s <= 40) { idx = 3; } idx = 1;
else { idx = 4; } } else if (s <= 30) {
idx = 2;
return { idx: idx + 1, col: this.colors[idx], message: this.messages[idx] }; } else if (s <= 40) {
idx = 3;
} else {
idx = 4;
}
return {
idx: idx + 1,
col: this.colors[idx],
message: this.messages[idx]
};
} }
}; };
scope.$watch(attrs.ngModel, function (newValue, oldValue) { scope.$watch(attrs.ngModel, function(newValue, oldValue) {
if (newValue && newValue !== '') { if (newValue && newValue !== '') {
var c = strength.getColor(strength.mesureStrength(newValue)); var c = strength.getColor(strength.mesureStrength(newValue));
element.css({ 'border-color': c.col }); element.css({
'border-color': c.col
});
scope[attrs.checkStrength] = c.message; scope[attrs.checkStrength] = c.message;
} }
}); });

99
js/models/core/TxProposals.js
View File

@ -1,22 +1,21 @@
'use strict'; 'use strict';
var imports = require('soop').imports(); var imports = require('soop').imports();
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var util = bitcore.util; var util = bitcore.util;
var Transaction = bitcore.Transaction; var Transaction = bitcore.Transaction;
var Builder = bitcore.TransactionBuilder; var Builder = bitcore.TransactionBuilder;
var Script = bitcore.Script; var Script = bitcore.Script;
var buffertools = bitcore.buffertools; var buffertools = bitcore.buffertools;
function TxProposal(opts) { function TxProposal(opts) {
this.creator = opts.creator; this.creator = opts.creator;
this.createdTs = opts.createdTs; this.createdTs = opts.createdTs;
this.seenBy = opts.seenBy || {}; this.seenBy = opts.seenBy || {};
this.signedBy = opts.signedBy || {}; this.signedBy = opts.signedBy || {};
this.rejectedBy = opts.rejectedBy || {}; this.rejectedBy = opts.rejectedBy || {};
this.builder = opts.builder; this.builder = opts.builder;
this.sentTs = opts.sentTs || null; this.sentTs = opts.sentTs || null;
this.sentTxid = opts.sentTxid || null; this.sentTxid = opts.sentTxid || null;
this.inputChainPaths = opts.inputChainPaths || []; this.inputChainPaths = opts.inputChainPaths || [];
@ -53,8 +52,8 @@ module.exports = require('soop')(TxProposal);
function TxProposals(opts) { function TxProposals(opts) {
opts = opts || {}; opts = opts || {};
this.walletId = opts.walletId; this.walletId = opts.walletId;
this.network = opts.networkName === 'livenet' ? this.network = opts.networkName === 'livenet' ?
bitcore.networks.livenet : bitcore.networks.testnet; bitcore.networks.livenet : bitcore.networks.testnet;
this.txps = {}; this.txps = {};
} }
@ -77,7 +76,7 @@ TxProposals.prototype.getNtxids = function() {
TxProposals.prototype.toObj = function(onlyThisNtxid) { TxProposals.prototype.toObj = function(onlyThisNtxid) {
var ret = []; var ret = [];
for(var id in this.txps){ for (var id in this.txps) {
if (onlyThisNtxid && id != onlyThisNtxid) if (onlyThisNtxid && id != onlyThisNtxid)
continue; continue;
@ -86,31 +85,33 @@ TxProposals.prototype.toObj = function(onlyThisNtxid) {
if (!t.sent) if (!t.sent)
ret.push(t.toObj()); ret.push(t.toObj());
} }
return { return {
txps: ret, txps: ret,
walletId: this.walletId, walletId: this.walletId,
networkName: this.network.name, networkName: this.network.name,
}; };
}; };
TxProposals.prototype._startMerge = function(myTxps, theirTxps) { TxProposals.prototype._startMerge = function(myTxps, theirTxps) {
var fromUs=0, fromTheirs=0, merged =0; var fromUs = 0,
var toMerge = {}, ready={}; fromTheirs = 0,
merged = 0;
var toMerge = {},
ready = {};
for(var hash in theirTxps){ for (var hash in theirTxps) {
if (!myTxps[hash]) { if (!myTxps[hash]) {
ready[hash]=theirTxps[hash]; // only in theirs; ready[hash] = theirTxps[hash]; // only in theirs;
fromTheirs++; fromTheirs++;
} } else {
else { toMerge[hash] = theirTxps[hash]; // need Merging
toMerge[hash]=theirTxps[hash]; // need Merging
merged++; merged++;
} }
} }
for(var hash in myTxps){ for (var hash in myTxps) {
if(!toMerge[hash]) { if (!toMerge[hash]) {
ready[hash]=myTxps[hash]; // only in myTxps; ready[hash] = myTxps[hash]; // only in myTxps;
fromUs++; fromUs++;
} }
} }
@ -130,7 +131,7 @@ TxProposals.prototype._startMerge = function(myTxps, theirTxps) {
TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) { TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) {
var toMerge = mergeInfo.toMerge; var toMerge = mergeInfo.toMerge;
var hasChanged =0; var hasChanged = 0;
Object.keys(toMerge).forEach(function(hash) { Object.keys(toMerge).forEach(function(hash) {
var v0 = myTxps[hash]; var v0 = myTxps[hash];
@ -158,7 +159,7 @@ TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) {
}); });
if (!v0.sentTxid && v1.sentTxid) { if (!v0.sentTxid && v1.sentTxid) {
v0.sentTs = v1.sentTs; v0.sentTs = v1.sentTs;
v0.sentTxid = v1.sentTxid; v0.sentTxid = v1.sentTxid;
hasChanged++; hasChanged++;
} }
@ -170,9 +171,9 @@ TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) {
TxProposals.prototype._mergeBuilder = function(myTxps, theirTxps, mergeInfo) { TxProposals.prototype._mergeBuilder = function(myTxps, theirTxps, mergeInfo) {
var toMerge = mergeInfo.toMerge; var toMerge = mergeInfo.toMerge;
var hasChanged=0; var hasChanged = 0;
for(var hash in toMerge){ for (var hash in toMerge) {
var v0 = myTxps[hash].builder; var v0 = myTxps[hash].builder;
var v1 = toMerge[hash].builder; var v1 = toMerge[hash].builder;
@ -180,7 +181,7 @@ TxProposals.prototype._mergeBuilder = function(myTxps, theirTxps, mergeInfo) {
var before = JSON.stringify(v0.toObj()); var before = JSON.stringify(v0.toObj());
v0.merge(v1); v0.merge(v1);
var after = JSON.stringify(v0.toObj()); var after = JSON.stringify(v0.toObj());
if (after !== before) hasChanged ++; if (after !== before) hasChanged++;
} }
}; };
@ -191,7 +192,7 @@ TxProposals.prototype.add = function(data) {
}; };
TxProposals.prototype.setSent = function(ntxid,txid) { TxProposals.prototype.setSent = function(ntxid, txid) {
//sent TxProposals are local an not broadcasted. //sent TxProposals are local an not broadcasted.
this.txps[ntxid].setSent(txid); this.txps[ntxid].setSent(txid);
}; };
@ -205,26 +206,28 @@ TxProposals.prototype.getTxProposal = function(ntxid, copayers) {
i.peerActions = {}; i.peerActions = {};
if (copayers) { if (copayers) {
for(var j=0; j < copayers.length; j++) { for (var j = 0; j < copayers.length; j++) {
var p = copayers[j]; var p = copayers[j];
i.peerActions[p] = {}; i.peerActions[p] = {};
} }
} }
for(var p in txp.seenBy){ for (var p in txp.seenBy) {
i.peerActions[p]={seen: txp.seenBy[p]}; i.peerActions[p] = {
seen: txp.seenBy[p]
};
} }
for(var p in txp.signedBy){ for (var p in txp.signedBy) {
i.peerActions[p]= i.peerActions[p] || {}; i.peerActions[p] = i.peerActions[p] || {};
i.peerActions[p].sign = txp.signedBy[p]; i.peerActions[p].sign = txp.signedBy[p];
} }
var r=0; var r = 0;
for(var p in txp.rejectedBy){ for (var p in txp.rejectedBy) {
i.peerActions[p]= i.peerActions[p] || {}; i.peerActions[p] = i.peerActions[p] || {};
i.peerActions[p].rejected = txp.rejectedBy[p]; i.peerActions[p].rejected = txp.rejectedBy[p];
r++; r++;
} }
i.rejectCount=r; i.rejectCount = r;
var c = txp.creator; var c = txp.creator;
i.peerActions[c] = i.peerActions[c] || {}; i.peerActions[c] = i.peerActions[c] || {};
@ -235,30 +238,30 @@ TxProposals.prototype.getTxProposal = function(ntxid, copayers) {
//returns the unspent txid-vout used in PENDING Txs //returns the unspent txid-vout used in PENDING Txs
TxProposals.prototype.getUsedUnspent = function(maxRejectCount) { TxProposals.prototype.getUsedUnspent = function(maxRejectCount) {
var ret = {}; var ret = {};
for(var i in this.txps) { for (var i in this.txps) {
var u = this.txps[i].builder.getSelectedUnspent(); var u = this.txps[i].builder.getSelectedUnspent();
var p = this.getTxProposal(i); var p = this.getTxProposal(i);
if (p.rejectCount>maxRejectCount || p.sentTxid) if (p.rejectCount > maxRejectCount || p.sentTxid)
continue; continue;
for (var j in u) { for (var j in u) {
ret[u[j].txid + ',' + u[j].vout]=1; ret[u[j].txid + ',' + u[j].vout] = 1;
} }
} }
return ret; return ret;
}; };
TxProposals.prototype.merge = function(t) { TxProposals.prototype.merge = function(t) {
if (this.network.name !== t.network.name) if (this.network.name !== t.network.name)
throw new Error('network mismatch in:', t); throw new Error('network mismatch in:', t);
var res = []; var res = [];
var hasChanged = 0; var hasChanged = 0;
var myTxps = this.txps; var myTxps = this.txps;
var theirTxps = t.txps; var theirTxps = t.txps;
var mergeInfo = this._startMerge(myTxps, theirTxps); var mergeInfo = this._startMerge(myTxps, theirTxps);
hasChanged += this._mergeMetadata(myTxps, theirTxps, mergeInfo); hasChanged += this._mergeMetadata(myTxps, theirTxps, mergeInfo);
hasChanged += this._mergeBuilder(myTxps, theirTxps, mergeInfo); hasChanged += this._mergeBuilder(myTxps, theirTxps, mergeInfo);
@ -268,7 +271,7 @@ TxProposals.prototype.merge = function(t) {
mergeInfo.stats.hasChanged = hasChanged; mergeInfo.stats.hasChanged = hasChanged;
this.txps=mergeInfo.ready; this.txps = mergeInfo.ready;
return mergeInfo.stats; return mergeInfo.stats;
}; };

18
js/models/core/Wallet.js
View File

@ -562,20 +562,13 @@ Wallet.prototype.addressIsOwn = function(addrStr, opts) {
return ret; return ret;
}; };
//retunrs values in SATOSHIs
Wallet.prototype.getBalance = function(cb) { Wallet.prototype.getBalance = function(cb) {
var balance = 0; var balance = 0;
var safeBalance = 0; var safeBalance = 0;
var balanceByAddr = {}; var balanceByAddr = {};
var BIT = coinUtil.BIT;
var COIN = coinUtil.COIN; var COIN = coinUtil.COIN;
if (!BIT)
throw new Error('BIT not defined. A newer version of bitcore is needed');
console.log('[Wallet.js.574] getBalance'); //TODO
this.getUnspent(function(err, safeUnspent, unspent) { this.getUnspent(function(err, safeUnspent, unspent) {
if (err) { if (err) {
return cb(err); return cb(err);
@ -590,9 +583,10 @@ Wallet.prototype.getBalance = function(cb) {
// we multiply and divide by BIT to avoid rounding errors when adding // we multiply and divide by BIT to avoid rounding errors when adding
for (var a in balanceByAddr) { for (var a in balanceByAddr) {
balanceByAddr[a] = balanceByAddr[a].toFixed(0) / BIT; balanceByAddr[a] = parseInt(balanceByAddr[a].toFixed(0));
} }
balance = balance.toFixed(0) / BIT;
balance = parseInt(balance.toFixed(0));
for (var i = 0; i < safeUnspent.length; i++) { for (var i = 0; i < safeUnspent.length; i++) {
var u = safeUnspent[i]; var u = safeUnspent[i];
@ -600,7 +594,7 @@ Wallet.prototype.getBalance = function(cb) {
safeBalance += amt; safeBalance += amt;
} }
safeBalance = safeBalance.toFixed(0) / BIT; safeBalance = parseInt(safeBalance.toFixed(0));
return cb(null, balance, balanceByAddr, safeBalance); return cb(null, balance, balanceByAddr, safeBalance);
}); });
}; };
@ -608,7 +602,6 @@ Wallet.prototype.getBalance = function(cb) {
Wallet.prototype.getUnspent = function(cb) { Wallet.prototype.getUnspent = function(cb) {
var self = this; var self = this;
this.blockchain.getUnspent(this.getAddressesStr(), function(err, unspentList) { this.blockchain.getUnspent(this.getAddressesStr(), function(err, unspentList) {
console.log('[Wallet.js.606:unspentList:]', unspentList); //TODO
if (err) { if (err) {
return cb(err); return cb(err);
@ -642,7 +635,6 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, comment, opts, cb)
} }
this.getUnspent(function(err, safeUnspent) { this.getUnspent(function(err, safeUnspent) {
console.log('[Wallet.js.639:safeUnspent:]', safeUnspent); //TODO
var ntxid = self.createTxSync(toAddress, amountSatStr, comment, safeUnspent, opts); var ntxid = self.createTxSync(toAddress, amountSatStr, comment, safeUnspent, opts);
if (ntxid) { if (ntxid) {
self.sendIndexes(); self.sendIndexes();

115
js/services/controllerUtils.js
View File

@ -36,28 +36,33 @@ angular.module('copayApp.services')
root.onError(scope); root.onError(scope);
if (msg) $rootScope.$flashMessage = { if (msg) $rootScope.$flashMessage = {
type: 'error', type: 'error',
message: msg message: msg
}; };
$rootScope.$digest(); $rootScope.$digest();
}; };
root.installStartupHandlers = function(wallet, $scope) { root.installStartupHandlers = function(wallet, $scope) {
wallet.on('serverError', function(msg) { wallet.on('serverError', function(msg) {
$rootScope.$flashMessage = { $rootScope.$flashMessage = {
message: 'There was an error connecting to the PeerJS server.' message: 'There was an error connecting to the PeerJS server.' + (msg || 'Check you settings and Internet connection.'),
+(msg||'Check you settings and Internet connection.'), type: 'error',
type: 'error', };
}; root.onErrorDigest($scope);
root.onErrorDigest($scope); $location.path('addresses');
$location.path('addresses');
}); });
wallet.on('connectionError', function() { wallet.on('connectionError', function() {
var message = "Looks like you are already connected to this wallet, please logout from it and try importing it again."; var message = "Looks like you are already connected to this wallet, please logout from it and try importing it again.";
$rootScope.$flashMessage = { message: message, type: 'error'}; $rootScope.$flashMessage = {
message: message,
type: 'error'
};
root.onErrorDigest($scope); root.onErrorDigest($scope);
}); });
wallet.on('serverError', function() { wallet.on('serverError', function() {
$rootScope.$flashMessage = { message: 'The PeerJS server is not responding, please try again', type: 'error'}; $rootScope.$flashMessage = {
message: 'The PeerJS server is not responding, please try again',
type: 'error'
};
root.onErrorDigest($scope); root.onErrorDigest($scope);
}); });
wallet.on('ready', function() { wallet.on('ready', function() {
@ -105,17 +110,17 @@ angular.module('copayApp.services')
} }
}); });
w.on('txProposalsUpdated', function(dontDigest) { w.on('txProposalsUpdated', function(dontDigest) {
root.updateTxs({onlyPending:true}); root.updateTxs({
onlyPending: true
});
// give sometime to the tx to propagate. // give sometime to the tx to propagate.
$timeout(function() { $timeout(function() {
root.updateBalance(function() {
console.log('[controllerUtils.js.111] UPDATE BALANCE'); //TODO
root.updateBalance(function(){
if (!dontDigest) { if (!dontDigest) {
$rootScope.$digest(); $rootScope.$digest();
} }
}); });
},3000); }, 3000);
}); });
w.on('connectionError', function(msg) { w.on('connectionError', function(msg) {
root.onErrorDigest(null, msg); root.onErrorDigest(null, msg);
@ -145,27 +150,30 @@ console.log('[controllerUtils.js.111] UPDATE BALANCE'); //TODO
$rootScope.balanceByAddr = {}; $rootScope.balanceByAddr = {};
$rootScope.updatingBalance = true; $rootScope.updatingBalance = true;
console.log('[controllerUtils.js.147] GET'); //TODO w.getBalance(function(err, balanceSat, balanceByAddrSat, safeBalanceSat) {
w.getBalance(function(err, balance, balanceByAddr, safeBalance) {
console.log('[controllerUtils.js.150]', err, balance); //TODO
if (err) { if (err) {
console.error('Error: ' + err.message); //TODO console.error('Error: ' + err.message); //TODO
root._setCommError(); root._setCommError();
return null; return null;
} } else {
else {
root._clearCommError(); root._clearCommError();
} }
$rootScope.totalBalance = balance; var satToUnit = 1 / config.unitToSatoshi;
$rootScope.totalBalanceBTC = (balance / 1e6).toFixed(3) ; var COIN = bitcore.util.COIN;
$rootScope.availableBalance = safeBalance;
$rootScope.availableBalanceBTC = (safeBalance / 1e6).toFixed(3); $rootScope.totalBalance = balanceSat * satToUnit;
$rootScope.totalBalanceBTC = (balanceSat / COIN).toFixed(4);
$rootScope.availableBalance = safeBalanceSat * satToUnit;
$rootScope.availableBalanceBTC = (safeBalanceSat / COIN).toFixed(4);
var balanceByAddr = {};
for (var ii in balanceByAddrSat) {
balanceByAddr[ii] = balanceByAddrSat[ii] * satToUnit;
}
$rootScope.balanceByAddr = balanceByAddr; $rootScope.balanceByAddr = balanceByAddr;
root.updateAddressList(); root.updateAddressList();
$rootScope.updatingBalance = false; $rootScope.updatingBalance = false;
return cb?cb():null; return cb ? cb() : null;
}); });
}; };
@ -173,13 +181,16 @@ console.log('[controllerUtils.js.150]', err, balance); //TODO
var w = $rootScope.wallet; var w = $rootScope.wallet;
if (!w) return; if (!w) return;
opts = opts || {}; opts = opts || {};
var satToUnit = 1 / config.unitToSatoshi;
var myCopayerId = w.getMyCopayerId(); var myCopayerId = w.getMyCopayerId();
var pendingForUs = 0; var pendingForUs = 0;
var inT = w.getTxProposals().sort(function(t1, t2) { return t2.createdTs - t1.createdTs }); var inT = w.getTxProposals().sort(function(t1, t2) {
var txs = []; return t2.createdTs - t1.createdTs
});
var txs = [];
inT.forEach(function(i, index){ inT.forEach(function(i, index) {
if (opts.skip && (index < opts.skip[0] || index >= opts.skip[1])) { if (opts.skip && (index < opts.skip[0] || index >= opts.skip[1])) {
return txs.push(null); return txs.push(null);
} }
@ -188,47 +199,49 @@ console.log('[controllerUtils.js.150]', err, balance); //TODO
pendingForUs++; pendingForUs++;
} }
if (!i.finallyRejected && !i.sentTs) { if (!i.finallyRejected && !i.sentTs) {
i.isPending=1; i.isPending = 1;
} }
if (!opts.onlyPending || i.isPending) { if (!opts.onlyPending || i.isPending) {
var tx = i.builder.build(); var tx = i.builder.build();
var outs = []; var outs = [];
tx.outs.forEach(function(o) { tx.outs.forEach(function(o) {
var addr = bitcore.Address.fromScriptPubKey(o.getScript(), config.networkName)[0].toString(); var addr = bitcore.Address.fromScriptPubKey(o.getScript(), config.networkName)[0].toString();
if (!w.addressIsOwn(addr, {excludeMain:true})) { if (!w.addressIsOwn(addr, {
excludeMain: true
})) {
outs.push({ outs.push({
address: addr, address: addr,
value: bitcore.util.valueToBigInt(o.getValue())/bitcore.util.BIT, value: bitcore.util.valueToBigInt(o.getValue()) * satToUnit,
}); });
} }
}); });
// extra fields // extra fields
i.outs = outs; i.outs = outs;
i.fee = i.builder.feeSat/bitcore.util.BIT; i.fee = i.builder.feeSat * satToUnit;
i.missingSignatures = tx.countInputMissingSignatures(0); i.missingSignatures = tx.countInputMissingSignatures(0);
txs.push(i); txs.push(i);
} }
}); });
$rootScope.txs = txs; //.some(function(i) {return i.isPending; } ); $rootScope.txs = txs; //.some(function(i) {return i.isPending; } );
if ($rootScope.pendingTxCount < pendingForUs) { if ($rootScope.pendingTxCount < pendingForUs) {
$rootScope.txAlertCount = pendingForUs; $rootScope.txAlertCount = pendingForUs;
} }
$rootScope.pendingTxCount = pendingForUs; $rootScope.pendingTxCount = pendingForUs;
}; };
root._setCommError = function(e) { root._setCommError = function(e) {
if ($rootScope.insightError<0) if ($rootScope.insightError < 0)
$rootScope.insightError=0; $rootScope.insightError = 0;
$rootScope.insightError++; $rootScope.insightError++;
}; };
root._clearCommError = function(e) { root._clearCommError = function(e) {
if ($rootScope.insightError>0) if ($rootScope.insightError > 0)
$rootScope.insightError=-1; $rootScope.insightError = -1;
else else
$rootScope.insightError=0; $rootScope.insightError = 0;
}; };
root.setSocketHandlers = function() { root.setSocketHandlers = function() {
@ -238,16 +251,16 @@ console.log('[controllerUtils.js.150]', err, balance); //TODO
Socket.sysOn('reconnect_failed', root._setCommError); Socket.sysOn('reconnect_failed', root._setCommError);
Socket.sysOn('connect', root._clearCommError); Socket.sysOn('connect', root._clearCommError);
Socket.sysOn('reconnect', root._clearCommError); Socket.sysOn('reconnect', root._clearCommError);
Socket.sysEventsSet=true; Socket.sysEventsSet = true;
} }
if (!$rootScope.wallet) return; if (!$rootScope.wallet) return;
var currentAddrs= Socket.getListeners(); var currentAddrs = Socket.getListeners();
var addrs = $rootScope.wallet.getAddressesStr(); var addrs = $rootScope.wallet.getAddressesStr();
var newAddrs=[]; var newAddrs = [];
for(var i in addrs){ for (var i in addrs) {
var a=addrs[i]; var a = addrs[i];
if (!currentAddrs[a]) if (!currentAddrs[a])
newAddrs.push(a); newAddrs.push(a);
} }
@ -257,7 +270,7 @@ console.log('[controllerUtils.js.150]', err, balance); //TODO
newAddrs.forEach(function(addr) { newAddrs.forEach(function(addr) {
Socket.on(addr, function(txid) { Socket.on(addr, function(txid) {
$rootScope.receivedFund = [txid, addr]; $rootScope.receivedFund = [txid, addr];
root.updateBalance(function(){ root.updateBalance(function() {
$rootScope.$digest(); $rootScope.$digest();
}); });
}); });

24
test/test.TxProposals.js
View File

@ -308,15 +308,21 @@ describe('TxProposals model', function() {
it('#merge, merge signatures case 2', function() { it('#merge, merge signatures case 2', function() {
var o1 ={ extendedPrivateKeyString: 'tprv8ZgxMBicQKsPdSF1avR6mXyDj5Uv1XY2UyUHSDpAXQ5TvPN7prGeDppjy4562rBB9gMMAhRfFdJrNDpQ4t69kkqHNEEen3PX1zBJqSehJDH', var o1 = {
networkName: 'testnet', extendedPrivateKeyString: 'tprv8ZgxMBicQKsPdSF1avR6mXyDj5Uv1XY2UyUHSDpAXQ5TvPN7prGeDppjy4562rBB9gMMAhRfFdJrNDpQ4t69kkqHNEEen3PX1zBJqSehJDH',
privateKeyCache: {} }; networkName: 'testnet',
var o2 ={ extendedPrivateKeyString: 'tprv8ZgxMBicQKsPdVeB5RzuxS9JQcACueZYgUaM5eWzaEBkHjW5Pg6Mqez1APSqoUP1jUdbT8WVG7ZJYTXvUL7XtPzFYBXjmdKuwSor1dcNQ8j', privateKeyCache: {}
networkName: 'testnet', };
privateKeyCache: {} }; var o2 = {
var o3 ={ extendedPrivateKeyString: 'tprv8ZgxMBicQKsPeHWNrPVZtQVgcCtXBr5TACNbDQ56rwqNJce9MEc64US6DJKxpWsrebEomxxWZFDtkvkZGkzA43uLvdF4XHiWqoNaL6Dq2Gd', extendedPrivateKeyString: 'tprv8ZgxMBicQKsPdVeB5RzuxS9JQcACueZYgUaM5eWzaEBkHjW5Pg6Mqez1APSqoUP1jUdbT8WVG7ZJYTXvUL7XtPzFYBXjmdKuwSor1dcNQ8j',
networkName: 'testnet', networkName: 'testnet',
privateKeyCache: {} }; privateKeyCache: {}
};
var o3 = {
extendedPrivateKeyString: 'tprv8ZgxMBicQKsPeHWNrPVZtQVgcCtXBr5TACNbDQ56rwqNJce9MEc64US6DJKxpWsrebEomxxWZFDtkvkZGkzA43uLvdF4XHiWqoNaL6Dq2Gd',
networkName: 'testnet',
privateKeyCache: {}
};
var priv = PrivateKey.fromObj(o1); var priv = PrivateKey.fromObj(o1);

18
test/test.Wallet.js
View File

@ -450,13 +450,13 @@ describe('Wallet model', function() {
done(); done();
}); });
}); });
it('#getBalance should return values in bits', function(done) { it('#getBalance should return values in satoshis', function(done) {
var w = createW2(); var w = createW2();
w.generateAddress(); w.generateAddress();
w.getBalance(function(err, balance, balanceByAddr, safeBalance) { w.getBalance(function(err, balance, balanceByAddr, safeBalance) {
balance.should.equal(25000100.00); balance.should.equal(2500010000);
safeBalance.should.equal(25000100.00); safeBalance.should.equal(2500010000);
balanceByAddr.mji7zocy8QzYywQakwWf99w9bCT6orY1C1.should.equal(25000100.00); balanceByAddr.mji7zocy8QzYywQakwWf99w9bCT6orY1C1.should.equal(2500010000);
Object.keys(balanceByAddr).length.should.equal(1); Object.keys(balanceByAddr).length.should.equal(1);
done(); done();
}); });
@ -464,19 +464,19 @@ describe('Wallet model', function() {
var roundErrorChecks = [{ var roundErrorChecks = [{
unspent: [1.0001], unspent: [1.0001],
balance: 1000100 balance: 100010000
}, { }, {
unspent: [1.0002, 1.0003, 1.0004], unspent: [1.0002, 1.0003, 1.0004],
balance: 3000900 balance: 300090000
}, { }, {
unspent: [0.000002, 1.000003, 2.000004], unspent: [0.000002, 1.000003, 2.000004],
balance: 3000009 balance: 300000900
}, { }, {
unspent: [0.0001, 0.0003], unspent: [0.0001, 0.0003],
balance: 400 balance: 40000
}, { }, {
unspent: [0.0001, 0.0003, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0002], unspent: [0.0001, 0.0003, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0002],
balance: 1100 balance: 110000
}, },
]; ];

37
test/unit/directives/directivesSpec.js
View File

@ -8,6 +8,14 @@ describe("Unit: Testing Directives", function() {
beforeEach(module('copayApp.directives')); beforeEach(module('copayApp.directives'));
describe('Check config', function() {
it('unit should be set to BITS in config.js', function() {
expect(config.unitToSatoshi).to.equal(100);
expect(config.unitName).to.equal('bits');
});
});
describe('Validate Address', function() { describe('Validate Address', function() {
beforeEach(inject(function($compile, $rootScope) { beforeEach(inject(function($compile, $rootScope) {
$scope = $rootScope; $scope = $rootScope;
@ -15,8 +23,10 @@ describe("Unit: Testing Directives", function() {
'<form name="form">' + '<form name="form">' +
'<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>' + '<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>' +
'</form>' '</form>'
); );
$scope.model = { address: null }; $scope.model = {
address: null
};
$compile(element)($scope); $compile(element)($scope);
$scope.$digest(); $scope.$digest();
form = $scope.form; form = $scope.form;
@ -35,42 +45,47 @@ describe("Unit: Testing Directives", function() {
describe('Validate Amount', function() { describe('Validate Amount', function() {
beforeEach(inject(function($compile, $rootScope) { beforeEach(inject(function($compile, $rootScope) {
$scope = $rootScope; $scope = $rootScope;
$rootScope.availableBalance = 0.101; $rootScope.availableBalance = 1000;
var element = angular.element( var element = angular.element(
'<form name="form">' + '<form name="form">' +
'<input type="number" id="amount" name="amount" placeholder="Amount" ng-model="amount" min="0.0001" max="10000000" enough-amount required>' + '<input type="number" id="amount" name="amount" placeholder="Amount" ng-model="amount" min="0.0001" max="10000000" enough-amount required>' +
'</form>' '</form>'
); );
$scope.model = { amount: null }; $scope.model = {
amount: null
};
$compile(element)($scope); $compile(element)($scope);
$scope.$digest(); $scope.$digest();
form = $scope.form; form = $scope.form;
})); }));
it('should validate', function() { it('should validate', function() {
form.amount.$setViewValue(0.1); form.amount.$setViewValue(100);
expect(form.amount.$invalid).to.equal(false); expect(form.amount.$invalid).to.equal(false);
form.amount.$setViewValue(0.1009); form.amount.$setViewValue(900);
expect(form.amount.$invalid).to.equal(false); expect(form.amount.$invalid).to.equal(false);
}); });
it('should not validate', function() { it('should not validate', function() {
form.amount.$setViewValue(0); form.amount.$setViewValue(0);
expect(form.amount.$invalid).to.equal(true); expect(form.amount.$invalid).to.equal(true);
form.amount.$setViewValue(9999999999); form.amount.$setViewValue(9999999999);
expect(form.amount.$invalid).to.equal(true); expect(form.amount.$invalid).to.equal(true);
form.amount.$setViewValue(2.1); form.amount.$setViewValue(901);
expect(form.amount.$invalid).to.equal(true); expect(form.amount.$invalid).to.equal(true);
form.amount.$setViewValue(0.10091); form.amount.$setViewValue(1000);
expect(form.amount.$invalid).to.equal(true); expect(form.amount.$invalid).to.equal(true);
}); });
}); });
describe('Password strength', function() { describe('Password strength', function() {
beforeEach(inject(function($compile, $rootScope) { beforeEach(inject(function($compile, $rootScope) {
$scope = $rootScope; $scope = $rootScope;
var element = angular.element( var element = angular.element(
'<input type="password" name="password" ng-model="password" check-strength="passwordStrength" value="asd" required>' '<input type="password" name="password" ng-model="password" check-strength="passwordStrength" value="asd" required>'
); );
$compile(element)($scope); $compile(element)($scope);
$scope.$digest(); $scope.$digest();
})); }));

40
test/unit/services/servicesSpec.js
View File

@ -1,6 +1,16 @@
// //
// test/unit/services/servicesSpec.js // test/unit/services/servicesSpec.js
// //
//
//
describe('Check config', function() {
it('unit should be set to BITS in config.js', function() {
expect(config.unitToSatoshi).to.equal(100);
expect(config.unitName).to.equal('bits');
});
});
describe("Unit: Socket Service", function() { describe("Unit: Socket Service", function() {
beforeEach(angular.mock.module('copayApp.services')); beforeEach(angular.mock.module('copayApp.services'));
@ -20,9 +30,9 @@ describe("Unit: Socket Service", function() {
it('Socket should add handlers with #on', inject(function(Socket) { it('Socket should add handlers with #on', inject(function(Socket) {
Socket.on('a', function (){}); Socket.on('a', function() {});
Socket.on('b', function (){}); Socket.on('b', function() {});
Socket.sysOn('c', function (){}); Socket.sysOn('c', function() {});
var ret = Socket.getListeners(); var ret = Socket.getListeners();
expect(ret.a).to.be.equal(1); expect(ret.a).to.be.equal(1);
expect(ret.b).to.be.equal(1); expect(ret.b).to.be.equal(1);
@ -30,9 +40,9 @@ describe("Unit: Socket Service", function() {
})); }));
it('Socket should support #removeAllListeners', inject(function(Socket) { it('Socket should support #removeAllListeners', inject(function(Socket) {
Socket.on('a', function (){}); Socket.on('a', function() {});
Socket.on('b', function (){}); Socket.on('b', function() {});
Socket.sysOn('c', function (){}); Socket.sysOn('c', function() {});
var ret = Socket.getListeners(); var ret = Socket.getListeners();
expect(Object.keys(ret)).to.have.length(2); expect(Object.keys(ret)).to.have.length(2);
Socket.removeAllListeners(); Socket.removeAllListeners();
@ -57,16 +67,19 @@ describe("Unit: controllerUtils", function() {
expect(controllerUtils.updateBalance).not.to.equal(null); expect(controllerUtils.updateBalance).not.to.equal(null);
scope = $rootScope.$new(); scope = $rootScope.$new();
$rootScope.wallet=new FakeWallet(); $rootScope.wallet = new FakeWallet();
var addr = '1CjPR7Z5ZSyWk6WtXvSFgkptmpoi4UM9BC'; var addr = '1CjPR7Z5ZSyWk6WtXvSFgkptmpoi4UM9BC';
var a = {}; a[addr]=100; var a = {};
$rootScope.wallet.set(1000000,900000,a); a[addr] = 100;
//SATs
$rootScope.wallet.set(100000001, 90000002, a);
//retuns values in DEFAULT UNIT(bits)
controllerUtils.updateBalance(function() { controllerUtils.updateBalance(function() {
expect($rootScope.totalBalance).to.be.equal(1000000); expect($rootScope.totalBalanceBTC).to.be.equal('1.0000');
expect($rootScope.totalBalanceBTC).to.be.equal('1.000'); expect($rootScope.availableBalanceBTC).to.be.equal('0.9000');
expect($rootScope.availableBalance).to.be.equal(900000); expect($rootScope.totalBalance).to.be.equal(1000000.01);
expect($rootScope.availableBalanceBTC).to.be.equal('0.900'); expect($rootScope.availableBalance).to.be.equal(900000.02);
expect($rootScope.addrInfos).not.to.equal(null); expect($rootScope.addrInfos).not.to.equal(null);
expect($rootScope.addrInfos[0].address).to.equal(addr); expect($rootScope.addrInfos[0].address).to.equal(addr);
}); });
@ -74,4 +87,3 @@ describe("Unit: controllerUtils", function() {
}); });