AaronFiore/electrum
1
0
Fork 0
Code Activity

bitbox02: more robust account keypath

Browse Source 
In multisig, we plan to allow other kinds of keypaths that are not
exactly 4 elements long. This change allows parsing the account
keypath for any kind of keypath, assuming the last two element are /change/address.
This commit is contained in:
Marko Bencun
2020-11-23 14:28:28 +01:00
parent 9fced6d2b1
commit b78b077606
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
electrum/plugins/bitbox02/bitbox02.py
View File

@@ -293,8 +293,7 @@ class BitBox02Client(HardwareClientBase):
raise Exception( raise Exception(
"Need to setup communication first before attempting any BitBox02 calls" "Need to setup communication first before attempting any BitBox02 calls"
) )
account_keypath = bip32_path[:-2]
account_keypath = bip32_path[:4]
xpubs = wallet.get_master_public_keys() xpubs = wallet.get_master_public_keys()
our_xpub = self.get_xpub( our_xpub = self.get_xpub(
bip32.convert_bip32_intpath_to_strpath(account_keypath), xtype bip32.convert_bip32_intpath_to_strpath(account_keypath), xtype
@@ -504,15 +503,7 @@ class BitBox02Client(HardwareClientBase):
) )
) )
if type(wallet) is Standard_Wallet: keypath_account = full_path[:-2]
keypath_account = full_path[:3]
elif type(wallet) is Multisig_Wallet:
keypath_account = full_path[:4]
else:
raise Exception(
"BitBox02 does not support this wallet type: {}".format(type(wallet))
)
sigs = self.bitbox02_device.btc_sign( sigs = self.bitbox02_device.btc_sign(
coin, coin,
[bitbox02.btc.BTCScriptConfigWithKeypath( [bitbox02.btc.BTCScriptConfigWithKeypath(