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

fixed errors to import/open wallets

Browse source
This commit is contained in:
Mario Colque 2014-04-28 11:22:41 -03:00
commit f0911caf63
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,9 +53,9 @@ WalletFactory.prototype._checkRead = function(walletId) {
WalletFactory.prototype.fromObj = function(obj) { WalletFactory.prototype.fromObj = function(obj) {
var opts = obj.opts; var opts = obj.opts;
opts.publicKeyRing = new PublicKeyRing.fromObj(obj.publicKeyRing); opts['publicKeyRing'] = new PublicKeyRing.fromObj(obj.publicKeyRing);
opts.txProposals = new TxProposals.fromObj(obj.txProposals); opts['txProposals'] = new TxProposals.fromObj(obj.txProposals);
opts.privateKey = new PrivateKey.fromObj(obj.privateKey); opts['privateKey'] = new PrivateKey.fromObj(obj.privateKey);
opts.storage = this.storage; opts.storage = this.storage;
opts.network = this.network; opts.network = this.network;
opts.blockchain = this.blockchain; opts.blockchain = this.blockchain;
@ -79,14 +79,16 @@ WalletFactory.prototype.read = function(walletId) {
if (! this._checkRead(walletId)) if (! this._checkRead(walletId))
return false; return false;
var obj = {};
var s = this.storage; var s = this.storage;
var opts = s.get(walletId, 'opts');
opts.id = walletId;
opts.publicKeyRing = s.get(walletId, 'publicKeyRing');
opts.txProposals = s.get(walletId, 'txProposals');
opts.privateKey = s.get(walletId, 'privateKey');
w = this.formObj(opts); obj.id = walletId;
obj.opts = s.get(walletId, 'opts');
obj.publicKeyRing = s.get(walletId, 'publicKeyRing');
obj.txProposals = s.get(walletId, 'txProposals');
obj.privateKey = s.get(walletId, 'privateKey');
var w = this.fromObj(obj);
return w; return w;
}; };