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

wallet and profile backup working on the UX

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-16 10:18:37 -03:00
commit 7a463c9a9d
5 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/models/Identity.js
View file

@ -39,7 +39,6 @@ function Identity(email, password, opts) {
this.walletDefaults = opts.walletDefaults || {};
this.version = opts.version || version;
this.email = email;
// open wallets
this.openWallets = [];
@ -401,7 +400,7 @@ Identity.prototype.createWallet = function(opts, cb) {
});
opts.publicKeyRing.addCopayer(
opts.privateKey.deriveBIP45Branch().extendedPublicKeyString(),
opts.nickname || this.email
opts.nickname || this.profile.getName()
);
log.debug('\t### PublicKeyRing Initialized');
@ -632,7 +631,7 @@ Identity.prototype.joinWallet = function(opts, cb) {
walletOpts.network = joinNetwork;
walletOpts.privateKey = privateKey;
walletOpts.nickname = opts.nickname || this.email;
walletOpts.nickname = opts.nickname || this.profile.getName();
if (opts.password)
walletOpts.password = opts.password;

2
js/models/Wallet.js
View file

@ -1171,7 +1171,7 @@ Wallet.fromObj = function(o, readOpts) {
*/
Wallet.prototype.toEncryptedObj = function() {
var walletObj = this.toObj();
return this.storage.export(walletObj);
return this.storage.encrypt(walletObj);
};
/**