tfixes for cosignerpool - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 867597cd91d45f3fb4eb882607cd275beb2ff668
DIR parent 3835751fac314a7c8f7e11edede64bc409877e88
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 22 Aug 2014 18:39:23 +0200
fixes for cosignerpool
Diffstat:
M plugins/cosigner_pool.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
---
DIR diff --git a/plugins/cosigner_pool.py b/plugins/cosigner_pool.py
t@@ -102,16 +102,23 @@ class Plugin(BasePlugin):
self.listener = Listener(self)
self.listener.start()
+ def enable(self):
+ self.set_enabled(True)
+ self.init()
+ if self.win.wallet:
+ self.load_wallet(self.win.wallet)
+ return True
+
def load_wallet(self, wallet):
self.wallet = wallet
mpk = self.wallet.get_master_public_keys()
- self.cold = mpk.get('cold')
+ self.cold = mpk.get('x2')
if self.cold:
self.cold_K = bitcoin.deserialize_xkey(self.cold)[-1].encode('hex')
self.cold_hash = bitcoin.Hash(self.cold_K).encode('hex')
- self.hot = mpk.get('hot')
+ self.hot = mpk.get('x1')
if self.hot:
self.hot_K = bitcoin.deserialize_xkey(self.hot)[-1].encode('hex')
self.hot_hash = bitcoin.Hash(self.hot_K).encode('hex')
t@@ -170,7 +177,7 @@ class Plugin(BasePlugin):
password = None
message = self.listener.message
- xpriv = self.wallet.get_master_private_key('m/', password)
+ xpriv = self.wallet.get_master_private_key('x1/', password)
if not xpriv:
return
try: