AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #8459 from benma/bitbox02-6.2.0

Browse Source 
bitbox02: update to 6.2.0 to fix a bug on macOS 13.3, and ability to display amount in sats on the device
This commit is contained in:
ghost43
2023-05-30 23:35:52 +00:00
committed by GitHub
parent 184281d2fc f284b42fa8
commit 2f769d4015
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/deterministic-build/requirements-hw.txt
View File

@@ -1,9 +1,9 @@
base58==2.1.1 \ base58==2.1.1 \
--hash=sha256:11a36f4d3ce51dfc1043f3218591ac4eb1ceb172919cebe05b52a5bcc8d245c2 \ --hash=sha256:11a36f4d3ce51dfc1043f3218591ac4eb1ceb172919cebe05b52a5bcc8d245c2 \
--hash=sha256:c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c --hash=sha256:c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c
bitbox02==6.1.1 \ bitbox02==6.2.0 \
--hash=sha256:99503409d6c61899f8e11eb11e7a29866b2754cb02c03acf34cdef99755aedd8 \ --hash=sha256:5a8290bd270468ccdf2e6ff7174d25ea2b2f191e19734a79aa573c2b982c266f \
--hash=sha256:f37f1e571f06aa0a4005441ca1948b53e68e3bef0b642963303b42810e2b1486 --hash=sha256:cede06e399c98ed536fed6d8a421208daa00f97b697bd8363a941ac5f33309bf
btchip-python==0.1.32 \ btchip-python==0.1.32 \
--hash=sha256:34f5e0c161c08f65dc0d070ba2ff4c315ed21c4b7e0faa32a46862d0dc1b8f55 --hash=sha256:34f5e0c161c08f65dc0d070ba2ff4c315ed21c4b7e0faa32a46862d0dc1b8f55
cbor==1.0.0 \ cbor==1.0.0 \

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

@@ -19,7 +19,7 @@ hidapi
ckcc-protocol>=0.7.7 ckcc-protocol>=0.7.7
# device plugin: bitbox02 # device plugin: bitbox02
bitbox02>=6.0.0 bitbox02>=6.2.0
# device plugin: jade # device plugin: jade
cbor>=1.0.0,<2.0.0 cbor>=1.0.0,<2.0.0

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

@@ -510,6 +510,12 @@ class BitBox02Client(HardwareClientBase):
) )
keypath_account = full_path[:-2] keypath_account = full_path[:-2]
format_unit = bitbox02.btc.BTCSignInitRequest.FormatUnit.DEFAULT
# Base unit is configured to be "sat":
if self.config.get_decimal_point() == 0:
format_unit = bitbox02.btc.BTCSignInitRequest.FormatUnit.SAT
sigs = self.bitbox02_device.btc_sign( sigs = self.bitbox02_device.btc_sign(
coin, coin,
[bitbox02.btc.BTCScriptConfigWithKeypath( [bitbox02.btc.BTCScriptConfigWithKeypath(
@@ -520,6 +526,7 @@ class BitBox02Client(HardwareClientBase):
outputs=outputs, outputs=outputs,
locktime=tx.locktime, locktime=tx.locktime,
version=tx.version, version=tx.version,
format_unit=format_unit,
) )
# Fill signatures # Fill signatures
@@ -631,7 +638,7 @@ class BitBox02_KeyStore(Hardware_KeyStore):
class BitBox02Plugin(HW_PluginBase): class BitBox02Plugin(HW_PluginBase):
keystore_class = BitBox02_KeyStore keystore_class = BitBox02_KeyStore
minimum_library = (6, 0, 0) minimum_library = (6, 2, 0)
DEVICE_IDS = [(0x03EB, 0x2403)] DEVICE_IDS = [(0x03EB, 0x2403)]
SUPPORTED_XTYPES = ("p2wpkh-p2sh", "p2wpkh", "p2wsh", "p2wsh-p2sh") SUPPORTED_XTYPES = ("p2wpkh-p2sh", "p2wpkh", "p2wsh", "p2wsh-p2sh")