mirror of https://github.com/BTCPrivate/copay.git
commit
ef6385ac65
68
css/main.css
68
css/main.css
|
@ -152,6 +152,12 @@ h3 {
|
||||||
border-right: 2px dashed #E3E3E3;
|
border-right: 2px dashed #E3E3E3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1025px) {
|
||||||
|
.line-dashed-v {
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.line-dashed-h {
|
.line-dashed-h {
|
||||||
margin: 1rem 0;
|
margin: 1rem 0;
|
||||||
border-bottom: 2px dashed #E3E3E3;
|
border-bottom: 2px dashed #E3E3E3;
|
||||||
|
@ -234,6 +240,7 @@ hr { margin: 2.25rem 0;}
|
||||||
.size-60 { font-size: 60px; }
|
.size-60 { font-size: 60px; }
|
||||||
.size-72 { font-size: 72px; }
|
.size-72 { font-size: 72px; }
|
||||||
.m10t {margin-top: 10px;}
|
.m10t {margin-top: 10px;}
|
||||||
|
.m10b {margin-bottom: 10px;}
|
||||||
.m10r {margin-right: 10px;}
|
.m10r {margin-right: 10px;}
|
||||||
.m10 {margin: 10px !important;}
|
.m10 {margin: 10px !important;}
|
||||||
.m15 {margin: 15px !important;}
|
.m15 {margin: 15px !important;}
|
||||||
|
@ -311,6 +318,63 @@ hr { margin: 2.25rem 0;}
|
||||||
padding: 2.7px;
|
padding: 2.7px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.box-setup {
|
||||||
|
padding: 20px 30px;
|
||||||
|
border: 1px solid #eee;
|
||||||
|
background: #fff;
|
||||||
|
overflow: hidden;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-setup-copayers {
|
||||||
|
position: relative;
|
||||||
|
background: #ffffff;
|
||||||
|
border: 2px solid #eee;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-setup-copayers:after, .box-setup-copayers:before {
|
||||||
|
bottom: 100%;
|
||||||
|
left: 50%;
|
||||||
|
border: solid transparent;
|
||||||
|
content: " ";
|
||||||
|
height: 0;
|
||||||
|
width: 0;
|
||||||
|
position: absolute;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-setup-copayers:after {
|
||||||
|
border-color: rgba(255, 255, 255, 0);
|
||||||
|
border-bottom-color: #ffffff;
|
||||||
|
border-width: 30px;
|
||||||
|
margin-left: -30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-setup-copayers:before {
|
||||||
|
border-color: rgba(238, 238, 238, 0);
|
||||||
|
border-bottom-color: #eee;
|
||||||
|
border-width: 33px;
|
||||||
|
margin-left: -33px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-setup-copayers-fix {
|
||||||
|
overflow: hidden;
|
||||||
|
padding: 10px 10px 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-setup-copay {
|
||||||
|
width: 60px;
|
||||||
|
height: 60px;
|
||||||
|
float: left;
|
||||||
|
margin-right: 10px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
border: 3px solid #eee;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-setup-copay-required {
|
||||||
|
border: 3px solid green;
|
||||||
|
}
|
||||||
|
|
||||||
.tx-copayers {
|
.tx-copayers {
|
||||||
background: #F8F8F8;
|
background: #F8F8F8;
|
||||||
-moz-box-shadow: inset 0px 0px 4px 0px rgba(0,0,0,0.05), inset 0px 1px 1px 0px rgba(0,0,0,0.05);
|
-moz-box-shadow: inset 0px 0px 4px 0px rgba(0,0,0,0.05), inset 0px 1px 1px 0px rgba(0,0,0,0.05);
|
||||||
|
@ -352,3 +416,7 @@ hr { margin: 2.25rem 0;}
|
||||||
width: 200px;
|
width: 200px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.loading {
|
||||||
|
background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
71
index.html
71
index.html
|
@ -18,11 +18,15 @@
|
||||||
<span class="logo"></span>
|
<span class="logo"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
|
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
|
||||||
<div class="large-4 medium-4 columns line-dashed-v">
|
<div class="large-4 columns line-dashed-v">
|
||||||
<a href="#/addresses" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
|
<a href="#/addresses" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
|
||||||
<strong><span>{{$root.getWalletDisplay()}}</span></strong>
|
<strong><span>{{$root.getWalletDisplay()}}</span></strong>
|
||||||
</a>
|
</a>
|
||||||
<a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
|
<a class="button radius small-icon" title="Manual Refresh"
|
||||||
|
ng-disabled="$root.loading"
|
||||||
|
ng-click="refresh()"><i class="fi-refresh"></i></a>
|
||||||
|
<a class="button radius small-icon" title="Signout"
|
||||||
|
ng-click="signout()"><i class="fi-power"></i></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="large-4 medium-4 columns line-dashed-v">
|
<div class="large-4 medium-4 columns line-dashed-v">
|
||||||
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
|
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
|
||||||
|
@ -196,36 +200,44 @@
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="!loading">
|
<div ng-show="!loading">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-6 large-centered columns">
|
<div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
|
||||||
<h3>Create new multisig wallet</h3>
|
<div class="large-6 columns line-dashed-v">
|
||||||
<hr>
|
|
||||||
<h6>Select total number of copayers</h6>
|
<h6>Select total number of copayers</h6>
|
||||||
<select ng-model="totalCopayers"
|
<select ng-model="totalCopayers"
|
||||||
ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
|
ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="large-6 columns">
|
||||||
<div class="row">
|
|
||||||
<div class="large-6 large-centered columns m30v">
|
|
||||||
<h6>Select required number of signatures</h6>
|
<h6>Select required number of signatures</h6>
|
||||||
<select ng-model="requiredCopayers"
|
<select ng-model="requiredCopayers"
|
||||||
ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
|
ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="large-6 large-centered columns m30v">
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
|
||||||
|
<div class="box-setup-copayers">
|
||||||
|
<div class="box-setup-copayers-fix">
|
||||||
|
<img class="box-setup-copay" ng-repeat="i in getNumber(totalCopayers) track by $index" src="./img/satoshi.gif" alt="Copayer {{$index+1}}-{{totalCopayers}}" ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
|
||||||
<h6>Wallet name (optional)</h6>
|
<h6>Wallet name (optional)</h6>
|
||||||
<input ng-model="walletName" placeholder="My multisig wallet" class="size-24" style="width:100%">
|
<input type="text" class="form-control" ng-model="walletName" placeholder="Enter wallet name">
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="large-6 large-centered columns m30v">
|
<div class="row">
|
||||||
<hr>
|
<div class="large-12 columns line-dashed">
|
||||||
<button class="button primary radius right" type="button"
|
<button class="button primary radius right" type="button"
|
||||||
ng-click="create(totalCopayers, requiredCopayers, walletName)">
|
ng-click="create(totalCopayers, requiredCopayers, walletName)">
|
||||||
Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
|
Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
|
||||||
</button>
|
</button>
|
||||||
<div class="left">
|
<a class="button secondary radius" href="#signin">Go back</a>
|
||||||
<a href="#signin">Go back</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -237,21 +249,34 @@
|
||||||
<div class="addresses" data-ng-controller="AddressesController">
|
<div class="addresses" data-ng-controller="AddressesController">
|
||||||
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
|
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-9 columns" ng-if="addrs[0]">
|
<div class="large-9 columns" ng-if="addrInfos[0]">
|
||||||
<h3>Addresses (available to spend)</h3>
|
|
||||||
<div class="large-8 columns">
|
<div class="large-8 columns">
|
||||||
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
|
<a class="panel db" ng-repeat="addrInfo in addrInfos"
|
||||||
<span ng-if="!isMain[addr]">(change)</span>
|
ng-click="selectAddr(addrInfo.address.toString())">
|
||||||
<span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
|
<span>{{addrInfo.address.toString()}}</span>
|
||||||
|
<span ng-if="addrInfo.isChange">(change)</span>
|
||||||
|
<span class="right">
|
||||||
|
<span ng-if="$root.loading">...</span>
|
||||||
|
<span ng-if="!$root.loading">{{balanceByAddr[addrInfo.address.toString()] || 0}}</span>
|
||||||
|
<i class="fi-bitcoin"></i>
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="large-4 columns line-dashed-v text-center">
|
<div class="large-4 columns line-dashed-v text-center">
|
||||||
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
|
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
|
||||||
<p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong> </p>
|
<p class="m10t">
|
||||||
|
<strong>
|
||||||
|
<span ng-if="$root.loading">...</span>
|
||||||
|
<span ng-if="!$root.loading">{{balanceByAddr[selectedAddr] || 0}}</span>
|
||||||
|
<i class="fi-bitcoin"></i>
|
||||||
|
</strong>
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="columns text-center" ng-class="{'large-3' : addrs[0]}">
|
<div class="columns text-center" ng-class="{'large-3' : !!addrInfos[0]}">
|
||||||
<p> Create a New <strong> Address </strong> </p>
|
<p> Create a New <strong> Address </strong> </p>
|
||||||
<button class="secondary radius expandi new-address" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
|
<button class="secondary radius expandi new-address" ng-click="newAddr()"
|
||||||
|
ng-disabled="loading" loading="Creating"> Create </button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
|
||||||
|
var copay = require('copay');
|
||||||
|
|
||||||
var copayApp = window.copayApp = angular.module('copay',[
|
var copayApp = window.copayApp = angular.module('copay',[
|
||||||
'ngRoute',
|
'ngRoute',
|
||||||
'mm.foundation',
|
'mm.foundation',
|
||||||
|
|
|
@ -2,36 +2,21 @@
|
||||||
|
|
||||||
angular.module('copay.addresses').controller('AddressesController',
|
angular.module('copay.addresses').controller('AddressesController',
|
||||||
function($scope, $rootScope, controllerUtils) {
|
function($scope, $rootScope, controllerUtils) {
|
||||||
$scope.title = 'Home';
|
|
||||||
$scope.oneAtATime = true;
|
|
||||||
$scope.addrBalance = {};
|
|
||||||
|
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
|
|
||||||
var _updateBalance = function () {
|
|
||||||
controllerUtils.setSocketHandlers();
|
|
||||||
w.getBalance(true, function (balance, balanceByAddr, isMain) {
|
|
||||||
if (balanceByAddr && Object.keys(balanceByAddr).length) {
|
|
||||||
$rootScope.balanceByAddr = balanceByAddr;
|
|
||||||
$scope.isMain = isMain;
|
|
||||||
$scope.addrs = Object.keys(balanceByAddr);
|
|
||||||
$scope.selectedAddr = $scope.addrs[0];
|
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
$rootScope.$digest();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.newAddr = function() {
|
$scope.newAddr = function() {
|
||||||
$scope.loading = true;
|
$scope.loading = true;
|
||||||
w.generateAddress();
|
w.generateAddress();
|
||||||
_updateBalance();
|
controllerUtils.updateBalance(function() {
|
||||||
|
$scope.loading = false;
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.selectAddr = function(addr) {
|
$scope.selectAddr = function(addr) {
|
||||||
$scope.selectedAddr = addr;
|
$scope.selectedAddr = addr;
|
||||||
};
|
};
|
||||||
|
|
||||||
_updateBalance();
|
|
||||||
w.on('refresh', _updateBalance);
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -40,7 +40,13 @@ angular.module('copay.header').controller('HeaderController',
|
||||||
w.disconnect();
|
w.disconnect();
|
||||||
controllerUtils.logout();
|
controllerUtils.logout();
|
||||||
}
|
}
|
||||||
$rootScope.flashMessage = {};
|
$scope.clearFlashMessage();
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.refresh = function() {
|
||||||
|
controllerUtils.updateBalance(function() {
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.clearFlashMessage = function() {
|
$scope.clearFlashMessage = function() {
|
||||||
|
|
|
@ -5,6 +5,11 @@ angular.module('copay.setup').controller('SetupController',
|
||||||
|
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
|
|
||||||
|
// ng-repeat defined number of times instead of repeating over array?
|
||||||
|
$scope.getNumber = function(num) {
|
||||||
|
return new Array(num);
|
||||||
|
}
|
||||||
|
|
||||||
$scope.totalCopayers = config.wallet.totalCopayers;
|
$scope.totalCopayers = config.wallet.totalCopayers;
|
||||||
$scope.TCValues = [];
|
$scope.TCValues = [];
|
||||||
for (var n = 1; n <= config.limits.totalCopayers; n++)
|
for (var n = 1; n <= config.limits.totalCopayers; n++)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
var copay = require('copay');
|
|
||||||
angular.element(document).ready(function() {
|
angular.element(document).ready(function() {
|
||||||
// Init the app
|
// Init the app
|
||||||
angular.bootstrap(document, ['copay']);
|
angular.bootstrap(document, ['copay']);
|
||||||
|
|
|
@ -143,7 +143,6 @@ PublicKeyRing.prototype.addCopayer = function (newEpk) {
|
||||||
return newEpk;
|
return newEpk;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
PublicKeyRing.prototype.getPubKeys = function (index, isChange) {
|
PublicKeyRing.prototype.getPubKeys = function (index, isChange) {
|
||||||
this._checkKeys();
|
this._checkKeys();
|
||||||
|
|
||||||
|
@ -159,6 +158,7 @@ PublicKeyRing.prototype.getPubKeys = function (index, isChange) {
|
||||||
this.publicKeysCache[path] = pubKeys.map(function(pk){return pk.toString('hex');});
|
this.publicKeysCache[path] = pubKeys.map(function(pk){return pk.toString('hex');});
|
||||||
} else {
|
} else {
|
||||||
pubKeys = pubKeys.map(function(s){return new Buffer(s,'hex')});
|
pubKeys = pubKeys.map(function(s){return new Buffer(s,'hex')});
|
||||||
|
//console.log('public keys cache HIT');
|
||||||
}
|
}
|
||||||
|
|
||||||
return pubKeys;
|
return pubKeys;
|
||||||
|
@ -183,21 +183,12 @@ PublicKeyRing.prototype.getRedeemScript = function (index, isChange) {
|
||||||
|
|
||||||
// TODO this could be cached
|
// TODO this could be cached
|
||||||
PublicKeyRing.prototype.getAddress = function (index, isChange) {
|
PublicKeyRing.prototype.getAddress = function (index, isChange) {
|
||||||
this._checkIndexRange(index, isChange);
|
|
||||||
var script = this.getRedeemScript(index,isChange);
|
var script = this.getRedeemScript(index,isChange);
|
||||||
return Address.fromScript(script, this.network.name);
|
return Address.fromScript(script, this.network.name);
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO this could be cached
|
|
||||||
PublicKeyRing.prototype._addScriptMap = function (map, index, isChange) {
|
|
||||||
this._checkIndexRange(index, isChange);
|
|
||||||
var script = this.getRedeemScript(index,isChange);
|
|
||||||
map[Address.fromScript(script, this.network.name).toString()] = script.getBuffer().toString('hex');
|
|
||||||
};
|
|
||||||
|
|
||||||
// TODO this could be cached
|
// TODO this could be cached
|
||||||
PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
|
PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
|
||||||
this._checkIndexRange(index, isChange);
|
|
||||||
var addr = this.getAddress(index,isChange);
|
var addr = this.getAddress(index,isChange);
|
||||||
return Script.createP2SH(addr.payload()).getBuffer().toString('hex');
|
return Script.createP2SH(addr.payload()).getBuffer().toString('hex');
|
||||||
};
|
};
|
||||||
|
@ -218,21 +209,39 @@ PublicKeyRing.prototype.generateAddress = function(isChange) {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
PublicKeyRing.prototype.getAddresses = function(onlyMain) {
|
PublicKeyRing.prototype.getAddresses = function(excludeChange) {
|
||||||
|
return this.getAddressesInfo(excludeChange).map(function(info) {
|
||||||
|
return info.address;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
PublicKeyRing.prototype.getAddressesInfo = function(excludeChange) {
|
||||||
var ret = [];
|
var ret = [];
|
||||||
|
if (!excludeChange) {
|
||||||
|
for (var i=0; i<this.changeAddressIndex; i++) {
|
||||||
|
ret.unshift({
|
||||||
|
address: this.getAddress(i,true),
|
||||||
|
isChange: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (var i=0; i<this.addressIndex; i++) {
|
for (var i=0; i<this.addressIndex; i++) {
|
||||||
ret.unshift(this.getAddress(i,false));
|
ret.unshift({
|
||||||
|
address: this.getAddress(i,false),
|
||||||
|
isChange: false
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!onlyMain) {
|
|
||||||
for (var i=0; i<this.changeAddressIndex; i++) {
|
|
||||||
ret.unshift(this.getAddress(i,true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// TODO this could be cached
|
||||||
|
PublicKeyRing.prototype._addScriptMap = function (map, index, isChange) {
|
||||||
|
var script = this.getRedeemScript(index,isChange);
|
||||||
|
map[Address.fromScript(script, this.network.name).toString()] = script.getBuffer().toString('hex');
|
||||||
|
};
|
||||||
|
|
||||||
PublicKeyRing.prototype.getRedeemScriptMap = function () {
|
PublicKeyRing.prototype.getRedeemScriptMap = function () {
|
||||||
var ret = {};
|
var ret = {};
|
||||||
|
|
||||||
|
|
|
@ -401,16 +401,19 @@ Wallet.prototype.addSeenToTxProposals = function() {
|
||||||
return ret;
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
Wallet.prototype.getAddresses = function(onlyMain) {
|
// TODO: remove this method and use getAddressesInfo everywhere
|
||||||
return this.publicKeyRing.getAddresses(onlyMain);
|
Wallet.prototype.getAddresses = function(excludeChange) {
|
||||||
|
return this.publicKeyRing.getAddresses(excludeChange);
|
||||||
};
|
};
|
||||||
|
|
||||||
Wallet.prototype.getAddressesStr = function(onlyMain) {
|
Wallet.prototype.getAddressesStr = function(excludeChange) {
|
||||||
var ret = [];
|
return this.getAddresses(excludeChange).map(function(a) {
|
||||||
this.publicKeyRing.getAddresses(onlyMain).forEach(function(a) {
|
return a.toString();
|
||||||
ret.push(a.toString());
|
|
||||||
});
|
});
|
||||||
return ret;
|
};
|
||||||
|
|
||||||
|
Wallet.prototype.getAddressesInfo = function(excludeChange) {
|
||||||
|
return this.publicKeyRing.getAddressesInfo(excludeChange);
|
||||||
};
|
};
|
||||||
|
|
||||||
Wallet.prototype.addressIsOwn = function(addrStr) {
|
Wallet.prototype.addressIsOwn = function(addrStr) {
|
||||||
|
@ -432,27 +435,21 @@ Wallet.prototype.getBalance = function(safe, cb) {
|
||||||
var balanceByAddr = {};
|
var balanceByAddr = {};
|
||||||
var isMain = {};
|
var isMain = {};
|
||||||
var COIN = bitcore.util.COIN;
|
var COIN = bitcore.util.COIN;
|
||||||
var addresses = this.getAddressesStr(true);
|
|
||||||
|
|
||||||
if (!addresses.length) return cb(0, []);
|
|
||||||
|
|
||||||
// Prefill balanceByAddr with main address
|
|
||||||
addresses.forEach(function(a) {
|
|
||||||
balanceByAddr[a] = 0;
|
|
||||||
isMain[a] = 1;
|
|
||||||
});
|
|
||||||
var f = safe ? this.getSafeUnspent.bind(this) : this.getUnspent.bind(this);
|
var f = safe ? this.getSafeUnspent.bind(this) : this.getUnspent.bind(this);
|
||||||
f(function(utxos) {
|
f(function(utxos) {
|
||||||
for (var i = 0; i < utxos.length; i++) {
|
for (var i = 0; i < utxos.length; i++) {
|
||||||
var u = utxos[i];
|
var u = utxos[i];
|
||||||
var amt = u.amount * COIN;
|
var amt = u.amount * COIN;
|
||||||
balance = balance + amt;
|
balance += amt;
|
||||||
balanceByAddr[u.address] = (balanceByAddr[u.address] || 0) + amt;
|
balanceByAddr[u.address] = (balanceByAddr[u.address] || 0) + amt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// we multiply and divide by COIN to avoid rounding errors when adding
|
||||||
for (var a in balanceByAddr) {
|
for (var a in balanceByAddr) {
|
||||||
balanceByAddr[a] = balanceByAddr[a] / COIN;
|
balanceByAddr[a] = balanceByAddr[a] / COIN;
|
||||||
}
|
}
|
||||||
return cb(balance / COIN, balanceByAddr, isMain);
|
balance = balance / COIN;
|
||||||
|
return cb(balance, balanceByAddr, isMain);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,8 @@ angular.module('copay.controllerUtils')
|
||||||
.factory('controllerUtils', function($rootScope, $sce, $location, Socket, video) {
|
.factory('controllerUtils', function($rootScope, $sce, $location, Socket, video) {
|
||||||
var root = {};
|
var root = {};
|
||||||
$rootScope.videoSrc = {};
|
$rootScope.videoSrc = {};
|
||||||
|
$rootScope.loading = false;
|
||||||
|
|
||||||
$rootScope.getVideoURL = function(copayer) {
|
$rootScope.getVideoURL = function(copayer) {
|
||||||
var encoded = $rootScope.videoSrc[copayer];
|
var encoded = $rootScope.videoSrc[copayer];
|
||||||
if (!encoded) return;
|
if (!encoded) return;
|
||||||
|
@ -18,7 +20,6 @@ angular.module('copay.controllerUtils')
|
||||||
};
|
};
|
||||||
|
|
||||||
root.logout = function() {
|
root.logout = function() {
|
||||||
console.log('### DELETING WALLET'); //TODO
|
|
||||||
$rootScope.wallet = null;
|
$rootScope.wallet = null;
|
||||||
delete $rootScope['wallet'];
|
delete $rootScope['wallet'];
|
||||||
$rootScope.totalBalance = 0;
|
$rootScope.totalBalance = 0;
|
||||||
|
@ -44,7 +45,7 @@ angular.module('copay.controllerUtils')
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$rootScope.videoSrc[peerID] = encodeURI(url);
|
$rootScope.videoSrc[peerID] = encodeURI(url);
|
||||||
$rootScope.$apply();
|
$rootScope.$digest();
|
||||||
};
|
};
|
||||||
w.on('badMessage', function(peerId) {
|
w.on('badMessage', function(peerId) {
|
||||||
$rootScope.flashMessage = {
|
$rootScope.flashMessage = {
|
||||||
|
@ -54,12 +55,15 @@ angular.module('copay.controllerUtils')
|
||||||
});
|
});
|
||||||
w.on('created', function(myPeerID) {
|
w.on('created', function(myPeerID) {
|
||||||
video.setOwnPeer(myPeerID, w, handlePeerVideo);
|
video.setOwnPeer(myPeerID, w, handlePeerVideo);
|
||||||
$location.path('addresses');
|
|
||||||
$rootScope.wallet = w;
|
$rootScope.wallet = w;
|
||||||
root.updateBalance();
|
$location.path('addresses');
|
||||||
});
|
});
|
||||||
w.on('refresh', function() {
|
w.on('refresh', function() {
|
||||||
root.updateBalance();
|
root.setSocketHandlers();
|
||||||
|
root.updateBalance(function() {
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
|
$rootScope.$digest();
|
||||||
});
|
});
|
||||||
w.on('publicKeyRingUpdated', function() {
|
w.on('publicKeyRingUpdated', function() {
|
||||||
root.setSocketHandlers();
|
root.setSocketHandlers();
|
||||||
|
@ -72,21 +76,31 @@ angular.module('copay.controllerUtils')
|
||||||
w.netStart();
|
w.netStart();
|
||||||
};
|
};
|
||||||
|
|
||||||
root.updateBalance = function() {
|
root.updateBalance = function(cb) {
|
||||||
|
root.setSocketHandlers();
|
||||||
|
$rootScope.balanceByAddr = {};
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
if (!w) return;
|
$rootScope.addrInfos = w.getAddressesInfo();
|
||||||
|
if ($rootScope.addrInfos.length === 0) return;
|
||||||
|
$rootScope.loading = true;
|
||||||
w.getBalance(false, function(balance, balanceByAddr) {
|
w.getBalance(false, function(balance, balanceByAddr) {
|
||||||
|
console.log('New total balance:', balance);
|
||||||
$rootScope.totalBalance = balance;
|
$rootScope.totalBalance = balance;
|
||||||
$rootScope.balanceByAddr = balanceByAddr;
|
$rootScope.balanceByAddr = balanceByAddr;
|
||||||
console.log('New balance:', balance);
|
$rootScope.selectedAddr = $rootScope.addrInfos[0].address.toString();
|
||||||
w.getBalance(true, function(balance) {
|
$rootScope.loading = false;
|
||||||
$rootScope.availableBalance = balance;
|
if (cb) cb();
|
||||||
$rootScope.$digest();
|
|
||||||
});
|
});
|
||||||
|
w.getBalance(true, function(balance) {
|
||||||
|
console.log('New available balance:', balance);
|
||||||
|
$rootScope.availableBalance = balance;
|
||||||
|
$rootScope.loading = false;
|
||||||
|
if (cb) cb();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
root.setSocketHandlers = function() {
|
root.setSocketHandlers = function() {
|
||||||
|
// TODO: optimize this?
|
||||||
Socket.removeAllListeners();
|
Socket.removeAllListeners();
|
||||||
if (!$rootScope.wallet) return;
|
if (!$rootScope.wallet) return;
|
||||||
|
|
||||||
|
@ -98,10 +112,11 @@ angular.module('copay.controllerUtils')
|
||||||
addrs.forEach(function(addr) {
|
addrs.forEach(function(addr) {
|
||||||
Socket.on(addr, function(txid) {
|
Socket.on(addr, function(txid) {
|
||||||
console.log('Received!', txid);
|
console.log('Received!', txid);
|
||||||
root.updateBalance();
|
root.updateBalance(function() {
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return root;
|
return root;
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var wf;
|
angular.module('copay.walletFactory').value('walletFactory', new copay.WalletFactory(config));
|
||||||
angular.module('copay.walletFactory').factory('walletFactory', function($rootScope) {
|
|
||||||
wf = wf || new copay.WalletFactory(config);
|
|
||||||
return wf;
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue