mirror of https://github.com/BTCPrivate/copay.git
commit
bea2d6cf78
|
@ -3,14 +3,19 @@
|
|||
var config = {
|
||||
networkName: 'testnet',
|
||||
network: {
|
||||
key: 'lwjd5qra8257b9', //Copay API key for public PeerJS server
|
||||
// key: 'lwjd5qra8257b9', //Copay API key for public PeerJS server
|
||||
// This is for running local peerJs with params: ./peerjs -p 10009 -k 'sdfjhwefh'
|
||||
//key: 'sdfjhwefh',
|
||||
//host: 'localhost',
|
||||
//port: 10009,
|
||||
//path: '/',
|
||||
maxPeers: 3,
|
||||
debug: 3,
|
||||
//
|
||||
key: 'g23ihfh82h35rf',
|
||||
host:'162.242.219.26',
|
||||
port:10009,
|
||||
path: '/',
|
||||
maxPeers: 15,
|
||||
debug: 3
|
||||
},
|
||||
limits: {
|
||||
totalCopayers: 10,
|
||||
|
|
|
@ -258,8 +258,8 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
|
|||
self._checkAnyPeer();
|
||||
});
|
||||
|
||||
p.on('connection', function(dataConn) {
|
||||
|
||||
p.on('connection', function(dataConn) {
|
||||
console.log('### NEW INBOUND CONNECTION %d/%d', self.connectedPeers.length, self.maxPeers);
|
||||
if (self.connectedPeers.length >= self.maxPeers) {
|
||||
console.log('### PEER REJECTED. PEER MAX LIMIT REACHED');
|
||||
|
@ -403,6 +403,7 @@ Network.prototype.connectTo = function(copayerId) {
|
|||
};
|
||||
|
||||
Network.prototype._cleanUp = function() {
|
||||
var self = this;
|
||||
self.connectedPeers = [];
|
||||
self.started = false;
|
||||
self.peerId = null;
|
||||
|
@ -421,9 +422,10 @@ Network.prototype._cleanUp = function() {
|
|||
Network.prototype.disconnect = function(cb, forced) {
|
||||
var self = this;
|
||||
self.closing = 1;
|
||||
this.send(null, { type: 'disconnect' });
|
||||
this._cleanUp();
|
||||
if (typeof cb === 'function') cb();
|
||||
self.send(null, { type: 'disconnect' }, function(){
|
||||
self._cleanUp();
|
||||
if (typeof cb === 'function') cb();
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = require('soop')(Network);
|
||||
|
|
|
@ -4,6 +4,8 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
|
|||
var root = {};
|
||||
|
||||
root.logout = function() {
|
||||
console.log('### DELETING WALLET'); //TODO
|
||||
$rootScope.wallet = null;
|
||||
delete $rootScope['wallet'];
|
||||
$rootScope.totalBalance = 0;
|
||||
$location.path('signin');
|
||||
|
|
Loading…
Reference in New Issue