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

fix history sync

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-11-10 20:05:05 -03:00
commit 232b78ee8c
12 changed files with 96 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ angular.module('copayApp.services')
root.callbacks = {};
root.getEntropySource = function(isMultisig, account, callback) {
root.getXPubKey(hwWallet.getEntropyPath(isMultisig, account), function(data) {
root.getXPubKey(hwWallet.getEntropyPath('trezor', isMultisig, account), function(data) {
if (!data.success)
return callback(hwWallet._err(data));
@ -31,13 +31,17 @@ angular.module('copayApp.services')
$log.debug('Waiting TREZOR to settle...');
$timeout(function() {
root.getXPubKey(hwWallet.getAddressPath(isMultisig, account), function(data) {
root.getXPubKey(hwWallet.getAddressPath('trezor', isMultisig, account), function(data) {
if (!data.success)
return callback(hwWallet._err(data));
opts.extendedPublicKey = data.xpubkey;
opts.externalSource = 'trezor';
opts.account = account;
if (isMultisig)
opts.derivationStrategy = 'BIP48';
return callback(null, opts);
});
}, SETTLE_TIME);