tfix address_id - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b58aae699ebea742fdac29dd5196945c0a3bd5e1
DIR parent da6d5b4baa55dabc8ed0f1a0d60eebf2254780c3
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 26 Aug 2014 12:38:05 +0200
fix address_id
Diffstat:
M plugins/trezor.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
DIR diff --git a/plugins/trezor.py b/plugins/trezor.py
t@@ -177,7 +177,7 @@ class TrezorWallet(NewWallet):
def address_id(self, address):
account_id, (change, address_index) = self.get_address_index(address)
- return "%s/%d/%d" % (account_id, change, address_index)
+ return "44'/0'/%s'/%d/%d" % (account_id, change, address_index)
def create_main_account(self, password):
self.create_account('Main account', None) #name, empty password
t@@ -221,6 +221,8 @@ class TrezorWallet(NewWallet):
return str(decrypted_msg)
def sign_message(self, address, message, password):
+ if not self.check_proper_device():
+ give_error('Wrong device or password')
try:
address_path = self.address_id(address)
address_n = self.get_client().expand_path(address_path)