Merge pull request #1015 from m0mchil/show_on_trezor
Confirm address on TREZOR
This commit is contained in:
commit
018e073dd3
|
@ -131,6 +131,10 @@ class Plugin(BasePlugin):
|
||||||
self.wallet.trezor_sign(tx)
|
self.wallet.trezor_sign(tx)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
tx.error = str(e)
|
tx.error = str(e)
|
||||||
|
@hook
|
||||||
|
def receive_menu(self, menu, addrs):
|
||||||
|
if not self.wallet.is_watching_only() and len(addrs) == 1:
|
||||||
|
menu.addAction(_("Show on TREZOR"), lambda: self.wallet.show_address(addrs[0]))
|
||||||
|
|
||||||
def settings_widget(self, window):
|
def settings_widget(self, window):
|
||||||
return EnterButton(_('Settings'), self.settings_dialog)
|
return EnterButton(_('Settings'), self.settings_dialog)
|
||||||
|
@ -277,6 +281,21 @@ class TrezorWallet(BIP32_HD_Wallet):
|
||||||
# twd.emit(SIGNAL('trezor_done'))
|
# twd.emit(SIGNAL('trezor_done'))
|
||||||
#return str(decrypted_msg)
|
#return str(decrypted_msg)
|
||||||
|
|
||||||
|
def show_address(self, address):
|
||||||
|
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)
|
||||||
|
except Exception, e:
|
||||||
|
give_error(e)
|
||||||
|
try:
|
||||||
|
self.get_client().get_address('Bitcoin', address_n, True)
|
||||||
|
except Exception, e:
|
||||||
|
give_error(e)
|
||||||
|
finally:
|
||||||
|
twd.emit(SIGNAL('trezor_done'))
|
||||||
|
|
||||||
def sign_message(self, address, message, password):
|
def sign_message(self, address, message, password):
|
||||||
if not self.check_proper_device():
|
if not self.check_proper_device():
|
||||||
give_error('Wrong device or password')
|
give_error('Wrong device or password')
|
||||||
|
@ -426,6 +445,8 @@ class TrezorQtGuiMixin(object):
|
||||||
message = "Confirm transaction fee on Trezor device to continue"
|
message = "Confirm transaction fee on Trezor device to continue"
|
||||||
elif msg.code == 7:
|
elif msg.code == 7:
|
||||||
message = "Confirm message to sign on Trezor device to continue"
|
message = "Confirm message to sign on Trezor device to continue"
|
||||||
|
elif msg.code == 10:
|
||||||
|
message = "Confirm address on Trezor device to continue"
|
||||||
else:
|
else:
|
||||||
message = "Check Trezor device to continue"
|
message = "Check Trezor device to continue"
|
||||||
twd.start(message)
|
twd.start(message)
|
||||||
|
|
Loading…
Reference in New Issue