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

fix networkname on partial import

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-20 17:23:34 -04:00
commit b70857f9e1
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -533,13 +533,14 @@ Wallet.prototype.toObj = function() {
// fromObj => from a trusted source
Wallet.fromObj = function(o, storage, network, blockchain) {
var opts = JSON.parse(JSON.stringify(o.opts));
opts.addressBook = o.addressBook;
if (o.privateKey)
opts.privateKey = PrivateKey.fromObj(o.privateKey);
else
opts.privateKey = new PrivateKey({
networkName: this.networkName
networkName: opts.networkName
});
if (o.publicKeyRing)