mirror of https://github.com/BTCPrivate/copay.git
Bug fixes - retest intel tee.
This commit is contained in:
parent
413990f94c
commit
36cb23015a
|
@ -63,9 +63,11 @@ angular.module('copayApp.controllers').controller('createController',
|
||||||
var seedOptions = [{
|
var seedOptions = [{
|
||||||
id: 'new',
|
id: 'new',
|
||||||
label: gettextCatalog.getString('Random'),
|
label: gettextCatalog.getString('Random'),
|
||||||
|
supportsTestnet: true
|
||||||
}, {
|
}, {
|
||||||
id: 'set',
|
id: 'set',
|
||||||
label: gettextCatalog.getString('Specify Recovery Phrase...'),
|
label: gettextCatalog.getString('Specify Recovery Phrase...'),
|
||||||
|
supportsTestnet: false
|
||||||
}];
|
}];
|
||||||
|
|
||||||
$scope.seedSource = seedOptions[0];
|
$scope.seedSource = seedOptions[0];
|
||||||
|
@ -81,12 +83,14 @@ angular.module('copayApp.controllers').controller('createController',
|
||||||
seedOptions.push({
|
seedOptions.push({
|
||||||
id: walletService.externalSource.ledger.id,
|
id: walletService.externalSource.ledger.id,
|
||||||
label: walletService.externalSource.ledger.longName,
|
label: walletService.externalSource.ledger.longName,
|
||||||
|
supportsTestnet: walletService.externalSource.ledger.supportsTestnet
|
||||||
});
|
});
|
||||||
|
|
||||||
if (walletService.externalSource.trezor.supported) {
|
if (walletService.externalSource.trezor.supported) {
|
||||||
seedOptions.push({
|
seedOptions.push({
|
||||||
id: walletService.externalSource.trezor.id,
|
id: walletService.externalSource.trezor.id,
|
||||||
label: walletService.externalSource.trezor.longName,
|
label: walletService.externalSource.trezor.longName,
|
||||||
|
supportsTestnet: walletService.externalSource.trezor.supportsTestnet
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,6 +98,7 @@ angular.module('copayApp.controllers').controller('createController',
|
||||||
seedOptions.push({
|
seedOptions.push({
|
||||||
id: walletService.externalSource.intelTEE.id,
|
id: walletService.externalSource.intelTEE.id,
|
||||||
label: walletService.externalSource.intelTEE.longName,
|
label: walletService.externalSource.intelTEE.longName,
|
||||||
|
supportsTestnet: walletService.externalSource.intelTEE.supportsTestnet
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -183,7 +188,7 @@ angular.module('copayApp.controllers').controller('createController',
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) {
|
src.getInfoForNewWallet(opts.n > 1, account, opts.networkName, function(err, lopts) {
|
||||||
ongoingProcess.set('connecting ' + $scope.seedSource.id, false);
|
ongoingProcess.set('connecting ' + $scope.seedSource.id, false);
|
||||||
if (err) {
|
if (err) {
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||||
|
|
|
@ -262,7 +262,7 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.importTrezor = function(account, isMultisig) {
|
$scope.importTrezor = function(account, isMultisig) {
|
||||||
trezor.getInfoForNewWallet(isMultisig, account, function(err, lopts) {
|
trezor.getInfoForNewWallet(isMultisig, account, 'livenet', function(err, lopts) {
|
||||||
ongoingProcess.clear();
|
ongoingProcess.clear();
|
||||||
if (err) {
|
if (err) {
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||||
|
@ -318,7 +318,7 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.importLedger = function(account) {
|
$scope.importLedger = function(account) {
|
||||||
ledger.getInfoForNewWallet(true, account, function(err, lopts) {
|
ledger.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
|
||||||
ongoingProcess.clear();
|
ongoingProcess.clear();
|
||||||
if (err) {
|
if (err) {
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||||
|
|
|
@ -142,7 +142,7 @@ angular.module('copayApp.controllers').controller('joinController',
|
||||||
ongoingProcess.set('connecting' + self.seedSourceId, true);
|
ongoingProcess.set('connecting' + self.seedSourceId, true);
|
||||||
var src = self.seedSourceId == walletService.externalSource.ledger.id ? ledger : trezor;
|
var src = self.seedSourceId == walletService.externalSource.ledger.id ? ledger : trezor;
|
||||||
|
|
||||||
src.getInfoForNewWallet(true, account, function(err, lopts) {
|
src.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
|
||||||
ongoingProcess.set('connecting' + self.seedSourceId, false);
|
ongoingProcess.set('connecting' + self.seedSourceId, false);
|
||||||
if (err) {
|
if (err) {
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||||
|
|
|
@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesExternalController
|
||||||
return source.id == wallet.getPrivKeyExternalSourceName();
|
return source.id == wallet.getPrivKeyExternalSourceName();
|
||||||
});
|
});
|
||||||
|
|
||||||
if ($scope.externalSource.hasEmbeddedHardware) {
|
if ($scope.externalSource.isEmbeddedHardware) {
|
||||||
$scope.hardwareConnected = $scope.externalSource.version.length > 0;
|
$scope.hardwareConnected = $scope.externalSource.version.length > 0;
|
||||||
|
|
||||||
$scope.showMneumonicFromHardwarePopup = function() {
|
$scope.showMneumonicFromHardwarePopup = function() {
|
||||||
|
|
|
@ -12,7 +12,8 @@ angular.module('copayApp.services')
|
||||||
name: 'Intel TEE',
|
name: 'Intel TEE',
|
||||||
longName: 'Intel TEE Hardware Wallet',
|
longName: 'Intel TEE Hardware Wallet',
|
||||||
derivationStrategy: 'BIP44',
|
derivationStrategy: 'BIP44',
|
||||||
hasEmbeddedHardware: true
|
isEmbeddedHardware: true,
|
||||||
|
supportsTestnet: true
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!root.description.supported) {
|
if (!root.description.supported) {
|
||||||
|
@ -28,7 +29,7 @@ angular.module('copayApp.services')
|
||||||
$log.error('Failed to create Intel Wallet enclave');
|
$log.error('Failed to create Intel Wallet enclave');
|
||||||
}
|
}
|
||||||
|
|
||||||
root.getInfoForNewWallet = function(isMultisig, account, callback) {
|
root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
|
||||||
var opts = {};
|
var opts = {};
|
||||||
initSource(opts, function(err, opts) {
|
initSource(opts, function(err, opts) {
|
||||||
if (err) return callback(err);
|
if (err) return callback(err);
|
||||||
|
@ -37,7 +38,7 @@ angular.module('copayApp.services')
|
||||||
if (err) return callback(err);
|
if (err) return callback(err);
|
||||||
|
|
||||||
opts.entropySource = entropySource;
|
opts.entropySource = entropySource;
|
||||||
root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, account, opts.networkName), function(data) {
|
root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, account, networkName), function(data) {
|
||||||
if (!data.success) {
|
if (!data.success) {
|
||||||
$log.warn(data.message);
|
$log.warn(data.message);
|
||||||
return callback(data);
|
return callback(data);
|
||||||
|
@ -185,7 +186,7 @@ angular.module('copayApp.services')
|
||||||
name: root.description.id,
|
name: root.description.id,
|
||||||
id: teeStatus
|
id: teeStatus
|
||||||
};
|
};
|
||||||
$log.debug('TEE wallet created: ' + opts.hwInfo);
|
$log.debug('TEE wallet created: ' + opts.hwInfo.id);
|
||||||
return callback(null, opts);
|
return callback(null, opts);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,8 @@ angular.module('copayApp.services')
|
||||||
id: 'ledger',
|
id: 'ledger',
|
||||||
name: 'Ledger',
|
name: 'Ledger',
|
||||||
longName: 'Ledger Hardware Wallet',
|
longName: 'Ledger Hardware Wallet',
|
||||||
hasEmbeddedHardware: false
|
isEmbeddedHardware: false,
|
||||||
|
supportsTestnet: false
|
||||||
};
|
};
|
||||||
|
|
||||||
root.callbacks = {};
|
root.callbacks = {};
|
||||||
|
@ -43,7 +44,8 @@ angular.module('copayApp.services')
|
||||||
return callback(opts);
|
return callback(opts);
|
||||||
};
|
};
|
||||||
|
|
||||||
root.getInfoForNewWallet = function(isMultisig, account, callback) {
|
root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
|
||||||
|
// networkName not used for this hardware (always livenet)
|
||||||
root.getEntropySource(isMultisig, account, function(err, entropySource) {
|
root.getEntropySource(isMultisig, account, function(err, entropySource) {
|
||||||
if (err) return callback(err);
|
if (err) return callback(err);
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,8 @@ angular.module('copayApp.services')
|
||||||
name: 'Trezor',
|
name: 'Trezor',
|
||||||
longName: 'Trezor Hardware Wallet',
|
longName: 'Trezor Hardware Wallet',
|
||||||
derivationStrategy: 'BIP48',
|
derivationStrategy: 'BIP48',
|
||||||
hasEmbeddedHardware: false
|
isEmbeddedHardware: false,
|
||||||
|
supportsTestnet: false
|
||||||
};
|
};
|
||||||
|
|
||||||
root.getEntropySource = function(isMultisig, account, callback) {
|
root.getEntropySource = function(isMultisig, account, callback) {
|
||||||
|
@ -40,7 +41,8 @@ angular.module('copayApp.services')
|
||||||
return callback(opts);
|
return callback(opts);
|
||||||
};
|
};
|
||||||
|
|
||||||
root.getInfoForNewWallet = function(isMultisig, account, callback) {
|
root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
|
||||||
|
// networkName not used for this hardware (always livenet)
|
||||||
var opts = {};
|
var opts = {};
|
||||||
root.getEntropySource(isMultisig, account, function(err, data) {
|
root.getEntropySource(isMultisig, account, function(err, data) {
|
||||||
if (err) return callback(err);
|
if (err) return callback(err);
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<div ng-include="'views/includes/walletItem.html'"></div>
|
<div ng-include="'views/includes/walletItem.html'"></div>
|
||||||
|
|
||||||
<div ng-if="!hasEmbeddedHardware">
|
<div ng-if="!externalSource.isEmbeddedHardware">
|
||||||
<div ng-if="!hardwareConnected" class="info centered">
|
<div ng-if="!hardwareConnected" class="info centered">
|
||||||
<span translate>No hardware information available.</span>
|
<span translate>No hardware information available.</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="hasEmbeddedHardware">
|
<div ng-if="externalSource.isEmbeddedHardware">
|
||||||
<div ng-if="!hardwareConnected" class="warning centered">
|
<div ng-if="!hardwareConnected" class="warning centered">
|
||||||
<span translate>Hardware not connected.</span><br>
|
<span translate>Hardware not connected.</span><br>
|
||||||
<span translate>Check installation and retry.</span>
|
<span translate>Check installation and retry.</span>
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
ng-model="formData.derivationPath">
|
ng-model="formData.derivationPath">
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<ion-toggle ng-show="seedSource.id == 'new'" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
<ion-toggle ng-show="seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
||||||
<span translate>Testnet</span>
|
<span translate>Testnet</span>
|
||||||
</ion-toggle>
|
</ion-toggle>
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@
|
||||||
ng-model="formData.derivationPath">
|
ng-model="formData.derivationPath">
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<ion-toggle ng-show="seedSource.id == 'new' || seedSource.id == 'intelTEE'" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
<ion-toggle ng-show="seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
||||||
Testnet
|
Testnet
|
||||||
</ion-toggle>
|
</ion-toggle>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue