AaronFiore/electrum
1
0
Fork 0
Code Activity

fixes for cosignerpool

Browse Source
This commit is contained in:
ThomasV
2014-08-22 18:39:23 +02:00
parent 3835751fac
commit 867597cd91
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/cosigner_pool.py
View File

@@ -102,16 +102,23 @@ class Plugin(BasePlugin):
self.listener = Listener(self) self.listener = Listener(self)
self.listener.start() 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): def load_wallet(self, wallet):
self.wallet = wallet self.wallet = wallet
mpk = self.wallet.get_master_public_keys() mpk = self.wallet.get_master_public_keys()
self.cold = mpk.get('cold') self.cold = mpk.get('x2')
if self.cold: if self.cold:
self.cold_K = bitcoin.deserialize_xkey(self.cold)[-1].encode('hex') self.cold_K = bitcoin.deserialize_xkey(self.cold)[-1].encode('hex')
self.cold_hash = bitcoin.Hash(self.cold_K).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: if self.hot:
self.hot_K = bitcoin.deserialize_xkey(self.hot)[-1].encode('hex') self.hot_K = bitcoin.deserialize_xkey(self.hot)[-1].encode('hex')
self.hot_hash = bitcoin.Hash(self.hot_K).encode('hex') self.hot_hash = bitcoin.Hash(self.hot_K).encode('hex')
@@ -170,7 +177,7 @@ class Plugin(BasePlugin):
password = None password = None
message = self.listener.message 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: if not xpriv:
return return
try: try: