From e18e323c4579198a8910bc697a62fc2e0cec7ebb Mon Sep 17 00:00:00 2001 From: ThomasV Date: Tue, 20 Dec 2016 11:12:22 +0100 Subject: [PATCH] fix cosignerpool plugin, change hostname --- plugins/cosigner_pool/qt.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/cosigner_pool/qt.py b/plugins/cosigner_pool/qt.py index a0bca47ab..f288ac0b7 100644 --- a/plugins/cosigner_pool/qt.py +++ b/plugins/cosigner_pool/qt.py @@ -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) @@ -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)) @@ -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 @@ -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: