From 4c9385f78b77272c0bc90c4c233ffef850150869 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 28 Sep 2015 10:26:57 -0300 Subject: [PATCH] trezor WIP --- src/js/services/profileService.js | 2 +- src/js/services/trezor.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 0e9d0883d..c3dd68916 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -276,7 +276,7 @@ console.log('[profileService.js.239:walletClient:]',walletClient); //TODO root._seedWallet(opts, function(err, walletClient) { if (err) return cb(err); - walletClient.joinWallet(opts.secret, opts.myName || 'me', function(err) { + walletClient.joinWallet(opts.secret, opts.myName || 'me', {}, function(err) { if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb); root.profile.credentials.push(JSON.parse(walletClient.export())); diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js index ea1c1d725..951b21c5c 100644 --- a/src/js/services/trezor.js +++ b/src/js/services/trezor.js @@ -72,6 +72,7 @@ angular.module('copayApp.services') var pathArr = i.path.split('/'); console.log('[trezor.js.72:pathArr:]',pathArr); //TODO var n = [44 | 0x80000000, 0 | 0x80000000, account | 0x80000000, parseInt(pathArr[1]) , parseInt(pathArr[2])]; +console.log('[trezor.js.74]', n); //TODO return { address_n: n, prev_index: i.vout,