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

fix conflicts

This commit is contained in:
Mario Colque 2014-05-13 14:29:17 -03:00
parent 9027243052 d03ce646af
commit 8325c2b02a
8 changed files with 98 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/main.css
View File

@ -88,6 +88,11 @@ html, body {height: 100%;}
width: 25%;
}
.top-bar-section .label.alert {
vertical-align: super;
margin-left: 5px;
}
.header {
margin-bottom: 30px;
}

28
index.html
View File

@ -42,6 +42,7 @@
<span ng-if="!$root.loading">{{availableBalance || 0}}</span>
<i class="fi-bitcoin"></i>
</div>
</div>
</div>
@ -56,7 +57,9 @@
<section class="top-bar-section {{isCollapsed && 'hide_menu' || 'show_menu'}}">
<ul>
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="text-center" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}"> <i class="{{item.icon}}"></i> {{item.title}}</a>
<a href="{{item.link}}"> <i class="{{item.icon}}"></i> {{item.title}}
<span class="label alert round" ng-if="item.link=='#/transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
</a>
</li>
</ul>
</section>
@ -387,10 +390,10 @@
<div class="row m15">
<div class="large-4 columns" ng-show="!tx.sentTs" style="padding-left: 5px;">
<div ng-show="!tx.signedByUs && !tx.rejectedByUs && !tx.finallyRejected && tx.missingSignatures">
<button class="secondary radius m10r" ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">
<button class="secondary radius m10r" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check"></i> Sign
</button>
<button class="warning radius" ng-click="reject(tx.ntxid)" ng-disabled="loading" loading>
<button class="warning radius" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x" ></i> Reject
</button>
</div>
@ -602,7 +605,6 @@
<input type="number" ng-model="blockchainPort">
</div>
</fieldset>
<fieldset>
<legend>Socket</legend>
<div class="row">
@ -626,8 +628,22 @@
</div>
</script>
<!-- / <div class="large-4 columns box-backup">Backup to Dropbox</div>
// <div class="large-4 columns box-backup">Backup to email</div> -->
<!-- UNSUPPORTED -->
<script type="text/ng-template" id="unsupported.html">
<h2 class="text-center">Browser unsupported</h2>
<h3 class="text-center">
Copay uses webRTC for peer-to-peer communications,
but your browser does not support it.
Please use
a current version of Google Chrome, Mozilla Firefox, or Opera.
<br><br>
For more information
on supported browsers please check <a href="http://www.webrtc.org/">http://www.webrtc.org/</a>
</h3>
</script>
<!-- NOT FOUND -->
<script type="text/ng-template" id="404.html">
<h2 class="text-center">404</h2>

1
js/controllers/header.js
View File

@ -23,6 +23,7 @@ angular.module('copay.header').controller('HeaderController',
$rootScope.$watch('wallet', function(wallet) {
if (wallet) {
controllerUtils.updateTxs();
}
});

63
js/controllers/transactions.js
View File

@ -1,46 +1,11 @@
'use strict';
angular.module('copay.transactions').controller('TransactionsController',
function($scope, $rootScope, $location) {
var bitcore = require('bitcore');
function($scope, $rootScope, controllerUtils) {
$scope.title = 'Transactions';
$scope.loading = false;
var _updateTxs = function() {
var w =$rootScope.wallet;
if (!w) return;
var inT = w.getTxProposals();
var txs = [];
inT.forEach(function(i){
var tx = i.builder.build();
var outs = [];
tx.outs.forEach(function(o) {
var addr = bitcore.Address.fromScriptPubKey(o.getScript(), config.networkName)[0].toString();
if (!w.addressIsOwn(addr, {excludeMain:true})) {
outs.push({
address: addr,
value: bitcore.util.valueToBigInt(o.getValue())/bitcore.util.COIN,
});
}
});
// extra fields
i.outs = outs;
i.fee = i.builder.feeSat/bitcore.util.COIN;
i.missingSignatures = tx.countInputMissingSignatures(0);
txs.push(i);
});
$scope.txs = txs;
w.removeListener('txProposalsUpdated',_updateTxs)
w.once('txProposalsUpdated',_updateTxs);
$scope.loading = false;
};
$scope.send = function (ntxid) {
$scope.loading = true;
var w = $rootScope.wallet;
@ -50,7 +15,8 @@ angular.module('copay.transactions').controller('TransactionsController',
? {type:'success', message: 'Transaction broadcasted. txid: ' + txid}
: {type:'error', message: 'There was an error sending the Transaction'}
;
_updateTxs();
controllerUtils.updateTxs();
$scope.loading = false;
$rootScope.$digest();
});
};
@ -62,17 +28,19 @@ angular.module('copay.transactions').controller('TransactionsController',
if (!ret) {
$rootScope.flashMessage = {type:'error', message: 'There was an error signing the Transaction'};
_updateTxs();
$rootScope.$digest();
controllerUtils.updateTxs();
$scope.loading = false;
$rootScope.$digest();
return;
}
var p = w.txProposals.getTxProposal(ntxid);
if (p.builder.isFullySigned()) {
$scope.send(ntxid);
_updateTxs();
controllerUtils.updateTxs();
}
else {
_updateTxs();
controllerUtils.updateTxs();
$scope.loading = false;
$rootScope.$digest();
}
};
@ -100,18 +68,7 @@ angular.module('copay.transactions').controller('TransactionsController',
var w = $rootScope.wallet;
w.reject(ntxid);
$rootScope.flashMessage = {type:'warning', message: 'Transaction rejected by you'};
_updateTxs();
// $rootScope.$digest();
$scope.loading = false;
};
_updateTxs();
var w = $rootScope.wallet;
if (w) {
w.on('txProposalsUpdated', function() {
console.log('[transactions.js.108: txProposalsUpdated:]'); //TODO
_updateTxs();
$rootScope.$digest();
});
}
});

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

@ -346,7 +346,7 @@ Wallet.prototype.reject = function(ntxid) {
txp.rejectedBy[myId] = Date.now();
this.sendTxProposals();
this.store();
this.emit('refresh');
this.emit('txProposalsUpdated');
};
@ -367,7 +367,7 @@ Wallet.prototype.sign = function(ntxid) {
txp.signedBy[myId] = Date.now();
this.sendTxProposals();
this.store();
this.emit('refresh');
this.emit('txProposalsUpdated');
return true;
}
return false;
@ -505,6 +505,7 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
self.sendPublicKeyRing(); // Change Address
self.sendTxProposals();
self.store();
self.emit('txProposalsUpdated');
}
return cb();
});

