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

updates ledger integration

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-09-04 10:17:59 -03:00
commit fe7a628edd
9 changed files with 282 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/js/controllers/create.js
View file

@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('createController',
$scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
};
this.externalIndexValues = lodash.range(0,20);
this.externalIndexValues = lodash.range(0,ledger.MAX_SLOT);
$scope.externalIndex = 0;
this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
$scope.totalCopayers = defaults.wallet.totalCopayers;
@ -73,24 +73,17 @@ angular.module('copayApp.controllers').controller('createController',
return;
}
self.loading = true;
if (form.hwLedger.$modelValue) {
self.ledger = true;
ledger.getXPubKey($scope.externalIndex, function(data) {
ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
self.ledger = false;
if (data.success) {
if (err) {
self.error = err;
$scope.$apply();
opts.extendedPublicKey = data.xpubkey;
opts.externalSource = 'ledger';
opts.externalIndex = $scope.externalIndex;
self._create(opts);
} else {
self.loading = false;
self.error = data.message;
$scope.$apply();
$log.debug(data.message);
return;
}
opts = lodash.assign(lopts, opts);
self._create(opts);
});
} else {
self._create(opts);
@ -98,6 +91,7 @@ angular.module('copayApp.controllers').controller('createController',
};
this._create = function (opts) {
self.loading = true;
$timeout(function() {
profileService.createWallet(opts, function(err, secret, walletId) {
self.loading = false;
@ -105,14 +99,14 @@ angular.module('copayApp.controllers').controller('createController',
if (err == "Error creating wallet" && opts.extendedPublicKey) {
err = gettext("This xpub index is already used by another wallet. Please select another index.");
}
$log.debug(err);
$log.warn(err);
self.error = err;
$timeout(function() {
$rootScope.$apply();
});
}
else {
if (opts.mnemonic && opts.n==1) {
if ( ( opts.mnemonic && opts.n==1) || otps.externalSource ) {
$rootScope.$emit('Local/WalletImported', walletId);
} else {
go.walletHome();

2
src/js/controllers/index.js
View file

@ -101,6 +101,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.walletId = fc.credentials.walletId;
self.isComplete = fc.isComplete();
self.canSign = fc.canSign();
self.isPrivKeyExternal = fc.isPrivKeyExternal();
self.externalSource = fc.getPrivKeyExternalSourceName();
self.txps = [];
self.copayers = [];
self.updateColor();

2
src/js/controllers/join.js
View file

@ -204,7 +204,7 @@ angular.module('copayApp.controllers').controller('joinController',
}
$timeout(function() {
var fc = profileService.focusedClient;
if (opts.mnemonic && fc.isComplete()) {
if ( ( opts.mnemonic || opts.externalSource ) && fc.isComplete()) {
$rootScope.$emit('Local/WalletImported', fc.credentials.walletId);
} else {
go.walletHome();

6
src/js/controllers/walletHome.js
View file

@ -184,7 +184,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.error = null;
$scope.copayers = copayers
$scope.copayerId = fc.credentials.copayerId;
$scope.canSign = fc.canSign();
$scope.canSign = fc.canSign() || fc.isPrivKeyExternal();
$scope.loading = null;
$scope.color = fc.backgroundColor;
@ -244,7 +244,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.sign = function(txp) {
var fc = profileService.focusedClient;
if (!fc.canSign())
if (!fc.canSign() && !fc.isPrivKeyExternal())
return;
if (fc.isPrivKeyEncrypted()) {
@ -801,7 +801,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
return self.setSendError(err);
}
if (!fc.canSign()) {
if (!fc.canSign() && !fc.isPrivKeyExternal()) {
$log.info('No signing proposal: No private key')
self.setOngoingProcess();
self.resetForm();