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

Bug fixes - retest intel tee.

Browse source
This commit is contained in:
Gabrielbazan7 2017-04-07 17:12:02 -04:00 • committed by Andy Phillipson
commit 36cb23015a
10 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,8 @@ angular.module('copayApp.services')
name: 'Intel TEE',
longName: 'Intel TEE Hardware Wallet',
derivationStrategy: 'BIP44',
hasEmbeddedHardware: true
isEmbeddedHardware: true,
supportsTestnet: true
};
if (!root.description.supported) {
@ -28,7 +29,7 @@ angular.module('copayApp.services')
$log.error('Failed to create Intel Wallet enclave');
}
root.getInfoForNewWallet = function(isMultisig, account, callback) {
root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
var opts = {};
initSource(opts, function(err, opts) {
if (err) return callback(err);
@ -37,7 +38,7 @@ angular.module('copayApp.services')
if (err) return callback(err);
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) {
$log.warn(data.message);
return callback(data);
@ -185,7 +186,7 @@ angular.module('copayApp.services')
name: root.description.id,
id: teeStatus
};
$log.debug('TEE wallet created: ' + opts.hwInfo);
$log.debug('TEE wallet created: ' + opts.hwInfo.id);
return callback(null, opts);
}
};

6
src/js/services/ledger.js
View file

@ -10,7 +10,8 @@ angular.module('copayApp.services')
id: 'ledger',
name: 'Ledger',
longName: 'Ledger Hardware Wallet',
hasEmbeddedHardware: false
isEmbeddedHardware: false,
supportsTestnet: false
};
root.callbacks = {};
@ -43,7 +44,8 @@ angular.module('copayApp.services')
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) {
if (err) return callback(err);

6
src/js/services/trezor.js
View file

@ -13,7 +13,8 @@ angular.module('copayApp.services')
name: 'Trezor',
longName: 'Trezor Hardware Wallet',
derivationStrategy: 'BIP48',
hasEmbeddedHardware: false
isEmbeddedHardware: false,
supportsTestnet: false
};
root.getEntropySource = function(isMultisig, account, callback) {
@ -40,7 +41,8 @@ angular.module('copayApp.services')
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 = {};
root.getEntropySource(isMultisig, account, function(err, data) {
if (err) return callback(err);