LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-29 16:31:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins/bitbox02: fix compatibility with bitbox02-3.0.0

Browse source
This commit is contained in:
Marko Bencun 2020-06-03 15:12:49 +02:00
parent cfdfbd2bfe
commit b863150fe3
No known key found for this signature in database
GPG key ID: 804538928C37EAE8
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/requirements/requirements-hw.txt
View file

@ -13,5 +13,5 @@ safet>=0.1.5
keepkey>=6.3.1 keepkey>=6.3.1
btchip-python>=0.1.26 btchip-python>=0.1.26
ckcc-protocol>=0.7.7 ckcc-protocol>=0.7.7
bitbox02>=2.0.2 bitbox02>=3.0.0
hidapi hidapi

34
electrum/plugins/bitbox02/bitbox02.py
View file

@ -364,6 +364,32 @@ class BitBox02Client(HardwareClientBase):
"A wallet owned pubkey was not found in the transaction input to be signed" "A wallet owned pubkey was not found in the transaction input to be signed"
) )
prev_tx = wallet.db.get_transaction(txin.prevout.txid.hex())
if prev_tx is None:
raise Exception(
"Could not find transaction {} in db".format(txin.prevout.txid.hex()),
)
prev_inputs: List[bitbox02.BTCPrevTxInputType] = []
prev_outputs: List[bitbox02.BTCPrevTxOutputType] = []
for prev_txin in prev_tx.inputs():
prev_inputs.append(
{
"prev_out_hash": prev_txin.prevout.txid[::-1],
"prev_out_index": prev_txin.prevout.out_idx,
"signature_script": prev_txin.script_sig,
"sequence": prev_txin.nsequence,
}
)
for prev_txout in prev_tx.outputs():
prev_outputs.append(
{
"value": prev_txout.value,
"pubkey_script": prev_txout.scriptpubkey,
}
)
inputs.append( inputs.append(
{ {
"prev_out_hash": txin.prevout.txid[::-1], "prev_out_hash": txin.prevout.txid[::-1],
@ -371,6 +397,12 @@ class BitBox02Client(HardwareClientBase):
"prev_out_value": txin.value_sats(), "prev_out_value": txin.value_sats(),
"sequence": txin.nsequence, "sequence": txin.nsequence,
"keypath": full_path, "keypath": full_path,
"prev_tx": {
"version": prev_tx.version,
"locktime": prev_tx.locktime,
"inputs": prev_inputs,
"outputs": prev_outputs,
},
} }
) )
@ -536,7 +568,7 @@ class BitBox02_KeyStore(Hardware_KeyStore):
class BitBox02Plugin(HW_PluginBase): class BitBox02Plugin(HW_PluginBase):
keystore_class = BitBox02_KeyStore keystore_class = BitBox02_KeyStore
minimum_library = (2, 0, 2) minimum_library = (3, 0, 0)
DEVICE_IDS = [(0x03EB, 0x2403)] DEVICE_IDS = [(0x03EB, 0x2403)]
SUPPORTED_XTYPES = ("p2wpkh-p2sh", "p2wpkh", "p2wsh") SUPPORTED_XTYPES = ("p2wpkh-p2sh", "p2wpkh", "p2wsh")