arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-03 12:00:59 +00:00
Code Issues Releases Wiki Activity

apps.common.signtx: add paytoscripthash support, fix multibyte

Browse Source
This commit is contained in:
Pavol Rusnak 2016-11-15 18:02:05 +01:00
parent 3373ecf128
commit 8d496d456b
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,31 +297,47 @@ def output_derive_script(o: TxOutputType, coin: CoinType, root) -> bytes:
if o.script_type == OutputScriptType.PAYTOADDRESS: if o.script_type == OutputScriptType.PAYTOADDRESS:
ra = output_paytoaddress_extract_raw_address(o, coin, root) ra = output_paytoaddress_extract_raw_address(o, coin, root)
return script_paytoaddress_new(ra[1:]) return script_paytoaddress_new(ra[1:])
elif o.script_type == OutputScriptType.PAYTOSCRIPTHASH:
ra = output_paytoaddress_extract_raw_address(o, coin, root, p2sh=True)
return script_paytoaddress_new(ra[1:])
else: else:
raise SigningError(FailureType.SyntaxError, raise SigningError(FailureType.SyntaxError,
'Invalid output script type') 'Invalid output script type')
return 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)
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)
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)
def output_paytoaddress_extract_raw_address(o: TxOutputType, coin: CoinType, root) -> bytes: 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
# TODO: dont encode/decode more then necessary # TODO: dont encode/decode more then necessary
# TODO: detect correct address type
address_n = getattr(o, 'address_n', None) address_n = getattr(o, 'address_n', None)
if address_n is not None: if address_n is not None:
node = node_derive(root, address_n) node = node_derive(root, address_n)
address = node.address(coin.address_type) address = node.address(address_type)
return base58.decode_check(address) return base58.decode_check(address)
address = getattr(o, 'address', None) address = getattr(o, 'address', None)
if address: if address:
raw = base58.decode_check(address) raw = base58.decode_check(address)
if raw[0] != coin.address_type: if not check_address_type(address_type, raw_address):
raise SigningError(FailureType.SyntaxError, raise SigningError(FailureType.SyntaxError,
'Invalid address type') 'Invalid address type')
return raw return raw
raise SigningError(FailureType.SyntaxError, raise SigningError(FailureType.SyntaxError,
'Missing address') 'Missing address')
def output_is_change(o: TxOutputType): def output_is_change(o: TxOutputType):
address_n = getattr(o, 'address_n', None) address_n = getattr(o, 'address_n', None)
return bool(address_n) return bool(address_n)