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

fix import from xPriv (#4192)

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-05-09 12:03:25 -03:00 • committed by Gustavo Maximiliano Cortez
commit 88ac00afcc
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/js/controllers/import.js
View file

@ -82,7 +82,6 @@ angular.module('copayApp.controllers').controller('importController',
}; };
var _importExtendedPrivateKey = function(xPrivKey, opts) { var _importExtendedPrivateKey = function(xPrivKey, opts) {
console.log('[import.js.84:xPrivKey:]',xPrivKey); //TODO
self.loading = true; self.loading = true;
$timeout(function() { $timeout(function() {
@ -177,7 +176,16 @@ console.log('[import.js.84:xPrivKey:]',xPrivKey); //TODO
if ($scope.bwsurl) if ($scope.bwsurl)
opts.bwsurl = $scope.bwsurl; opts.bwsurl = $scope.bwsurl;
var passphrase = form.passphrase.$modelValue;
var pathData = derivationPathHelper.parse($scope.derivationPath);
if (!pathData) {
this.error = gettext('Invalid derivation path');
return;
}
opts.account = pathData.account;
opts.networkName = pathData.networkName;
opts.derivationStrategy = pathData.derivationStrategy;
var words = form.words.$modelValue; var words = form.words.$modelValue;
this.error = null; this.error = null;
@ -199,18 +207,9 @@ console.log('[import.js.84:xPrivKey:]',xPrivKey); //TODO
return; return;
} }
var passphrase = form.passphrase.$modelValue;
opts.passphrase = form.passphrase.$modelValue || null; opts.passphrase = form.passphrase.$modelValue || null;
var pathData = derivationPathHelper.parse($scope.derivationPath);
if (!pathData) {
this.error = gettext('Invalid derivation path');
return;
}
opts.account = pathData.account;
opts.networkName = pathData.networkName;
opts.derivationStrategy = pathData.derivationStrategy;
_importMnemonic(words, opts); _importMnemonic(words, opts);
}; };

9
src/js/services/derivationPathHelper.js
View file

@ -16,6 +16,13 @@ angular.module('copayApp.services').factory('derivationPathHelper', function(lod
case "44'": case "44'":
ret.derivationStrategy = 'BIP44'; ret.derivationStrategy = 'BIP44';
break; break;
case "45'":
return {
derivationStrategy: 'BIP45',
networkName: 'livenet',
account: 0,
}
break;
case "48'": case "48'":
ret.derivationStrategy = 'BIP48'; ret.derivationStrategy = 'BIP48';
break; break;
@ -37,7 +44,7 @@ angular.module('copayApp.services').factory('derivationPathHelper', function(lod
var match = arr[3].match(/(\d+)'/); var match = arr[3].match(/(\d+)'/);
if (!match) if (!match)
return false; return false;
ret.account = + match[1] ret.account = +match[1]
return ret; return ret;
}; };

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

@ -495,7 +495,7 @@ angular.module('copayApp.services')
var walletClient = bwcService.getClient(); var walletClient = bwcService.getClient();
$log.debug('Importing Wallet xPrivKey'); $log.debug('Importing Wallet xPrivKey');
walletClient.importFromExtendedPrivateKey(xPrivKey, function(err) { walletClient.importFromExtendedPrivateKey(xPrivKey, opts, function(err) {
if (err) if (err)
return bwsError.cb(err, gettext('Could not import'), cb); return bwsError.cb(err, gettext('Could not import'), cb);