13
js/routes.js
View File

@ -46,6 +46,9 @@ angular
templateUrl: 'settings.html',
validate: false
})
.when('/unsupported', {
templateUrl: 'unsupported.html'
})
.otherwise({
templateUrl: '404.html'
});
@ -61,8 +64,14 @@ angular
})
.run(function($rootScope, $location) {
$rootScope.$on('$routeChangeStart', function(event, next, current) {
if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) {
$location.path('signin');
if (!util.supports.data) {
$location.path('unsupported');
}
else {
if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) {
$location.path('signin');
}
}
});
});

47
js/services/controllerUtils.js
View File

@ -82,6 +82,10 @@ angular.module('copay.controllerUtils')
root.updateBalance();
$rootScope.$digest();
});
w.on('txProposalsUpdated', function() {
root.updateTxs();
root.updateBalance();
});
w.on('openError', root.onErrorDigest);
w.on('connect', function(peerID) {
if (peerID) {
@ -104,7 +108,6 @@ angular.module('copay.controllerUtils')
if ($rootScope.addrInfos.length === 0) return;
$rootScope.loading = true;
w.getBalance(false, function(balance, balanceByAddr) {
console.log('New total balance:', balance);
$rootScope.totalBalance = balance;
$rootScope.balanceByAddr = balanceByAddr;
$rootScope.selectedAddr = $rootScope.addrInfos[0].address.toString();
@ -113,13 +116,53 @@ angular.module('copay.controllerUtils')
if (cb) cb();
});
w.getBalance(true, function(balance) {
console.log('New available balance:', balance);
$rootScope.availableBalance = balance;
$rootScope.loading = false;
$rootScope.$digest();
if (cb) cb();
});
};
root.updateTxs = function() {
var bitcore = require('bitcore');
var w = $rootScope.wallet;
if (!w) return;
var inT = w.getTxProposals();
var txs = [];
inT.forEach(function(i){
var tx = i.builder.build();
var outs = [];
tx.outs.forEach(function(o) {
var addr = bitcore.Address.fromScriptPubKey(o.getScript(), config.networkName)[0].toString();
if (!w.addressIsOwn(addr, {excludeMain:true})) {
outs.push({
address: addr,
value: bitcore.util.valueToBigInt(o.getValue())/bitcore.util.COIN,
});
}
});
// extra fields
i.outs = outs;
i.fee = i.builder.feeSat/bitcore.util.COIN;
i.missingSignatures = tx.countInputMissingSignatures(0);
txs.push(i);
});
$rootScope.txs = txs;
var pending = 0;
for(var i=0; i<txs.length;i++) {
if (!txs[i].finallyRejected && !txs[i].sentTs) {
pending++;
}
}
$rootScope.pendingTxCount = pending;
w.removeListener('txProposalsUpdated',root.updateTxs)
w.once('txProposalsUpdated',root.updateTxs);
$rootScope.loading = false;
};
root.setSocketHandlers = function() {
// TODO: optimize this?
Socket.removeAllListeners();

1
util/build.js
View File

@ -42,6 +42,7 @@ var createBundle = function(opts) {
b.require('./copay', {
expose: 'copay'
});
b.external('bitcore');
b.require('./js/models/core/WalletFactory');
b.require('./js/models/core/Wallet');
b.require('./js/models/core/Wallet', {