mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #830 from yemel/fix/peer-id-taken
Derive token from cid, bring back the custom version of peerjs
This commit is contained in:
commit
2626414771
|
@ -927,7 +927,7 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
|
||||||
<script src="lib/angular-route/angular-route.min.js"></script>
|
<script src="lib/angular-route/angular-route.min.js"></script>
|
||||||
<script src="lib/angular-foundation/mm-foundation.min.js"></script>
|
<script src="lib/angular-foundation/mm-foundation.min.js"></script>
|
||||||
<script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
|
<script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
|
||||||
<script src="lib/peerjs/peer.min.js"></script>
|
<script src="lib/peer.js"></script> <!-- TODO Change this on PeerJS version 0.3.9 -->
|
||||||
<script src="lib/bitcore/browser/bundle.js"></script>
|
<script src="lib/bitcore/browser/bundle.js"></script>
|
||||||
<script src="lib/crypto-js/rollups/sha256.js"></script>
|
<script src="lib/crypto-js/rollups/sha256.js"></script>
|
||||||
<script src="lib/crypto-js/rollups/pbkdf2.js"></script>
|
<script src="lib/crypto-js/rollups/pbkdf2.js"></script>
|
||||||
|
|
|
@ -39,12 +39,6 @@ function Wallet(opts) {
|
||||||
this.id = opts.id || Wallet.getRandomId();
|
this.id = opts.id || Wallet.getRandomId();
|
||||||
this.name = opts.name;
|
this.name = opts.name;
|
||||||
|
|
||||||
// Renew token every 24hs
|
|
||||||
if (opts.tokenTime && new Date().getTime() - opts.tokenTime < 86400000) {
|
|
||||||
this.token = opts.token;
|
|
||||||
this.tokenTime = opts.tokenTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.verbose = opts.verbose;
|
this.verbose = opts.verbose;
|
||||||
this.publicKeyRing.walletId = this.id;
|
this.publicKeyRing.walletId = this.id;
|
||||||
this.txProposals.walletId = this.id;
|
this.txProposals.walletId = this.id;
|
||||||
|
@ -224,11 +218,6 @@ Wallet.prototype._optsToObj = function() {
|
||||||
version: this.version,
|
version: this.version,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (this.token) {
|
|
||||||
obj.token = this.token;
|
|
||||||
obj.tokenTime = new Date().getTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -287,7 +276,6 @@ Wallet.prototype.netStart = function(callback) {
|
||||||
var startOpts = {
|
var startOpts = {
|
||||||
copayerId: myId,
|
copayerId: myId,
|
||||||
privkey: myIdPriv,
|
privkey: myIdPriv,
|
||||||
token: self.token,
|
|
||||||
maxPeers: self.totalCopayers
|
maxPeers: self.totalCopayers
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -297,7 +285,6 @@ Wallet.prototype.netStart = function(callback) {
|
||||||
|
|
||||||
net.start(startOpts, function() {
|
net.start(startOpts, function() {
|
||||||
self.emit('ready', net.getPeer());
|
self.emit('ready', net.getPeer());
|
||||||
self.token = net.peer.options.token;
|
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
self.emit('publicKeyRingUpdated', true);
|
self.emit('publicKeyRingUpdated', true);
|
||||||
self.scheduleConnect();
|
self.scheduleConnect();
|
||||||
|
@ -384,8 +371,6 @@ Wallet.fromObj = function(o, storage, network, blockchain) {
|
||||||
|
|
||||||
Wallet.prototype.toEncryptedObj = function() {
|
Wallet.prototype.toEncryptedObj = function() {
|
||||||
var walletObj = this.toObj();
|
var walletObj = this.toObj();
|
||||||
delete walletObj.opts.token;
|
|
||||||
delete walletObj.opts.tokenTime;
|
|
||||||
return this.storage.export(walletObj);
|
return this.storage.export(walletObj);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -345,6 +345,7 @@ Network.prototype.start = function(opts, openCallback) {
|
||||||
|
|
||||||
if (!self.criticalError && self.tries < self.reconnectAttempts) {
|
if (!self.criticalError && self.tries < self.reconnectAttempts) {
|
||||||
self.tries++;
|
self.tries++;
|
||||||
|
self.opts.token = util.sha256(self.peerId).toString('hex');
|
||||||
self.peer = new Peer(self.peerId, self.opts);
|
self.peer = new Peer(self.peerId, self.opts);
|
||||||
self.started = true;
|
self.started = true;
|
||||||
self._setupPeerHandlers(openCallback);
|
self._setupPeerHandlers(openCallback);
|
||||||
|
|
Loading…
Reference in New Issue