AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #1436 from keepkey/master

Browse Source 
fixed attempt to access account derivation before it is created
This commit is contained in:
ThomasV
2015-09-01 18:10:41 +02:00
parent c33b223cbe c918ec2cdf
commit c3fb7fdb1d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/keepkey.py
View File

@@ -289,8 +289,6 @@ class Plugin(BasePlugin):
xpub_n = self.get_client().expand_path(self.xpub_path[xpub])
txinputtype.address_n.extend(xpub_n + s)
break
else:
raise
prev_hash = unhexlify(txin['prevout_hash'])
prev_index = txin['prevout_n']
@@ -484,6 +482,7 @@ class KeepKeyWallet(BIP32_HD_Wallet):
prev_tx[tx_hash] = ptx
for x_pubkey in txin['x_pubkeys']:
account_derivation = None
if not is_extended_pubkey(x_pubkey):
continue
xpub = x_to_xpub(x_pubkey)
@@ -491,7 +490,8 @@ class KeepKeyWallet(BIP32_HD_Wallet):
if v == xpub:
account_id = re.match("x/(\d+)'", k).group(1)
account_derivation = "44'/0'/%s'"%account_id
xpub_path[xpub] = account_derivation
if account_derivation is not None:
xpub_path[xpub] = account_derivation
self.plugin.sign_transaction(tx, prev_tx, xpub_path)

6
plugins/trezor.py
View File

@@ -288,8 +288,6 @@ class Plugin(BasePlugin):
xpub_n = self.get_client().expand_path(self.xpub_path[xpub])
txinputtype.address_n.extend(xpub_n + s)
break
else:
raise
prev_hash = unhexlify(txin['prevout_hash'])
prev_index = txin['prevout_n']
@@ -483,6 +481,7 @@ class TrezorWallet(BIP32_HD_Wallet):
prev_tx[tx_hash] = ptx
for x_pubkey in txin['x_pubkeys']:
account_derivation = None
if not is_extended_pubkey(x_pubkey):
continue
xpub = x_to_xpub(x_pubkey)
@@ -490,7 +489,8 @@ class TrezorWallet(BIP32_HD_Wallet):
if v == xpub:
account_id = re.match("x/(\d+)'", k).group(1)
account_derivation = "44'/0'/%s'"%account_id
xpub_path[xpub] = account_derivation
if account_derivation is not None:
xpub_path[xpub] = account_derivation
self.plugin.sign_transaction(tx, prev_tx, xpub_path)