1
0

fix cosignerpool plugin, change hostname

This commit is contained in:
ThomasV
2016-12-20 11:12:22 +01:00
parent ca6e32442c
commit e18e323c45

View File

@@ -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: