Merge the network and network_proxy

plugins/keepkey.py

@@ -156,7 +156,7 @@ class Plugin(BasePlugin):
 
     @hook
     def installwizard_restore(self, wizard, storage):
-        if storage.get('wallet_type') != 'keepkey': 
+        if storage.get('wallet_type') != 'keepkey':
             return
         seed = wizard.enter_seed_dialog("Enter your KeepKey seed", None, func=lambda x:True)
         if not seed:
@@ -478,7 +478,7 @@ class KeepKeyWallet(BIP32_HD_Wallet):
 
             ptx = self.transactions.get(tx_hash)
             if ptx is None:
-                ptx = self.network.synchronous_get([('blockchain.transaction.get', [tx_hash])])[0]
+                ptx = self.network.synchronous_get(('blockchain.transaction.get', [tx_hash]))
                 ptx = Transaction(ptx)
             prev_tx[tx_hash] = ptx
 
@@ -673,5 +673,5 @@ if KEEPKEY:
             except ConnectionError:
                 self.bad = True
                 raise
-    
+
             return resp