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

fix import

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-08-24 17:09:59 -03:00
commit 1ab9d8507f
6 changed files with 205 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/js/services/profileService.js
View file

@ -25,7 +25,7 @@ angular.module('copayApp.services')
// Set local object
if (walletId)
root.focusedClient = root.walletClients[walletId];
else
else
root.focusedClient = [];
if (lodash.isEmpty(root.focusedClient)) {
@ -174,7 +174,7 @@ angular.module('copayApp.services')
var walletClient = bwcService.getClient();
// TODO LANG...
// TODO...
log.warn("TODO LANG!")
$log.warn("TODO LANG!")
walletClient.seedFromRandomWithMnemonic('livenet');
walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
@ -207,7 +207,7 @@ log.warn("TODO LANG!")
}
// TODO LANG...
// TODO...
log.warn("TODO LANG!")
$log.warn("TODO LANG!")
walletClient.seedFromRandomWithMnemonic(opts.networkName);
walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
@ -250,7 +250,7 @@ log.warn("TODO LANG!")
if (lodash.find(root.profile.credentials, {
'walletId': walletData.walletId
})) {
return cb(gettext('Cannot join the same wallet more that once'));
return cb(gettext('Cannot join the same wallet more that once'));
}
} catch (ex) {
return cb(gettext('Bad wallet invitation'));
@ -298,18 +298,7 @@ log.warn("TODO LANG!")
});
};
root.importWallet = function(str, opts, cb) {
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet:', opts);
try {
walletClient.import(str, {
compressed: opts.compressed,
password: opts.password
});
} catch (err) {
return cb(gettext('Could not import. Check input file and password'));
}
root._addWalletClient = function(walletClient, cb) {
var walletId = walletClient.credentials.walletId;
// check if exist
@ -327,8 +316,52 @@ log.warn("TODO LANG!")
return cb(null, walletId);
});
});
};
root.importWallet = function(str, opts, cb) {
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet:', opts);
try {
walletClient.import(str, {
compressed: opts.compressed,
password: opts.password
});
} catch (err) {
return cb(gettext('Could not import. Check input file and password'));
}
root._addWalletClient(walletClient, cb);
};
root.importWalletMnemonic = function(words, opts, cb) {
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet Mnemonic');
walletClient.importFromMnemonic(words, {
passphrase: opts.passphrase,
}, function(err) {
if (err)
return bwsError.cb(err, gettext('Could not import'), cb);
root._addWalletClient(walletClient, cb);
});
};
root.importWalletMnemonicEx = function(words, opts, cb) {
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet Mnemonic EX', opts);
walletClient.importFromMnemonic(words, opts,
function(err) {
if (err)
return bwsError.cb(err, gettext('Could not import'), cb);
root._addWalletClient(walletClient, cb);
});
};
root.create = function(opts, cb) {
$log.info('Creating profile');
configService.get(function(err) {
@ -420,13 +453,17 @@ log.warn("TODO LANG!")
$log.debug('Wallet is encrypted');
$rootScope.$emit('Local/NeedsPassword', false, function(err2, password) {
if (err2 || !password) {
return cb({message: (err2 || gettext('Password needed'))});
return cb({
message: (err2 || gettext('Password needed'))
});
}
try {
fc.unlock(password);
} catch (e) {
$log.debug(e);
return cb({message: gettext('Wrong password')});
return cb({
message: gettext('Wrong password')
});
}
$timeout(function() {
if (fc.isPrivKeyEncrypted()) {