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

Bug fixes - ledger testing

Browse source
This commit is contained in:
Andy Phillipson 2017-04-07 10:54:30 -04:00
commit 413990f94c
9 changed files with 66 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,8 @@ angular.module('copayApp.services')
id: 'intelTEE',
name: 'Intel TEE',
longName: 'Intel TEE Hardware Wallet',
derivationStrategy: 'BIP44'
derivationStrategy: 'BIP44',
hasEmbeddedHardware: true
};
if (!root.description.supported) {
@ -27,16 +28,16 @@ angular.module('copayApp.services')
$log.error('Failed to create Intel Wallet enclave');
}
root.getInfoForNewWallet = function(opts, callback) {
root.getInfoForNewWallet = function(isMultisig, account, callback) {
var opts = {};
initSource(opts, function(err, opts) {
if (err) return callback(err);
var isMultisig = opts.n > 1;
root.getEntropySource(opts.hwInfo.id, isMultisig, opts.account, function(err, entropySource) {
root.getEntropySource(opts.hwInfo.id, isMultisig, account, function(err, entropySource) {
if (err) return callback(err);
opts.entropySource = entropySource;
root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, opts.account, opts.networkName), function(data) {
root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, account, opts.networkName), function(data) {
if (!data.success) {
$log.warn(data.message);
return callback(data);

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

@ -9,7 +9,8 @@ angular.module('copayApp.services')
supported: platformInfo.supportsLedger,
id: 'ledger',
name: 'Ledger',
longName: 'Ledger Hardware Wallet'
longName: 'Ledger Hardware Wallet',
hasEmbeddedHardware: false
};
root.callbacks = {};
@ -42,13 +43,13 @@ angular.module('copayApp.services')
return callback(opts);
};
root.getInfoForNewWallet = function(opts, callback) {
var isMultisig = opts.n > 1;
root.getEntropySource(isMultisig, opts.account, function(err, entropySource) {
root.getInfoForNewWallet = function(isMultisig, account, callback) {
root.getEntropySource(isMultisig, account, function(err, entropySource) {
if (err) return callback(err);
var opts = {};
opts.entropySource = entropySource;
root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, opts.account), function(data) {
root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, account), function(data) {
if (!data.success) {
$log.warn(data.message);
return callback(data);

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

@ -12,7 +12,8 @@ angular.module('copayApp.services')
id: 'trezor',
name: 'Trezor',
longName: 'Trezor Hardware Wallet',
derivationStrategy: 'BIP48'
derivationStrategy: 'BIP48',
hasEmbeddedHardware: false
};
root.getEntropySource = function(isMultisig, account, callback) {
@ -39,15 +40,15 @@ angular.module('copayApp.services')
return callback(opts);
};
root.getInfoForNewWallet = function(opts, callback) {
var isMultisig = opts.n > 1;
root.getEntropySource(isMultisig, opts.account, function(err, data) {
root.getInfoForNewWallet = function(isMultisig, account, callback) {
var opts = {};
root.getEntropySource(isMultisig, account, function(err, data) {
if (err) return callback(err);
opts.entropySource = data;
$log.debug('Waiting TREZOR to settle...');
$timeout(function() {
root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, opts.account), function(data) {
root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, account), function(data) {
if (!data.success)
return callback(hwWallet._err(data));