mirror of https://github.com/BTCPrivate/copay.git
make it work with reconnections
This commit is contained in:
Manuel Araoz
parent
4fff3a9d4d
commit
81a20cb1dc
|
|
@ -45,7 +45,6 @@ Network.prototype.cleanUp = function() {
|
||||||
this.copayerForPeer = {};
|
this.copayerForPeer = {};
|
||||||
this.connections = {};
|
this.connections = {};
|
||||||
this.criticalErr = '';
|
this.criticalErr = '';
|
||||||
this.removeAllListeners();
|
|
||||||
if (this.socket) {
|
if (this.socket) {
|
||||||
this.socket.disconnect();
|
this.socket.disconnect();
|
||||||
this.socket = null;
|
this.socket = null;
|
||||||
|
|
@ -224,6 +223,7 @@ Network.prototype._setupConnectionHandlers = function(cb) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
self.socket.on('connect', function() {
|
self.socket.on('connect', function() {
|
||||||
|
alert('socket connected!');
|
||||||
self.socket.on('disconnect', function() {
|
self.socket.on('disconnect', function() {
|
||||||
self.cleanUp();
|
self.cleanUp();
|
||||||
});
|
});
|
||||||
|
|
@ -298,6 +298,7 @@ Network.prototype.start = function(opts, openCallback) {
|
||||||
this.socket.emit('subscribe', pubkey);
|
this.socket.emit('subscribe', pubkey);
|
||||||
this.socket.emit('sync', opts.lastTimestamp);
|
this.socket.emit('sync', opts.lastTimestamp);
|
||||||
this.started = true;
|
this.started = true;
|
||||||
|
alert('started = true');
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -305,6 +306,7 @@ Network.prototype.createSocket = function(host, port) {
|
||||||
var hostPort = host + ':' + port;
|
var hostPort = host + ':' + port;
|
||||||
return io.connect(hostPort, {
|
return io.connect(hostPort, {
|
||||||
reconnection: true,
|
reconnection: true,
|
||||||
|
'force new connection': true
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,377 +2,381 @@
|
||||||
var bitcore = require('bitcore');
|
var bitcore = require('bitcore');
|
||||||
|
|
||||||
angular.module('copayApp.services')
|
angular.module('copayApp.services')
|
||||||
.factory('controllerUtils', function($rootScope, $sce, $location, notification, $timeout, Socket, video, uriHandler) {
|
.factory('controllerUtils', function($rootScope, $sce, $location, notification, $timeout, Socket, video, uriHandler) {
|
||||||
var root = {};
|
var root = {};
|
||||||
root.getVideoMutedStatus = function(copayer) {
|
root.getVideoMutedStatus = function(copayer) {
|
||||||
if (!$rootScope.videoInfo) return;
|
if (!$rootScope.videoInfo) return;
|
||||||
|
|
||||||
var vi = $rootScope.videoInfo[copayer]
|
var vi = $rootScope.videoInfo[copayer]
|
||||||
if (!vi) {
|
if (!vi) {
|
||||||
return;
|
|
||||||
}
|
|
||||||
return vi.muted;
|
|
||||||
};
|
|
||||||
|
|
||||||
root.redirIfLogged = function() {
|
|
||||||
if ($rootScope.wallet) {
|
|
||||||
$rootScope.wallet.path('receive');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
root.logout = function() {
|
|
||||||
if ($rootScope.wallet)
|
|
||||||
$rootScope.wallet.disconnect();
|
|
||||||
|
|
||||||
Socket.removeAllListeners();
|
|
||||||
|
|
||||||
$rootScope.wallet = null;
|
|
||||||
delete $rootScope['wallet'];
|
|
||||||
|
|
||||||
video.close();
|
|
||||||
// Clear rootScope
|
|
||||||
for (var i in $rootScope) {
|
|
||||||
if (i.charAt(0) != '$') {
|
|
||||||
delete $rootScope[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$location.path('/');
|
|
||||||
};
|
|
||||||
|
|
||||||
root.onError = function(scope) {
|
|
||||||
if (scope) scope.loading = false;
|
|
||||||
root.logout();
|
|
||||||
}
|
|
||||||
|
|
||||||
root.onErrorDigest = function(scope, msg) {
|
|
||||||
root.onError(scope);
|
|
||||||
if (msg) {
|
|
||||||
notification.error('Error', msg);
|
|
||||||
}
|
|
||||||
$rootScope.$digest();
|
|
||||||
};
|
|
||||||
|
|
||||||
root.installStartupHandlers = function(wallet, $scope) {
|
|
||||||
wallet.on('connectionError', function() {
|
|
||||||
var message = "Looks like you are already connected to this wallet, please logout and try importing it again.";
|
|
||||||
notification.error('PeerJS Error', message);
|
|
||||||
root.onErrorDigest($scope);
|
|
||||||
});
|
|
||||||
wallet.on('ready', function() {
|
|
||||||
$scope.loading = false;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
root.setupRootVariables = function() {
|
|
||||||
uriHandler.register();
|
|
||||||
$rootScope.unitName = config.unitName;
|
|
||||||
$rootScope.txAlertCount = 0;
|
|
||||||
$rootScope.insightError = 0;
|
|
||||||
$rootScope.isCollapsed = true;
|
|
||||||
$rootScope.$watch('txAlertCount', function(txAlertCount) {
|
|
||||||
if (txAlertCount && txAlertCount > 0) {
|
|
||||||
|
|
||||||
notification.info('New Transaction', ($rootScope.txAlertCount == 1) ? 'You have a pending transaction proposal' : 'You have ' + $rootScope.txAlertCount + ' pending transaction proposals', txAlertCount);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
$rootScope.$watch('receivedFund', function(receivedFund) {
|
|
||||||
if (receivedFund) {
|
|
||||||
var currentAddr;
|
|
||||||
for (var i = 0; i < $rootScope.addrInfos.length; i++) {
|
|
||||||
var addrinfo = $rootScope.addrInfos[i];
|
|
||||||
if (addrinfo.address.toString() == receivedFund[1] && !addrinfo.isChange) {
|
|
||||||
currentAddr = addrinfo.address.toString();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (currentAddr) {
|
|
||||||
//var beep = new Audio('sound/transaction.mp3');
|
|
||||||
notification.funds('Received fund', currentAddr, receivedFund);
|
|
||||||
//beep.play();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
root.startNetwork = function(w, $scope) {
|
|
||||||
Socket.removeAllListeners();
|
|
||||||
|
|
||||||
root.setupRootVariables();
|
|
||||||
root.installStartupHandlers(w, $scope);
|
|
||||||
root.setSocketHandlers();
|
|
||||||
|
|
||||||
var handlePeerVideo = function(err, peerID, url) {
|
|
||||||
if (err) {
|
|
||||||
delete $rootScope.videoInfo[peerID];
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$rootScope.videoInfo[peerID] = {
|
return vi.muted;
|
||||||
url: encodeURI(url),
|
};
|
||||||
muted: peerID === w.network.peerId
|
|
||||||
};
|
root.redirIfLogged = function() {
|
||||||
|
if ($rootScope.wallet) {
|
||||||
|
$rootScope.wallet.path('receive');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
root.logout = function() {
|
||||||
|
if ($rootScope.wallet)
|
||||||
|
$rootScope.wallet.disconnect();
|
||||||
|
|
||||||
|
Socket.removeAllListeners();
|
||||||
|
|
||||||
|
$rootScope.wallet = null;
|
||||||
|
delete $rootScope['wallet'];
|
||||||
|
|
||||||
|
video.close();
|
||||||
|
// Clear rootScope
|
||||||
|
for (var i in $rootScope) {
|
||||||
|
if (i.charAt(0) != '$') {
|
||||||
|
delete $rootScope[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$location.path('/');
|
||||||
|
};
|
||||||
|
|
||||||
|
root.onError = function(scope) {
|
||||||
|
if (scope) scope.loading = false;
|
||||||
|
root.logout();
|
||||||
|
}
|
||||||
|
|
||||||
|
root.onErrorDigest = function(scope, msg) {
|
||||||
|
root.onError(scope);
|
||||||
|
if (msg) {
|
||||||
|
notification.error('Error', msg);
|
||||||
|
}
|
||||||
$rootScope.$digest();
|
$rootScope.$digest();
|
||||||
};
|
};
|
||||||
|
|
||||||
notification.enableHtml5Mode(); // for chrome: if support, enable it
|
root.installStartupHandlers = function(wallet, $scope) {
|
||||||
|
wallet.on('connectionError', function() {
|
||||||
|
var message = "Looks like you are already connected to this wallet, please logout and try importing it again.";
|
||||||
|
notification.error('PeerJS Error', message);
|
||||||
|
root.onErrorDigest($scope);
|
||||||
|
});
|
||||||
|
wallet.on('ready', function() {
|
||||||
|
$scope.loading = false;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
w.on('corrupt', function(peerId) {
|
root.setupRootVariables = function() {
|
||||||
notification.error('Error', 'Received corrupt message from ' + peerId);
|
uriHandler.register();
|
||||||
});
|
$rootScope.unitName = config.unitName;
|
||||||
w.on('ready', function(myPeerID) {
|
$rootScope.txAlertCount = 0;
|
||||||
$rootScope.wallet = w;
|
$rootScope.insightError = 0;
|
||||||
if ($rootScope.pendingPayment) {
|
$rootScope.isCollapsed = true;
|
||||||
$location.path('send');
|
$rootScope.$watch('txAlertCount', function(txAlertCount) {
|
||||||
} else {
|
if (txAlertCount && txAlertCount > 0) {
|
||||||
$location.path('receive');
|
|
||||||
}
|
|
||||||
if (!config.disableVideo)
|
|
||||||
video.setOwnPeer(myPeerID, w, handlePeerVideo);
|
|
||||||
});
|
|
||||||
|
|
||||||
w.on('publicKeyRingUpdated', function(dontDigest) {
|
notification.info('New Transaction', ($rootScope.txAlertCount == 1) ? 'You have a pending transaction proposal' : 'You have ' + $rootScope.txAlertCount + ' pending transaction proposals', txAlertCount);
|
||||||
root.setSocketHandlers();
|
}
|
||||||
if (!dontDigest) {
|
});
|
||||||
$rootScope.$digest();
|
|
||||||
}
|
|
||||||
});
|
$rootScope.$watch('receivedFund', function(receivedFund) {
|
||||||
w.on('txProposalsUpdated', function(dontDigest) {
|
if (receivedFund) {
|
||||||
root.updateTxs();
|
var currentAddr;
|
||||||
// give sometime to the tx to propagate.
|
for (var i = 0; i < $rootScope.addrInfos.length; i++) {
|
||||||
$timeout(function() {
|
var addrinfo = $rootScope.addrInfos[i];
|
||||||
root.updateBalance(function() {
|
if (addrinfo.address.toString() == receivedFund[1] && !addrinfo.isChange) {
|
||||||
if (!dontDigest) {
|
currentAddr = addrinfo.address.toString();
|
||||||
$rootScope.$digest();
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
if (currentAddr) {
|
||||||
}, 3000);
|
//var beep = new Audio('sound/transaction.mp3');
|
||||||
});
|
notification.funds('Received fund', currentAddr, receivedFund);
|
||||||
w.on('txProposalEvent', function(e) {
|
//beep.play();
|
||||||
var user = w.publicKeyRing.nicknameForCopayer(e.cId);
|
}
|
||||||
switch (e.type) {
|
}
|
||||||
case 'signed':
|
});
|
||||||
notification.info('Transaction Update', 'A transaction was signed by ' + user);
|
|
||||||
break;
|
};
|
||||||
case 'rejected':
|
|
||||||
notification.info('Transaction Update', 'A transaction was rejected by ' + user);
|
|
||||||
break;
|
root.startNetwork = function(w, $scope) {
|
||||||
case 'corrupt':
|
Socket.removeAllListeners();
|
||||||
notification.error('Transaction Error', 'Received corrupt transaction from '+user);
|
|
||||||
break;
|
root.setupRootVariables();
|
||||||
}
|
root.installStartupHandlers(w, $scope);
|
||||||
});
|
root.setSocketHandlers();
|
||||||
w.on('addressBookUpdated', function(dontDigest) {
|
|
||||||
if (!dontDigest) {
|
var handlePeerVideo = function(err, peerID, url) {
|
||||||
|
if (err) {
|
||||||
|
delete $rootScope.videoInfo[peerID];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$rootScope.videoInfo[peerID] = {
|
||||||
|
url: encodeURI(url),
|
||||||
|
muted: peerID === w.network.peerId
|
||||||
|
};
|
||||||
$rootScope.$digest();
|
$rootScope.$digest();
|
||||||
}
|
};
|
||||||
});
|
|
||||||
w.on('connectionError', function(msg) {
|
|
||||||
root.onErrorDigest(null, msg);
|
|
||||||
});
|
|
||||||
w.on('connect', function(peerID) {
|
|
||||||
if (peerID && !config.disableVideo) {
|
|
||||||
video.callPeer(peerID, handlePeerVideo);
|
|
||||||
}
|
|
||||||
$rootScope.$digest();
|
|
||||||
});
|
|
||||||
w.on('disconnect', function(peerID) {
|
|
||||||
$rootScope.$digest();
|
|
||||||
});
|
|
||||||
w.on('close', root.onErrorDigest);
|
|
||||||
w.on('locked', root.onErrorDigest.bind(this));
|
|
||||||
w.netStart();
|
|
||||||
};
|
|
||||||
|
|
||||||
root.updateAddressList = function() {
|
notification.enableHtml5Mode(); // for chrome: if support, enable it
|
||||||
var w = $rootScope.wallet;
|
|
||||||
if (w && w.isReady())
|
|
||||||
$rootScope.addrInfos = w.getAddressesInfo();
|
|
||||||
};
|
|
||||||
|
|
||||||
root.updateBalance = function(cb) {
|
w.on('corrupt', function(peerId) {
|
||||||
var w = $rootScope.wallet;
|
notification.error('Error', 'Received corrupt message from ' + peerId);
|
||||||
if (!w) return root.onErrorDigest();
|
});
|
||||||
if (!w.isReady()) return;
|
w.on('ready', function(myPeerID) {
|
||||||
|
alert('wallet ready!');
|
||||||
|
$rootScope.wallet = w;
|
||||||
|
if ($rootScope.pendingPayment) {
|
||||||
|
$location.path('send');
|
||||||
|
} else {
|
||||||
|
$location.path('receive');
|
||||||
|
}
|
||||||
|
if (!config.disableVideo)
|
||||||
|
video.setOwnPeer(myPeerID, w, handlePeerVideo);
|
||||||
|
});
|
||||||
|
|
||||||
$rootScope.balanceByAddr = {};
|
w.on('publicKeyRingUpdated', function(dontDigest) {
|
||||||
$rootScope.updatingBalance = true;
|
root.setSocketHandlers();
|
||||||
|
if (!dontDigest) {
|
||||||
|
$rootScope.$digest();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
w.on('txProposalsUpdated', function(dontDigest) {
|
||||||
|
root.updateTxs();
|
||||||
|
// give sometime to the tx to propagate.
|
||||||
|
$timeout(function() {
|
||||||
|
root.updateBalance(function() {
|
||||||
|
if (!dontDigest) {
|
||||||
|
$rootScope.$digest();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}, 3000);
|
||||||
|
});
|
||||||
|
w.on('txProposalEvent', function(e) {
|
||||||
|
var user = w.publicKeyRing.nicknameForCopayer(e.cId);
|
||||||
|
switch (e.type) {
|
||||||
|
case 'signed':
|
||||||
|
notification.info('Transaction Update', 'A transaction was signed by ' + user);
|
||||||
|
break;
|
||||||
|
case 'rejected':
|
||||||
|
notification.info('Transaction Update', 'A transaction was rejected by ' + user);
|
||||||
|
break;
|
||||||
|
case 'corrupt':
|
||||||
|
notification.error('Transaction Error', 'Received corrupt transaction from ' + user);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
w.on('addressBookUpdated', function(dontDigest) {
|
||||||
|
if (!dontDigest) {
|
||||||
|
$rootScope.$digest();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
w.on('connectionError', function(msg) {
|
||||||
|
root.onErrorDigest(null, msg);
|
||||||
|
});
|
||||||
|
w.on('connect', function(peerID) {
|
||||||
|
if (peerID && !config.disableVideo) {
|
||||||
|
video.callPeer(peerID, handlePeerVideo);
|
||||||
|
}
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
|
w.on('disconnect', function(peerID) {
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
|
w.on('close', root.onErrorDigest);
|
||||||
|
w.on('locked', root.onErrorDigest.bind(this));
|
||||||
|
w.netStart();
|
||||||
|
};
|
||||||
|
|
||||||
w.getBalance(function(err, balanceSat, balanceByAddrSat, safeBalanceSat) {
|
root.updateAddressList = function() {
|
||||||
if (err) {
|
var w = $rootScope.wallet;
|
||||||
console.error('Error: ' + err.message); //TODO
|
if (w && w.isReady())
|
||||||
root._setCommError();
|
$rootScope.addrInfos = w.getAddressesInfo();
|
||||||
return null;
|
};
|
||||||
} else {
|
|
||||||
root._clearCommError();
|
root.updateBalance = function(cb) {
|
||||||
}
|
var w = $rootScope.wallet;
|
||||||
|
if (!w) return root.onErrorDigest();
|
||||||
|
if (!w.isReady()) return;
|
||||||
|
|
||||||
|
$rootScope.balanceByAddr = {};
|
||||||
|
$rootScope.updatingBalance = true;
|
||||||
|
|
||||||
|
w.getBalance(function(err, balanceSat, balanceByAddrSat, safeBalanceSat) {
|
||||||
|
if (err) {
|
||||||
|
console.error('Error: ' + err.message); //TODO
|
||||||
|
root._setCommError();
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
root._clearCommError();
|
||||||
|
}
|
||||||
|
|
||||||
|
var satToUnit = 1 / config.unitToSatoshi;
|
||||||
|
var COIN = bitcore.util.COIN;
|
||||||
|
|
||||||
|
$rootScope.totalBalance = balanceSat * satToUnit;
|
||||||
|
$rootScope.totalBalanceBTC = (balanceSat / COIN);
|
||||||
|
$rootScope.availableBalance = safeBalanceSat * satToUnit;
|
||||||
|
$rootScope.availableBalanceBTC = (safeBalanceSat / COIN);
|
||||||
|
|
||||||
|
$rootScope.lockedBalance = (balanceSat - safeBalanceSat) * satToUnit;
|
||||||
|
$rootScope.lockedBalanceBTC = (balanceSat - safeBalanceSat) / COIN;
|
||||||
|
|
||||||
|
var balanceByAddr = {};
|
||||||
|
for (var ii in balanceByAddrSat) {
|
||||||
|
balanceByAddr[ii] = balanceByAddrSat[ii] * satToUnit;
|
||||||
|
}
|
||||||
|
$rootScope.balanceByAddr = balanceByAddr;
|
||||||
|
root.updateAddressList();
|
||||||
|
$rootScope.updatingBalance = false;
|
||||||
|
return cb ? cb() : null;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
root.updateTxs = function(opts) {
|
||||||
|
var w = $rootScope.wallet;
|
||||||
|
if (!w) return;
|
||||||
|
opts = opts || $rootScope.txsOpts || {};
|
||||||
|
|
||||||
var satToUnit = 1 / config.unitToSatoshi;
|
var satToUnit = 1 / config.unitToSatoshi;
|
||||||
var COIN = bitcore.util.COIN;
|
var myCopayerId = w.getMyCopayerId();
|
||||||
|
var pendingForUs = 0;
|
||||||
|
var inT = w.getTxProposals().sort(function(t1, t2) {
|
||||||
|
return t2.createdTs - t1.createdTs
|
||||||
|
});
|
||||||
|
var txs = [];
|
||||||
|
|
||||||
$rootScope.totalBalance = balanceSat * satToUnit;
|
inT.forEach(function(i, index) {
|
||||||
$rootScope.totalBalanceBTC = (balanceSat / COIN);
|
if (opts.skip && (index < opts.skip[0] || index >= opts.skip[1])) {
|
||||||
$rootScope.availableBalance = safeBalanceSat * satToUnit;
|
return txs.push(null);
|
||||||
$rootScope.availableBalanceBTC = (safeBalanceSat / COIN);
|
}
|
||||||
|
|
||||||
$rootScope.lockedBalance = (balanceSat - safeBalanceSat) * satToUnit;
|
if (myCopayerId != i.creator && !i.finallyRejected && !i.sentTs && !i.rejectedByUs && !i.signedByUs) {
|
||||||
$rootScope.lockedBalanceBTC = (balanceSat - safeBalanceSat) / COIN;
|
pendingForUs++;
|
||||||
|
}
|
||||||
|
if (!i.finallyRejected && !i.sentTs) {
|
||||||
|
i.isPending = 1;
|
||||||
|
}
|
||||||
|
|
||||||
var balanceByAddr = {};
|
if (!!opts.pending == !!i.isPending) {
|
||||||
for (var ii in balanceByAddrSat) {
|
var tx = i.builder.build();
|
||||||
balanceByAddr[ii] = balanceByAddrSat[ii] * satToUnit;
|
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()) * satToUnit,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
// extra fields
|
||||||
|
i.outs = outs;
|
||||||
|
i.fee = i.builder.feeSat * satToUnit;
|
||||||
|
i.missingSignatures = tx.countInputMissingSignatures(0);
|
||||||
|
i.actionList = getActionList(i.peerActions);
|
||||||
|
txs.push(i);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$rootScope.txs = txs;
|
||||||
|
$rootScope.txsOpts = opts;
|
||||||
|
if ($rootScope.pendingTxCount < pendingForUs) {
|
||||||
|
$rootScope.txAlertCount = pendingForUs;
|
||||||
}
|
}
|
||||||
$rootScope.balanceByAddr = balanceByAddr;
|
$rootScope.pendingTxCount = pendingForUs;
|
||||||
|
};
|
||||||
|
|
||||||
|
function getActionList(actions) {
|
||||||
|
var peers = Object.keys(actions).map(function(i) {
|
||||||
|
return {
|
||||||
|
cId: i,
|
||||||
|
actions: actions[i]
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return peers.sort(function(a, b) {
|
||||||
|
return !!b.actions.create - !!a.actions.create;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
var connectionLost = false;
|
||||||
|
$rootScope.$watch('insightError', function(status) {
|
||||||
|
if (!status) return;
|
||||||
|
|
||||||
|
// Reconnected
|
||||||
|
if (status === -1) {
|
||||||
|
if (!connectionLost) return; // Skip on first reconnect
|
||||||
|
connectionLost = false;
|
||||||
|
notification.success('Networking restored', 'Connection to Insight re-established');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retry
|
||||||
|
if (status == 1) return; // Skip the first try
|
||||||
|
connectionLost = true;
|
||||||
|
notification.error('Networking problem', 'Connection to Insight lost, reconnecting (attempt number ' + (status - 1) + ')');
|
||||||
|
});
|
||||||
|
|
||||||
|
root._setCommError = function(e) {
|
||||||
|
if ($rootScope.insightError < 0)
|
||||||
|
$rootScope.insightError = 0;
|
||||||
|
$rootScope.insightError++;
|
||||||
|
};
|
||||||
|
|
||||||
|
root._clearCommError = function(e) {
|
||||||
|
if ($rootScope.insightError > 0)
|
||||||
|
$rootScope.insightError = -1;
|
||||||
|
else
|
||||||
|
$rootScope.insightError = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
root.setSocketHandlers = function() {
|
||||||
root.updateAddressList();
|
root.updateAddressList();
|
||||||
$rootScope.updatingBalance = false;
|
if (!Socket.sysEventsSet) {
|
||||||
return cb ? cb() : null;
|
Socket.sysOn('error', root._setCommError);
|
||||||
});
|
Socket.sysOn('reconnect_error', root._setCommError);
|
||||||
};
|
Socket.sysOn('reconnect_failed', root._setCommError);
|
||||||
|
Socket.sysOn('connect', root._clearCommError);
|
||||||
root.updateTxs = function(opts) {
|
Socket.sysOn('reconnect', root._clearCommError);
|
||||||
var w = $rootScope.wallet;
|
Socket.sysEventsSet = true;
|
||||||
if (!w) return;
|
|
||||||
opts = opts || $rootScope.txsOpts || {};
|
|
||||||
|
|
||||||
var satToUnit = 1 / config.unitToSatoshi;
|
|
||||||
var myCopayerId = w.getMyCopayerId();
|
|
||||||
var pendingForUs = 0;
|
|
||||||
var inT = w.getTxProposals().sort(function(t1, t2) {
|
|
||||||
return t2.createdTs - t1.createdTs
|
|
||||||
});
|
|
||||||
var txs = [];
|
|
||||||
|
|
||||||
inT.forEach(function(i, index) {
|
|
||||||
if (opts.skip && (index < opts.skip[0] || index >= opts.skip[1])) {
|
|
||||||
return txs.push(null);
|
|
||||||
}
|
}
|
||||||
|
if (!$rootScope.wallet) return;
|
||||||
|
|
||||||
if (myCopayerId != i.creator && !i.finallyRejected && !i.sentTs && !i.rejectedByUs && !i.signedByUs) {
|
var currentAddrs = Socket.getListeners();
|
||||||
pendingForUs++;
|
var allAddrs = $rootScope.addrInfos;
|
||||||
}
|
|
||||||
if (!i.finallyRejected && !i.sentTs) {
|
|
||||||
i.isPending = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!!opts.pending == !!i.isPending) {
|
var newAddrs = [];
|
||||||
var tx = i.builder.build();
|
for (var i in allAddrs) {
|
||||||
var outs = [];
|
var a = allAddrs[i];
|
||||||
tx.outs.forEach(function(o) {
|
if (!currentAddrs[a.addressStr])
|
||||||
var addr = bitcore.Address.fromScriptPubKey(o.getScript(), config.networkName)[0].toString();
|
newAddrs.push(a);
|
||||||
if (!w.addressIsOwn(addr, {
|
}
|
||||||
excludeMain: true
|
for (var i = 0; i < newAddrs.length; i++) {
|
||||||
})) {
|
Socket.emit('subscribe', newAddrs[i].addressStr);
|
||||||
outs.push({
|
}
|
||||||
address: addr,
|
newAddrs.forEach(function(a) {
|
||||||
value: bitcore.util.valueToBigInt(o.getValue()) * satToUnit,
|
Socket.on(a.addressStr, function(txid) {
|
||||||
});
|
|
||||||
}
|
if (!a.isChange)
|
||||||
|
notification.funds('Funds received!', a.addressStr);
|
||||||
|
|
||||||
|
root.updateBalance(function() {
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!$rootScope.wallet.spendUnconfirmed && !Socket.isListeningBlocks()) {
|
||||||
|
Socket.emit('subscribe', 'inv');
|
||||||
|
Socket.on('block', function(block) {
|
||||||
|
root.updateBalance(function() {
|
||||||
|
$rootScope.$digest();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
// extra fields
|
|
||||||
i.outs = outs;
|
|
||||||
i.fee = i.builder.feeSat * satToUnit;
|
|
||||||
i.missingSignatures = tx.countInputMissingSignatures(0);
|
|
||||||
i.actionList = getActionList(i.peerActions);
|
|
||||||
txs.push(i);
|
|
||||||
}
|
}
|
||||||
});
|
};
|
||||||
|
return root;
|
||||||
$rootScope.txs = txs;
|
|
||||||
$rootScope.txsOpts = opts;
|
|
||||||
if ($rootScope.pendingTxCount < pendingForUs) {
|
|
||||||
$rootScope.txAlertCount = pendingForUs;
|
|
||||||
}
|
|
||||||
$rootScope.pendingTxCount = pendingForUs;
|
|
||||||
};
|
|
||||||
|
|
||||||
function getActionList(actions) {
|
|
||||||
var peers = Object.keys(actions).map(function(i) {
|
|
||||||
return {cId: i, actions: actions[i] }
|
|
||||||
});
|
|
||||||
|
|
||||||
return peers.sort(function(a, b) {
|
|
||||||
return !!b.actions.create - !!a.actions.create;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
var connectionLost = false;
|
|
||||||
$rootScope.$watch('insightError', function(status) {
|
|
||||||
if (!status) return;
|
|
||||||
|
|
||||||
// Reconnected
|
|
||||||
if (status === -1) {
|
|
||||||
if (!connectionLost) return; // Skip on first reconnect
|
|
||||||
connectionLost = false;
|
|
||||||
notification.success('Networking restored', 'Connection to Insight re-established');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retry
|
|
||||||
if (status == 1) return; // Skip the first try
|
|
||||||
connectionLost = true;
|
|
||||||
notification.error('Networking problem', 'Connection to Insight lost, reconnecting (attempt number ' + (status-1) + ')');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
root._setCommError = function(e) {
|
|
||||||
if ($rootScope.insightError < 0)
|
|
||||||
$rootScope.insightError = 0;
|
|
||||||
$rootScope.insightError++;
|
|
||||||
};
|
|
||||||
|
|
||||||
root._clearCommError = function(e) {
|
|
||||||
if ($rootScope.insightError > 0)
|
|
||||||
$rootScope.insightError = -1;
|
|
||||||
else
|
|
||||||
$rootScope.insightError = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
root.setSocketHandlers = function() {
|
|
||||||
root.updateAddressList();
|
|
||||||
if (!Socket.sysEventsSet) {
|
|
||||||
Socket.sysOn('error', root._setCommError);
|
|
||||||
Socket.sysOn('reconnect_error', root._setCommError);
|
|
||||||
Socket.sysOn('reconnect_failed', root._setCommError);
|
|
||||||
Socket.sysOn('connect', root._clearCommError);
|
|
||||||
Socket.sysOn('reconnect', root._clearCommError);
|
|
||||||
Socket.sysEventsSet = true;
|
|
||||||
}
|
|
||||||
if (!$rootScope.wallet) return;
|
|
||||||
|
|
||||||
var currentAddrs = Socket.getListeners();
|
|
||||||
var allAddrs = $rootScope.addrInfos;
|
|
||||||
|
|
||||||
var newAddrs = [];
|
|
||||||
for (var i in allAddrs) {
|
|
||||||
var a = allAddrs[i];
|
|
||||||
if (!currentAddrs[a.addressStr])
|
|
||||||
newAddrs.push(a);
|
|
||||||
}
|
|
||||||
for (var i = 0; i < newAddrs.length; i++) {
|
|
||||||
Socket.emit('subscribe', newAddrs[i].addressStr);
|
|
||||||
}
|
|
||||||
newAddrs.forEach(function(a) {
|
|
||||||
Socket.on(a.addressStr, function(txid) {
|
|
||||||
|
|
||||||
if (!a.isChange)
|
|
||||||
notification.funds('Funds received!', a.addressStr);
|
|
||||||
|
|
||||||
root.updateBalance(function() {
|
|
||||||
$rootScope.$digest();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!$rootScope.wallet.spendUnconfirmed && !Socket.isListeningBlocks()) {
|
|
||||||
Socket.emit('subscribe', 'inv');
|
|
||||||
Socket.on('block', function(block) {
|
|
||||||
root.updateBalance(function() {
|
|
||||||
$rootScope.$digest();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
return root;
|
|
||||||
});
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue