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

checks network match when joining a wallet

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-09 21:00:28 -03:00
commit 4ae3748414
5 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/models/core/PublicKeyRing.js
View file

@ -248,7 +248,7 @@ PublicKeyRing.prototype._checkInPKR = function(inPKR, ignoreId) {
}
if (this.network.name !== inPKR.network.name) {
throw new Error('inPKR network mismatch. Should be '+this.network.name +
throw new Error('Network mismatch. Should be '+this.network.name +
' and found '+inPKR.network.name);
}

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

@ -87,7 +87,15 @@ Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
var inPKR = copay.PublicKeyRing.fromObj(data.publicKeyRing);
var wasIncomplete = !this.publicKeyRing.isComplete();
var hasChanged = this.publicKeyRing.merge(inPKR, true);
var hasChanged;
try{
hasChanged = this.publicKeyRing.merge(inPKR, true);
} catch (e){
console.log('## WALLET ERROR', e); //TODO
this.emit('connectionError', e.message);
return;
}
if (hasChanged) {
if (wasIncomplete) {
@ -381,7 +389,8 @@ Wallet.prototype.sendWalletId = function(recipients) {
this.network.send(recipients, {
type: 'walletId',
walletId: this.id,
opts: this._optsToObj()
opts: this._optsToObj(),
networkName: this.getNetworkName(),
});
};

6
js/models/core/WalletFactory.js
View file

@ -220,6 +220,12 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
});
self.network.on('data', function(sender, data) {
if (data.type ==='walletId') {
console.log('[WalletFactory.js.223]', data.networkName, self.networkName); //TODO
if (data.networkName !== self.networkName ){
return cb('badNetwork');
}
data.opts.privateKey = privateKey;
data.opts.nickname = nickname;
data.opts.passphrase = passphrase;