tfix cosignerpool plugin, change hostname - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e18e323c4579198a8910bc697a62fc2e0cec7ebb
DIR parent ca6e32442c6c70d2c1b62c95c480ccbbe4cd3e23
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 20 Dec 2016 11:12:22 +0100
fix cosignerpool plugin, change hostname
Diffstat:
M plugins/cosigner_pool/qt.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/plugins/cosigner_pool/qt.py b/plugins/cosigner_pool/qt.py
t@@ -43,7 +43,7 @@ import traceback
PORT = 12344
-HOST = 'ecdsa.net'
+HOST = 'cosigner.electrum.org'
server = xmlrpclib.ServerProxy('http://%s:%d'%(HOST,PORT), allow_none=True)
t@@ -130,7 +130,7 @@ class Plugin(BasePlugin):
xpub = keystore.get_master_public_key()
K = bitcoin.deserialize_xkey(xpub)[-1].encode('hex')
_hash = bitcoin.Hash(K).encode('hex')
- if wallet.master_private_keys.get(key):
+ if not keystore.is_watching_only():
self.keys.append((key, _hash, window))
else:
self.cosigner_list.append((window, xpub, K, _hash))
t@@ -189,7 +189,7 @@ class Plugin(BasePlugin):
return
wallet = window.wallet
- if wallet.use_encryption:
+ if wallet.has_password():
password = window.password_dialog('An encrypted transaction was retrieved from cosigning pool.\nPlease enter your password to decrypt it.')
if not password:
return
t@@ -198,7 +198,7 @@ class Plugin(BasePlugin):
if not window.question(_("An encrypted transaction was retrieved from cosigning pool.\nDo you want to open it now?")):
return
- xprv = wallet.get_master_private_key(key, password)
+ xprv = wallet.keystore.get_master_private_key(password)
if not xprv:
return
try: