mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-12-30 10:08:18 +00:00
1a0b590914
WIP - typing the trezorctl apps typing functions trezorlib/cli addressing most of mypy issue for trezorlib apps and _internal folder fixing broken device tests by changing asserts in debuglink.py addressing most of mypy issues in trezorlib/cli folder adding types to some untyped functions, mypy section in setup.cfg typing what can be typed, some mypy fixes, resolving circular import issues importing type objects in "if TYPE_CHECKING:" branch fixing CI by removing assert in emulator, better ignore comments CI assert fix, style fixes, new config options fixup! CI assert fix, style fixes, new config options type fixes after rebasing on master fixing python3.6 and 3.7 unittests by importing Literal from typing_extensions couple mypy and style fixes fixes and improvements from code review silencing all but one mypy issues trial of typing the tools.expect function fixup! trial of typing the tools.expect function @expect and @session decorators correctly type-checked Optional args in CLI where relevant, not using general list/tuple/dict where possible python/Makefile commands, adding them into CI, ignoring last mypy issue documenting overload for expect decorator, two mypy fixes coming from that black style fix improved typing of decorators, pyright config file addressing or ignoring pyright errors, replacing mypy in CI by pyright fixing incomplete assert causing device tests to fail pyright issue that showed in CI but not locally, printing pyright version in CI fixup! pyright issue that showed in CI but not locally, printing pyright version in CI unifying type:ignore statements for pyright usage resolving PIL.Image issues, pyrightconfig not excluding anything replacing couple asserts with TypeGuard on safe_issubclass better error handling of usb1 import for webusb better error handling of hid import small typing details found out by strict pyright mode improvements from code review chore(python): changing List to Sequence for protobuf messages small code changes to reflect the protobuf change to Sequence importing TypedDict from typing_extensions to support 3.6 and 3.7 simplify _format_access_list function fixup! simplify _format_access_list function typing tools folder typing helper-scripts folder some click typing enforcing all functions to have typed arguments reverting the changed argument name in tools replacing TransportType with Transport making PinMatrixRequest.type protobuf attribute required reverting the protobuf change, making argument into get_pin Optional small fixes in asserts solving the session decorator type issues fixup! solving the session decorator type issues improvements from code review fixing new pyright errors introduced after version increase changing -> Iterable to -> Sequence in enumerate_devices, change in wait_for_devices style change in debuglink.py chore(python): adding type annotation to Sequences in messages.py better "self and cls" types on Transport fixup! better "self and cls" types on Transport fixing some easy things from strict pyright run
88 lines
2.3 KiB
Python
Executable File
88 lines
2.3 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import os
|
|
import sys
|
|
from typing import Any, Optional
|
|
|
|
try:
|
|
import construct as c
|
|
from construct import len_, this
|
|
except ImportError:
|
|
sys.stderr.write(
|
|
"This tool requires Construct. Install it with 'pip install Construct'.\n"
|
|
)
|
|
sys.exit(1)
|
|
|
|
|
|
if os.isatty(sys.stdin.fileno()):
|
|
tx_hex = input("Enter transaction in hex format: ")
|
|
else:
|
|
tx_hex = sys.stdin.read().strip()
|
|
|
|
tx_bin = bytes.fromhex(tx_hex)
|
|
|
|
|
|
CompactUintStruct = c.Struct(
|
|
"base" / c.Int8ul,
|
|
"ext" / c.Switch(this.base, {0xFD: c.Int16ul, 0xFE: c.Int32ul, 0xFF: c.Int64ul}),
|
|
)
|
|
|
|
|
|
class CompactUintAdapter(c.Adapter):
|
|
def _encode(self, obj: int, context: Any, path: Any) -> dict:
|
|
if obj < 0xFD:
|
|
return {"base": obj}
|
|
if obj < 2 ** 16:
|
|
return {"base": 0xFD, "ext": obj}
|
|
if obj < 2 ** 32:
|
|
return {"base": 0xFE, "ext": obj}
|
|
if obj < 2 ** 64:
|
|
return {"base": 0xFF, "ext": obj}
|
|
raise ValueError("Value too big for compact uint")
|
|
|
|
def _decode(self, obj: dict, context: Any, path: Any):
|
|
return obj["ext"] or obj["base"]
|
|
|
|
|
|
class ConstFlag(c.Adapter):
|
|
def __init__(self, const: bytes) -> None:
|
|
self.const = const
|
|
super().__init__(c.Optional(c.Const(const)))
|
|
|
|
def _encode(self, obj: Any, context: Any, path: Any) -> Optional[bytes]:
|
|
return self.const if obj else None
|
|
|
|
def _decode(self, obj: Any, context: Any, path: Any) -> bool:
|
|
return obj is not None
|
|
|
|
|
|
CompactUint = CompactUintAdapter(CompactUintStruct)
|
|
|
|
TxInput = c.Struct(
|
|
"tx" / c.Bytes(32),
|
|
"index" / c.Int32ul,
|
|
# TODO coinbase tx
|
|
"script" / c.Prefixed(CompactUint, c.GreedyBytes),
|
|
"sequence" / c.Int32ul,
|
|
)
|
|
|
|
TxOutput = c.Struct(
|
|
"value" / c.Int64ul,
|
|
"pk_script" / c.Prefixed(CompactUint, c.GreedyBytes),
|
|
)
|
|
|
|
StackItem = c.Prefixed(CompactUint, c.GreedyBytes)
|
|
TxInputWitness = c.PrefixedArray(CompactUint, StackItem)
|
|
|
|
Transaction = c.Struct(
|
|
"version" / c.Int32ul,
|
|
"segwit" / ConstFlag(b"\x00\x01"),
|
|
"inputs" / c.PrefixedArray(CompactUint, TxInput),
|
|
"outputs" / c.PrefixedArray(CompactUint, TxOutput),
|
|
"witness" / c.If(this.segwit, TxInputWitness[len_(this.inputs)]),
|
|
"lock_time" / c.Int32ul,
|
|
c.Terminated,
|
|
)
|
|
|
|
print(Transaction.parse(tx_bin))
|