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

Merge pull request #3335 from isocolsky/ref/account

Browse source 
All seed* and import* methods working with account 0
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-27 16:03:15 -03:00
commit a0f3a5a03f
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -8,7 +8,7 @@
],
"dependencies": {
"angular": "1.4.6",
"angular-bitcore-wallet-client": "1.1.1",
"angular-bitcore-wallet-client": "1.1.2",
"angular-foundation": "0.7.0",
"angular-gettext": "2.1.0",
"angular-moment": "0.10.1",

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

@ -178,7 +178,11 @@ angular.module('copayApp.services')
if (opts.mnemonic) {
try {
opts.mnemonic = root._normalizeMnemonic(opts.mnemonic);
walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
walletClient.seedFromMnemonic(opts.mnemonic, {
network: network,
passphrase: opts.passphrase,
account: 0,
});
} catch (ex) {
$log.info(ex);
return cb(gettext('Could not create: Invalid wallet seed'));
@ -192,7 +196,9 @@ angular.module('copayApp.services')
}
} else if (opts.extendedPublicKey) {
try {
walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource);
walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource, {
account: 0
});
} catch (ex) {
$log.warn("Creating wallet from Extended Public Key Arg:", ex, opts);
return cb(gettext('Could not create using the specified extended public key'));
@ -200,12 +206,21 @@ angular.module('copayApp.services')
} else {
var lang = uxLanguage.getCurrentLanguage();
try {
walletClient.seedFromRandomWithMnemonic(network, opts.passphrase, lang);
walletClient.seedFromRandomWithMnemonic({
network: network,
passphrase: opts.passphrase,
language: lang,
account: 0,
});
} catch (e) {
$log.info('Error creating seed: ' + e.message);
if (e.message.indexOf('language') > 0) {
$log.info('Using default language for mnemonic');
walletClient.seedFromRandomWithMnemonic(network, opts.passphrase);
walletClient.seedFromRandomWithMnemonic({
network: network,
passphrase: opts.passphrase,
account: 0,
});
} else {
return cb(e);
}
@ -392,6 +407,7 @@ angular.module('copayApp.services')
walletClient.importFromMnemonic(words, {
network: opts.networkName,
passphrase: opts.passphrase,
account: 0,
}, function(err) {
if (err)
return bwsError.cb(err, gettext('Could not import'), cb);
@ -407,7 +423,9 @@ angular.module('copayApp.services')
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet XPubKey');
walletClient.importFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource, function(err) {
walletClient.importFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource, {
account: 0
}, function(err) {
if (err) {
// in HW wallets, req key is always the same. They can't addAccess.