- fix sign/verify messages

- fix hardware wallet tx_outputs

plugins/trezor/plugin.py

@@ -25,6 +25,9 @@ class TrezorCompatibleKeyStore(Hardware_KeyStore):
     root = "m/44'/0'"
     account_id = 0
 
+    def load(self, storage, name):
+        self.xpub = storage.get('master_public_keys', {}).get(name)
+
     def get_derivation(self):
         return self.root + "/%d'"%self.account_id
 
@@ -46,9 +49,9 @@ class TrezorCompatibleKeyStore(Hardware_KeyStore):
         result = client.decrypt_message(address_n, nonce, message, msg_hmac)
         return result.message
 
-    def sign_message(self, address, message, password):
+    def sign_message(self, sequence, message, password):
         client = self.get_client()
-        address_path = self.address_id(address)
+        address_path = self.get_derivation() + "/%d/%d"%sequence
         address_n = client.expand_path(address_path)
         msg_sig = client.sign_message('Bitcoin', address_n, message)
         return msg_sig.signature
@@ -312,7 +315,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
                 txoutputtype.op_return_data = address[2:]
             elif _type == TYPE_ADDRESS:
                 if change is not None:
-                    address_path = "%s/%d/%d/"%(derivation, change, index)
+                    address_path = "%s/%d/%d"%(derivation, change, index)
                     address_n = self.client_class.expand_path(address_path)
                     txoutputtype.address_n.extend(address_n)
                 else:

plugins/trezor/qt_generic.py

@@ -285,7 +285,6 @@ def qt_plugin_class(base_plugin_class):
         keystore.thread.add(partial(self.get_client, keystore))
 
     def on_create_wallet(self, keystore, wizard):
-        #assert type(keystore) == self.keystore_class
         keystore.handler = self.create_handler(wizard)
         keystore.thread = TaskThread(wizard, wizard.on_error)
         # Setup device and create accounts in separate thread; wait until done
@@ -298,6 +297,7 @@ def qt_plugin_class(base_plugin_class):
         if exc_info:
             wizard.on_error(exc_info)
             raise UserCancelled
+        wizard.create_wallet(keystore, None)
 
     @hook
     def receive_menu(self, menu, addrs, wallet):