tMerge pull request #3431 from kyuupichan/upstream - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit d878286a3a9a2db673b6fd34e66ab2cb34eac02e
DIR parent f0eb5536814bc821c93c9c09613dddf58bea7f5f
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sat, 2 Dec 2017 13:00:58 +0100
Merge pull request #3431 from kyuupichan/upstream
Make trezor code specific to trezor
Diffstat:
M plugins/trezor/plugin.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
t@@ -183,11 +183,11 @@ class TrezorCompatiblePlugin(HW_PluginBase):
if method == TIM_NEW:
strength = 64 * (item + 2) # 128, 192 or 256
- u2f_counter = 0
- skip_backup = False
- client.reset_device(True, strength, passphrase_protection,
- pin_protection, label, language,
- u2f_counter, skip_backup)
+ args = [True, strength, passphrase_protection,
+ pin_protection, label, language]
+ if self.device == 'TREZOR':
+ args.extend([0, False]) # u2f_counter, skip_backup
+ client.reset_device(*args)
elif method == TIM_RECOVER:
word_count = 6 * (item + 2) # 12, 18 or 24
client.step = 0