anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #206 from matiu/feature/rm-encryption-and-signing

Browse source 
removes encryption and signing. Relays on webrtc DTS. Keep authenticatio...
This commit is contained in:
Manuel Aráoz 2014-04-28 15:20:28 -03:00
commit 46a5edf9f7
5 changed files with 13 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/models/core/Wallet.js
View file

@ -53,12 +53,12 @@ Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
var hasChanged = pkr.merge(inPKR, true);
if (hasChanged) {
this.log('### BROADCASTING PKR');
recipients = null;
this.sendPublicKeyRing(recipients);
if (this.publicKeyRing.isComplete()) {
this._lockIncomming();
}
this.log('### BROADCASTING PKR');
recipients = null;
this.sendPublicKeyRing(recipients);
}
this.emit('publicKeyRingUpdated', this.publicKeyRing);
this.store();
@ -161,7 +161,6 @@ Wallet.prototype.netStart = function() {
var myId = self.getMyCopayerId();
var startOpts = {
copayerId: myId,
signingKeyHex: self.privateKey.getSigningKey(),
maxPeers: self.totalCopayers,
};