arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 14:28:07 +00:00
Code Issues Releases Wiki Activity

signtx: fix typo

Browse Source
This commit is contained in:
Jan Pochyla 2016-11-15 18:07:49 +01:00
parent 8d496d456b
commit 72be5cf2f2
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/apps/common/signtx.py
View File

@ -305,20 +305,22 @@ def output_derive_script(o: TxOutputType, coin: CoinType, root) -> bytes:
'Invalid output script type')
return
def check_address_type(address_type, raw_address):
if address_type <= 0xFF:
return raw_address[0] == address_type
if address_type <= 0xFFFF:
return raw_address[0] == (address_type >> 8) \
and raw_address[1] == (address_type & 0xFF)
and raw_address[1] == (address_type & 0xFF)
if address_type <= 0xFFFFFF:
return raw_address[0] == (address_type >> 16) \
and raw_address[1] == ((address_type >> 8) & 0xFF) \
and raw_address[2] == (address_type & 0xFF)
and raw_address[1] == ((address_type >> 8) & 0xFF) \
and raw_address[2] == (address_type & 0xFF)
return raw_address[0] == (address_type >> 24) \
and raw_address[1] == ((address_type >> 16) & 0xFF) \
and raw_address[2] == ((address_type >> 8) & 0xFF) \
and raw_address[3] == (address_type & 0xFF)
and raw_address[1] == ((address_type >> 16) & 0xFF) \
and raw_address[2] == ((address_type >> 8) & 0xFF) \
and raw_address[3] == (address_type & 0xFF)
def output_paytoaddress_extract_raw_address(o: TxOutputType, coin: CoinType, root, p2sh=False) -> bytes:
address_type = coin.address_type_p2sh if p2sh else coin.address_type
@ -331,13 +333,14 @@ def output_paytoaddress_extract_raw_address(o: TxOutputType, coin: CoinType, roo
address = getattr(o, 'address', None)
if address:
raw = base58.decode_check(address)
if not check_address_type(address_type, raw_address):
if not check_address_type(address_type, raw):
raise SigningError(FailureType.SyntaxError,
'Invalid address type')
return raw
raise SigningError(FailureType.SyntaxError,
'Missing address')
def output_is_change(o: TxOutputType):
address_n = getattr(o, 'address_n', None)
return bool(address_n)