diff --git a/common/protob/pb2py b/common/protob/pb2py
index 5096a04f34..eb4f810233 100755
--- a/common/protob/pb2py
+++ b/common/protob/pb2py
@@ -279,9 +279,12 @@ class Descriptor:
         for field in required_fields:
             yield f"        {field.name}: {field.py_type},"
         for field in repeated_fields:
-            yield f"        {field.name}: List[{field.py_type}] = None,"
+            yield f"        {field.name}: Optional[List[{field.py_type}]] = None,"
         for field in optional_fields:
-            yield f"        {field.name}: {field.py_type} = {field.default_value},"
+            if field.default_value is None:
+                yield f"        {field.name}: Optional[{field.py_type}] = None,"
+            else:
+                yield f"        {field.name}: {field.py_type} = {field.default_value},"
         yield          "    ) -> None:"
 
         for field in repeated_fields:
@@ -356,7 +359,7 @@ class Descriptor:
         yield ""
         yield "if __debug__:"
         yield "    try:"
-        yield "        from typing import Dict, List  # noqa: F401"
+        yield "        from typing import Dict, List, Optional  # noqa: F401"
         yield "        from typing_extensions import Literal  # noqa: F401"
 
         all_enums = [field for field in fields if field.type_name in self.enum_types]
diff --git a/core/src/trezor/messages/Address.py b/core/src/trezor/messages/Address.py
index 61c664cf19..e2099ce325 100644
--- a/core/src/trezor/messages/Address.py
+++ b/core/src/trezor/messages/Address.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/ApplyFlags.py b/core/src/trezor/messages/ApplyFlags.py
index 298e0926d1..8cb6a2ec56 100644
--- a/core/src/trezor/messages/ApplyFlags.py
+++ b/core/src/trezor/messages/ApplyFlags.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class ApplyFlags(p.MessageType):
     def __init__(
         self,
         *,
-        flags: int = None,
+        flags: Optional[int] = None,
     ) -> None:
         self.flags = flags
 
diff --git a/core/src/trezor/messages/ApplySettings.py b/core/src/trezor/messages/ApplySettings.py
index 5c0eb1187e..ad0049a933 100644
--- a/core/src/trezor/messages/ApplySettings.py
+++ b/core/src/trezor/messages/ApplySettings.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeSafetyCheckLevel = Literal[0, 1, 2]
     except ImportError:
@@ -17,15 +17,15 @@ class ApplySettings(p.MessageType):
     def __init__(
         self,
         *,
-        language: str = None,
-        label: str = None,
-        use_passphrase: bool = None,
-        homescreen: bytes = None,
-        auto_lock_delay_ms: int = None,
-        display_rotation: int = None,
-        passphrase_always_on_device: bool = None,
-        safety_checks: EnumTypeSafetyCheckLevel = None,
-        experimental_features: bool = None,
+        language: Optional[str] = None,
+        label: Optional[str] = None,
+        use_passphrase: Optional[bool] = None,
+        homescreen: Optional[bytes] = None,
+        auto_lock_delay_ms: Optional[int] = None,
+        display_rotation: Optional[int] = None,
+        passphrase_always_on_device: Optional[bool] = None,
+        safety_checks: Optional[EnumTypeSafetyCheckLevel] = None,
+        experimental_features: Optional[bool] = None,
     ) -> None:
         self.language = language
         self.label = label
diff --git a/core/src/trezor/messages/AuthorizeCoinJoin.py b/core/src/trezor/messages/AuthorizeCoinJoin.py
index b349d15d7d..05777cfac5 100644
--- a/core/src/trezor/messages/AuthorizeCoinJoin.py
+++ b/core/src/trezor/messages/AuthorizeCoinJoin.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
         EnumTypeAmountUnit = Literal[0, 1, 2, 3]
@@ -21,8 +21,8 @@ class AuthorizeCoinJoin(p.MessageType):
         *,
         coordinator: str,
         max_total_fee: int,
-        address_n: List[int] = None,
-        fee_per_anonymity: int = None,
+        address_n: Optional[List[int]] = None,
+        fee_per_anonymity: Optional[int] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 0,
         amount_unit: EnumTypeAmountUnit = 0,
diff --git a/core/src/trezor/messages/BackupDevice.py b/core/src/trezor/messages/BackupDevice.py
index a37ab856f1..9182f807ee 100644
--- a/core/src/trezor/messages/BackupDevice.py
+++ b/core/src/trezor/messages/BackupDevice.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/BinanceAddress.py b/core/src/trezor/messages/BinanceAddress.py
index 70e96e22f4..908005d1d1 100644
--- a/core/src/trezor/messages/BinanceAddress.py
+++ b/core/src/trezor/messages/BinanceAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/BinanceCancelMsg.py b/core/src/trezor/messages/BinanceCancelMsg.py
index c45d98b5cf..484e7ac265 100644
--- a/core/src/trezor/messages/BinanceCancelMsg.py
+++ b/core/src/trezor/messages/BinanceCancelMsg.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class BinanceCancelMsg(p.MessageType):
     def __init__(
         self,
         *,
-        refid: str = None,
-        sender: str = None,
-        symbol: str = None,
+        refid: Optional[str] = None,
+        sender: Optional[str] = None,
+        symbol: Optional[str] = None,
     ) -> None:
         self.refid = refid
         self.sender = sender
diff --git a/core/src/trezor/messages/BinanceCoin.py b/core/src/trezor/messages/BinanceCoin.py
index a7787122cf..34db516c8b 100644
--- a/core/src/trezor/messages/BinanceCoin.py
+++ b/core/src/trezor/messages/BinanceCoin.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class BinanceCoin(p.MessageType):
     def __init__(
         self,
         *,
-        amount: int = None,
-        denom: str = None,
+        amount: Optional[int] = None,
+        denom: Optional[str] = None,
     ) -> None:
         self.amount = amount
         self.denom = denom
diff --git a/core/src/trezor/messages/BinanceGetAddress.py b/core/src/trezor/messages/BinanceGetAddress.py
index c28627066d..d1ffbb31f7 100644
--- a/core/src/trezor/messages/BinanceGetAddress.py
+++ b/core/src/trezor/messages/BinanceGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class BinanceGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/BinanceGetPublicKey.py b/core/src/trezor/messages/BinanceGetPublicKey.py
index bee1e9f8c1..59f30ff314 100644
--- a/core/src/trezor/messages/BinanceGetPublicKey.py
+++ b/core/src/trezor/messages/BinanceGetPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class BinanceGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/BinanceInputOutput.py b/core/src/trezor/messages/BinanceInputOutput.py
index 6e309e8aaa..eed4c2a6fe 100644
--- a/core/src/trezor/messages/BinanceInputOutput.py
+++ b/core/src/trezor/messages/BinanceInputOutput.py
@@ -6,7 +6,7 @@ from .BinanceCoin import BinanceCoin
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class BinanceInputOutput(p.MessageType):
     def __init__(
         self,
         *,
-        coins: List[BinanceCoin] = None,
-        address: str = None,
+        coins: Optional[List[BinanceCoin]] = None,
+        address: Optional[str] = None,
     ) -> None:
         self.coins = coins if coins is not None else []
         self.address = address
diff --git a/core/src/trezor/messages/BinanceOrderMsg.py b/core/src/trezor/messages/BinanceOrderMsg.py
index d5005154de..59e1b7b1d0 100644
--- a/core/src/trezor/messages/BinanceOrderMsg.py
+++ b/core/src/trezor/messages/BinanceOrderMsg.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeBinanceOrderType = Literal[0, 1, 2, 3]
         EnumTypeBinanceOrderSide = Literal[0, 1, 2]
@@ -19,14 +19,14 @@ class BinanceOrderMsg(p.MessageType):
     def __init__(
         self,
         *,
-        id: str = None,
-        ordertype: EnumTypeBinanceOrderType = None,
-        price: int = None,
-        quantity: int = None,
-        sender: str = None,
-        side: EnumTypeBinanceOrderSide = None,
-        symbol: str = None,
-        timeinforce: EnumTypeBinanceTimeInForce = None,
+        id: Optional[str] = None,
+        ordertype: Optional[EnumTypeBinanceOrderType] = None,
+        price: Optional[int] = None,
+        quantity: Optional[int] = None,
+        sender: Optional[str] = None,
+        side: Optional[EnumTypeBinanceOrderSide] = None,
+        symbol: Optional[str] = None,
+        timeinforce: Optional[EnumTypeBinanceTimeInForce] = None,
     ) -> None:
         self.id = id
         self.ordertype = ordertype
diff --git a/core/src/trezor/messages/BinancePublicKey.py b/core/src/trezor/messages/BinancePublicKey.py
index 1dba05d5ff..e04a44d3e3 100644
--- a/core/src/trezor/messages/BinancePublicKey.py
+++ b/core/src/trezor/messages/BinancePublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/BinanceSignTx.py b/core/src/trezor/messages/BinanceSignTx.py
index e542b58bf9..68fdf8f3f9 100644
--- a/core/src/trezor/messages/BinanceSignTx.py
+++ b/core/src/trezor/messages/BinanceSignTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,13 +16,13 @@ class BinanceSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        msg_count: int = None,
-        account_number: int = None,
-        chain_id: str = None,
-        memo: str = None,
-        sequence: int = None,
-        source: int = None,
+        address_n: Optional[List[int]] = None,
+        msg_count: Optional[int] = None,
+        account_number: Optional[int] = None,
+        chain_id: Optional[str] = None,
+        memo: Optional[str] = None,
+        sequence: Optional[int] = None,
+        source: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.msg_count = msg_count
diff --git a/core/src/trezor/messages/BinanceSignedTx.py b/core/src/trezor/messages/BinanceSignedTx.py
index 82880ce215..c8bce24cf3 100644
--- a/core/src/trezor/messages/BinanceSignedTx.py
+++ b/core/src/trezor/messages/BinanceSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/BinanceTransferMsg.py b/core/src/trezor/messages/BinanceTransferMsg.py
index 83b34d594e..de638d8168 100644
--- a/core/src/trezor/messages/BinanceTransferMsg.py
+++ b/core/src/trezor/messages/BinanceTransferMsg.py
@@ -6,7 +6,7 @@ from .BinanceInputOutput import BinanceInputOutput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,8 +18,8 @@ class BinanceTransferMsg(p.MessageType):
     def __init__(
         self,
         *,
-        inputs: List[BinanceInputOutput] = None,
-        outputs: List[BinanceInputOutput] = None,
+        inputs: Optional[List[BinanceInputOutput]] = None,
+        outputs: Optional[List[BinanceInputOutput]] = None,
     ) -> None:
         self.inputs = inputs if inputs is not None else []
         self.outputs = outputs if outputs is not None else []
diff --git a/core/src/trezor/messages/BinanceTxRequest.py b/core/src/trezor/messages/BinanceTxRequest.py
index d80f12cd91..6c52adf157 100644
--- a/core/src/trezor/messages/BinanceTxRequest.py
+++ b/core/src/trezor/messages/BinanceTxRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/ButtonAck.py b/core/src/trezor/messages/ButtonAck.py
index 015b83c3ba..9ca3f57b8c 100644
--- a/core/src/trezor/messages/ButtonAck.py
+++ b/core/src/trezor/messages/ButtonAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/ButtonRequest.py b/core/src/trezor/messages/ButtonRequest.py
index b3f79b555c..a40d052659 100644
--- a/core/src/trezor/messages/ButtonRequest.py
+++ b/core/src/trezor/messages/ButtonRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeButtonRequestType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
     except ImportError:
@@ -17,7 +17,7 @@ class ButtonRequest(p.MessageType):
     def __init__(
         self,
         *,
-        code: EnumTypeButtonRequestType = None,
+        code: Optional[EnumTypeButtonRequestType] = None,
     ) -> None:
         self.code = code
 
diff --git a/core/src/trezor/messages/Cancel.py b/core/src/trezor/messages/Cancel.py
index 4ac639ccd2..cf42f23253 100644
--- a/core/src/trezor/messages/Cancel.py
+++ b/core/src/trezor/messages/Cancel.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CancelAuthorization.py b/core/src/trezor/messages/CancelAuthorization.py
index 90e2125297..716c584eab 100644
--- a/core/src/trezor/messages/CancelAuthorization.py
+++ b/core/src/trezor/messages/CancelAuthorization.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoAddress.py b/core/src/trezor/messages/CardanoAddress.py
index 48b1ba5a93..de2f1b9887 100644
--- a/core/src/trezor/messages/CardanoAddress.py
+++ b/core/src/trezor/messages/CardanoAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoAddressParametersType.py b/core/src/trezor/messages/CardanoAddressParametersType.py
index 45cbd1dbf1..67ef15c944 100644
--- a/core/src/trezor/messages/CardanoAddressParametersType.py
+++ b/core/src/trezor/messages/CardanoAddressParametersType.py
@@ -6,7 +6,7 @@ from .CardanoBlockchainPointerType import CardanoBlockchainPointerType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCardanoAddressType = Literal[0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15]
     except ImportError:
@@ -19,10 +19,10 @@ class CardanoAddressParametersType(p.MessageType):
         self,
         *,
         address_type: EnumTypeCardanoAddressType,
-        address_n: List[int] = None,
-        address_n_staking: List[int] = None,
-        staking_key_hash: bytes = None,
-        certificate_pointer: CardanoBlockchainPointerType = None,
+        address_n: Optional[List[int]] = None,
+        address_n_staking: Optional[List[int]] = None,
+        staking_key_hash: Optional[bytes] = None,
+        certificate_pointer: Optional[CardanoBlockchainPointerType] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.address_n_staking = address_n_staking if address_n_staking is not None else []
diff --git a/core/src/trezor/messages/CardanoAssetGroupType.py b/core/src/trezor/messages/CardanoAssetGroupType.py
index b5c028c1f8..ea798533ac 100644
--- a/core/src/trezor/messages/CardanoAssetGroupType.py
+++ b/core/src/trezor/messages/CardanoAssetGroupType.py
@@ -6,7 +6,7 @@ from .CardanoTokenType import CardanoTokenType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class CardanoAssetGroupType(p.MessageType):
         self,
         *,
         policy_id: bytes,
-        tokens: List[CardanoTokenType] = None,
+        tokens: Optional[List[CardanoTokenType]] = None,
     ) -> None:
         self.tokens = tokens if tokens is not None else []
         self.policy_id = policy_id
diff --git a/core/src/trezor/messages/CardanoBlockchainPointerType.py b/core/src/trezor/messages/CardanoBlockchainPointerType.py
index f361afa469..e3fdbc384c 100644
--- a/core/src/trezor/messages/CardanoBlockchainPointerType.py
+++ b/core/src/trezor/messages/CardanoBlockchainPointerType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoGetAddress.py b/core/src/trezor/messages/CardanoGetAddress.py
index 88de813a27..68f5843fe0 100644
--- a/core/src/trezor/messages/CardanoGetAddress.py
+++ b/core/src/trezor/messages/CardanoGetAddress.py
@@ -6,7 +6,7 @@ from .CardanoAddressParametersType import CardanoAddressParametersType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoGetPublicKey.py b/core/src/trezor/messages/CardanoGetPublicKey.py
index 9670ab927c..565c56836b 100644
--- a/core/src/trezor/messages/CardanoGetPublicKey.py
+++ b/core/src/trezor/messages/CardanoGetPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class CardanoGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/CardanoPoolMetadataType.py b/core/src/trezor/messages/CardanoPoolMetadataType.py
index 6ab0ffade7..07e22deed5 100644
--- a/core/src/trezor/messages/CardanoPoolMetadataType.py
+++ b/core/src/trezor/messages/CardanoPoolMetadataType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoPoolOwnerType.py b/core/src/trezor/messages/CardanoPoolOwnerType.py
index cfd391ee8f..e3ce2753ef 100644
--- a/core/src/trezor/messages/CardanoPoolOwnerType.py
+++ b/core/src/trezor/messages/CardanoPoolOwnerType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class CardanoPoolOwnerType(p.MessageType):
     def __init__(
         self,
         *,
-        staking_key_path: List[int] = None,
-        staking_key_hash: bytes = None,
+        staking_key_path: Optional[List[int]] = None,
+        staking_key_hash: Optional[bytes] = None,
     ) -> None:
         self.staking_key_path = staking_key_path if staking_key_path is not None else []
         self.staking_key_hash = staking_key_hash
diff --git a/core/src/trezor/messages/CardanoPoolParametersType.py b/core/src/trezor/messages/CardanoPoolParametersType.py
index f65c449381..405905bc5c 100644
--- a/core/src/trezor/messages/CardanoPoolParametersType.py
+++ b/core/src/trezor/messages/CardanoPoolParametersType.py
@@ -8,7 +8,7 @@ from .CardanoPoolRelayParametersType import CardanoPoolRelayParametersType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -26,9 +26,9 @@ class CardanoPoolParametersType(p.MessageType):
         margin_numerator: int,
         margin_denominator: int,
         reward_account: str,
-        owners: List[CardanoPoolOwnerType] = None,
-        relays: List[CardanoPoolRelayParametersType] = None,
-        metadata: CardanoPoolMetadataType = None,
+        owners: Optional[List[CardanoPoolOwnerType]] = None,
+        relays: Optional[List[CardanoPoolRelayParametersType]] = None,
+        metadata: Optional[CardanoPoolMetadataType] = None,
     ) -> None:
         self.owners = owners if owners is not None else []
         self.relays = relays if relays is not None else []
diff --git a/core/src/trezor/messages/CardanoPoolRelayParametersType.py b/core/src/trezor/messages/CardanoPoolRelayParametersType.py
index 67eea36a27..79d4214257 100644
--- a/core/src/trezor/messages/CardanoPoolRelayParametersType.py
+++ b/core/src/trezor/messages/CardanoPoolRelayParametersType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCardanoPoolRelayType = Literal[0, 1, 2]
     except ImportError:
@@ -17,10 +17,10 @@ class CardanoPoolRelayParametersType(p.MessageType):
         self,
         *,
         type: EnumTypeCardanoPoolRelayType,
-        ipv4_address: bytes = None,
-        ipv6_address: bytes = None,
-        host_name: str = None,
-        port: int = None,
+        ipv4_address: Optional[bytes] = None,
+        ipv6_address: Optional[bytes] = None,
+        host_name: Optional[str] = None,
+        port: Optional[int] = None,
     ) -> None:
         self.type = type
         self.ipv4_address = ipv4_address
diff --git a/core/src/trezor/messages/CardanoPublicKey.py b/core/src/trezor/messages/CardanoPublicKey.py
index baecb6058e..47e3e3ff41 100644
--- a/core/src/trezor/messages/CardanoPublicKey.py
+++ b/core/src/trezor/messages/CardanoPublicKey.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoSignTx.py b/core/src/trezor/messages/CardanoSignTx.py
index 1f31d2cca7..a665d9e5f5 100644
--- a/core/src/trezor/messages/CardanoSignTx.py
+++ b/core/src/trezor/messages/CardanoSignTx.py
@@ -9,7 +9,7 @@ from .CardanoTxWithdrawalType import CardanoTxWithdrawalType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -24,13 +24,13 @@ class CardanoSignTx(p.MessageType):
         protocol_magic: int,
         fee: int,
         network_id: int,
-        inputs: List[CardanoTxInputType] = None,
-        outputs: List[CardanoTxOutputType] = None,
-        certificates: List[CardanoTxCertificateType] = None,
-        withdrawals: List[CardanoTxWithdrawalType] = None,
-        ttl: int = None,
-        metadata: bytes = None,
-        validity_interval_start: int = None,
+        inputs: Optional[List[CardanoTxInputType]] = None,
+        outputs: Optional[List[CardanoTxOutputType]] = None,
+        certificates: Optional[List[CardanoTxCertificateType]] = None,
+        withdrawals: Optional[List[CardanoTxWithdrawalType]] = None,
+        ttl: Optional[int] = None,
+        metadata: Optional[bytes] = None,
+        validity_interval_start: Optional[int] = None,
     ) -> None:
         self.inputs = inputs if inputs is not None else []
         self.outputs = outputs if outputs is not None else []
diff --git a/core/src/trezor/messages/CardanoSignedTx.py b/core/src/trezor/messages/CardanoSignedTx.py
index 081b9b34f9..dac0828828 100644
--- a/core/src/trezor/messages/CardanoSignedTx.py
+++ b/core/src/trezor/messages/CardanoSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class CardanoSignedTx(p.MessageType):
         self,
         *,
         tx_hash: bytes,
-        serialized_tx: bytes = None,
+        serialized_tx: Optional[bytes] = None,
     ) -> None:
         self.tx_hash = tx_hash
         self.serialized_tx = serialized_tx
diff --git a/core/src/trezor/messages/CardanoSignedTxChunk.py b/core/src/trezor/messages/CardanoSignedTxChunk.py
index 99ce6e10b1..0de820a90f 100644
--- a/core/src/trezor/messages/CardanoSignedTxChunk.py
+++ b/core/src/trezor/messages/CardanoSignedTxChunk.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoSignedTxChunkAck.py b/core/src/trezor/messages/CardanoSignedTxChunkAck.py
index c07e374648..d78f450f83 100644
--- a/core/src/trezor/messages/CardanoSignedTxChunkAck.py
+++ b/core/src/trezor/messages/CardanoSignedTxChunkAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoTokenType.py b/core/src/trezor/messages/CardanoTokenType.py
index 513a3956f5..42b43e0adb 100644
--- a/core/src/trezor/messages/CardanoTokenType.py
+++ b/core/src/trezor/messages/CardanoTokenType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/CardanoTxCertificateType.py b/core/src/trezor/messages/CardanoTxCertificateType.py
index 6da24776cb..468ff2ccee 100644
--- a/core/src/trezor/messages/CardanoTxCertificateType.py
+++ b/core/src/trezor/messages/CardanoTxCertificateType.py
@@ -6,7 +6,7 @@ from .CardanoPoolParametersType import CardanoPoolParametersType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCardanoCertificateType = Literal[0, 1, 2, 3]
     except ImportError:
@@ -19,9 +19,9 @@ class CardanoTxCertificateType(p.MessageType):
         self,
         *,
         type: EnumTypeCardanoCertificateType,
-        path: List[int] = None,
-        pool: bytes = None,
-        pool_parameters: CardanoPoolParametersType = None,
+        path: Optional[List[int]] = None,
+        pool: Optional[bytes] = None,
+        pool_parameters: Optional[CardanoPoolParametersType] = None,
     ) -> None:
         self.path = path if path is not None else []
         self.type = type
diff --git a/core/src/trezor/messages/CardanoTxInputType.py b/core/src/trezor/messages/CardanoTxInputType.py
index 892600b598..a770c16857 100644
--- a/core/src/trezor/messages/CardanoTxInputType.py
+++ b/core/src/trezor/messages/CardanoTxInputType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class CardanoTxInputType(p.MessageType):
         *,
         prev_hash: bytes,
         prev_index: int,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.prev_hash = prev_hash
diff --git a/core/src/trezor/messages/CardanoTxOutputType.py b/core/src/trezor/messages/CardanoTxOutputType.py
index e588a2bf8b..922c1ad0eb 100644
--- a/core/src/trezor/messages/CardanoTxOutputType.py
+++ b/core/src/trezor/messages/CardanoTxOutputType.py
@@ -7,7 +7,7 @@ from .CardanoAssetGroupType import CardanoAssetGroupType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,9 +19,9 @@ class CardanoTxOutputType(p.MessageType):
         self,
         *,
         amount: int,
-        token_bundle: List[CardanoAssetGroupType] = None,
-        address: str = None,
-        address_parameters: CardanoAddressParametersType = None,
+        token_bundle: Optional[List[CardanoAssetGroupType]] = None,
+        address: Optional[str] = None,
+        address_parameters: Optional[CardanoAddressParametersType] = None,
     ) -> None:
         self.token_bundle = token_bundle if token_bundle is not None else []
         self.amount = amount
diff --git a/core/src/trezor/messages/CardanoTxWithdrawalType.py b/core/src/trezor/messages/CardanoTxWithdrawalType.py
index 98271e8d41..f5e88d2ce5 100644
--- a/core/src/trezor/messages/CardanoTxWithdrawalType.py
+++ b/core/src/trezor/messages/CardanoTxWithdrawalType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class CardanoTxWithdrawalType(p.MessageType):
         self,
         *,
         amount: int,
-        path: List[int] = None,
+        path: Optional[List[int]] = None,
     ) -> None:
         self.path = path if path is not None else []
         self.amount = amount
diff --git a/core/src/trezor/messages/ChangePin.py b/core/src/trezor/messages/ChangePin.py
index e085980db3..6464248d11 100644
--- a/core/src/trezor/messages/ChangePin.py
+++ b/core/src/trezor/messages/ChangePin.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class ChangePin(p.MessageType):
     def __init__(
         self,
         *,
-        remove: bool = None,
+        remove: Optional[bool] = None,
     ) -> None:
         self.remove = remove
 
diff --git a/core/src/trezor/messages/ChangeWipeCode.py b/core/src/trezor/messages/ChangeWipeCode.py
index 16de08d864..80641410cf 100644
--- a/core/src/trezor/messages/ChangeWipeCode.py
+++ b/core/src/trezor/messages/ChangeWipeCode.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class ChangeWipeCode(p.MessageType):
     def __init__(
         self,
         *,
-        remove: bool = None,
+        remove: Optional[bool] = None,
     ) -> None:
         self.remove = remove
 
diff --git a/core/src/trezor/messages/CipherKeyValue.py b/core/src/trezor/messages/CipherKeyValue.py
index 6bbde1f13a..d09e6a575a 100644
--- a/core/src/trezor/messages/CipherKeyValue.py
+++ b/core/src/trezor/messages/CipherKeyValue.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,11 +18,11 @@ class CipherKeyValue(p.MessageType):
         *,
         key: str,
         value: bytes,
-        address_n: List[int] = None,
-        encrypt: bool = None,
-        ask_on_encrypt: bool = None,
-        ask_on_decrypt: bool = None,
-        iv: bytes = None,
+        address_n: Optional[List[int]] = None,
+        encrypt: Optional[bool] = None,
+        ask_on_encrypt: Optional[bool] = None,
+        ask_on_decrypt: Optional[bool] = None,
+        iv: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.key = key
diff --git a/core/src/trezor/messages/CipheredKeyValue.py b/core/src/trezor/messages/CipheredKeyValue.py
index 2c5466655f..07751e0159 100644
--- a/core/src/trezor/messages/CipheredKeyValue.py
+++ b/core/src/trezor/messages/CipheredKeyValue.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/DebugLinkDecision.py b/core/src/trezor/messages/DebugLinkDecision.py
index ce2921c769..860991deeb 100644
--- a/core/src/trezor/messages/DebugLinkDecision.py
+++ b/core/src/trezor/messages/DebugLinkDecision.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeDebugSwipeDirection = Literal[0, 1, 2, 3]
     except ImportError:
@@ -17,13 +17,13 @@ class DebugLinkDecision(p.MessageType):
     def __init__(
         self,
         *,
-        yes_no: bool = None,
-        swipe: EnumTypeDebugSwipeDirection = None,
-        input: str = None,
-        x: int = None,
-        y: int = None,
-        wait: bool = None,
-        hold_ms: int = None,
+        yes_no: Optional[bool] = None,
+        swipe: Optional[EnumTypeDebugSwipeDirection] = None,
+        input: Optional[str] = None,
+        x: Optional[int] = None,
+        y: Optional[int] = None,
+        wait: Optional[bool] = None,
+        hold_ms: Optional[int] = None,
     ) -> None:
         self.yes_no = yes_no
         self.swipe = swipe
diff --git a/core/src/trezor/messages/DebugLinkEraseSdCard.py b/core/src/trezor/messages/DebugLinkEraseSdCard.py
index d920b0103a..c4ae434cee 100644
--- a/core/src/trezor/messages/DebugLinkEraseSdCard.py
+++ b/core/src/trezor/messages/DebugLinkEraseSdCard.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkEraseSdCard(p.MessageType):
     def __init__(
         self,
         *,
-        format: bool = None,
+        format: Optional[bool] = None,
     ) -> None:
         self.format = format
 
diff --git a/core/src/trezor/messages/DebugLinkGetState.py b/core/src/trezor/messages/DebugLinkGetState.py
index 780bde3097..520ab5242c 100644
--- a/core/src/trezor/messages/DebugLinkGetState.py
+++ b/core/src/trezor/messages/DebugLinkGetState.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class DebugLinkGetState(p.MessageType):
     def __init__(
         self,
         *,
-        wait_word_list: bool = None,
-        wait_word_pos: bool = None,
-        wait_layout: bool = None,
+        wait_word_list: Optional[bool] = None,
+        wait_word_pos: Optional[bool] = None,
+        wait_layout: Optional[bool] = None,
     ) -> None:
         self.wait_word_list = wait_word_list
         self.wait_word_pos = wait_word_pos
diff --git a/core/src/trezor/messages/DebugLinkLayout.py b/core/src/trezor/messages/DebugLinkLayout.py
index abb0f695d9..03438da628 100644
--- a/core/src/trezor/messages/DebugLinkLayout.py
+++ b/core/src/trezor/messages/DebugLinkLayout.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkLayout(p.MessageType):
     def __init__(
         self,
         *,
-        lines: List[str] = None,
+        lines: Optional[List[str]] = None,
     ) -> None:
         self.lines = lines if lines is not None else []
 
diff --git a/core/src/trezor/messages/DebugLinkRecordScreen.py b/core/src/trezor/messages/DebugLinkRecordScreen.py
index 15021f4c76..4367748604 100644
--- a/core/src/trezor/messages/DebugLinkRecordScreen.py
+++ b/core/src/trezor/messages/DebugLinkRecordScreen.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkRecordScreen(p.MessageType):
     def __init__(
         self,
         *,
-        target_directory: str = None,
+        target_directory: Optional[str] = None,
     ) -> None:
         self.target_directory = target_directory
 
diff --git a/core/src/trezor/messages/DebugLinkReseedRandom.py b/core/src/trezor/messages/DebugLinkReseedRandom.py
index bf94bd06e9..4ae5a354b5 100644
--- a/core/src/trezor/messages/DebugLinkReseedRandom.py
+++ b/core/src/trezor/messages/DebugLinkReseedRandom.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkReseedRandom(p.MessageType):
     def __init__(
         self,
         *,
-        value: int = None,
+        value: Optional[int] = None,
     ) -> None:
         self.value = value
 
diff --git a/core/src/trezor/messages/DebugLinkState.py b/core/src/trezor/messages/DebugLinkState.py
index 4d373cce05..b06d1c56b7 100644
--- a/core/src/trezor/messages/DebugLinkState.py
+++ b/core/src/trezor/messages/DebugLinkState.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,19 +18,19 @@ class DebugLinkState(p.MessageType):
     def __init__(
         self,
         *,
-        layout_lines: List[str] = None,
-        layout: bytes = None,
-        pin: str = None,
-        matrix: str = None,
-        mnemonic_secret: bytes = None,
-        node: HDNodeType = None,
-        passphrase_protection: bool = None,
-        reset_word: str = None,
-        reset_entropy: bytes = None,
-        recovery_fake_word: str = None,
-        recovery_word_pos: int = None,
-        reset_word_pos: int = None,
-        mnemonic_type: int = None,
+        layout_lines: Optional[List[str]] = None,
+        layout: Optional[bytes] = None,
+        pin: Optional[str] = None,
+        matrix: Optional[str] = None,
+        mnemonic_secret: Optional[bytes] = None,
+        node: Optional[HDNodeType] = None,
+        passphrase_protection: Optional[bool] = None,
+        reset_word: Optional[str] = None,
+        reset_entropy: Optional[bytes] = None,
+        recovery_fake_word: Optional[str] = None,
+        recovery_word_pos: Optional[int] = None,
+        reset_word_pos: Optional[int] = None,
+        mnemonic_type: Optional[int] = None,
     ) -> None:
         self.layout_lines = layout_lines if layout_lines is not None else []
         self.layout = layout
diff --git a/core/src/trezor/messages/DebugLinkWatchLayout.py b/core/src/trezor/messages/DebugLinkWatchLayout.py
index 74bc91c9c4..cf3e139de7 100644
--- a/core/src/trezor/messages/DebugLinkWatchLayout.py
+++ b/core/src/trezor/messages/DebugLinkWatchLayout.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkWatchLayout(p.MessageType):
     def __init__(
         self,
         *,
-        watch: bool = None,
+        watch: Optional[bool] = None,
     ) -> None:
         self.watch = watch
 
diff --git a/core/src/trezor/messages/DebugMoneroDiagAck.py b/core/src/trezor/messages/DebugMoneroDiagAck.py
index 54b7ad2d5f..5c7be7f147 100644
--- a/core/src/trezor/messages/DebugMoneroDiagAck.py
+++ b/core/src/trezor/messages/DebugMoneroDiagAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class DebugMoneroDiagAck(p.MessageType):
     def __init__(
         self,
         *,
-        pd: List[int] = None,
-        ins: int = None,
-        p1: int = None,
-        p2: int = None,
-        data1: bytes = None,
-        data2: bytes = None,
+        pd: Optional[List[int]] = None,
+        ins: Optional[int] = None,
+        p1: Optional[int] = None,
+        p2: Optional[int] = None,
+        data1: Optional[bytes] = None,
+        data2: Optional[bytes] = None,
     ) -> None:
         self.pd = pd if pd is not None else []
         self.ins = ins
diff --git a/core/src/trezor/messages/DebugMoneroDiagRequest.py b/core/src/trezor/messages/DebugMoneroDiagRequest.py
index 34dded1c7c..658e8de510 100644
--- a/core/src/trezor/messages/DebugMoneroDiagRequest.py
+++ b/core/src/trezor/messages/DebugMoneroDiagRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class DebugMoneroDiagRequest(p.MessageType):
     def __init__(
         self,
         *,
-        pd: List[int] = None,
-        ins: int = None,
-        p1: int = None,
-        p2: int = None,
-        data1: bytes = None,
-        data2: bytes = None,
+        pd: Optional[List[int]] = None,
+        ins: Optional[int] = None,
+        p1: Optional[int] = None,
+        p2: Optional[int] = None,
+        data1: Optional[bytes] = None,
+        data2: Optional[bytes] = None,
     ) -> None:
         self.pd = pd if pd is not None else []
         self.ins = ins
diff --git a/core/src/trezor/messages/Deprecated_PassphraseStateAck.py b/core/src/trezor/messages/Deprecated_PassphraseStateAck.py
index 5bd97159e3..f4eb6dc40f 100644
--- a/core/src/trezor/messages/Deprecated_PassphraseStateAck.py
+++ b/core/src/trezor/messages/Deprecated_PassphraseStateAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py b/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py
index ad73b1c565..1f52808f7c 100644
--- a/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py
+++ b/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class Deprecated_PassphraseStateRequest(p.MessageType):
     def __init__(
         self,
         *,
-        state: bytes = None,
+        state: Optional[bytes] = None,
     ) -> None:
         self.state = state
 
diff --git a/core/src/trezor/messages/DoPreauthorized.py b/core/src/trezor/messages/DoPreauthorized.py
index 9fea449ef5..7a03eee72d 100644
--- a/core/src/trezor/messages/DoPreauthorized.py
+++ b/core/src/trezor/messages/DoPreauthorized.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/ECDHSessionKey.py b/core/src/trezor/messages/ECDHSessionKey.py
index 03d1a4ffaf..bf4436efeb 100644
--- a/core/src/trezor/messages/ECDHSessionKey.py
+++ b/core/src/trezor/messages/ECDHSessionKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class ECDHSessionKey(p.MessageType):
         self,
         *,
         session_key: bytes,
-        public_key: bytes = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.session_key = session_key
         self.public_key = public_key
diff --git a/core/src/trezor/messages/EndSession.py b/core/src/trezor/messages/EndSession.py
index 71169244d7..59b9cd4b4b 100644
--- a/core/src/trezor/messages/EndSession.py
+++ b/core/src/trezor/messages/EndSession.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/Entropy.py b/core/src/trezor/messages/Entropy.py
index 49679d8887..7d3a63bd2b 100644
--- a/core/src/trezor/messages/Entropy.py
+++ b/core/src/trezor/messages/Entropy.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/EntropyAck.py b/core/src/trezor/messages/EntropyAck.py
index 9ea7ae61bb..11d6c14e6d 100644
--- a/core/src/trezor/messages/EntropyAck.py
+++ b/core/src/trezor/messages/EntropyAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EntropyAck(p.MessageType):
     def __init__(
         self,
         *,
-        entropy: bytes = None,
+        entropy: Optional[bytes] = None,
     ) -> None:
         self.entropy = entropy
 
diff --git a/core/src/trezor/messages/EntropyRequest.py b/core/src/trezor/messages/EntropyRequest.py
index 57426760d0..7bcf7e7c27 100644
--- a/core/src/trezor/messages/EntropyRequest.py
+++ b/core/src/trezor/messages/EntropyRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/EosActionBuyRam.py b/core/src/trezor/messages/EosActionBuyRam.py
index f3e4851999..bb067e9ba6 100644
--- a/core/src/trezor/messages/EosActionBuyRam.py
+++ b/core/src/trezor/messages/EosActionBuyRam.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class EosActionBuyRam(p.MessageType):
     def __init__(
         self,
         *,
-        payer: int = None,
-        receiver: int = None,
-        quantity: EosAsset = None,
+        payer: Optional[int] = None,
+        receiver: Optional[int] = None,
+        quantity: Optional[EosAsset] = None,
     ) -> None:
         self.payer = payer
         self.receiver = receiver
diff --git a/core/src/trezor/messages/EosActionBuyRamBytes.py b/core/src/trezor/messages/EosActionBuyRamBytes.py
index f2bc497503..3e670d029a 100644
--- a/core/src/trezor/messages/EosActionBuyRamBytes.py
+++ b/core/src/trezor/messages/EosActionBuyRamBytes.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class EosActionBuyRamBytes(p.MessageType):
     def __init__(
         self,
         *,
-        payer: int = None,
-        receiver: int = None,
-        bytes: int = None,
+        payer: Optional[int] = None,
+        receiver: Optional[int] = None,
+        bytes: Optional[int] = None,
     ) -> None:
         self.payer = payer
         self.receiver = receiver
diff --git a/core/src/trezor/messages/EosActionCommon.py b/core/src/trezor/messages/EosActionCommon.py
index 9e512130b2..bf7a3d3c51 100644
--- a/core/src/trezor/messages/EosActionCommon.py
+++ b/core/src/trezor/messages/EosActionCommon.py
@@ -6,7 +6,7 @@ from .EosPermissionLevel import EosPermissionLevel
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class EosActionCommon(p.MessageType):
     def __init__(
         self,
         *,
-        authorization: List[EosPermissionLevel] = None,
-        account: int = None,
-        name: int = None,
+        authorization: Optional[List[EosPermissionLevel]] = None,
+        account: Optional[int] = None,
+        name: Optional[int] = None,
     ) -> None:
         self.authorization = authorization if authorization is not None else []
         self.account = account
diff --git a/core/src/trezor/messages/EosActionDelegate.py b/core/src/trezor/messages/EosActionDelegate.py
index 82df458bfd..d341c60d9e 100644
--- a/core/src/trezor/messages/EosActionDelegate.py
+++ b/core/src/trezor/messages/EosActionDelegate.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,11 +17,11 @@ class EosActionDelegate(p.MessageType):
     def __init__(
         self,
         *,
-        sender: int = None,
-        receiver: int = None,
-        net_quantity: EosAsset = None,
-        cpu_quantity: EosAsset = None,
-        transfer: bool = None,
+        sender: Optional[int] = None,
+        receiver: Optional[int] = None,
+        net_quantity: Optional[EosAsset] = None,
+        cpu_quantity: Optional[EosAsset] = None,
+        transfer: Optional[bool] = None,
     ) -> None:
         self.sender = sender
         self.receiver = receiver
diff --git a/core/src/trezor/messages/EosActionDeleteAuth.py b/core/src/trezor/messages/EosActionDeleteAuth.py
index ce0401dff4..eb813b9ae7 100644
--- a/core/src/trezor/messages/EosActionDeleteAuth.py
+++ b/core/src/trezor/messages/EosActionDeleteAuth.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosActionDeleteAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        permission: int = None,
+        account: Optional[int] = None,
+        permission: Optional[int] = None,
     ) -> None:
         self.account = account
         self.permission = permission
diff --git a/core/src/trezor/messages/EosActionLinkAuth.py b/core/src/trezor/messages/EosActionLinkAuth.py
index ee845ab045..9a1fb24672 100644
--- a/core/src/trezor/messages/EosActionLinkAuth.py
+++ b/core/src/trezor/messages/EosActionLinkAuth.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class EosActionLinkAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        code: int = None,
-        type: int = None,
-        requirement: int = None,
+        account: Optional[int] = None,
+        code: Optional[int] = None,
+        type: Optional[int] = None,
+        requirement: Optional[int] = None,
     ) -> None:
         self.account = account
         self.code = code
diff --git a/core/src/trezor/messages/EosActionNewAccount.py b/core/src/trezor/messages/EosActionNewAccount.py
index 3eec6b99fc..4e6c240cf8 100644
--- a/core/src/trezor/messages/EosActionNewAccount.py
+++ b/core/src/trezor/messages/EosActionNewAccount.py
@@ -6,7 +6,7 @@ from .EosAuthorization import EosAuthorization
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionNewAccount(p.MessageType):
     def __init__(
         self,
         *,
-        creator: int = None,
-        name: int = None,
-        owner: EosAuthorization = None,
-        active: EosAuthorization = None,
+        creator: Optional[int] = None,
+        name: Optional[int] = None,
+        owner: Optional[EosAuthorization] = None,
+        active: Optional[EosAuthorization] = None,
     ) -> None:
         self.creator = creator
         self.name = name
diff --git a/core/src/trezor/messages/EosActionRefund.py b/core/src/trezor/messages/EosActionRefund.py
index b16bb57603..571604ff3c 100644
--- a/core/src/trezor/messages/EosActionRefund.py
+++ b/core/src/trezor/messages/EosActionRefund.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,7 +15,7 @@ class EosActionRefund(p.MessageType):
     def __init__(
         self,
         *,
-        owner: int = None,
+        owner: Optional[int] = None,
     ) -> None:
         self.owner = owner
 
diff --git a/core/src/trezor/messages/EosActionSellRam.py b/core/src/trezor/messages/EosActionSellRam.py
index 0332566708..b762660ca8 100644
--- a/core/src/trezor/messages/EosActionSellRam.py
+++ b/core/src/trezor/messages/EosActionSellRam.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosActionSellRam(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        bytes: int = None,
+        account: Optional[int] = None,
+        bytes: Optional[int] = None,
     ) -> None:
         self.account = account
         self.bytes = bytes
diff --git a/core/src/trezor/messages/EosActionTransfer.py b/core/src/trezor/messages/EosActionTransfer.py
index 62faaf5f45..139b1c2614 100644
--- a/core/src/trezor/messages/EosActionTransfer.py
+++ b/core/src/trezor/messages/EosActionTransfer.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        sender: int = None,
-        receiver: int = None,
-        quantity: EosAsset = None,
-        memo: str = None,
+        sender: Optional[int] = None,
+        receiver: Optional[int] = None,
+        quantity: Optional[EosAsset] = None,
+        memo: Optional[str] = None,
     ) -> None:
         self.sender = sender
         self.receiver = receiver
diff --git a/core/src/trezor/messages/EosActionUndelegate.py b/core/src/trezor/messages/EosActionUndelegate.py
index 3a40e98214..26a553b285 100644
--- a/core/src/trezor/messages/EosActionUndelegate.py
+++ b/core/src/trezor/messages/EosActionUndelegate.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionUndelegate(p.MessageType):
     def __init__(
         self,
         *,
-        sender: int = None,
-        receiver: int = None,
-        net_quantity: EosAsset = None,
-        cpu_quantity: EosAsset = None,
+        sender: Optional[int] = None,
+        receiver: Optional[int] = None,
+        net_quantity: Optional[EosAsset] = None,
+        cpu_quantity: Optional[EosAsset] = None,
     ) -> None:
         self.sender = sender
         self.receiver = receiver
diff --git a/core/src/trezor/messages/EosActionUnknown.py b/core/src/trezor/messages/EosActionUnknown.py
index ac6af7ac62..bacf03d58c 100644
--- a/core/src/trezor/messages/EosActionUnknown.py
+++ b/core/src/trezor/messages/EosActionUnknown.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EosActionUnknown(p.MessageType):
         self,
         *,
         data_size: int,
-        data_chunk: bytes = None,
+        data_chunk: Optional[bytes] = None,
     ) -> None:
         self.data_size = data_size
         self.data_chunk = data_chunk
diff --git a/core/src/trezor/messages/EosActionUnlinkAuth.py b/core/src/trezor/messages/EosActionUnlinkAuth.py
index b6a7688783..245994c0b1 100644
--- a/core/src/trezor/messages/EosActionUnlinkAuth.py
+++ b/core/src/trezor/messages/EosActionUnlinkAuth.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class EosActionUnlinkAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        code: int = None,
-        type: int = None,
+        account: Optional[int] = None,
+        code: Optional[int] = None,
+        type: Optional[int] = None,
     ) -> None:
         self.account = account
         self.code = code
diff --git a/core/src/trezor/messages/EosActionUpdateAuth.py b/core/src/trezor/messages/EosActionUpdateAuth.py
index c4e86ed9a5..83ebd9ad18 100644
--- a/core/src/trezor/messages/EosActionUpdateAuth.py
+++ b/core/src/trezor/messages/EosActionUpdateAuth.py
@@ -6,7 +6,7 @@ from .EosAuthorization import EosAuthorization
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionUpdateAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        permission: int = None,
-        parent: int = None,
-        auth: EosAuthorization = None,
+        account: Optional[int] = None,
+        permission: Optional[int] = None,
+        parent: Optional[int] = None,
+        auth: Optional[EosAuthorization] = None,
     ) -> None:
         self.account = account
         self.permission = permission
diff --git a/core/src/trezor/messages/EosActionVoteProducer.py b/core/src/trezor/messages/EosActionVoteProducer.py
index 6bf43e6ab5..a79c1ea8e8 100644
--- a/core/src/trezor/messages/EosActionVoteProducer.py
+++ b/core/src/trezor/messages/EosActionVoteProducer.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class EosActionVoteProducer(p.MessageType):
     def __init__(
         self,
         *,
-        producers: List[int] = None,
-        voter: int = None,
-        proxy: int = None,
+        producers: Optional[List[int]] = None,
+        voter: Optional[int] = None,
+        proxy: Optional[int] = None,
     ) -> None:
         self.producers = producers if producers is not None else []
         self.voter = voter
diff --git a/core/src/trezor/messages/EosAsset.py b/core/src/trezor/messages/EosAsset.py
index b7238f4a5c..40b77b2c81 100644
--- a/core/src/trezor/messages/EosAsset.py
+++ b/core/src/trezor/messages/EosAsset.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosAsset(p.MessageType):
     def __init__(
         self,
         *,
-        amount: int = None,
-        symbol: int = None,
+        amount: Optional[int] = None,
+        symbol: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.symbol = symbol
diff --git a/core/src/trezor/messages/EosAuthorization.py b/core/src/trezor/messages/EosAuthorization.py
index 1ccfc4bf12..bc6d4e4290 100644
--- a/core/src/trezor/messages/EosAuthorization.py
+++ b/core/src/trezor/messages/EosAuthorization.py
@@ -8,7 +8,7 @@ from .EosAuthorizationWait import EosAuthorizationWait
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,10 +19,10 @@ class EosAuthorization(p.MessageType):
     def __init__(
         self,
         *,
-        keys: List[EosAuthorizationKey] = None,
-        accounts: List[EosAuthorizationAccount] = None,
-        waits: List[EosAuthorizationWait] = None,
-        threshold: int = None,
+        keys: Optional[List[EosAuthorizationKey]] = None,
+        accounts: Optional[List[EosAuthorizationAccount]] = None,
+        waits: Optional[List[EosAuthorizationWait]] = None,
+        threshold: Optional[int] = None,
     ) -> None:
         self.keys = keys if keys is not None else []
         self.accounts = accounts if accounts is not None else []
diff --git a/core/src/trezor/messages/EosAuthorizationAccount.py b/core/src/trezor/messages/EosAuthorizationAccount.py
index 255dc4d90a..aa1012e57f 100644
--- a/core/src/trezor/messages/EosAuthorizationAccount.py
+++ b/core/src/trezor/messages/EosAuthorizationAccount.py
@@ -6,7 +6,7 @@ from .EosPermissionLevel import EosPermissionLevel
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class EosAuthorizationAccount(p.MessageType):
     def __init__(
         self,
         *,
-        account: EosPermissionLevel = None,
-        weight: int = None,
+        account: Optional[EosPermissionLevel] = None,
+        weight: Optional[int] = None,
     ) -> None:
         self.account = account
         self.weight = weight
diff --git a/core/src/trezor/messages/EosAuthorizationKey.py b/core/src/trezor/messages/EosAuthorizationKey.py
index 53833f82f7..e403a05619 100644
--- a/core/src/trezor/messages/EosAuthorizationKey.py
+++ b/core/src/trezor/messages/EosAuthorizationKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class EosAuthorizationKey(p.MessageType):
         *,
         type: int,
         weight: int,
-        address_n: List[int] = None,
-        key: bytes = None,
+        address_n: Optional[List[int]] = None,
+        key: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.type = type
diff --git a/core/src/trezor/messages/EosAuthorizationWait.py b/core/src/trezor/messages/EosAuthorizationWait.py
index 42c9b9437f..7b132c5415 100644
--- a/core/src/trezor/messages/EosAuthorizationWait.py
+++ b/core/src/trezor/messages/EosAuthorizationWait.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosAuthorizationWait(p.MessageType):
     def __init__(
         self,
         *,
-        wait_sec: int = None,
-        weight: int = None,
+        wait_sec: Optional[int] = None,
+        weight: Optional[int] = None,
     ) -> None:
         self.wait_sec = wait_sec
         self.weight = weight
diff --git a/core/src/trezor/messages/EosGetPublicKey.py b/core/src/trezor/messages/EosGetPublicKey.py
index 9bb8a92b0e..a2e2aa38dc 100644
--- a/core/src/trezor/messages/EosGetPublicKey.py
+++ b/core/src/trezor/messages/EosGetPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EosGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/EosPermissionLevel.py b/core/src/trezor/messages/EosPermissionLevel.py
index 274b1dafa6..1198a7edc6 100644
--- a/core/src/trezor/messages/EosPermissionLevel.py
+++ b/core/src/trezor/messages/EosPermissionLevel.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosPermissionLevel(p.MessageType):
     def __init__(
         self,
         *,
-        actor: int = None,
-        permission: int = None,
+        actor: Optional[int] = None,
+        permission: Optional[int] = None,
     ) -> None:
         self.actor = actor
         self.permission = permission
diff --git a/core/src/trezor/messages/EosPublicKey.py b/core/src/trezor/messages/EosPublicKey.py
index 89217c0940..93f9fab3d3 100644
--- a/core/src/trezor/messages/EosPublicKey.py
+++ b/core/src/trezor/messages/EosPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/EosSignTx.py b/core/src/trezor/messages/EosSignTx.py
index d405d97be5..ac0cef4d8f 100644
--- a/core/src/trezor/messages/EosSignTx.py
+++ b/core/src/trezor/messages/EosSignTx.py
@@ -6,7 +6,7 @@ from .EosTxHeader import EosTxHeader
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class EosSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        chain_id: bytes = None,
-        header: EosTxHeader = None,
-        num_actions: int = None,
+        address_n: Optional[List[int]] = None,
+        chain_id: Optional[bytes] = None,
+        header: Optional[EosTxHeader] = None,
+        num_actions: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.chain_id = chain_id
diff --git a/core/src/trezor/messages/EosSignedTx.py b/core/src/trezor/messages/EosSignedTx.py
index 815cf14523..f8684a573e 100644
--- a/core/src/trezor/messages/EosSignedTx.py
+++ b/core/src/trezor/messages/EosSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/EosTxActionAck.py b/core/src/trezor/messages/EosTxActionAck.py
index 4b7777d10c..cfd1edf430 100644
--- a/core/src/trezor/messages/EosTxActionAck.py
+++ b/core/src/trezor/messages/EosTxActionAck.py
@@ -20,7 +20,7 @@ from .EosActionVoteProducer import EosActionVoteProducer
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -32,21 +32,21 @@ class EosTxActionAck(p.MessageType):
     def __init__(
         self,
         *,
-        common: EosActionCommon = None,
-        transfer: EosActionTransfer = None,
-        delegate: EosActionDelegate = None,
-        undelegate: EosActionUndelegate = None,
-        refund: EosActionRefund = None,
-        buy_ram: EosActionBuyRam = None,
-        buy_ram_bytes: EosActionBuyRamBytes = None,
-        sell_ram: EosActionSellRam = None,
-        vote_producer: EosActionVoteProducer = None,
-        update_auth: EosActionUpdateAuth = None,
-        delete_auth: EosActionDeleteAuth = None,
-        link_auth: EosActionLinkAuth = None,
-        unlink_auth: EosActionUnlinkAuth = None,
-        new_account: EosActionNewAccount = None,
-        unknown: EosActionUnknown = None,
+        common: Optional[EosActionCommon] = None,
+        transfer: Optional[EosActionTransfer] = None,
+        delegate: Optional[EosActionDelegate] = None,
+        undelegate: Optional[EosActionUndelegate] = None,
+        refund: Optional[EosActionRefund] = None,
+        buy_ram: Optional[EosActionBuyRam] = None,
+        buy_ram_bytes: Optional[EosActionBuyRamBytes] = None,
+        sell_ram: Optional[EosActionSellRam] = None,
+        vote_producer: Optional[EosActionVoteProducer] = None,
+        update_auth: Optional[EosActionUpdateAuth] = None,
+        delete_auth: Optional[EosActionDeleteAuth] = None,
+        link_auth: Optional[EosActionLinkAuth] = None,
+        unlink_auth: Optional[EosActionUnlinkAuth] = None,
+        new_account: Optional[EosActionNewAccount] = None,
+        unknown: Optional[EosActionUnknown] = None,
     ) -> None:
         self.common = common
         self.transfer = transfer
diff --git a/core/src/trezor/messages/EosTxActionRequest.py b/core/src/trezor/messages/EosTxActionRequest.py
index b11f6b913c..5fcc024b51 100644
--- a/core/src/trezor/messages/EosTxActionRequest.py
+++ b/core/src/trezor/messages/EosTxActionRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EosTxActionRequest(p.MessageType):
     def __init__(
         self,
         *,
-        data_size: int = None,
+        data_size: Optional[int] = None,
     ) -> None:
         self.data_size = data_size
 
diff --git a/core/src/trezor/messages/EosTxHeader.py b/core/src/trezor/messages/EosTxHeader.py
index 0a335d0618..fac2f64d61 100644
--- a/core/src/trezor/messages/EosTxHeader.py
+++ b/core/src/trezor/messages/EosTxHeader.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/EthereumAddress.py b/core/src/trezor/messages/EthereumAddress.py
index c8940f549d..07259f7bc4 100644
--- a/core/src/trezor/messages/EthereumAddress.py
+++ b/core/src/trezor/messages/EthereumAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EthereumAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address: str = None,
+        address: Optional[str] = None,
     ) -> None:
         self.address = address
 
diff --git a/core/src/trezor/messages/EthereumGetAddress.py b/core/src/trezor/messages/EthereumGetAddress.py
index 4f7243a72c..81d953126b 100644
--- a/core/src/trezor/messages/EthereumGetAddress.py
+++ b/core/src/trezor/messages/EthereumGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EthereumGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/EthereumGetPublicKey.py b/core/src/trezor/messages/EthereumGetPublicKey.py
index 7df2d8417b..52ef8d4c10 100644
--- a/core/src/trezor/messages/EthereumGetPublicKey.py
+++ b/core/src/trezor/messages/EthereumGetPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EthereumGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/EthereumMessageSignature.py b/core/src/trezor/messages/EthereumMessageSignature.py
index 1de4b0544b..e73066df09 100644
--- a/core/src/trezor/messages/EthereumMessageSignature.py
+++ b/core/src/trezor/messages/EthereumMessageSignature.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/EthereumPublicKey.py b/core/src/trezor/messages/EthereumPublicKey.py
index 55828dda52..ca338f144f 100644
--- a/core/src/trezor/messages/EthereumPublicKey.py
+++ b/core/src/trezor/messages/EthereumPublicKey.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/EthereumSignMessage.py b/core/src/trezor/messages/EthereumSignMessage.py
index 1f02ac8fa2..5887a71843 100644
--- a/core/src/trezor/messages/EthereumSignMessage.py
+++ b/core/src/trezor/messages/EthereumSignMessage.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EthereumSignMessage(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        message: bytes = None,
+        address_n: Optional[List[int]] = None,
+        message: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.message = message
diff --git a/core/src/trezor/messages/EthereumSignTx.py b/core/src/trezor/messages/EthereumSignTx.py
index f169a15a42..805d28a9de 100644
--- a/core/src/trezor/messages/EthereumSignTx.py
+++ b/core/src/trezor/messages/EthereumSignTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,16 +16,16 @@ class EthereumSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        nonce: bytes = None,
-        gas_price: bytes = None,
-        gas_limit: bytes = None,
-        to: str = None,
-        value: bytes = None,
-        data_initial_chunk: bytes = None,
-        data_length: int = None,
-        chain_id: int = None,
-        tx_type: int = None,
+        address_n: Optional[List[int]] = None,
+        nonce: Optional[bytes] = None,
+        gas_price: Optional[bytes] = None,
+        gas_limit: Optional[bytes] = None,
+        to: Optional[str] = None,
+        value: Optional[bytes] = None,
+        data_initial_chunk: Optional[bytes] = None,
+        data_length: Optional[int] = None,
+        chain_id: Optional[int] = None,
+        tx_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.nonce = nonce
diff --git a/core/src/trezor/messages/EthereumTxAck.py b/core/src/trezor/messages/EthereumTxAck.py
index dd2d6ccded..615ed88d68 100644
--- a/core/src/trezor/messages/EthereumTxAck.py
+++ b/core/src/trezor/messages/EthereumTxAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EthereumTxAck(p.MessageType):
     def __init__(
         self,
         *,
-        data_chunk: bytes = None,
+        data_chunk: Optional[bytes] = None,
     ) -> None:
         self.data_chunk = data_chunk
 
diff --git a/core/src/trezor/messages/EthereumTxRequest.py b/core/src/trezor/messages/EthereumTxRequest.py
index fe9e6eb0c5..8959966581 100644
--- a/core/src/trezor/messages/EthereumTxRequest.py
+++ b/core/src/trezor/messages/EthereumTxRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,10 +16,10 @@ class EthereumTxRequest(p.MessageType):
     def __init__(
         self,
         *,
-        data_length: int = None,
-        signature_v: int = None,
-        signature_r: bytes = None,
-        signature_s: bytes = None,
+        data_length: Optional[int] = None,
+        signature_v: Optional[int] = None,
+        signature_r: Optional[bytes] = None,
+        signature_s: Optional[bytes] = None,
     ) -> None:
         self.data_length = data_length
         self.signature_v = signature_v
diff --git a/core/src/trezor/messages/EthereumVerifyMessage.py b/core/src/trezor/messages/EthereumVerifyMessage.py
index 726ab367bd..64e4a8f006 100644
--- a/core/src/trezor/messages/EthereumVerifyMessage.py
+++ b/core/src/trezor/messages/EthereumVerifyMessage.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class EthereumVerifyMessage(p.MessageType):
     def __init__(
         self,
         *,
-        signature: bytes = None,
-        message: bytes = None,
-        address: str = None,
+        signature: Optional[bytes] = None,
+        message: Optional[bytes] = None,
+        address: Optional[str] = None,
     ) -> None:
         self.signature = signature
         self.message = message
diff --git a/core/src/trezor/messages/Failure.py b/core/src/trezor/messages/Failure.py
index 4e359e5636..359f875e25 100644
--- a/core/src/trezor/messages/Failure.py
+++ b/core/src/trezor/messages/Failure.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeFailureType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 99]
     except ImportError:
@@ -17,8 +17,8 @@ class Failure(p.MessageType):
     def __init__(
         self,
         *,
-        code: EnumTypeFailureType = None,
-        message: str = None,
+        code: Optional[EnumTypeFailureType] = None,
+        message: Optional[str] = None,
     ) -> None:
         self.code = code
         self.message = message
diff --git a/core/src/trezor/messages/Features.py b/core/src/trezor/messages/Features.py
index 82aa6f16de..0f3b2f5ce2 100644
--- a/core/src/trezor/messages/Features.py
+++ b/core/src/trezor/messages/Features.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCapability = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
         EnumTypeBackupType = Literal[0, 1, 2]
@@ -22,41 +22,41 @@ class Features(p.MessageType):
         major_version: int,
         minor_version: int,
         patch_version: int,
-        capabilities: List[EnumTypeCapability] = None,
-        vendor: str = None,
-        bootloader_mode: bool = None,
-        device_id: str = None,
-        pin_protection: bool = None,
-        passphrase_protection: bool = None,
-        language: str = None,
-        label: str = None,
-        initialized: bool = None,
-        revision: bytes = None,
-        bootloader_hash: bytes = None,
-        imported: bool = None,
-        unlocked: bool = None,
-        firmware_present: bool = None,
-        needs_backup: bool = None,
-        flags: int = None,
-        model: str = None,
-        fw_major: int = None,
-        fw_minor: int = None,
-        fw_patch: int = None,
-        fw_vendor: str = None,
-        fw_vendor_keys: bytes = None,
-        unfinished_backup: bool = None,
-        no_backup: bool = None,
-        recovery_mode: bool = None,
-        backup_type: EnumTypeBackupType = None,
-        sd_card_present: bool = None,
-        sd_protection: bool = None,
-        wipe_code_protection: bool = None,
-        session_id: bytes = None,
-        passphrase_always_on_device: bool = None,
-        safety_checks: EnumTypeSafetyCheckLevel = None,
-        auto_lock_delay_ms: int = None,
-        display_rotation: int = None,
-        experimental_features: bool = None,
+        capabilities: Optional[List[EnumTypeCapability]] = None,
+        vendor: Optional[str] = None,
+        bootloader_mode: Optional[bool] = None,
+        device_id: Optional[str] = None,
+        pin_protection: Optional[bool] = None,
+        passphrase_protection: Optional[bool] = None,
+        language: Optional[str] = None,
+        label: Optional[str] = None,
+        initialized: Optional[bool] = None,
+        revision: Optional[bytes] = None,
+        bootloader_hash: Optional[bytes] = None,
+        imported: Optional[bool] = None,
+        unlocked: Optional[bool] = None,
+        firmware_present: Optional[bool] = None,
+        needs_backup: Optional[bool] = None,
+        flags: Optional[int] = None,
+        model: Optional[str] = None,
+        fw_major: Optional[int] = None,
+        fw_minor: Optional[int] = None,
+        fw_patch: Optional[int] = None,
+        fw_vendor: Optional[str] = None,
+        fw_vendor_keys: Optional[bytes] = None,
+        unfinished_backup: Optional[bool] = None,
+        no_backup: Optional[bool] = None,
+        recovery_mode: Optional[bool] = None,
+        backup_type: Optional[EnumTypeBackupType] = None,
+        sd_card_present: Optional[bool] = None,
+        sd_protection: Optional[bool] = None,
+        wipe_code_protection: Optional[bool] = None,
+        session_id: Optional[bytes] = None,
+        passphrase_always_on_device: Optional[bool] = None,
+        safety_checks: Optional[EnumTypeSafetyCheckLevel] = None,
+        auto_lock_delay_ms: Optional[int] = None,
+        display_rotation: Optional[int] = None,
+        experimental_features: Optional[bool] = None,
     ) -> None:
         self.capabilities = capabilities if capabilities is not None else []
         self.major_version = major_version
diff --git a/core/src/trezor/messages/GetAddress.py b/core/src/trezor/messages/GetAddress.py
index 9883121549..04afdc5ac5 100644
--- a/core/src/trezor/messages/GetAddress.py
+++ b/core/src/trezor/messages/GetAddress.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -19,12 +19,12 @@ class GetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
         coin_name: str = "Bitcoin",
-        show_display: bool = None,
-        multisig: MultisigRedeemScriptType = None,
+        show_display: Optional[bool] = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
         script_type: EnumTypeInputScriptType = 0,
-        ignore_xpub_magic: bool = None,
+        ignore_xpub_magic: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.coin_name = coin_name
diff --git a/core/src/trezor/messages/GetECDHSessionKey.py b/core/src/trezor/messages/GetECDHSessionKey.py
index ed5e950596..b9e29ed5fe 100644
--- a/core/src/trezor/messages/GetECDHSessionKey.py
+++ b/core/src/trezor/messages/GetECDHSessionKey.py
@@ -6,7 +6,7 @@ from .IdentityType import IdentityType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,7 +20,7 @@ class GetECDHSessionKey(p.MessageType):
         *,
         identity: IdentityType,
         peer_public_key: bytes,
-        ecdsa_curve_name: str = None,
+        ecdsa_curve_name: Optional[str] = None,
     ) -> None:
         self.identity = identity
         self.peer_public_key = peer_public_key
diff --git a/core/src/trezor/messages/GetEntropy.py b/core/src/trezor/messages/GetEntropy.py
index 956c602b6c..f8592e62de 100644
--- a/core/src/trezor/messages/GetEntropy.py
+++ b/core/src/trezor/messages/GetEntropy.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/GetFeatures.py b/core/src/trezor/messages/GetFeatures.py
index f8e66e209b..510d2fc5b4 100644
--- a/core/src/trezor/messages/GetFeatures.py
+++ b/core/src/trezor/messages/GetFeatures.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/GetNextU2FCounter.py b/core/src/trezor/messages/GetNextU2FCounter.py
index dae21a4ba1..22ddf4cf2e 100644
--- a/core/src/trezor/messages/GetNextU2FCounter.py
+++ b/core/src/trezor/messages/GetNextU2FCounter.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/GetOwnershipId.py b/core/src/trezor/messages/GetOwnershipId.py
index 4ca7490d25..850eb65e1f 100644
--- a/core/src/trezor/messages/GetOwnershipId.py
+++ b/core/src/trezor/messages/GetOwnershipId.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -19,9 +19,9 @@ class GetOwnershipId(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
         coin_name: str = "Bitcoin",
-        multisig: MultisigRedeemScriptType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
         script_type: EnumTypeInputScriptType = 0,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
diff --git a/core/src/trezor/messages/GetOwnershipProof.py b/core/src/trezor/messages/GetOwnershipProof.py
index bb09a0c3ad..f803909f0e 100644
--- a/core/src/trezor/messages/GetOwnershipProof.py
+++ b/core/src/trezor/messages/GetOwnershipProof.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -19,11 +19,11 @@ class GetOwnershipProof(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        ownership_ids: List[bytes] = None,
+        address_n: Optional[List[int]] = None,
+        ownership_ids: Optional[List[bytes]] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 3,
-        multisig: MultisigRedeemScriptType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
         user_confirmation: bool = False,
         commitment_data: bytes = b"",
     ) -> None:
diff --git a/core/src/trezor/messages/GetPublicKey.py b/core/src/trezor/messages/GetPublicKey.py
index 4ebb8036dd..4d37cb8b40 100644
--- a/core/src/trezor/messages/GetPublicKey.py
+++ b/core/src/trezor/messages/GetPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -17,12 +17,12 @@ class GetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        ecdsa_curve_name: str = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        ecdsa_curve_name: Optional[str] = None,
+        show_display: Optional[bool] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 0,
-        ignore_xpub_magic: bool = None,
+        ignore_xpub_magic: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.ecdsa_curve_name = ecdsa_curve_name
diff --git a/core/src/trezor/messages/HDNodePathType.py b/core/src/trezor/messages/HDNodePathType.py
index b544bf7ffb..239772d4d1 100644
--- a/core/src/trezor/messages/HDNodePathType.py
+++ b/core/src/trezor/messages/HDNodePathType.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class HDNodePathType(p.MessageType):
         self,
         *,
         node: HDNodeType,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.node = node
diff --git a/core/src/trezor/messages/HDNodeType.py b/core/src/trezor/messages/HDNodeType.py
index cb4876ccd2..f87598eedb 100644
--- a/core/src/trezor/messages/HDNodeType.py
+++ b/core/src/trezor/messages/HDNodeType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,7 +20,7 @@ class HDNodeType(p.MessageType):
         child_num: int,
         chain_code: bytes,
         public_key: bytes,
-        private_key: bytes = None,
+        private_key: Optional[bytes] = None,
     ) -> None:
         self.depth = depth
         self.fingerprint = fingerprint
diff --git a/core/src/trezor/messages/IdentityType.py b/core/src/trezor/messages/IdentityType.py
index 2c544067e6..50bbf2af95 100644
--- a/core/src/trezor/messages/IdentityType.py
+++ b/core/src/trezor/messages/IdentityType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,11 +15,11 @@ class IdentityType(p.MessageType):
     def __init__(
         self,
         *,
-        proto: str = None,
-        user: str = None,
-        host: str = None,
-        port: str = None,
-        path: str = None,
+        proto: Optional[str] = None,
+        user: Optional[str] = None,
+        host: Optional[str] = None,
+        port: Optional[str] = None,
+        path: Optional[str] = None,
         index: int = 0,
     ) -> None:
         self.proto = proto
diff --git a/core/src/trezor/messages/Initialize.py b/core/src/trezor/messages/Initialize.py
index b5701955fd..d4a6227103 100644
--- a/core/src/trezor/messages/Initialize.py
+++ b/core/src/trezor/messages/Initialize.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class Initialize(p.MessageType):
     def __init__(
         self,
         *,
-        session_id: bytes = None,
+        session_id: Optional[bytes] = None,
     ) -> None:
         self.session_id = session_id
 
diff --git a/core/src/trezor/messages/LiskAddress.py b/core/src/trezor/messages/LiskAddress.py
index a0e0684e9e..b872d56358 100644
--- a/core/src/trezor/messages/LiskAddress.py
+++ b/core/src/trezor/messages/LiskAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/LiskDelegateType.py b/core/src/trezor/messages/LiskDelegateType.py
index 32ffad10bf..972111dd52 100644
--- a/core/src/trezor/messages/LiskDelegateType.py
+++ b/core/src/trezor/messages/LiskDelegateType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,7 +15,7 @@ class LiskDelegateType(p.MessageType):
     def __init__(
         self,
         *,
-        username: str = None,
+        username: Optional[str] = None,
     ) -> None:
         self.username = username
 
diff --git a/core/src/trezor/messages/LiskGetAddress.py b/core/src/trezor/messages/LiskGetAddress.py
index 42553fe108..66947efe7e 100644
--- a/core/src/trezor/messages/LiskGetAddress.py
+++ b/core/src/trezor/messages/LiskGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class LiskGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/LiskGetPublicKey.py b/core/src/trezor/messages/LiskGetPublicKey.py
index 0d23f2210a..fd6c32e946 100644
--- a/core/src/trezor/messages/LiskGetPublicKey.py
+++ b/core/src/trezor/messages/LiskGetPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class LiskGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/LiskMessageSignature.py b/core/src/trezor/messages/LiskMessageSignature.py
index 2daff6b738..f5090fd5bd 100644
--- a/core/src/trezor/messages/LiskMessageSignature.py
+++ b/core/src/trezor/messages/LiskMessageSignature.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/LiskMultisignatureType.py b/core/src/trezor/messages/LiskMultisignatureType.py
index 80f5a0c3a9..73dac521e7 100644
--- a/core/src/trezor/messages/LiskMultisignatureType.py
+++ b/core/src/trezor/messages/LiskMultisignatureType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class LiskMultisignatureType(p.MessageType):
     def __init__(
         self,
         *,
-        keys_group: List[str] = None,
-        min: int = None,
-        life_time: int = None,
+        keys_group: Optional[List[str]] = None,
+        min: Optional[int] = None,
+        life_time: Optional[int] = None,
     ) -> None:
         self.keys_group = keys_group if keys_group is not None else []
         self.min = min
diff --git a/core/src/trezor/messages/LiskPublicKey.py b/core/src/trezor/messages/LiskPublicKey.py
index d8ac90aae0..de026f4099 100644
--- a/core/src/trezor/messages/LiskPublicKey.py
+++ b/core/src/trezor/messages/LiskPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/LiskSignMessage.py b/core/src/trezor/messages/LiskSignMessage.py
index d00fab4844..4535be0263 100644
--- a/core/src/trezor/messages/LiskSignMessage.py
+++ b/core/src/trezor/messages/LiskSignMessage.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class LiskSignMessage(p.MessageType):
         self,
         *,
         message: bytes,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.message = message
diff --git a/core/src/trezor/messages/LiskSignTx.py b/core/src/trezor/messages/LiskSignTx.py
index 01a69ac0b9..934cb912ab 100644
--- a/core/src/trezor/messages/LiskSignTx.py
+++ b/core/src/trezor/messages/LiskSignTx.py
@@ -6,7 +6,7 @@ from .LiskTransactionCommon import LiskTransactionCommon
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,7 +19,7 @@ class LiskSignTx(p.MessageType):
         self,
         *,
         transaction: LiskTransactionCommon,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.transaction = transaction
diff --git a/core/src/trezor/messages/LiskSignatureType.py b/core/src/trezor/messages/LiskSignatureType.py
index 4e0d7d649b..8791bd61d9 100644
--- a/core/src/trezor/messages/LiskSignatureType.py
+++ b/core/src/trezor/messages/LiskSignatureType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,7 +15,7 @@ class LiskSignatureType(p.MessageType):
     def __init__(
         self,
         *,
-        public_key: bytes = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.public_key = public_key
 
diff --git a/core/src/trezor/messages/LiskSignedTx.py b/core/src/trezor/messages/LiskSignedTx.py
index c0956b3a5a..3f63563531 100644
--- a/core/src/trezor/messages/LiskSignedTx.py
+++ b/core/src/trezor/messages/LiskSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/LiskTransactionAsset.py b/core/src/trezor/messages/LiskTransactionAsset.py
index dfa7b03484..31b2078c6d 100644
--- a/core/src/trezor/messages/LiskTransactionAsset.py
+++ b/core/src/trezor/messages/LiskTransactionAsset.py
@@ -8,7 +8,7 @@ from .LiskSignatureType import LiskSignatureType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,11 +19,11 @@ class LiskTransactionAsset(p.MessageType):
     def __init__(
         self,
         *,
-        votes: List[str] = None,
-        signature: LiskSignatureType = None,
-        delegate: LiskDelegateType = None,
-        multisignature: LiskMultisignatureType = None,
-        data: str = None,
+        votes: Optional[List[str]] = None,
+        signature: Optional[LiskSignatureType] = None,
+        delegate: Optional[LiskDelegateType] = None,
+        multisignature: Optional[LiskMultisignatureType] = None,
+        data: Optional[str] = None,
     ) -> None:
         self.votes = votes if votes is not None else []
         self.signature = signature
diff --git a/core/src/trezor/messages/LiskTransactionCommon.py b/core/src/trezor/messages/LiskTransactionCommon.py
index 58c85bff72..66c40ebaca 100644
--- a/core/src/trezor/messages/LiskTransactionCommon.py
+++ b/core/src/trezor/messages/LiskTransactionCommon.py
@@ -6,7 +6,7 @@ from .LiskTransactionAsset import LiskTransactionAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeLiskTransactionType = Literal[0, 1, 2, 3, 4, 5, 6, 7]
     except ImportError:
@@ -18,15 +18,15 @@ class LiskTransactionCommon(p.MessageType):
     def __init__(
         self,
         *,
-        type: EnumTypeLiskTransactionType = None,
-        amount: int = None,
-        fee: int = None,
-        recipient_id: str = None,
-        sender_public_key: bytes = None,
-        requester_public_key: bytes = None,
-        signature: bytes = None,
-        timestamp: int = None,
-        asset: LiskTransactionAsset = None,
+        type: Optional[EnumTypeLiskTransactionType] = None,
+        amount: Optional[int] = None,
+        fee: Optional[int] = None,
+        recipient_id: Optional[str] = None,
+        sender_public_key: Optional[bytes] = None,
+        requester_public_key: Optional[bytes] = None,
+        signature: Optional[bytes] = None,
+        timestamp: Optional[int] = None,
+        asset: Optional[LiskTransactionAsset] = None,
     ) -> None:
         self.type = type
         self.amount = amount
diff --git a/core/src/trezor/messages/LiskVerifyMessage.py b/core/src/trezor/messages/LiskVerifyMessage.py
index c69e41faff..1fd19a955b 100644
--- a/core/src/trezor/messages/LiskVerifyMessage.py
+++ b/core/src/trezor/messages/LiskVerifyMessage.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/LoadDevice.py b/core/src/trezor/messages/LoadDevice.py
index aa69c219f0..c45012ee38 100644
--- a/core/src/trezor/messages/LoadDevice.py
+++ b/core/src/trezor/messages/LoadDevice.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,15 +16,15 @@ class LoadDevice(p.MessageType):
     def __init__(
         self,
         *,
-        mnemonics: List[str] = None,
-        pin: str = None,
-        passphrase_protection: bool = None,
+        mnemonics: Optional[List[str]] = None,
+        pin: Optional[str] = None,
+        passphrase_protection: Optional[bool] = None,
         language: str = "en-US",
-        label: str = None,
-        skip_checksum: bool = None,
-        u2f_counter: int = None,
-        needs_backup: bool = None,
-        no_backup: bool = None,
+        label: Optional[str] = None,
+        skip_checksum: Optional[bool] = None,
+        u2f_counter: Optional[int] = None,
+        needs_backup: Optional[bool] = None,
+        no_backup: Optional[bool] = None,
     ) -> None:
         self.mnemonics = mnemonics if mnemonics is not None else []
         self.pin = pin
diff --git a/core/src/trezor/messages/LockDevice.py b/core/src/trezor/messages/LockDevice.py
index 4489ec3827..bf836758bc 100644
--- a/core/src/trezor/messages/LockDevice.py
+++ b/core/src/trezor/messages/LockDevice.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MessageSignature.py b/core/src/trezor/messages/MessageSignature.py
index 8fc3643cb4..10890212b5 100644
--- a/core/src/trezor/messages/MessageSignature.py
+++ b/core/src/trezor/messages/MessageSignature.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroAccountPublicAddress.py b/core/src/trezor/messages/MoneroAccountPublicAddress.py
index b8b8ab829c..6b0a2d886b 100644
--- a/core/src/trezor/messages/MoneroAccountPublicAddress.py
+++ b/core/src/trezor/messages/MoneroAccountPublicAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroAccountPublicAddress(p.MessageType):
     def __init__(
         self,
         *,
-        spend_public_key: bytes = None,
-        view_public_key: bytes = None,
+        spend_public_key: Optional[bytes] = None,
+        view_public_key: Optional[bytes] = None,
     ) -> None:
         self.spend_public_key = spend_public_key
         self.view_public_key = view_public_key
diff --git a/core/src/trezor/messages/MoneroAddress.py b/core/src/trezor/messages/MoneroAddress.py
index cb0a4f1aa5..483ab33097 100644
--- a/core/src/trezor/messages/MoneroAddress.py
+++ b/core/src/trezor/messages/MoneroAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class MoneroAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address: bytes = None,
+        address: Optional[bytes] = None,
     ) -> None:
         self.address = address
 
diff --git a/core/src/trezor/messages/MoneroExportedKeyImage.py b/core/src/trezor/messages/MoneroExportedKeyImage.py
index 7394e17ecd..44fb2ba2bc 100644
--- a/core/src/trezor/messages/MoneroExportedKeyImage.py
+++ b/core/src/trezor/messages/MoneroExportedKeyImage.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroExportedKeyImage(p.MessageType):
     def __init__(
         self,
         *,
-        iv: bytes = None,
-        blob: bytes = None,
+        iv: Optional[bytes] = None,
+        blob: Optional[bytes] = None,
     ) -> None:
         self.iv = iv
         self.blob = blob
diff --git a/core/src/trezor/messages/MoneroGetAddress.py b/core/src/trezor/messages/MoneroGetAddress.py
index dd48910843..455f199471 100644
--- a/core/src/trezor/messages/MoneroGetAddress.py
+++ b/core/src/trezor/messages/MoneroGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class MoneroGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
-        network_type: int = None,
-        account: int = None,
-        minor: int = None,
-        payment_id: bytes = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
+        network_type: Optional[int] = None,
+        account: Optional[int] = None,
+        minor: Optional[int] = None,
+        payment_id: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/MoneroGetTxKeyAck.py b/core/src/trezor/messages/MoneroGetTxKeyAck.py
index 43c111f978..cd33d20fdf 100644
--- a/core/src/trezor/messages/MoneroGetTxKeyAck.py
+++ b/core/src/trezor/messages/MoneroGetTxKeyAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class MoneroGetTxKeyAck(p.MessageType):
     def __init__(
         self,
         *,
-        salt: bytes = None,
-        tx_keys: bytes = None,
-        tx_derivations: bytes = None,
+        salt: Optional[bytes] = None,
+        tx_keys: Optional[bytes] = None,
+        tx_derivations: Optional[bytes] = None,
     ) -> None:
         self.salt = salt
         self.tx_keys = tx_keys
diff --git a/core/src/trezor/messages/MoneroGetTxKeyRequest.py b/core/src/trezor/messages/MoneroGetTxKeyRequest.py
index b65a01b0d5..d09f5cfe60 100644
--- a/core/src/trezor/messages/MoneroGetTxKeyRequest.py
+++ b/core/src/trezor/messages/MoneroGetTxKeyRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,14 +16,14 @@ class MoneroGetTxKeyRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_type: int = None,
-        salt1: bytes = None,
-        salt2: bytes = None,
-        tx_enc_keys: bytes = None,
-        tx_prefix_hash: bytes = None,
-        reason: int = None,
-        view_public_key: bytes = None,
+        address_n: Optional[List[int]] = None,
+        network_type: Optional[int] = None,
+        salt1: Optional[bytes] = None,
+        salt2: Optional[bytes] = None,
+        tx_enc_keys: Optional[bytes] = None,
+        tx_prefix_hash: Optional[bytes] = None,
+        reason: Optional[int] = None,
+        view_public_key: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_type = network_type
diff --git a/core/src/trezor/messages/MoneroGetWatchKey.py b/core/src/trezor/messages/MoneroGetWatchKey.py
index 102e56eecd..a81499d921 100644
--- a/core/src/trezor/messages/MoneroGetWatchKey.py
+++ b/core/src/trezor/messages/MoneroGetWatchKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroGetWatchKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_type: int = None,
+        address_n: Optional[List[int]] = None,
+        network_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_type = network_type
diff --git a/core/src/trezor/messages/MoneroKeyImageExportInitAck.py b/core/src/trezor/messages/MoneroKeyImageExportInitAck.py
index fbad4608b6..2efe152cb6 100644
--- a/core/src/trezor/messages/MoneroKeyImageExportInitAck.py
+++ b/core/src/trezor/messages/MoneroKeyImageExportInitAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py b/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py
index 4772ab1f9d..ae2a68a9f3 100644
--- a/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py
+++ b/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py
@@ -6,7 +6,7 @@ from .MoneroSubAddressIndicesList import MoneroSubAddressIndicesList
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,11 +18,11 @@ class MoneroKeyImageExportInitRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        subs: List[MoneroSubAddressIndicesList] = None,
-        num: int = None,
-        hash: bytes = None,
-        network_type: int = None,
+        address_n: Optional[List[int]] = None,
+        subs: Optional[List[MoneroSubAddressIndicesList]] = None,
+        num: Optional[int] = None,
+        hash: Optional[bytes] = None,
+        network_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.subs = subs if subs is not None else []
diff --git a/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py b/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py
index f644a54e2c..115091b370 100644
--- a/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py
+++ b/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class MoneroKeyImageSyncFinalAck(p.MessageType):
     def __init__(
         self,
         *,
-        enc_key: bytes = None,
+        enc_key: Optional[bytes] = None,
     ) -> None:
         self.enc_key = enc_key
 
diff --git a/core/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py b/core/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py
index 0295772ed6..058b993aef 100644
--- a/core/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py
+++ b/core/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py b/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py
index 2a4c57bbe1..c75a0c8bad 100644
--- a/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py
+++ b/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py
@@ -6,7 +6,7 @@ from .MoneroExportedKeyImage import MoneroExportedKeyImage
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroKeyImageSyncStepAck(p.MessageType):
     def __init__(
         self,
         *,
-        kis: List[MoneroExportedKeyImage] = None,
+        kis: Optional[List[MoneroExportedKeyImage]] = None,
     ) -> None:
         self.kis = kis if kis is not None else []
 
diff --git a/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py b/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py
index e9aac326a1..fd6d70d127 100644
--- a/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py
+++ b/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransferDetails import MoneroTransferDetails
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroKeyImageSyncStepRequest(p.MessageType):
     def __init__(
         self,
         *,
-        tdis: List[MoneroTransferDetails] = None,
+        tdis: Optional[List[MoneroTransferDetails]] = None,
     ) -> None:
         self.tdis = tdis if tdis is not None else []
 
diff --git a/core/src/trezor/messages/MoneroLiveRefreshFinalAck.py b/core/src/trezor/messages/MoneroLiveRefreshFinalAck.py
index c14fd38255..ebad29b726 100644
--- a/core/src/trezor/messages/MoneroLiveRefreshFinalAck.py
+++ b/core/src/trezor/messages/MoneroLiveRefreshFinalAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroLiveRefreshFinalRequest.py b/core/src/trezor/messages/MoneroLiveRefreshFinalRequest.py
index b905aadb70..bb184602e1 100644
--- a/core/src/trezor/messages/MoneroLiveRefreshFinalRequest.py
+++ b/core/src/trezor/messages/MoneroLiveRefreshFinalRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroLiveRefreshStartAck.py b/core/src/trezor/messages/MoneroLiveRefreshStartAck.py
index bbc0da01f7..565fd5544b 100644
--- a/core/src/trezor/messages/MoneroLiveRefreshStartAck.py
+++ b/core/src/trezor/messages/MoneroLiveRefreshStartAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py b/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py
index 82655a0243..049f329649 100644
--- a/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py
+++ b/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroLiveRefreshStartRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_type: int = None,
+        address_n: Optional[List[int]] = None,
+        network_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_type = network_type
diff --git a/core/src/trezor/messages/MoneroLiveRefreshStepAck.py b/core/src/trezor/messages/MoneroLiveRefreshStepAck.py
index eaa11eb84e..6f6b6736f2 100644
--- a/core/src/trezor/messages/MoneroLiveRefreshStepAck.py
+++ b/core/src/trezor/messages/MoneroLiveRefreshStepAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroLiveRefreshStepAck(p.MessageType):
     def __init__(
         self,
         *,
-        salt: bytes = None,
-        key_image: bytes = None,
+        salt: Optional[bytes] = None,
+        key_image: Optional[bytes] = None,
     ) -> None:
         self.salt = salt
         self.key_image = key_image
diff --git a/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py b/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py
index b410659ecb..02502b2352 100644
--- a/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py
+++ b/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,11 +16,11 @@ class MoneroLiveRefreshStepRequest(p.MessageType):
     def __init__(
         self,
         *,
-        out_key: bytes = None,
-        recv_deriv: bytes = None,
-        real_out_idx: int = None,
-        sub_addr_major: int = None,
-        sub_addr_minor: int = None,
+        out_key: Optional[bytes] = None,
+        recv_deriv: Optional[bytes] = None,
+        real_out_idx: Optional[int] = None,
+        sub_addr_major: Optional[int] = None,
+        sub_addr_minor: Optional[int] = None,
     ) -> None:
         self.out_key = out_key
         self.recv_deriv = recv_deriv
diff --git a/core/src/trezor/messages/MoneroMultisigKLRki.py b/core/src/trezor/messages/MoneroMultisigKLRki.py
index c1758f9d4c..c52d9f22c5 100644
--- a/core/src/trezor/messages/MoneroMultisigKLRki.py
+++ b/core/src/trezor/messages/MoneroMultisigKLRki.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class MoneroMultisigKLRki(p.MessageType):
     def __init__(
         self,
         *,
-        K: bytes = None,
-        L: bytes = None,
-        R: bytes = None,
-        ki: bytes = None,
+        K: Optional[bytes] = None,
+        L: Optional[bytes] = None,
+        R: Optional[bytes] = None,
+        ki: Optional[bytes] = None,
     ) -> None:
         self.K = K
         self.L = L
diff --git a/core/src/trezor/messages/MoneroOutputEntry.py b/core/src/trezor/messages/MoneroOutputEntry.py
index 9bdb71333d..841ae9fa0a 100644
--- a/core/src/trezor/messages/MoneroOutputEntry.py
+++ b/core/src/trezor/messages/MoneroOutputEntry.py
@@ -6,7 +6,7 @@ from .MoneroRctKeyPublic import MoneroRctKeyPublic
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class MoneroOutputEntry(p.MessageType):
     def __init__(
         self,
         *,
-        idx: int = None,
-        key: MoneroRctKeyPublic = None,
+        idx: Optional[int] = None,
+        key: Optional[MoneroRctKeyPublic] = None,
     ) -> None:
         self.idx = idx
         self.key = key
diff --git a/core/src/trezor/messages/MoneroRctKeyPublic.py b/core/src/trezor/messages/MoneroRctKeyPublic.py
index 2ceb5422a2..2e27e8a14f 100644
--- a/core/src/trezor/messages/MoneroRctKeyPublic.py
+++ b/core/src/trezor/messages/MoneroRctKeyPublic.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroRctKeyPublic(p.MessageType):
     def __init__(
         self,
         *,
-        dest: bytes = None,
-        commitment: bytes = None,
+        dest: Optional[bytes] = None,
+        commitment: Optional[bytes] = None,
     ) -> None:
         self.dest = dest
         self.commitment = commitment
diff --git a/core/src/trezor/messages/MoneroRingCtSig.py b/core/src/trezor/messages/MoneroRingCtSig.py
index 6c4f6d1110..1d62e2aa69 100644
--- a/core/src/trezor/messages/MoneroRingCtSig.py
+++ b/core/src/trezor/messages/MoneroRingCtSig.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class MoneroRingCtSig(p.MessageType):
     def __init__(
         self,
         *,
-        txn_fee: int = None,
-        message: bytes = None,
-        rv_type: int = None,
+        txn_fee: Optional[int] = None,
+        message: Optional[bytes] = None,
+        rv_type: Optional[int] = None,
     ) -> None:
         self.txn_fee = txn_fee
         self.message = message
diff --git a/core/src/trezor/messages/MoneroSubAddressIndicesList.py b/core/src/trezor/messages/MoneroSubAddressIndicesList.py
index 9d27460ba9..3f74af6ac7 100644
--- a/core/src/trezor/messages/MoneroSubAddressIndicesList.py
+++ b/core/src/trezor/messages/MoneroSubAddressIndicesList.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroSubAddressIndicesList(p.MessageType):
     def __init__(
         self,
         *,
-        minor_indices: List[int] = None,
-        account: int = None,
+        minor_indices: Optional[List[int]] = None,
+        account: Optional[int] = None,
     ) -> None:
         self.minor_indices = minor_indices if minor_indices is not None else []
         self.account = account
diff --git a/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py b/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py
index bb2d70171a..a1016d3d3c 100644
--- a/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py
+++ b/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroTransactionAllInputsSetAck(p.MessageType):
     def __init__(
         self,
         *,
-        rsig_data: MoneroTransactionRsigData = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
     ) -> None:
         self.rsig_data = rsig_data
 
diff --git a/core/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py b/core/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py
index c455145c0b..49bbba29af 100644
--- a/core/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py b/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py
index 4452db9a63..050a12ebb7 100644
--- a/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py
+++ b/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py
@@ -6,7 +6,7 @@ from .MoneroRingCtSig import MoneroRingCtSig
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class MoneroTransactionAllOutSetAck(p.MessageType):
     def __init__(
         self,
         *,
-        extra: bytes = None,
-        tx_prefix_hash: bytes = None,
-        rv: MoneroRingCtSig = None,
-        full_message_hash: bytes = None,
+        extra: Optional[bytes] = None,
+        tx_prefix_hash: Optional[bytes] = None,
+        rv: Optional[MoneroRingCtSig] = None,
+        full_message_hash: Optional[bytes] = None,
     ) -> None:
         self.extra = extra
         self.tx_prefix_hash = tx_prefix_hash
diff --git a/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py b/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py
index 33ee18aef2..b9f86638fd 100644
--- a/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroTransactionAllOutSetRequest(p.MessageType):
     def __init__(
         self,
         *,
-        rsig_data: MoneroTransactionRsigData = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
     ) -> None:
         self.rsig_data = rsig_data
 
diff --git a/core/src/trezor/messages/MoneroTransactionData.py b/core/src/trezor/messages/MoneroTransactionData.py
index a63baa1a93..4b42cf7b44 100644
--- a/core/src/trezor/messages/MoneroTransactionData.py
+++ b/core/src/trezor/messages/MoneroTransactionData.py
@@ -7,7 +7,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,21 +18,21 @@ class MoneroTransactionData(p.MessageType):
     def __init__(
         self,
         *,
-        outputs: List[MoneroTransactionDestinationEntry] = None,
-        minor_indices: List[int] = None,
-        integrated_indices: List[int] = None,
-        version: int = None,
-        payment_id: bytes = None,
-        unlock_time: int = None,
-        change_dts: MoneroTransactionDestinationEntry = None,
-        num_inputs: int = None,
-        mixin: int = None,
-        fee: int = None,
-        account: int = None,
-        rsig_data: MoneroTransactionRsigData = None,
-        client_version: int = None,
-        hard_fork: int = None,
-        monero_version: bytes = None,
+        outputs: Optional[List[MoneroTransactionDestinationEntry]] = None,
+        minor_indices: Optional[List[int]] = None,
+        integrated_indices: Optional[List[int]] = None,
+        version: Optional[int] = None,
+        payment_id: Optional[bytes] = None,
+        unlock_time: Optional[int] = None,
+        change_dts: Optional[MoneroTransactionDestinationEntry] = None,
+        num_inputs: Optional[int] = None,
+        mixin: Optional[int] = None,
+        fee: Optional[int] = None,
+        account: Optional[int] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
+        client_version: Optional[int] = None,
+        hard_fork: Optional[int] = None,
+        monero_version: Optional[bytes] = None,
     ) -> None:
         self.outputs = outputs if outputs is not None else []
         self.minor_indices = minor_indices if minor_indices is not None else []
diff --git a/core/src/trezor/messages/MoneroTransactionDestinationEntry.py b/core/src/trezor/messages/MoneroTransactionDestinationEntry.py
index fcf2bef161..44c61703ed 100644
--- a/core/src/trezor/messages/MoneroTransactionDestinationEntry.py
+++ b/core/src/trezor/messages/MoneroTransactionDestinationEntry.py
@@ -6,7 +6,7 @@ from .MoneroAccountPublicAddress import MoneroAccountPublicAddress
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,11 +17,11 @@ class MoneroTransactionDestinationEntry(p.MessageType):
     def __init__(
         self,
         *,
-        amount: int = None,
-        addr: MoneroAccountPublicAddress = None,
-        is_subaddress: bool = None,
-        original: bytes = None,
-        is_integrated: bool = None,
+        amount: Optional[int] = None,
+        addr: Optional[MoneroAccountPublicAddress] = None,
+        is_subaddress: Optional[bool] = None,
+        original: Optional[bytes] = None,
+        is_integrated: Optional[bool] = None,
     ) -> None:
         self.amount = amount
         self.addr = addr
diff --git a/core/src/trezor/messages/MoneroTransactionFinalAck.py b/core/src/trezor/messages/MoneroTransactionFinalAck.py
index a99b6da45d..73e1d01a92 100644
--- a/core/src/trezor/messages/MoneroTransactionFinalAck.py
+++ b/core/src/trezor/messages/MoneroTransactionFinalAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,11 +16,11 @@ class MoneroTransactionFinalAck(p.MessageType):
     def __init__(
         self,
         *,
-        cout_key: bytes = None,
-        salt: bytes = None,
-        rand_mult: bytes = None,
-        tx_enc_keys: bytes = None,
-        opening_key: bytes = None,
+        cout_key: Optional[bytes] = None,
+        salt: Optional[bytes] = None,
+        rand_mult: Optional[bytes] = None,
+        tx_enc_keys: Optional[bytes] = None,
+        opening_key: Optional[bytes] = None,
     ) -> None:
         self.cout_key = cout_key
         self.salt = salt
diff --git a/core/src/trezor/messages/MoneroTransactionFinalRequest.py b/core/src/trezor/messages/MoneroTransactionFinalRequest.py
index 2acdd29ceb..ab46a573ef 100644
--- a/core/src/trezor/messages/MoneroTransactionFinalRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionFinalRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroTransactionInitAck.py b/core/src/trezor/messages/MoneroTransactionInitAck.py
index e3f921ddd9..08b23235f3 100644
--- a/core/src/trezor/messages/MoneroTransactionInitAck.py
+++ b/core/src/trezor/messages/MoneroTransactionInitAck.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,8 +18,8 @@ class MoneroTransactionInitAck(p.MessageType):
     def __init__(
         self,
         *,
-        hmacs: List[bytes] = None,
-        rsig_data: MoneroTransactionRsigData = None,
+        hmacs: Optional[List[bytes]] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
     ) -> None:
         self.hmacs = hmacs if hmacs is not None else []
         self.rsig_data = rsig_data
diff --git a/core/src/trezor/messages/MoneroTransactionInitRequest.py b/core/src/trezor/messages/MoneroTransactionInitRequest.py
index 9178493bf7..b7ab8a74c3 100644
--- a/core/src/trezor/messages/MoneroTransactionInitRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionInitRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionData import MoneroTransactionData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class MoneroTransactionInitRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        version: int = None,
-        network_type: int = None,
-        tsx_data: MoneroTransactionData = None,
+        address_n: Optional[List[int]] = None,
+        version: Optional[int] = None,
+        network_type: Optional[int] = None,
+        tsx_data: Optional[MoneroTransactionData] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.version = version
diff --git a/core/src/trezor/messages/MoneroTransactionInputViniAck.py b/core/src/trezor/messages/MoneroTransactionInputViniAck.py
index 2a03b16032..643ec2395d 100644
--- a/core/src/trezor/messages/MoneroTransactionInputViniAck.py
+++ b/core/src/trezor/messages/MoneroTransactionInputViniAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroTransactionInputViniRequest.py b/core/src/trezor/messages/MoneroTransactionInputViniRequest.py
index 220df2a47b..fd11ee507b 100644
--- a/core/src/trezor/messages/MoneroTransactionInputViniRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionInputViniRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionSourceEntry import MoneroTransactionSourceEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,12 +18,12 @@ class MoneroTransactionInputViniRequest(p.MessageType):
     def __init__(
         self,
         *,
-        src_entr: MoneroTransactionSourceEntry = None,
-        vini: bytes = None,
-        vini_hmac: bytes = None,
-        pseudo_out: bytes = None,
-        pseudo_out_hmac: bytes = None,
-        orig_idx: int = None,
+        src_entr: Optional[MoneroTransactionSourceEntry] = None,
+        vini: Optional[bytes] = None,
+        vini_hmac: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
+        pseudo_out_hmac: Optional[bytes] = None,
+        orig_idx: Optional[int] = None,
     ) -> None:
         self.src_entr = src_entr
         self.vini = vini
diff --git a/core/src/trezor/messages/MoneroTransactionInputsPermutationAck.py b/core/src/trezor/messages/MoneroTransactionInputsPermutationAck.py
index f523af9f48..16f1a7bd21 100644
--- a/core/src/trezor/messages/MoneroTransactionInputsPermutationAck.py
+++ b/core/src/trezor/messages/MoneroTransactionInputsPermutationAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py b/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py
index 36f36bfeaf..dba45b2eb5 100644
--- a/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class MoneroTransactionInputsPermutationRequest(p.MessageType):
     def __init__(
         self,
         *,
-        perm: List[int] = None,
+        perm: Optional[List[int]] = None,
     ) -> None:
         self.perm = perm if perm is not None else []
 
diff --git a/core/src/trezor/messages/MoneroTransactionRsigData.py b/core/src/trezor/messages/MoneroTransactionRsigData.py
index d5aef9e919..f848cf3b9c 100644
--- a/core/src/trezor/messages/MoneroTransactionRsigData.py
+++ b/core/src/trezor/messages/MoneroTransactionRsigData.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,13 +15,13 @@ class MoneroTransactionRsigData(p.MessageType):
     def __init__(
         self,
         *,
-        grouping: List[int] = None,
-        rsig_parts: List[bytes] = None,
-        rsig_type: int = None,
-        offload_type: int = None,
-        mask: bytes = None,
-        rsig: bytes = None,
-        bp_version: int = None,
+        grouping: Optional[List[int]] = None,
+        rsig_parts: Optional[List[bytes]] = None,
+        rsig_type: Optional[int] = None,
+        offload_type: Optional[int] = None,
+        mask: Optional[bytes] = None,
+        rsig: Optional[bytes] = None,
+        bp_version: Optional[int] = None,
     ) -> None:
         self.grouping = grouping if grouping is not None else []
         self.rsig_parts = rsig_parts if rsig_parts is not None else []
diff --git a/core/src/trezor/messages/MoneroTransactionSetInputAck.py b/core/src/trezor/messages/MoneroTransactionSetInputAck.py
index 4c5f73cdde..24bbff4c48 100644
--- a/core/src/trezor/messages/MoneroTransactionSetInputAck.py
+++ b/core/src/trezor/messages/MoneroTransactionSetInputAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class MoneroTransactionSetInputAck(p.MessageType):
     def __init__(
         self,
         *,
-        vini: bytes = None,
-        vini_hmac: bytes = None,
-        pseudo_out: bytes = None,
-        pseudo_out_hmac: bytes = None,
-        pseudo_out_alpha: bytes = None,
-        spend_key: bytes = None,
+        vini: Optional[bytes] = None,
+        vini_hmac: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
+        pseudo_out_hmac: Optional[bytes] = None,
+        pseudo_out_alpha: Optional[bytes] = None,
+        spend_key: Optional[bytes] = None,
     ) -> None:
         self.vini = vini
         self.vini_hmac = vini_hmac
diff --git a/core/src/trezor/messages/MoneroTransactionSetInputRequest.py b/core/src/trezor/messages/MoneroTransactionSetInputRequest.py
index 3670da7ebe..2a374fce9c 100644
--- a/core/src/trezor/messages/MoneroTransactionSetInputRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionSetInputRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionSourceEntry import MoneroTransactionSourceEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroTransactionSetInputRequest(p.MessageType):
     def __init__(
         self,
         *,
-        src_entr: MoneroTransactionSourceEntry = None,
+        src_entr: Optional[MoneroTransactionSourceEntry] = None,
     ) -> None:
         self.src_entr = src_entr
 
diff --git a/core/src/trezor/messages/MoneroTransactionSetOutputAck.py b/core/src/trezor/messages/MoneroTransactionSetOutputAck.py
index f408256733..696688fc7e 100644
--- a/core/src/trezor/messages/MoneroTransactionSetOutputAck.py
+++ b/core/src/trezor/messages/MoneroTransactionSetOutputAck.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,11 +18,11 @@ class MoneroTransactionSetOutputAck(p.MessageType):
     def __init__(
         self,
         *,
-        tx_out: bytes = None,
-        vouti_hmac: bytes = None,
-        rsig_data: MoneroTransactionRsigData = None,
-        out_pk: bytes = None,
-        ecdh_info: bytes = None,
+        tx_out: Optional[bytes] = None,
+        vouti_hmac: Optional[bytes] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
+        out_pk: Optional[bytes] = None,
+        ecdh_info: Optional[bytes] = None,
     ) -> None:
         self.tx_out = tx_out
         self.vouti_hmac = vouti_hmac
diff --git a/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py b/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py
index 89699c0616..c6df072f60 100644
--- a/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py
@@ -7,7 +7,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,10 +19,10 @@ class MoneroTransactionSetOutputRequest(p.MessageType):
     def __init__(
         self,
         *,
-        dst_entr: MoneroTransactionDestinationEntry = None,
-        dst_entr_hmac: bytes = None,
-        rsig_data: MoneroTransactionRsigData = None,
-        is_offloaded_bp: bool = None,
+        dst_entr: Optional[MoneroTransactionDestinationEntry] = None,
+        dst_entr_hmac: Optional[bytes] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
+        is_offloaded_bp: Optional[bool] = None,
     ) -> None:
         self.dst_entr = dst_entr
         self.dst_entr_hmac = dst_entr_hmac
diff --git a/core/src/trezor/messages/MoneroTransactionSignInputAck.py b/core/src/trezor/messages/MoneroTransactionSignInputAck.py
index da1de5aa82..8837dd19a3 100644
--- a/core/src/trezor/messages/MoneroTransactionSignInputAck.py
+++ b/core/src/trezor/messages/MoneroTransactionSignInputAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroTransactionSignInputAck(p.MessageType):
     def __init__(
         self,
         *,
-        signature: bytes = None,
-        pseudo_out: bytes = None,
+        signature: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
     ) -> None:
         self.signature = signature
         self.pseudo_out = pseudo_out
diff --git a/core/src/trezor/messages/MoneroTransactionSignInputRequest.py b/core/src/trezor/messages/MoneroTransactionSignInputRequest.py
index 704d56f1d8..3a3d03eb9f 100644
--- a/core/src/trezor/messages/MoneroTransactionSignInputRequest.py
+++ b/core/src/trezor/messages/MoneroTransactionSignInputRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionSourceEntry import MoneroTransactionSourceEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,14 +18,14 @@ class MoneroTransactionSignInputRequest(p.MessageType):
     def __init__(
         self,
         *,
-        src_entr: MoneroTransactionSourceEntry = None,
-        vini: bytes = None,
-        vini_hmac: bytes = None,
-        pseudo_out: bytes = None,
-        pseudo_out_hmac: bytes = None,
-        pseudo_out_alpha: bytes = None,
-        spend_key: bytes = None,
-        orig_idx: int = None,
+        src_entr: Optional[MoneroTransactionSourceEntry] = None,
+        vini: Optional[bytes] = None,
+        vini_hmac: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
+        pseudo_out_hmac: Optional[bytes] = None,
+        pseudo_out_alpha: Optional[bytes] = None,
+        spend_key: Optional[bytes] = None,
+        orig_idx: Optional[int] = None,
     ) -> None:
         self.src_entr = src_entr
         self.vini = vini
diff --git a/core/src/trezor/messages/MoneroTransactionSourceEntry.py b/core/src/trezor/messages/MoneroTransactionSourceEntry.py
index 914bc93d2b..333f56ee05 100644
--- a/core/src/trezor/messages/MoneroTransactionSourceEntry.py
+++ b/core/src/trezor/messages/MoneroTransactionSourceEntry.py
@@ -7,7 +7,7 @@ from .MoneroOutputEntry import MoneroOutputEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,16 +18,16 @@ class MoneroTransactionSourceEntry(p.MessageType):
     def __init__(
         self,
         *,
-        outputs: List[MoneroOutputEntry] = None,
-        real_out_additional_tx_keys: List[bytes] = None,
-        real_output: int = None,
-        real_out_tx_key: bytes = None,
-        real_output_in_tx_index: int = None,
-        amount: int = None,
-        rct: bool = None,
-        mask: bytes = None,
-        multisig_kLRki: MoneroMultisigKLRki = None,
-        subaddr_minor: int = None,
+        outputs: Optional[List[MoneroOutputEntry]] = None,
+        real_out_additional_tx_keys: Optional[List[bytes]] = None,
+        real_output: Optional[int] = None,
+        real_out_tx_key: Optional[bytes] = None,
+        real_output_in_tx_index: Optional[int] = None,
+        amount: Optional[int] = None,
+        rct: Optional[bool] = None,
+        mask: Optional[bytes] = None,
+        multisig_kLRki: Optional[MoneroMultisigKLRki] = None,
+        subaddr_minor: Optional[int] = None,
     ) -> None:
         self.outputs = outputs if outputs is not None else []
         self.real_out_additional_tx_keys = real_out_additional_tx_keys if real_out_additional_tx_keys is not None else []
diff --git a/core/src/trezor/messages/MoneroTransferDetails.py b/core/src/trezor/messages/MoneroTransferDetails.py
index 3f1ef6ee9a..3c92050c3b 100644
--- a/core/src/trezor/messages/MoneroTransferDetails.py
+++ b/core/src/trezor/messages/MoneroTransferDetails.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,12 +15,12 @@ class MoneroTransferDetails(p.MessageType):
     def __init__(
         self,
         *,
-        additional_tx_pub_keys: List[bytes] = None,
-        out_key: bytes = None,
-        tx_pub_key: bytes = None,
-        internal_output_index: int = None,
-        sub_addr_major: int = None,
-        sub_addr_minor: int = None,
+        additional_tx_pub_keys: Optional[List[bytes]] = None,
+        out_key: Optional[bytes] = None,
+        tx_pub_key: Optional[bytes] = None,
+        internal_output_index: Optional[int] = None,
+        sub_addr_major: Optional[int] = None,
+        sub_addr_minor: Optional[int] = None,
     ) -> None:
         self.additional_tx_pub_keys = additional_tx_pub_keys if additional_tx_pub_keys is not None else []
         self.out_key = out_key
diff --git a/core/src/trezor/messages/MoneroWatchKey.py b/core/src/trezor/messages/MoneroWatchKey.py
index 6250e5ab7a..4cc708454f 100644
--- a/core/src/trezor/messages/MoneroWatchKey.py
+++ b/core/src/trezor/messages/MoneroWatchKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroWatchKey(p.MessageType):
     def __init__(
         self,
         *,
-        watch_key: bytes = None,
-        address: bytes = None,
+        watch_key: Optional[bytes] = None,
+        address: Optional[bytes] = None,
     ) -> None:
         self.watch_key = watch_key
         self.address = address
diff --git a/core/src/trezor/messages/MultisigRedeemScriptType.py b/core/src/trezor/messages/MultisigRedeemScriptType.py
index 9005d209e0..d6f9b6f727 100644
--- a/core/src/trezor/messages/MultisigRedeemScriptType.py
+++ b/core/src/trezor/messages/MultisigRedeemScriptType.py
@@ -7,7 +7,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,10 +19,10 @@ class MultisigRedeemScriptType(p.MessageType):
         self,
         *,
         m: int,
-        pubkeys: List[HDNodePathType] = None,
-        signatures: List[bytes] = None,
-        nodes: List[HDNodeType] = None,
-        address_n: List[int] = None,
+        pubkeys: Optional[List[HDNodePathType]] = None,
+        signatures: Optional[List[bytes]] = None,
+        nodes: Optional[List[HDNodeType]] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.pubkeys = pubkeys if pubkeys is not None else []
         self.signatures = signatures if signatures is not None else []
diff --git a/core/src/trezor/messages/NEMAddress.py b/core/src/trezor/messages/NEMAddress.py
index 04da2a2f61..05243b64ab 100644
--- a/core/src/trezor/messages/NEMAddress.py
+++ b/core/src/trezor/messages/NEMAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/NEMAggregateModification.py b/core/src/trezor/messages/NEMAggregateModification.py
index 567a8c1dcf..d7cf6cfd81 100644
--- a/core/src/trezor/messages/NEMAggregateModification.py
+++ b/core/src/trezor/messages/NEMAggregateModification.py
@@ -6,7 +6,7 @@ from .NEMCosignatoryModification import NEMCosignatoryModification
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class NEMAggregateModification(p.MessageType):
     def __init__(
         self,
         *,
-        modifications: List[NEMCosignatoryModification] = None,
-        relative_change: int = None,
+        modifications: Optional[List[NEMCosignatoryModification]] = None,
+        relative_change: Optional[int] = None,
     ) -> None:
         self.modifications = modifications if modifications is not None else []
         self.relative_change = relative_change
diff --git a/core/src/trezor/messages/NEMCosignatoryModification.py b/core/src/trezor/messages/NEMCosignatoryModification.py
index b8fc856c6f..a8df337b9a 100644
--- a/core/src/trezor/messages/NEMCosignatoryModification.py
+++ b/core/src/trezor/messages/NEMCosignatoryModification.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMModificationType = Literal[1, 2]
     except ImportError:
@@ -16,8 +16,8 @@ class NEMCosignatoryModification(p.MessageType):
     def __init__(
         self,
         *,
-        type: EnumTypeNEMModificationType = None,
-        public_key: bytes = None,
+        type: Optional[EnumTypeNEMModificationType] = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.type = type
         self.public_key = public_key
diff --git a/core/src/trezor/messages/NEMGetAddress.py b/core/src/trezor/messages/NEMGetAddress.py
index 765b29cad5..0b07a9f1d4 100644
--- a/core/src/trezor/messages/NEMGetAddress.py
+++ b/core/src/trezor/messages/NEMGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class NEMGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network: int = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        network: Optional[int] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network = network
diff --git a/core/src/trezor/messages/NEMImportanceTransfer.py b/core/src/trezor/messages/NEMImportanceTransfer.py
index f4936426b7..b2625fa09d 100644
--- a/core/src/trezor/messages/NEMImportanceTransfer.py
+++ b/core/src/trezor/messages/NEMImportanceTransfer.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMImportanceTransferMode = Literal[1, 2]
     except ImportError:
@@ -16,8 +16,8 @@ class NEMImportanceTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        mode: EnumTypeNEMImportanceTransferMode = None,
-        public_key: bytes = None,
+        mode: Optional[EnumTypeNEMImportanceTransferMode] = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.mode = mode
         self.public_key = public_key
diff --git a/core/src/trezor/messages/NEMMosaic.py b/core/src/trezor/messages/NEMMosaic.py
index 3409363a6a..da179d6a96 100644
--- a/core/src/trezor/messages/NEMMosaic.py
+++ b/core/src/trezor/messages/NEMMosaic.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class NEMMosaic(p.MessageType):
     def __init__(
         self,
         *,
-        namespace: str = None,
-        mosaic: str = None,
-        quantity: int = None,
+        namespace: Optional[str] = None,
+        mosaic: Optional[str] = None,
+        quantity: Optional[int] = None,
     ) -> None:
         self.namespace = namespace
         self.mosaic = mosaic
diff --git a/core/src/trezor/messages/NEMMosaicCreation.py b/core/src/trezor/messages/NEMMosaicCreation.py
index cc996cb841..aac43c9b6d 100644
--- a/core/src/trezor/messages/NEMMosaicCreation.py
+++ b/core/src/trezor/messages/NEMMosaicCreation.py
@@ -6,7 +6,7 @@ from .NEMMosaicDefinition import NEMMosaicDefinition
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class NEMMosaicCreation(p.MessageType):
     def __init__(
         self,
         *,
-        definition: NEMMosaicDefinition = None,
-        sink: str = None,
-        fee: int = None,
+        definition: Optional[NEMMosaicDefinition] = None,
+        sink: Optional[str] = None,
+        fee: Optional[int] = None,
     ) -> None:
         self.definition = definition
         self.sink = sink
diff --git a/core/src/trezor/messages/NEMMosaicDefinition.py b/core/src/trezor/messages/NEMMosaicDefinition.py
index d480b5057c..399a7403f8 100644
--- a/core/src/trezor/messages/NEMMosaicDefinition.py
+++ b/core/src/trezor/messages/NEMMosaicDefinition.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMMosaicLevy = Literal[1, 2]
     except ImportError:
@@ -16,21 +16,21 @@ class NEMMosaicDefinition(p.MessageType):
     def __init__(
         self,
         *,
-        networks: List[int] = None,
-        name: str = None,
-        ticker: str = None,
-        namespace: str = None,
-        mosaic: str = None,
-        divisibility: int = None,
-        levy: EnumTypeNEMMosaicLevy = None,
-        fee: int = None,
-        levy_address: str = None,
-        levy_namespace: str = None,
-        levy_mosaic: str = None,
-        supply: int = None,
-        mutable_supply: bool = None,
-        transferable: bool = None,
-        description: str = None,
+        networks: Optional[List[int]] = None,
+        name: Optional[str] = None,
+        ticker: Optional[str] = None,
+        namespace: Optional[str] = None,
+        mosaic: Optional[str] = None,
+        divisibility: Optional[int] = None,
+        levy: Optional[EnumTypeNEMMosaicLevy] = None,
+        fee: Optional[int] = None,
+        levy_address: Optional[str] = None,
+        levy_namespace: Optional[str] = None,
+        levy_mosaic: Optional[str] = None,
+        supply: Optional[int] = None,
+        mutable_supply: Optional[bool] = None,
+        transferable: Optional[bool] = None,
+        description: Optional[str] = None,
     ) -> None:
         self.networks = networks if networks is not None else []
         self.name = name
diff --git a/core/src/trezor/messages/NEMMosaicSupplyChange.py b/core/src/trezor/messages/NEMMosaicSupplyChange.py
index 7de88018a4..9b300c4c5b 100644
--- a/core/src/trezor/messages/NEMMosaicSupplyChange.py
+++ b/core/src/trezor/messages/NEMMosaicSupplyChange.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMSupplyChangeType = Literal[1, 2]
     except ImportError:
@@ -16,10 +16,10 @@ class NEMMosaicSupplyChange(p.MessageType):
     def __init__(
         self,
         *,
-        namespace: str = None,
-        mosaic: str = None,
-        type: EnumTypeNEMSupplyChangeType = None,
-        delta: int = None,
+        namespace: Optional[str] = None,
+        mosaic: Optional[str] = None,
+        type: Optional[EnumTypeNEMSupplyChangeType] = None,
+        delta: Optional[int] = None,
     ) -> None:
         self.namespace = namespace
         self.mosaic = mosaic
diff --git a/core/src/trezor/messages/NEMProvisionNamespace.py b/core/src/trezor/messages/NEMProvisionNamespace.py
index fba3587670..a208805125 100644
--- a/core/src/trezor/messages/NEMProvisionNamespace.py
+++ b/core/src/trezor/messages/NEMProvisionNamespace.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class NEMProvisionNamespace(p.MessageType):
     def __init__(
         self,
         *,
-        namespace: str = None,
-        parent: str = None,
-        sink: str = None,
-        fee: int = None,
+        namespace: Optional[str] = None,
+        parent: Optional[str] = None,
+        sink: Optional[str] = None,
+        fee: Optional[int] = None,
     ) -> None:
         self.namespace = namespace
         self.parent = parent
diff --git a/core/src/trezor/messages/NEMSignTx.py b/core/src/trezor/messages/NEMSignTx.py
index 4522b0b5de..bfb8d9a665 100644
--- a/core/src/trezor/messages/NEMSignTx.py
+++ b/core/src/trezor/messages/NEMSignTx.py
@@ -12,7 +12,7 @@ from .NEMTransfer import NEMTransfer
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -24,15 +24,15 @@ class NEMSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        transaction: NEMTransactionCommon = None,
-        multisig: NEMTransactionCommon = None,
-        transfer: NEMTransfer = None,
-        cosigning: bool = None,
-        provision_namespace: NEMProvisionNamespace = None,
-        mosaic_creation: NEMMosaicCreation = None,
-        supply_change: NEMMosaicSupplyChange = None,
-        aggregate_modification: NEMAggregateModification = None,
-        importance_transfer: NEMImportanceTransfer = None,
+        transaction: Optional[NEMTransactionCommon] = None,
+        multisig: Optional[NEMTransactionCommon] = None,
+        transfer: Optional[NEMTransfer] = None,
+        cosigning: Optional[bool] = None,
+        provision_namespace: Optional[NEMProvisionNamespace] = None,
+        mosaic_creation: Optional[NEMMosaicCreation] = None,
+        supply_change: Optional[NEMMosaicSupplyChange] = None,
+        aggregate_modification: Optional[NEMAggregateModification] = None,
+        importance_transfer: Optional[NEMImportanceTransfer] = None,
     ) -> None:
         self.transaction = transaction
         self.multisig = multisig
diff --git a/core/src/trezor/messages/NEMSignedTx.py b/core/src/trezor/messages/NEMSignedTx.py
index c242db0d88..8563a8a0b3 100644
--- a/core/src/trezor/messages/NEMSignedTx.py
+++ b/core/src/trezor/messages/NEMSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/NEMTransactionCommon.py b/core/src/trezor/messages/NEMTransactionCommon.py
index a9f76fb151..50b01389c2 100644
--- a/core/src/trezor/messages/NEMTransactionCommon.py
+++ b/core/src/trezor/messages/NEMTransactionCommon.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,12 +15,12 @@ class NEMTransactionCommon(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network: int = None,
-        timestamp: int = None,
-        fee: int = None,
-        deadline: int = None,
-        signer: bytes = None,
+        address_n: Optional[List[int]] = None,
+        network: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        fee: Optional[int] = None,
+        deadline: Optional[int] = None,
+        signer: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network = network
diff --git a/core/src/trezor/messages/NEMTransfer.py b/core/src/trezor/messages/NEMTransfer.py
index a890db4465..64a90e8595 100644
--- a/core/src/trezor/messages/NEMTransfer.py
+++ b/core/src/trezor/messages/NEMTransfer.py
@@ -6,7 +6,7 @@ from .NEMMosaic import NEMMosaic
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,11 +17,11 @@ class NEMTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        mosaics: List[NEMMosaic] = None,
-        recipient: str = None,
-        amount: int = None,
-        payload: bytes = None,
-        public_key: bytes = None,
+        mosaics: Optional[List[NEMMosaic]] = None,
+        recipient: Optional[str] = None,
+        amount: Optional[int] = None,
+        payload: Optional[bytes] = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.mosaics = mosaics if mosaics is not None else []
         self.recipient = recipient
diff --git a/core/src/trezor/messages/NextU2FCounter.py b/core/src/trezor/messages/NextU2FCounter.py
index 2a53ebd2b0..157f89a5a4 100644
--- a/core/src/trezor/messages/NextU2FCounter.py
+++ b/core/src/trezor/messages/NextU2FCounter.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class NextU2FCounter(p.MessageType):
     def __init__(
         self,
         *,
-        u2f_counter: int = None,
+        u2f_counter: Optional[int] = None,
     ) -> None:
         self.u2f_counter = u2f_counter
 
diff --git a/core/src/trezor/messages/OwnershipId.py b/core/src/trezor/messages/OwnershipId.py
index 38c3477ccb..0eaeae711d 100644
--- a/core/src/trezor/messages/OwnershipId.py
+++ b/core/src/trezor/messages/OwnershipId.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/OwnershipProof.py b/core/src/trezor/messages/OwnershipProof.py
index 942e5f88e5..a9793c477e 100644
--- a/core/src/trezor/messages/OwnershipProof.py
+++ b/core/src/trezor/messages/OwnershipProof.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/PassphraseAck.py b/core/src/trezor/messages/PassphraseAck.py
index 113d8eefd9..6e46f06d4c 100644
--- a/core/src/trezor/messages/PassphraseAck.py
+++ b/core/src/trezor/messages/PassphraseAck.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class PassphraseAck(p.MessageType):
     def __init__(
         self,
         *,
-        passphrase: str = None,
-        on_device: bool = None,
+        passphrase: Optional[str] = None,
+        on_device: Optional[bool] = None,
     ) -> None:
         self.passphrase = passphrase
         self.on_device = on_device
diff --git a/core/src/trezor/messages/PassphraseRequest.py b/core/src/trezor/messages/PassphraseRequest.py
index 898f91cc20..1411e5f939 100644
--- a/core/src/trezor/messages/PassphraseRequest.py
+++ b/core/src/trezor/messages/PassphraseRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/Ping.py b/core/src/trezor/messages/Ping.py
index b087488a86..fe96b23bd8 100644
--- a/core/src/trezor/messages/Ping.py
+++ b/core/src/trezor/messages/Ping.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class Ping(p.MessageType):
         self,
         *,
         message: str = "",
-        button_protection: bool = None,
+        button_protection: Optional[bool] = None,
     ) -> None:
         self.message = message
         self.button_protection = button_protection
diff --git a/core/src/trezor/messages/PreauthorizedRequest.py b/core/src/trezor/messages/PreauthorizedRequest.py
index b1944b1ef5..ed2eb8f790 100644
--- a/core/src/trezor/messages/PreauthorizedRequest.py
+++ b/core/src/trezor/messages/PreauthorizedRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/PrevInput.py b/core/src/trezor/messages/PrevInput.py
index e3fc3f0038..a78531bf46 100644
--- a/core/src/trezor/messages/PrevInput.py
+++ b/core/src/trezor/messages/PrevInput.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,7 +19,7 @@ class PrevInput(p.MessageType):
         prev_index: int,
         script_sig: bytes,
         sequence: int,
-        decred_tree: int = None,
+        decred_tree: Optional[int] = None,
     ) -> None:
         self.prev_hash = prev_hash
         self.prev_index = prev_index
diff --git a/core/src/trezor/messages/PrevOutput.py b/core/src/trezor/messages/PrevOutput.py
index 7ead364dee..82df7f2171 100644
--- a/core/src/trezor/messages/PrevOutput.py
+++ b/core/src/trezor/messages/PrevOutput.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class PrevOutput(p.MessageType):
         *,
         amount: int,
         script_pubkey: bytes,
-        decred_script_version: int = None,
+        decred_script_version: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.script_pubkey = script_pubkey
diff --git a/core/src/trezor/messages/PrevTx.py b/core/src/trezor/messages/PrevTx.py
index 2e637d233e..6340bbaee4 100644
--- a/core/src/trezor/messages/PrevTx.py
+++ b/core/src/trezor/messages/PrevTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,10 +20,10 @@ class PrevTx(p.MessageType):
         inputs_count: int,
         outputs_count: int,
         extra_data_len: int = 0,
-        expiry: int = None,
-        version_group_id: int = None,
-        timestamp: int = None,
-        branch_id: int = None,
+        expiry: Optional[int] = None,
+        version_group_id: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        branch_id: Optional[int] = None,
     ) -> None:
         self.version = version
         self.lock_time = lock_time
diff --git a/core/src/trezor/messages/PublicKey.py b/core/src/trezor/messages/PublicKey.py
index d093f12dcd..dae1216d20 100644
--- a/core/src/trezor/messages/PublicKey.py
+++ b/core/src/trezor/messages/PublicKey.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,7 +20,7 @@ class PublicKey(p.MessageType):
         *,
         node: HDNodeType,
         xpub: str,
-        root_fingerprint: int = None,
+        root_fingerprint: Optional[int] = None,
     ) -> None:
         self.node = node
         self.xpub = xpub
diff --git a/core/src/trezor/messages/RebootToBootloader.py b/core/src/trezor/messages/RebootToBootloader.py
index c6b035aba4..0dfc43b05b 100644
--- a/core/src/trezor/messages/RebootToBootloader.py
+++ b/core/src/trezor/messages/RebootToBootloader.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/RecoveryDevice.py b/core/src/trezor/messages/RecoveryDevice.py
index 4b0adf4a6a..d619a57cc3 100644
--- a/core/src/trezor/messages/RecoveryDevice.py
+++ b/core/src/trezor/messages/RecoveryDevice.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeRecoveryDeviceType = Literal[0, 1]
     except ImportError:
@@ -17,15 +17,15 @@ class RecoveryDevice(p.MessageType):
     def __init__(
         self,
         *,
-        word_count: int = None,
-        passphrase_protection: bool = None,
-        pin_protection: bool = None,
-        language: str = None,
-        label: str = None,
-        enforce_wordlist: bool = None,
-        type: EnumTypeRecoveryDeviceType = None,
-        u2f_counter: int = None,
-        dry_run: bool = None,
+        word_count: Optional[int] = None,
+        passphrase_protection: Optional[bool] = None,
+        pin_protection: Optional[bool] = None,
+        language: Optional[str] = None,
+        label: Optional[str] = None,
+        enforce_wordlist: Optional[bool] = None,
+        type: Optional[EnumTypeRecoveryDeviceType] = None,
+        u2f_counter: Optional[int] = None,
+        dry_run: Optional[bool] = None,
     ) -> None:
         self.word_count = word_count
         self.passphrase_protection = passphrase_protection
diff --git a/core/src/trezor/messages/ResetDevice.py b/core/src/trezor/messages/ResetDevice.py
index ad9cf4f18a..77609e47db 100644
--- a/core/src/trezor/messages/ResetDevice.py
+++ b/core/src/trezor/messages/ResetDevice.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeBackupType = Literal[0, 1, 2]
     except ImportError:
@@ -17,15 +17,15 @@ class ResetDevice(p.MessageType):
     def __init__(
         self,
         *,
-        display_random: bool = None,
+        display_random: Optional[bool] = None,
         strength: int = 256,
-        passphrase_protection: bool = None,
-        pin_protection: bool = None,
+        passphrase_protection: Optional[bool] = None,
+        pin_protection: Optional[bool] = None,
         language: str = "en-US",
-        label: str = None,
-        u2f_counter: int = None,
-        skip_backup: bool = None,
-        no_backup: bool = None,
+        label: Optional[str] = None,
+        u2f_counter: Optional[int] = None,
+        skip_backup: Optional[bool] = None,
+        no_backup: Optional[bool] = None,
         backup_type: EnumTypeBackupType = 0,
     ) -> None:
         self.display_random = display_random
diff --git a/core/src/trezor/messages/RippleAddress.py b/core/src/trezor/messages/RippleAddress.py
index 798c78402b..e8f134e52d 100644
--- a/core/src/trezor/messages/RippleAddress.py
+++ b/core/src/trezor/messages/RippleAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/RippleGetAddress.py b/core/src/trezor/messages/RippleGetAddress.py
index ba6ad08c9c..8951523dce 100644
--- a/core/src/trezor/messages/RippleGetAddress.py
+++ b/core/src/trezor/messages/RippleGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class RippleGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/RipplePayment.py b/core/src/trezor/messages/RipplePayment.py
index a8890ee5ee..e4d47b133b 100644
--- a/core/src/trezor/messages/RipplePayment.py
+++ b/core/src/trezor/messages/RipplePayment.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class RipplePayment(p.MessageType):
         *,
         amount: int,
         destination: str,
-        destination_tag: int = None,
+        destination_tag: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.destination = destination
diff --git a/core/src/trezor/messages/RippleSignTx.py b/core/src/trezor/messages/RippleSignTx.py
index b239fa063d..348d738d8b 100644
--- a/core/src/trezor/messages/RippleSignTx.py
+++ b/core/src/trezor/messages/RippleSignTx.py
@@ -6,7 +6,7 @@ from .RipplePayment import RipplePayment
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,12 +18,12 @@ class RippleSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        fee: int = None,
-        flags: int = None,
-        sequence: int = None,
-        last_ledger_sequence: int = None,
-        payment: RipplePayment = None,
+        address_n: Optional[List[int]] = None,
+        fee: Optional[int] = None,
+        flags: Optional[int] = None,
+        sequence: Optional[int] = None,
+        last_ledger_sequence: Optional[int] = None,
+        payment: Optional[RipplePayment] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.fee = fee
diff --git a/core/src/trezor/messages/RippleSignedTx.py b/core/src/trezor/messages/RippleSignedTx.py
index 8534b1e1cd..a29018a7b5 100644
--- a/core/src/trezor/messages/RippleSignedTx.py
+++ b/core/src/trezor/messages/RippleSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/SdProtect.py b/core/src/trezor/messages/SdProtect.py
index fbb33312c3..97ce66e277 100644
--- a/core/src/trezor/messages/SdProtect.py
+++ b/core/src/trezor/messages/SdProtect.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeSdProtectOperationType = Literal[0, 1, 2]
     except ImportError:
@@ -17,7 +17,7 @@ class SdProtect(p.MessageType):
     def __init__(
         self,
         *,
-        operation: EnumTypeSdProtectOperationType = None,
+        operation: Optional[EnumTypeSdProtectOperationType] = None,
     ) -> None:
         self.operation = operation
 
diff --git a/core/src/trezor/messages/SetU2FCounter.py b/core/src/trezor/messages/SetU2FCounter.py
index 856dd85e07..83749d9284 100644
--- a/core/src/trezor/messages/SetU2FCounter.py
+++ b/core/src/trezor/messages/SetU2FCounter.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class SetU2FCounter(p.MessageType):
     def __init__(
         self,
         *,
-        u2f_counter: int = None,
+        u2f_counter: Optional[int] = None,
     ) -> None:
         self.u2f_counter = u2f_counter
 
diff --git a/core/src/trezor/messages/SignIdentity.py b/core/src/trezor/messages/SignIdentity.py
index 95b4d352de..cd56b45b3b 100644
--- a/core/src/trezor/messages/SignIdentity.py
+++ b/core/src/trezor/messages/SignIdentity.py
@@ -6,7 +6,7 @@ from .IdentityType import IdentityType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -21,7 +21,7 @@ class SignIdentity(p.MessageType):
         identity: IdentityType,
         challenge_hidden: bytes = b"",
         challenge_visual: str = "",
-        ecdsa_curve_name: str = None,
+        ecdsa_curve_name: Optional[str] = None,
     ) -> None:
         self.identity = identity
         self.challenge_hidden = challenge_hidden
diff --git a/core/src/trezor/messages/SignMessage.py b/core/src/trezor/messages/SignMessage.py
index 7523498ae8..a972433f02 100644
--- a/core/src/trezor/messages/SignMessage.py
+++ b/core/src/trezor/messages/SignMessage.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -18,7 +18,7 @@ class SignMessage(p.MessageType):
         self,
         *,
         message: bytes,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 0,
     ) -> None:
diff --git a/core/src/trezor/messages/SignTx.py b/core/src/trezor/messages/SignTx.py
index 4275db5601..071fa94c88 100644
--- a/core/src/trezor/messages/SignTx.py
+++ b/core/src/trezor/messages/SignTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeAmountUnit = Literal[0, 1, 2, 3]
     except ImportError:
@@ -22,10 +22,10 @@ class SignTx(p.MessageType):
         coin_name: str = "Bitcoin",
         version: int = 1,
         lock_time: int = 0,
-        expiry: int = None,
-        version_group_id: int = None,
-        timestamp: int = None,
-        branch_id: int = None,
+        expiry: Optional[int] = None,
+        version_group_id: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        branch_id: Optional[int] = None,
         amount_unit: EnumTypeAmountUnit = 0,
         decred_staking_ticket: bool = False,
     ) -> None:
diff --git a/core/src/trezor/messages/SignedIdentity.py b/core/src/trezor/messages/SignedIdentity.py
index 6ad53c091c..795cdd258c 100644
--- a/core/src/trezor/messages/SignedIdentity.py
+++ b/core/src/trezor/messages/SignedIdentity.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class SignedIdentity(p.MessageType):
         *,
         public_key: bytes,
         signature: bytes,
-        address: str = None,
+        address: Optional[str] = None,
     ) -> None:
         self.public_key = public_key
         self.signature = signature
diff --git a/core/src/trezor/messages/StellarAccountMergeOp.py b/core/src/trezor/messages/StellarAccountMergeOp.py
index 0b4b8f714f..dcd1cff1f5 100644
--- a/core/src/trezor/messages/StellarAccountMergeOp.py
+++ b/core/src/trezor/messages/StellarAccountMergeOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarAccountMergeOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        destination_account: str = None,
+        source_account: Optional[str] = None,
+        destination_account: Optional[str] = None,
     ) -> None:
         self.source_account = source_account
         self.destination_account = destination_account
diff --git a/core/src/trezor/messages/StellarAddress.py b/core/src/trezor/messages/StellarAddress.py
index 47f756fcb7..943c26113c 100644
--- a/core/src/trezor/messages/StellarAddress.py
+++ b/core/src/trezor/messages/StellarAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/StellarAllowTrustOp.py b/core/src/trezor/messages/StellarAllowTrustOp.py
index 29216f3bc2..23aa52fd31 100644
--- a/core/src/trezor/messages/StellarAllowTrustOp.py
+++ b/core/src/trezor/messages/StellarAllowTrustOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,11 +16,11 @@ class StellarAllowTrustOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        trusted_account: str = None,
-        asset_type: int = None,
-        asset_code: str = None,
-        is_authorized: int = None,
+        source_account: Optional[str] = None,
+        trusted_account: Optional[str] = None,
+        asset_type: Optional[int] = None,
+        asset_code: Optional[str] = None,
+        is_authorized: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.trusted_account = trusted_account
diff --git a/core/src/trezor/messages/StellarAssetType.py b/core/src/trezor/messages/StellarAssetType.py
index 0a2046835f..1a0d15627e 100644
--- a/core/src/trezor/messages/StellarAssetType.py
+++ b/core/src/trezor/messages/StellarAssetType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarAssetType(p.MessageType):
         self,
         *,
         type: int,
-        code: str = None,
-        issuer: str = None,
+        code: Optional[str] = None,
+        issuer: Optional[str] = None,
     ) -> None:
         self.type = type
         self.code = code
diff --git a/core/src/trezor/messages/StellarBumpSequenceOp.py b/core/src/trezor/messages/StellarBumpSequenceOp.py
index ab1703701f..b10d07c847 100644
--- a/core/src/trezor/messages/StellarBumpSequenceOp.py
+++ b/core/src/trezor/messages/StellarBumpSequenceOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarBumpSequenceOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        bump_to: int = None,
+        source_account: Optional[str] = None,
+        bump_to: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.bump_to = bump_to
diff --git a/core/src/trezor/messages/StellarChangeTrustOp.py b/core/src/trezor/messages/StellarChangeTrustOp.py
index a72e403432..6abecb2734 100644
--- a/core/src/trezor/messages/StellarChangeTrustOp.py
+++ b/core/src/trezor/messages/StellarChangeTrustOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,9 +18,9 @@ class StellarChangeTrustOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        asset: StellarAssetType = None,
-        limit: int = None,
+        source_account: Optional[str] = None,
+        asset: Optional[StellarAssetType] = None,
+        limit: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.asset = asset
diff --git a/core/src/trezor/messages/StellarCreateAccountOp.py b/core/src/trezor/messages/StellarCreateAccountOp.py
index b83bbdf04c..b24f46715d 100644
--- a/core/src/trezor/messages/StellarCreateAccountOp.py
+++ b/core/src/trezor/messages/StellarCreateAccountOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class StellarCreateAccountOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        new_account: str = None,
-        starting_balance: int = None,
+        source_account: Optional[str] = None,
+        new_account: Optional[str] = None,
+        starting_balance: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.new_account = new_account
diff --git a/core/src/trezor/messages/StellarCreatePassiveOfferOp.py b/core/src/trezor/messages/StellarCreatePassiveOfferOp.py
index 1b439007ad..85233ec99d 100644
--- a/core/src/trezor/messages/StellarCreatePassiveOfferOp.py
+++ b/core/src/trezor/messages/StellarCreatePassiveOfferOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,12 +18,12 @@ class StellarCreatePassiveOfferOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        selling_asset: StellarAssetType = None,
-        buying_asset: StellarAssetType = None,
-        amount: int = None,
-        price_n: int = None,
-        price_d: int = None,
+        source_account: Optional[str] = None,
+        selling_asset: Optional[StellarAssetType] = None,
+        buying_asset: Optional[StellarAssetType] = None,
+        amount: Optional[int] = None,
+        price_n: Optional[int] = None,
+        price_d: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.selling_asset = selling_asset
diff --git a/core/src/trezor/messages/StellarGetAddress.py b/core/src/trezor/messages/StellarGetAddress.py
index d6f39b0743..aef9344989 100644
--- a/core/src/trezor/messages/StellarGetAddress.py
+++ b/core/src/trezor/messages/StellarGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/StellarManageDataOp.py b/core/src/trezor/messages/StellarManageDataOp.py
index 6193f7c055..a344547bc9 100644
--- a/core/src/trezor/messages/StellarManageDataOp.py
+++ b/core/src/trezor/messages/StellarManageDataOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class StellarManageDataOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        key: str = None,
-        value: bytes = None,
+        source_account: Optional[str] = None,
+        key: Optional[str] = None,
+        value: Optional[bytes] = None,
     ) -> None:
         self.source_account = source_account
         self.key = key
diff --git a/core/src/trezor/messages/StellarManageOfferOp.py b/core/src/trezor/messages/StellarManageOfferOp.py
index c731805dd7..ac4325ae7b 100644
--- a/core/src/trezor/messages/StellarManageOfferOp.py
+++ b/core/src/trezor/messages/StellarManageOfferOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,13 +18,13 @@ class StellarManageOfferOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        selling_asset: StellarAssetType = None,
-        buying_asset: StellarAssetType = None,
-        amount: int = None,
-        price_n: int = None,
-        price_d: int = None,
-        offer_id: int = None,
+        source_account: Optional[str] = None,
+        selling_asset: Optional[StellarAssetType] = None,
+        buying_asset: Optional[StellarAssetType] = None,
+        amount: Optional[int] = None,
+        price_n: Optional[int] = None,
+        price_d: Optional[int] = None,
+        offer_id: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.selling_asset = selling_asset
diff --git a/core/src/trezor/messages/StellarPathPaymentOp.py b/core/src/trezor/messages/StellarPathPaymentOp.py
index f80b2821d2..db17dd08f9 100644
--- a/core/src/trezor/messages/StellarPathPaymentOp.py
+++ b/core/src/trezor/messages/StellarPathPaymentOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,13 +18,13 @@ class StellarPathPaymentOp(p.MessageType):
     def __init__(
         self,
         *,
-        paths: List[StellarAssetType] = None,
-        source_account: str = None,
-        send_asset: StellarAssetType = None,
-        send_max: int = None,
-        destination_account: str = None,
-        destination_asset: StellarAssetType = None,
-        destination_amount: int = None,
+        paths: Optional[List[StellarAssetType]] = None,
+        source_account: Optional[str] = None,
+        send_asset: Optional[StellarAssetType] = None,
+        send_max: Optional[int] = None,
+        destination_account: Optional[str] = None,
+        destination_asset: Optional[StellarAssetType] = None,
+        destination_amount: Optional[int] = None,
     ) -> None:
         self.paths = paths if paths is not None else []
         self.source_account = source_account
diff --git a/core/src/trezor/messages/StellarPaymentOp.py b/core/src/trezor/messages/StellarPaymentOp.py
index 835713c2c8..f2cb9891e3 100644
--- a/core/src/trezor/messages/StellarPaymentOp.py
+++ b/core/src/trezor/messages/StellarPaymentOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class StellarPaymentOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        destination_account: str = None,
-        asset: StellarAssetType = None,
-        amount: int = None,
+        source_account: Optional[str] = None,
+        destination_account: Optional[str] = None,
+        asset: Optional[StellarAssetType] = None,
+        amount: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.destination_account = destination_account
diff --git a/core/src/trezor/messages/StellarSetOptionsOp.py b/core/src/trezor/messages/StellarSetOptionsOp.py
index 1ed08ace42..3736be322e 100644
--- a/core/src/trezor/messages/StellarSetOptionsOp.py
+++ b/core/src/trezor/messages/StellarSetOptionsOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,18 +16,18 @@ class StellarSetOptionsOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        inflation_destination_account: str = None,
-        clear_flags: int = None,
-        set_flags: int = None,
-        master_weight: int = None,
-        low_threshold: int = None,
-        medium_threshold: int = None,
-        high_threshold: int = None,
-        home_domain: str = None,
-        signer_type: int = None,
-        signer_key: bytes = None,
-        signer_weight: int = None,
+        source_account: Optional[str] = None,
+        inflation_destination_account: Optional[str] = None,
+        clear_flags: Optional[int] = None,
+        set_flags: Optional[int] = None,
+        master_weight: Optional[int] = None,
+        low_threshold: Optional[int] = None,
+        medium_threshold: Optional[int] = None,
+        high_threshold: Optional[int] = None,
+        home_domain: Optional[str] = None,
+        signer_type: Optional[int] = None,
+        signer_key: Optional[bytes] = None,
+        signer_weight: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.inflation_destination_account = inflation_destination_account
diff --git a/core/src/trezor/messages/StellarSignTx.py b/core/src/trezor/messages/StellarSignTx.py
index baa04300d4..371152a063 100644
--- a/core/src/trezor/messages/StellarSignTx.py
+++ b/core/src/trezor/messages/StellarSignTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,18 +16,18 @@ class StellarSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_passphrase: str = None,
-        source_account: str = None,
-        fee: int = None,
-        sequence_number: int = None,
-        timebounds_start: int = None,
-        timebounds_end: int = None,
-        memo_type: int = None,
-        memo_text: str = None,
-        memo_id: int = None,
-        memo_hash: bytes = None,
-        num_operations: int = None,
+        address_n: Optional[List[int]] = None,
+        network_passphrase: Optional[str] = None,
+        source_account: Optional[str] = None,
+        fee: Optional[int] = None,
+        sequence_number: Optional[int] = None,
+        timebounds_start: Optional[int] = None,
+        timebounds_end: Optional[int] = None,
+        memo_type: Optional[int] = None,
+        memo_text: Optional[str] = None,
+        memo_id: Optional[int] = None,
+        memo_hash: Optional[bytes] = None,
+        num_operations: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_passphrase = network_passphrase
diff --git a/core/src/trezor/messages/StellarSignedTx.py b/core/src/trezor/messages/StellarSignedTx.py
index d089a2cba9..68a0c31f11 100644
--- a/core/src/trezor/messages/StellarSignedTx.py
+++ b/core/src/trezor/messages/StellarSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/StellarTxOpRequest.py b/core/src/trezor/messages/StellarTxOpRequest.py
index 7efdbbb84e..8d1cb59b23 100644
--- a/core/src/trezor/messages/StellarTxOpRequest.py
+++ b/core/src/trezor/messages/StellarTxOpRequest.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/Success.py b/core/src/trezor/messages/Success.py
index b8632fd884..70676d638f 100644
--- a/core/src/trezor/messages/Success.py
+++ b/core/src/trezor/messages/Success.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TezosAddress.py b/core/src/trezor/messages/TezosAddress.py
index a87807be9b..ae0ad6fe53 100644
--- a/core/src/trezor/messages/TezosAddress.py
+++ b/core/src/trezor/messages/TezosAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TezosBallotOp.py b/core/src/trezor/messages/TezosBallotOp.py
index 0e183591ab..3a2c2bfc83 100644
--- a/core/src/trezor/messages/TezosBallotOp.py
+++ b/core/src/trezor/messages/TezosBallotOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeTezosBallotType = Literal[0, 1, 2]
     except ImportError:
@@ -16,10 +16,10 @@ class TezosBallotOp(p.MessageType):
     def __init__(
         self,
         *,
-        source: bytes = None,
-        period: int = None,
-        proposal: bytes = None,
-        ballot: EnumTypeTezosBallotType = None,
+        source: Optional[bytes] = None,
+        period: Optional[int] = None,
+        proposal: Optional[bytes] = None,
+        ballot: Optional[EnumTypeTezosBallotType] = None,
     ) -> None:
         self.source = source
         self.period = period
diff --git a/core/src/trezor/messages/TezosContractID.py b/core/src/trezor/messages/TezosContractID.py
index 39d5123244..7201fc3b46 100644
--- a/core/src/trezor/messages/TezosContractID.py
+++ b/core/src/trezor/messages/TezosContractID.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeTezosContractType = Literal[0, 1]
     except ImportError:
diff --git a/core/src/trezor/messages/TezosDelegationOp.py b/core/src/trezor/messages/TezosDelegationOp.py
index 6b96990d64..28683e677e 100644
--- a/core/src/trezor/messages/TezosDelegationOp.py
+++ b/core/src/trezor/messages/TezosDelegationOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TezosGetAddress.py b/core/src/trezor/messages/TezosGetAddress.py
index d94e713a47..7e734352cc 100644
--- a/core/src/trezor/messages/TezosGetAddress.py
+++ b/core/src/trezor/messages/TezosGetAddress.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class TezosGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/TezosGetPublicKey.py b/core/src/trezor/messages/TezosGetPublicKey.py
index 8ca8709f99..13c7a5dab5 100644
--- a/core/src/trezor/messages/TezosGetPublicKey.py
+++ b/core/src/trezor/messages/TezosGetPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class TezosGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/core/src/trezor/messages/TezosManagerTransfer.py b/core/src/trezor/messages/TezosManagerTransfer.py
index 1a875a0b67..abc8ec60c0 100644
--- a/core/src/trezor/messages/TezosManagerTransfer.py
+++ b/core/src/trezor/messages/TezosManagerTransfer.py
@@ -6,7 +6,7 @@ from .TezosContractID import TezosContractID
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class TezosManagerTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        destination: TezosContractID = None,
-        amount: int = None,
+        destination: Optional[TezosContractID] = None,
+        amount: Optional[int] = None,
     ) -> None:
         self.destination = destination
         self.amount = amount
diff --git a/core/src/trezor/messages/TezosOriginationOp.py b/core/src/trezor/messages/TezosOriginationOp.py
index 163ace15aa..65c9a02ad4 100644
--- a/core/src/trezor/messages/TezosOriginationOp.py
+++ b/core/src/trezor/messages/TezosOriginationOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -22,10 +22,10 @@ class TezosOriginationOp(p.MessageType):
         storage_limit: int,
         balance: int,
         script: bytes,
-        manager_pubkey: bytes = None,
-        spendable: bool = None,
-        delegatable: bool = None,
-        delegate: bytes = None,
+        manager_pubkey: Optional[bytes] = None,
+        spendable: Optional[bool] = None,
+        delegatable: Optional[bool] = None,
+        delegate: Optional[bytes] = None,
     ) -> None:
         self.source = source
         self.fee = fee
diff --git a/core/src/trezor/messages/TezosParametersManager.py b/core/src/trezor/messages/TezosParametersManager.py
index c53e32e8fc..f4a1564478 100644
--- a/core/src/trezor/messages/TezosParametersManager.py
+++ b/core/src/trezor/messages/TezosParametersManager.py
@@ -6,7 +6,7 @@ from .TezosManagerTransfer import TezosManagerTransfer
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class TezosParametersManager(p.MessageType):
     def __init__(
         self,
         *,
-        set_delegate: bytes = None,
-        cancel_delegate: bool = None,
-        transfer: TezosManagerTransfer = None,
+        set_delegate: Optional[bytes] = None,
+        cancel_delegate: Optional[bool] = None,
+        transfer: Optional[TezosManagerTransfer] = None,
     ) -> None:
         self.set_delegate = set_delegate
         self.cancel_delegate = cancel_delegate
diff --git a/core/src/trezor/messages/TezosProposalOp.py b/core/src/trezor/messages/TezosProposalOp.py
index d2780efffd..6bf3c870df 100644
--- a/core/src/trezor/messages/TezosProposalOp.py
+++ b/core/src/trezor/messages/TezosProposalOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class TezosProposalOp(p.MessageType):
     def __init__(
         self,
         *,
-        proposals: List[bytes] = None,
-        source: bytes = None,
-        period: int = None,
+        proposals: Optional[List[bytes]] = None,
+        source: Optional[bytes] = None,
+        period: Optional[int] = None,
     ) -> None:
         self.proposals = proposals if proposals is not None else []
         self.source = source
diff --git a/core/src/trezor/messages/TezosPublicKey.py b/core/src/trezor/messages/TezosPublicKey.py
index 29062176fe..939ccbcc1c 100644
--- a/core/src/trezor/messages/TezosPublicKey.py
+++ b/core/src/trezor/messages/TezosPublicKey.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TezosRevealOp.py b/core/src/trezor/messages/TezosRevealOp.py
index 89f9c00536..deaa109079 100644
--- a/core/src/trezor/messages/TezosRevealOp.py
+++ b/core/src/trezor/messages/TezosRevealOp.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TezosSignTx.py b/core/src/trezor/messages/TezosSignTx.py
index 6aaa143b9e..73ee56ffee 100644
--- a/core/src/trezor/messages/TezosSignTx.py
+++ b/core/src/trezor/messages/TezosSignTx.py
@@ -11,7 +11,7 @@ from .TezosTransactionOp import TezosTransactionOp
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -24,13 +24,13 @@ class TezosSignTx(p.MessageType):
         self,
         *,
         branch: bytes,
-        address_n: List[int] = None,
-        reveal: TezosRevealOp = None,
-        transaction: TezosTransactionOp = None,
-        origination: TezosOriginationOp = None,
-        delegation: TezosDelegationOp = None,
-        proposal: TezosProposalOp = None,
-        ballot: TezosBallotOp = None,
+        address_n: Optional[List[int]] = None,
+        reveal: Optional[TezosRevealOp] = None,
+        transaction: Optional[TezosTransactionOp] = None,
+        origination: Optional[TezosOriginationOp] = None,
+        delegation: Optional[TezosDelegationOp] = None,
+        proposal: Optional[TezosProposalOp] = None,
+        ballot: Optional[TezosBallotOp] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.branch = branch
diff --git a/core/src/trezor/messages/TezosSignedTx.py b/core/src/trezor/messages/TezosSignedTx.py
index 5ccaa0f8da..dea63c87dd 100644
--- a/core/src/trezor/messages/TezosSignedTx.py
+++ b/core/src/trezor/messages/TezosSignedTx.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TezosTransactionOp.py b/core/src/trezor/messages/TezosTransactionOp.py
index f91b9823b5..d42b53cd74 100644
--- a/core/src/trezor/messages/TezosTransactionOp.py
+++ b/core/src/trezor/messages/TezosTransactionOp.py
@@ -7,7 +7,7 @@ from .TezosParametersManager import TezosParametersManager
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -25,8 +25,8 @@ class TezosTransactionOp(p.MessageType):
         storage_limit: int,
         amount: int,
         destination: TezosContractID,
-        parameters: bytes = None,
-        parameters_manager: TezosParametersManager = None,
+        parameters: Optional[bytes] = None,
+        parameters_manager: Optional[TezosParametersManager] = None,
     ) -> None:
         self.source = source
         self.fee = fee
diff --git a/core/src/trezor/messages/TransactionType.py b/core/src/trezor/messages/TransactionType.py
index 0d66d4f1be..bdba7f2277 100644
--- a/core/src/trezor/messages/TransactionType.py
+++ b/core/src/trezor/messages/TransactionType.py
@@ -8,7 +8,7 @@ from .TxOutputType import TxOutputType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,19 +19,19 @@ class TransactionType(p.MessageType):
     def __init__(
         self,
         *,
-        inputs: List[TxInputType] = None,
-        bin_outputs: List[TxOutputBinType] = None,
-        outputs: List[TxOutputType] = None,
-        version: int = None,
-        lock_time: int = None,
-        inputs_cnt: int = None,
-        outputs_cnt: int = None,
-        extra_data: bytes = None,
-        extra_data_len: int = None,
-        expiry: int = None,
-        version_group_id: int = None,
-        timestamp: int = None,
-        branch_id: int = None,
+        inputs: Optional[List[TxInputType]] = None,
+        bin_outputs: Optional[List[TxOutputBinType]] = None,
+        outputs: Optional[List[TxOutputType]] = None,
+        version: Optional[int] = None,
+        lock_time: Optional[int] = None,
+        inputs_cnt: Optional[int] = None,
+        outputs_cnt: Optional[int] = None,
+        extra_data: Optional[bytes] = None,
+        extra_data_len: Optional[int] = None,
+        expiry: Optional[int] = None,
+        version_group_id: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        branch_id: Optional[int] = None,
     ) -> None:
         self.inputs = inputs if inputs is not None else []
         self.bin_outputs = bin_outputs if bin_outputs is not None else []
diff --git a/core/src/trezor/messages/TxAck.py b/core/src/trezor/messages/TxAck.py
index d2630ffd50..b8bd80d1a9 100644
--- a/core/src/trezor/messages/TxAck.py
+++ b/core/src/trezor/messages/TxAck.py
@@ -6,7 +6,7 @@ from .TransactionType import TransactionType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class TxAck(p.MessageType):
     def __init__(
         self,
         *,
-        tx: TransactionType = None,
+        tx: Optional[TransactionType] = None,
     ) -> None:
         self.tx = tx
 
diff --git a/core/src/trezor/messages/TxAckInput.py b/core/src/trezor/messages/TxAckInput.py
index eb23898ab0..1d6c7993b3 100644
--- a/core/src/trezor/messages/TxAckInput.py
+++ b/core/src/trezor/messages/TxAckInput.py
@@ -6,7 +6,7 @@ from .TxAckInputWrapper import TxAckInputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckInputWrapper.py b/core/src/trezor/messages/TxAckInputWrapper.py
index b2923dec25..54c72312d9 100644
--- a/core/src/trezor/messages/TxAckInputWrapper.py
+++ b/core/src/trezor/messages/TxAckInputWrapper.py
@@ -6,7 +6,7 @@ from .TxInput import TxInput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckOutput.py b/core/src/trezor/messages/TxAckOutput.py
index 5353bb2013..1888bf6136 100644
--- a/core/src/trezor/messages/TxAckOutput.py
+++ b/core/src/trezor/messages/TxAckOutput.py
@@ -6,7 +6,7 @@ from .TxAckOutputWrapper import TxAckOutputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckOutputWrapper.py b/core/src/trezor/messages/TxAckOutputWrapper.py
index a0fc9d6c44..7bebf5af7b 100644
--- a/core/src/trezor/messages/TxAckOutputWrapper.py
+++ b/core/src/trezor/messages/TxAckOutputWrapper.py
@@ -6,7 +6,7 @@ from .TxOutput import TxOutput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckPrevExtraData.py b/core/src/trezor/messages/TxAckPrevExtraData.py
index a540407f68..b9bd2c17e5 100644
--- a/core/src/trezor/messages/TxAckPrevExtraData.py
+++ b/core/src/trezor/messages/TxAckPrevExtraData.py
@@ -6,7 +6,7 @@ from .TxAckPrevExtraDataWrapper import TxAckPrevExtraDataWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckPrevExtraDataWrapper.py b/core/src/trezor/messages/TxAckPrevExtraDataWrapper.py
index 3e1e30e928..3535374f53 100644
--- a/core/src/trezor/messages/TxAckPrevExtraDataWrapper.py
+++ b/core/src/trezor/messages/TxAckPrevExtraDataWrapper.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckPrevInput.py b/core/src/trezor/messages/TxAckPrevInput.py
index d2c939321c..9106b0d739 100644
--- a/core/src/trezor/messages/TxAckPrevInput.py
+++ b/core/src/trezor/messages/TxAckPrevInput.py
@@ -6,7 +6,7 @@ from .TxAckPrevInputWrapper import TxAckPrevInputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckPrevInputWrapper.py b/core/src/trezor/messages/TxAckPrevInputWrapper.py
index 205c123c83..e6f6f40569 100644
--- a/core/src/trezor/messages/TxAckPrevInputWrapper.py
+++ b/core/src/trezor/messages/TxAckPrevInputWrapper.py
@@ -6,7 +6,7 @@ from .PrevInput import PrevInput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckPrevMeta.py b/core/src/trezor/messages/TxAckPrevMeta.py
index 2899ccfe5f..175cb18067 100644
--- a/core/src/trezor/messages/TxAckPrevMeta.py
+++ b/core/src/trezor/messages/TxAckPrevMeta.py
@@ -6,7 +6,7 @@ from .PrevTx import PrevTx
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckPrevOutput.py b/core/src/trezor/messages/TxAckPrevOutput.py
index cc50e169c7..4c24c8e6a9 100644
--- a/core/src/trezor/messages/TxAckPrevOutput.py
+++ b/core/src/trezor/messages/TxAckPrevOutput.py
@@ -6,7 +6,7 @@ from .TxAckPrevOutputWrapper import TxAckPrevOutputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxAckPrevOutputWrapper.py b/core/src/trezor/messages/TxAckPrevOutputWrapper.py
index 8b074124f6..22faf67e0d 100644
--- a/core/src/trezor/messages/TxAckPrevOutputWrapper.py
+++ b/core/src/trezor/messages/TxAckPrevOutputWrapper.py
@@ -6,7 +6,7 @@ from .PrevOutput import PrevOutput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/TxInput.py b/core/src/trezor/messages/TxInput.py
index c3810624cb..468d46cc0d 100644
--- a/core/src/trezor/messages/TxInput.py
+++ b/core/src/trezor/messages/TxInput.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
         EnumTypeDecredStakingSpendType = Literal[0, 1]
@@ -22,18 +22,18 @@ class TxInput(p.MessageType):
         prev_hash: bytes,
         prev_index: int,
         amount: int,
-        address_n: List[int] = None,
-        script_sig: bytes = None,
+        address_n: Optional[List[int]] = None,
+        script_sig: Optional[bytes] = None,
         sequence: int = 4294967295,
         script_type: EnumTypeInputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        decred_tree: int = None,
-        witness: bytes = None,
-        ownership_proof: bytes = None,
-        commitment_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
-        decred_staking_spend: EnumTypeDecredStakingSpendType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        decred_tree: Optional[int] = None,
+        witness: Optional[bytes] = None,
+        ownership_proof: Optional[bytes] = None,
+        commitment_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
+        decred_staking_spend: Optional[EnumTypeDecredStakingSpendType] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.prev_hash = prev_hash
diff --git a/core/src/trezor/messages/TxInputType.py b/core/src/trezor/messages/TxInputType.py
index e07b4351ee..f69aa3ec12 100644
--- a/core/src/trezor/messages/TxInputType.py
+++ b/core/src/trezor/messages/TxInputType.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
         EnumTypeDecredStakingSpendType = Literal[0, 1]
@@ -21,19 +21,19 @@ class TxInputType(p.MessageType):
         *,
         prev_hash: bytes,
         prev_index: int,
-        address_n: List[int] = None,
-        script_sig: bytes = None,
+        address_n: Optional[List[int]] = None,
+        script_sig: Optional[bytes] = None,
         sequence: int = 4294967295,
         script_type: EnumTypeInputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        amount: int = None,
-        decred_tree: int = None,
-        witness: bytes = None,
-        ownership_proof: bytes = None,
-        commitment_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
-        decred_staking_spend: EnumTypeDecredStakingSpendType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        amount: Optional[int] = None,
+        decred_tree: Optional[int] = None,
+        witness: Optional[bytes] = None,
+        ownership_proof: Optional[bytes] = None,
+        commitment_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
+        decred_staking_spend: Optional[EnumTypeDecredStakingSpendType] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.prev_hash = prev_hash
diff --git a/core/src/trezor/messages/TxOutput.py b/core/src/trezor/messages/TxOutput.py
index 0108547cd2..398f18420c 100644
--- a/core/src/trezor/messages/TxOutput.py
+++ b/core/src/trezor/messages/TxOutput.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeOutputScriptType = Literal[0, 1, 2, 3, 4, 5]
     except ImportError:
@@ -19,13 +19,13 @@ class TxOutput(p.MessageType):
         self,
         *,
         amount: int,
-        address_n: List[int] = None,
-        address: str = None,
+        address_n: Optional[List[int]] = None,
+        address: Optional[str] = None,
         script_type: EnumTypeOutputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        op_return_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        op_return_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.amount = amount
diff --git a/core/src/trezor/messages/TxOutputBinType.py b/core/src/trezor/messages/TxOutputBinType.py
index 0063c51b5b..4cdafaafad 100644
--- a/core/src/trezor/messages/TxOutputBinType.py
+++ b/core/src/trezor/messages/TxOutputBinType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class TxOutputBinType(p.MessageType):
         *,
         amount: int,
         script_pubkey: bytes,
-        decred_script_version: int = None,
+        decred_script_version: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.script_pubkey = script_pubkey
diff --git a/core/src/trezor/messages/TxOutputType.py b/core/src/trezor/messages/TxOutputType.py
index a749614b33..ac5fc160f4 100644
--- a/core/src/trezor/messages/TxOutputType.py
+++ b/core/src/trezor/messages/TxOutputType.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeOutputScriptType = Literal[0, 1, 2, 3, 4, 5]
     except ImportError:
@@ -19,13 +19,13 @@ class TxOutputType(p.MessageType):
         self,
         *,
         amount: int,
-        address_n: List[int] = None,
-        address: str = None,
+        address_n: Optional[List[int]] = None,
+        address: Optional[str] = None,
         script_type: EnumTypeOutputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        op_return_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        op_return_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.amount = amount
diff --git a/core/src/trezor/messages/TxRequest.py b/core/src/trezor/messages/TxRequest.py
index 98badef6e0..6ccf888fd2 100644
--- a/core/src/trezor/messages/TxRequest.py
+++ b/core/src/trezor/messages/TxRequest.py
@@ -7,7 +7,7 @@ from .TxRequestSerializedType import TxRequestSerializedType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeRequestType = Literal[0, 1, 2, 3, 4, 5, 6]
     except ImportError:
@@ -20,9 +20,9 @@ class TxRequest(p.MessageType):
     def __init__(
         self,
         *,
-        request_type: EnumTypeRequestType = None,
-        details: TxRequestDetailsType = None,
-        serialized: TxRequestSerializedType = None,
+        request_type: Optional[EnumTypeRequestType] = None,
+        details: Optional[TxRequestDetailsType] = None,
+        serialized: Optional[TxRequestSerializedType] = None,
     ) -> None:
         self.request_type = request_type
         self.details = details
diff --git a/core/src/trezor/messages/TxRequestDetailsType.py b/core/src/trezor/messages/TxRequestDetailsType.py
index 63dfd26866..403e9814cb 100644
--- a/core/src/trezor/messages/TxRequestDetailsType.py
+++ b/core/src/trezor/messages/TxRequestDetailsType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class TxRequestDetailsType(p.MessageType):
     def __init__(
         self,
         *,
-        request_index: int = None,
-        tx_hash: bytes = None,
-        extra_data_len: int = None,
-        extra_data_offset: int = None,
+        request_index: Optional[int] = None,
+        tx_hash: Optional[bytes] = None,
+        extra_data_len: Optional[int] = None,
+        extra_data_offset: Optional[int] = None,
     ) -> None:
         self.request_index = request_index
         self.tx_hash = tx_hash
diff --git a/core/src/trezor/messages/TxRequestSerializedType.py b/core/src/trezor/messages/TxRequestSerializedType.py
index 5f95894b2a..730fc34862 100644
--- a/core/src/trezor/messages/TxRequestSerializedType.py
+++ b/core/src/trezor/messages/TxRequestSerializedType.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class TxRequestSerializedType(p.MessageType):
     def __init__(
         self,
         *,
-        signature_index: int = None,
-        signature: bytes = None,
-        serialized_tx: bytes = None,
+        signature_index: Optional[int] = None,
+        signature: Optional[bytes] = None,
+        serialized_tx: Optional[bytes] = None,
     ) -> None:
         self.signature_index = signature_index
         self.signature = signature
diff --git a/core/src/trezor/messages/VerifyMessage.py b/core/src/trezor/messages/VerifyMessage.py
index 963583c607..a98288c283 100644
--- a/core/src/trezor/messages/VerifyMessage.py
+++ b/core/src/trezor/messages/VerifyMessage.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/WebAuthnAddResidentCredential.py b/core/src/trezor/messages/WebAuthnAddResidentCredential.py
index 411c3c26f7..a8b2ec2eef 100644
--- a/core/src/trezor/messages/WebAuthnAddResidentCredential.py
+++ b/core/src/trezor/messages/WebAuthnAddResidentCredential.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class WebAuthnAddResidentCredential(p.MessageType):
     def __init__(
         self,
         *,
-        credential_id: bytes = None,
+        credential_id: Optional[bytes] = None,
     ) -> None:
         self.credential_id = credential_id
 
diff --git a/core/src/trezor/messages/WebAuthnCredential.py b/core/src/trezor/messages/WebAuthnCredential.py
index ceabd8f81d..aff9ad8d1c 100644
--- a/core/src/trezor/messages/WebAuthnCredential.py
+++ b/core/src/trezor/messages/WebAuthnCredential.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,18 +15,18 @@ class WebAuthnCredential(p.MessageType):
     def __init__(
         self,
         *,
-        index: int = None,
-        id: bytes = None,
-        rp_id: str = None,
-        rp_name: str = None,
-        user_id: bytes = None,
-        user_name: str = None,
-        user_display_name: str = None,
-        creation_time: int = None,
-        hmac_secret: bool = None,
-        use_sign_count: bool = None,
-        algorithm: int = None,
-        curve: int = None,
+        index: Optional[int] = None,
+        id: Optional[bytes] = None,
+        rp_id: Optional[str] = None,
+        rp_name: Optional[str] = None,
+        user_id: Optional[bytes] = None,
+        user_name: Optional[str] = None,
+        user_display_name: Optional[str] = None,
+        creation_time: Optional[int] = None,
+        hmac_secret: Optional[bool] = None,
+        use_sign_count: Optional[bool] = None,
+        algorithm: Optional[int] = None,
+        curve: Optional[int] = None,
     ) -> None:
         self.index = index
         self.id = id
diff --git a/core/src/trezor/messages/WebAuthnCredentials.py b/core/src/trezor/messages/WebAuthnCredentials.py
index d024eef680..29ed07a597 100644
--- a/core/src/trezor/messages/WebAuthnCredentials.py
+++ b/core/src/trezor/messages/WebAuthnCredentials.py
@@ -6,7 +6,7 @@ from .WebAuthnCredential import WebAuthnCredential
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class WebAuthnCredentials(p.MessageType):
     def __init__(
         self,
         *,
-        credentials: List[WebAuthnCredential] = None,
+        credentials: Optional[List[WebAuthnCredential]] = None,
     ) -> None:
         self.credentials = credentials if credentials is not None else []
 
diff --git a/core/src/trezor/messages/WebAuthnListResidentCredentials.py b/core/src/trezor/messages/WebAuthnListResidentCredentials.py
index 6c67d9170d..be307e9618 100644
--- a/core/src/trezor/messages/WebAuthnListResidentCredentials.py
+++ b/core/src/trezor/messages/WebAuthnListResidentCredentials.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py b/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py
index 0040098e54..43df048cff 100644
--- a/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py
+++ b/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class WebAuthnRemoveResidentCredential(p.MessageType):
     def __init__(
         self,
         *,
-        index: int = None,
+        index: Optional[int] = None,
     ) -> None:
         self.index = index
 
diff --git a/core/src/trezor/messages/WipeDevice.py b/core/src/trezor/messages/WipeDevice.py
index 6e001cb434..4683f210f3 100644
--- a/core/src/trezor/messages/WipeDevice.py
+++ b/core/src/trezor/messages/WipeDevice.py
@@ -4,7 +4,7 @@ import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/Address.py b/python/src/trezorlib/messages/Address.py
index f07b92c6ba..f8c98468f6 100644
--- a/python/src/trezorlib/messages/Address.py
+++ b/python/src/trezorlib/messages/Address.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/ApplyFlags.py b/python/src/trezorlib/messages/ApplyFlags.py
index 408b344c8c..ce6b401b50 100644
--- a/python/src/trezorlib/messages/ApplyFlags.py
+++ b/python/src/trezorlib/messages/ApplyFlags.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class ApplyFlags(p.MessageType):
     def __init__(
         self,
         *,
-        flags: int = None,
+        flags: Optional[int] = None,
     ) -> None:
         self.flags = flags
 
diff --git a/python/src/trezorlib/messages/ApplySettings.py b/python/src/trezorlib/messages/ApplySettings.py
index 40ed92cbae..32c27a1548 100644
--- a/python/src/trezorlib/messages/ApplySettings.py
+++ b/python/src/trezorlib/messages/ApplySettings.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeSafetyCheckLevel = Literal[0, 1, 2]
     except ImportError:
@@ -17,15 +17,15 @@ class ApplySettings(p.MessageType):
     def __init__(
         self,
         *,
-        language: str = None,
-        label: str = None,
-        use_passphrase: bool = None,
-        homescreen: bytes = None,
-        auto_lock_delay_ms: int = None,
-        display_rotation: int = None,
-        passphrase_always_on_device: bool = None,
-        safety_checks: EnumTypeSafetyCheckLevel = None,
-        experimental_features: bool = None,
+        language: Optional[str] = None,
+        label: Optional[str] = None,
+        use_passphrase: Optional[bool] = None,
+        homescreen: Optional[bytes] = None,
+        auto_lock_delay_ms: Optional[int] = None,
+        display_rotation: Optional[int] = None,
+        passphrase_always_on_device: Optional[bool] = None,
+        safety_checks: Optional[EnumTypeSafetyCheckLevel] = None,
+        experimental_features: Optional[bool] = None,
     ) -> None:
         self.language = language
         self.label = label
diff --git a/python/src/trezorlib/messages/AuthorizeCoinJoin.py b/python/src/trezorlib/messages/AuthorizeCoinJoin.py
index b68ac7f7a2..b741143239 100644
--- a/python/src/trezorlib/messages/AuthorizeCoinJoin.py
+++ b/python/src/trezorlib/messages/AuthorizeCoinJoin.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
         EnumTypeAmountUnit = Literal[0, 1, 2, 3]
@@ -21,8 +21,8 @@ class AuthorizeCoinJoin(p.MessageType):
         *,
         coordinator: str,
         max_total_fee: int,
-        address_n: List[int] = None,
-        fee_per_anonymity: int = None,
+        address_n: Optional[List[int]] = None,
+        fee_per_anonymity: Optional[int] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 0,
         amount_unit: EnumTypeAmountUnit = 0,
diff --git a/python/src/trezorlib/messages/BackupDevice.py b/python/src/trezorlib/messages/BackupDevice.py
index 5464034ff8..20a47f9345 100644
--- a/python/src/trezorlib/messages/BackupDevice.py
+++ b/python/src/trezorlib/messages/BackupDevice.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/BinanceAddress.py b/python/src/trezorlib/messages/BinanceAddress.py
index 3f2108cf55..1853e68da5 100644
--- a/python/src/trezorlib/messages/BinanceAddress.py
+++ b/python/src/trezorlib/messages/BinanceAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/BinanceCancelMsg.py b/python/src/trezorlib/messages/BinanceCancelMsg.py
index 143dc08b8c..4e4b127c69 100644
--- a/python/src/trezorlib/messages/BinanceCancelMsg.py
+++ b/python/src/trezorlib/messages/BinanceCancelMsg.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class BinanceCancelMsg(p.MessageType):
     def __init__(
         self,
         *,
-        refid: str = None,
-        sender: str = None,
-        symbol: str = None,
+        refid: Optional[str] = None,
+        sender: Optional[str] = None,
+        symbol: Optional[str] = None,
     ) -> None:
         self.refid = refid
         self.sender = sender
diff --git a/python/src/trezorlib/messages/BinanceCoin.py b/python/src/trezorlib/messages/BinanceCoin.py
index 310f6823a8..3f65d06cb4 100644
--- a/python/src/trezorlib/messages/BinanceCoin.py
+++ b/python/src/trezorlib/messages/BinanceCoin.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class BinanceCoin(p.MessageType):
     def __init__(
         self,
         *,
-        amount: int = None,
-        denom: str = None,
+        amount: Optional[int] = None,
+        denom: Optional[str] = None,
     ) -> None:
         self.amount = amount
         self.denom = denom
diff --git a/python/src/trezorlib/messages/BinanceGetAddress.py b/python/src/trezorlib/messages/BinanceGetAddress.py
index a72d68fd2c..699c5b5890 100644
--- a/python/src/trezorlib/messages/BinanceGetAddress.py
+++ b/python/src/trezorlib/messages/BinanceGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class BinanceGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/BinanceGetPublicKey.py b/python/src/trezorlib/messages/BinanceGetPublicKey.py
index 8c651740c9..9a569a8d0a 100644
--- a/python/src/trezorlib/messages/BinanceGetPublicKey.py
+++ b/python/src/trezorlib/messages/BinanceGetPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class BinanceGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/BinanceInputOutput.py b/python/src/trezorlib/messages/BinanceInputOutput.py
index 136c40fc16..7b383efad7 100644
--- a/python/src/trezorlib/messages/BinanceInputOutput.py
+++ b/python/src/trezorlib/messages/BinanceInputOutput.py
@@ -6,7 +6,7 @@ from .BinanceCoin import BinanceCoin
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class BinanceInputOutput(p.MessageType):
     def __init__(
         self,
         *,
-        coins: List[BinanceCoin] = None,
-        address: str = None,
+        coins: Optional[List[BinanceCoin]] = None,
+        address: Optional[str] = None,
     ) -> None:
         self.coins = coins if coins is not None else []
         self.address = address
diff --git a/python/src/trezorlib/messages/BinanceOrderMsg.py b/python/src/trezorlib/messages/BinanceOrderMsg.py
index 3624c498b7..a449aa754f 100644
--- a/python/src/trezorlib/messages/BinanceOrderMsg.py
+++ b/python/src/trezorlib/messages/BinanceOrderMsg.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeBinanceOrderType = Literal[0, 1, 2, 3]
         EnumTypeBinanceOrderSide = Literal[0, 1, 2]
@@ -19,14 +19,14 @@ class BinanceOrderMsg(p.MessageType):
     def __init__(
         self,
         *,
-        id: str = None,
-        ordertype: EnumTypeBinanceOrderType = None,
-        price: int = None,
-        quantity: int = None,
-        sender: str = None,
-        side: EnumTypeBinanceOrderSide = None,
-        symbol: str = None,
-        timeinforce: EnumTypeBinanceTimeInForce = None,
+        id: Optional[str] = None,
+        ordertype: Optional[EnumTypeBinanceOrderType] = None,
+        price: Optional[int] = None,
+        quantity: Optional[int] = None,
+        sender: Optional[str] = None,
+        side: Optional[EnumTypeBinanceOrderSide] = None,
+        symbol: Optional[str] = None,
+        timeinforce: Optional[EnumTypeBinanceTimeInForce] = None,
     ) -> None:
         self.id = id
         self.ordertype = ordertype
diff --git a/python/src/trezorlib/messages/BinancePublicKey.py b/python/src/trezorlib/messages/BinancePublicKey.py
index 48d9dff13f..bd031b83fe 100644
--- a/python/src/trezorlib/messages/BinancePublicKey.py
+++ b/python/src/trezorlib/messages/BinancePublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/BinanceSignTx.py b/python/src/trezorlib/messages/BinanceSignTx.py
index fcc0f874b5..85c6569add 100644
--- a/python/src/trezorlib/messages/BinanceSignTx.py
+++ b/python/src/trezorlib/messages/BinanceSignTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,13 +16,13 @@ class BinanceSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        msg_count: int = None,
-        account_number: int = None,
-        chain_id: str = None,
-        memo: str = None,
-        sequence: int = None,
-        source: int = None,
+        address_n: Optional[List[int]] = None,
+        msg_count: Optional[int] = None,
+        account_number: Optional[int] = None,
+        chain_id: Optional[str] = None,
+        memo: Optional[str] = None,
+        sequence: Optional[int] = None,
+        source: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.msg_count = msg_count
diff --git a/python/src/trezorlib/messages/BinanceSignedTx.py b/python/src/trezorlib/messages/BinanceSignedTx.py
index f236c6dc63..01c92c72c7 100644
--- a/python/src/trezorlib/messages/BinanceSignedTx.py
+++ b/python/src/trezorlib/messages/BinanceSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/BinanceTransferMsg.py b/python/src/trezorlib/messages/BinanceTransferMsg.py
index 539f296169..aa64adbabd 100644
--- a/python/src/trezorlib/messages/BinanceTransferMsg.py
+++ b/python/src/trezorlib/messages/BinanceTransferMsg.py
@@ -6,7 +6,7 @@ from .BinanceInputOutput import BinanceInputOutput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,8 +18,8 @@ class BinanceTransferMsg(p.MessageType):
     def __init__(
         self,
         *,
-        inputs: List[BinanceInputOutput] = None,
-        outputs: List[BinanceInputOutput] = None,
+        inputs: Optional[List[BinanceInputOutput]] = None,
+        outputs: Optional[List[BinanceInputOutput]] = None,
     ) -> None:
         self.inputs = inputs if inputs is not None else []
         self.outputs = outputs if outputs is not None else []
diff --git a/python/src/trezorlib/messages/BinanceTxRequest.py b/python/src/trezorlib/messages/BinanceTxRequest.py
index 70da3a4a55..012e0d9b84 100644
--- a/python/src/trezorlib/messages/BinanceTxRequest.py
+++ b/python/src/trezorlib/messages/BinanceTxRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/ButtonAck.py b/python/src/trezorlib/messages/ButtonAck.py
index 48d50d8069..8869852246 100644
--- a/python/src/trezorlib/messages/ButtonAck.py
+++ b/python/src/trezorlib/messages/ButtonAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/ButtonRequest.py b/python/src/trezorlib/messages/ButtonRequest.py
index bbbc48550e..59ab56e287 100644
--- a/python/src/trezorlib/messages/ButtonRequest.py
+++ b/python/src/trezorlib/messages/ButtonRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeButtonRequestType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
     except ImportError:
@@ -17,7 +17,7 @@ class ButtonRequest(p.MessageType):
     def __init__(
         self,
         *,
-        code: EnumTypeButtonRequestType = None,
+        code: Optional[EnumTypeButtonRequestType] = None,
     ) -> None:
         self.code = code
 
diff --git a/python/src/trezorlib/messages/Cancel.py b/python/src/trezorlib/messages/Cancel.py
index 22ea2b9009..2227769a16 100644
--- a/python/src/trezorlib/messages/Cancel.py
+++ b/python/src/trezorlib/messages/Cancel.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CancelAuthorization.py b/python/src/trezorlib/messages/CancelAuthorization.py
index 21c31a28ac..ad60fa2548 100644
--- a/python/src/trezorlib/messages/CancelAuthorization.py
+++ b/python/src/trezorlib/messages/CancelAuthorization.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoAddress.py b/python/src/trezorlib/messages/CardanoAddress.py
index 52e96c52f0..392a6fc87b 100644
--- a/python/src/trezorlib/messages/CardanoAddress.py
+++ b/python/src/trezorlib/messages/CardanoAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoAddressParametersType.py b/python/src/trezorlib/messages/CardanoAddressParametersType.py
index 3261ed03af..72b1acfe04 100644
--- a/python/src/trezorlib/messages/CardanoAddressParametersType.py
+++ b/python/src/trezorlib/messages/CardanoAddressParametersType.py
@@ -6,7 +6,7 @@ from .CardanoBlockchainPointerType import CardanoBlockchainPointerType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCardanoAddressType = Literal[0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15]
     except ImportError:
@@ -19,10 +19,10 @@ class CardanoAddressParametersType(p.MessageType):
         self,
         *,
         address_type: EnumTypeCardanoAddressType,
-        address_n: List[int] = None,
-        address_n_staking: List[int] = None,
-        staking_key_hash: bytes = None,
-        certificate_pointer: CardanoBlockchainPointerType = None,
+        address_n: Optional[List[int]] = None,
+        address_n_staking: Optional[List[int]] = None,
+        staking_key_hash: Optional[bytes] = None,
+        certificate_pointer: Optional[CardanoBlockchainPointerType] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.address_n_staking = address_n_staking if address_n_staking is not None else []
diff --git a/python/src/trezorlib/messages/CardanoAssetGroupType.py b/python/src/trezorlib/messages/CardanoAssetGroupType.py
index 097d05af6b..5038a81410 100644
--- a/python/src/trezorlib/messages/CardanoAssetGroupType.py
+++ b/python/src/trezorlib/messages/CardanoAssetGroupType.py
@@ -6,7 +6,7 @@ from .CardanoTokenType import CardanoTokenType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class CardanoAssetGroupType(p.MessageType):
         self,
         *,
         policy_id: bytes,
-        tokens: List[CardanoTokenType] = None,
+        tokens: Optional[List[CardanoTokenType]] = None,
     ) -> None:
         self.tokens = tokens if tokens is not None else []
         self.policy_id = policy_id
diff --git a/python/src/trezorlib/messages/CardanoBlockchainPointerType.py b/python/src/trezorlib/messages/CardanoBlockchainPointerType.py
index 908a98ee9d..5abef09e78 100644
--- a/python/src/trezorlib/messages/CardanoBlockchainPointerType.py
+++ b/python/src/trezorlib/messages/CardanoBlockchainPointerType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoGetAddress.py b/python/src/trezorlib/messages/CardanoGetAddress.py
index 273ec68ce1..f604624a97 100644
--- a/python/src/trezorlib/messages/CardanoGetAddress.py
+++ b/python/src/trezorlib/messages/CardanoGetAddress.py
@@ -6,7 +6,7 @@ from .CardanoAddressParametersType import CardanoAddressParametersType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoGetPublicKey.py b/python/src/trezorlib/messages/CardanoGetPublicKey.py
index 957d274385..30ba6311ff 100644
--- a/python/src/trezorlib/messages/CardanoGetPublicKey.py
+++ b/python/src/trezorlib/messages/CardanoGetPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class CardanoGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/CardanoPoolMetadataType.py b/python/src/trezorlib/messages/CardanoPoolMetadataType.py
index ac265c4b0b..45032c27ca 100644
--- a/python/src/trezorlib/messages/CardanoPoolMetadataType.py
+++ b/python/src/trezorlib/messages/CardanoPoolMetadataType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoPoolOwnerType.py b/python/src/trezorlib/messages/CardanoPoolOwnerType.py
index 9579347a13..3b8f075cd2 100644
--- a/python/src/trezorlib/messages/CardanoPoolOwnerType.py
+++ b/python/src/trezorlib/messages/CardanoPoolOwnerType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class CardanoPoolOwnerType(p.MessageType):
     def __init__(
         self,
         *,
-        staking_key_path: List[int] = None,
-        staking_key_hash: bytes = None,
+        staking_key_path: Optional[List[int]] = None,
+        staking_key_hash: Optional[bytes] = None,
     ) -> None:
         self.staking_key_path = staking_key_path if staking_key_path is not None else []
         self.staking_key_hash = staking_key_hash
diff --git a/python/src/trezorlib/messages/CardanoPoolParametersType.py b/python/src/trezorlib/messages/CardanoPoolParametersType.py
index d44ab87da6..593fb0ee88 100644
--- a/python/src/trezorlib/messages/CardanoPoolParametersType.py
+++ b/python/src/trezorlib/messages/CardanoPoolParametersType.py
@@ -8,7 +8,7 @@ from .CardanoPoolRelayParametersType import CardanoPoolRelayParametersType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -26,9 +26,9 @@ class CardanoPoolParametersType(p.MessageType):
         margin_numerator: int,
         margin_denominator: int,
         reward_account: str,
-        owners: List[CardanoPoolOwnerType] = None,
-        relays: List[CardanoPoolRelayParametersType] = None,
-        metadata: CardanoPoolMetadataType = None,
+        owners: Optional[List[CardanoPoolOwnerType]] = None,
+        relays: Optional[List[CardanoPoolRelayParametersType]] = None,
+        metadata: Optional[CardanoPoolMetadataType] = None,
     ) -> None:
         self.owners = owners if owners is not None else []
         self.relays = relays if relays is not None else []
diff --git a/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py b/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py
index 31c58d9147..10d4e82b0a 100644
--- a/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py
+++ b/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCardanoPoolRelayType = Literal[0, 1, 2]
     except ImportError:
@@ -17,10 +17,10 @@ class CardanoPoolRelayParametersType(p.MessageType):
         self,
         *,
         type: EnumTypeCardanoPoolRelayType,
-        ipv4_address: bytes = None,
-        ipv6_address: bytes = None,
-        host_name: str = None,
-        port: int = None,
+        ipv4_address: Optional[bytes] = None,
+        ipv6_address: Optional[bytes] = None,
+        host_name: Optional[str] = None,
+        port: Optional[int] = None,
     ) -> None:
         self.type = type
         self.ipv4_address = ipv4_address
diff --git a/python/src/trezorlib/messages/CardanoPublicKey.py b/python/src/trezorlib/messages/CardanoPublicKey.py
index d0f12b31ba..112e4cbcb2 100644
--- a/python/src/trezorlib/messages/CardanoPublicKey.py
+++ b/python/src/trezorlib/messages/CardanoPublicKey.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoSignTx.py b/python/src/trezorlib/messages/CardanoSignTx.py
index a82fb78b88..6c08308d8d 100644
--- a/python/src/trezorlib/messages/CardanoSignTx.py
+++ b/python/src/trezorlib/messages/CardanoSignTx.py
@@ -9,7 +9,7 @@ from .CardanoTxWithdrawalType import CardanoTxWithdrawalType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -24,13 +24,13 @@ class CardanoSignTx(p.MessageType):
         protocol_magic: int,
         fee: int,
         network_id: int,
-        inputs: List[CardanoTxInputType] = None,
-        outputs: List[CardanoTxOutputType] = None,
-        certificates: List[CardanoTxCertificateType] = None,
-        withdrawals: List[CardanoTxWithdrawalType] = None,
-        ttl: int = None,
-        metadata: bytes = None,
-        validity_interval_start: int = None,
+        inputs: Optional[List[CardanoTxInputType]] = None,
+        outputs: Optional[List[CardanoTxOutputType]] = None,
+        certificates: Optional[List[CardanoTxCertificateType]] = None,
+        withdrawals: Optional[List[CardanoTxWithdrawalType]] = None,
+        ttl: Optional[int] = None,
+        metadata: Optional[bytes] = None,
+        validity_interval_start: Optional[int] = None,
     ) -> None:
         self.inputs = inputs if inputs is not None else []
         self.outputs = outputs if outputs is not None else []
diff --git a/python/src/trezorlib/messages/CardanoSignedTx.py b/python/src/trezorlib/messages/CardanoSignedTx.py
index dbb8e1be39..e07ff5c23b 100644
--- a/python/src/trezorlib/messages/CardanoSignedTx.py
+++ b/python/src/trezorlib/messages/CardanoSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class CardanoSignedTx(p.MessageType):
         self,
         *,
         tx_hash: bytes,
-        serialized_tx: bytes = None,
+        serialized_tx: Optional[bytes] = None,
     ) -> None:
         self.tx_hash = tx_hash
         self.serialized_tx = serialized_tx
diff --git a/python/src/trezorlib/messages/CardanoSignedTxChunk.py b/python/src/trezorlib/messages/CardanoSignedTxChunk.py
index c2b683a58d..2560042f23 100644
--- a/python/src/trezorlib/messages/CardanoSignedTxChunk.py
+++ b/python/src/trezorlib/messages/CardanoSignedTxChunk.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoSignedTxChunkAck.py b/python/src/trezorlib/messages/CardanoSignedTxChunkAck.py
index 25d4e12243..1ec48c4922 100644
--- a/python/src/trezorlib/messages/CardanoSignedTxChunkAck.py
+++ b/python/src/trezorlib/messages/CardanoSignedTxChunkAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoTokenType.py b/python/src/trezorlib/messages/CardanoTokenType.py
index 0a111fdc93..560eebea1e 100644
--- a/python/src/trezorlib/messages/CardanoTokenType.py
+++ b/python/src/trezorlib/messages/CardanoTokenType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CardanoTxCertificateType.py b/python/src/trezorlib/messages/CardanoTxCertificateType.py
index 9a31ca9427..5cd62bbaf8 100644
--- a/python/src/trezorlib/messages/CardanoTxCertificateType.py
+++ b/python/src/trezorlib/messages/CardanoTxCertificateType.py
@@ -6,7 +6,7 @@ from .CardanoPoolParametersType import CardanoPoolParametersType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCardanoCertificateType = Literal[0, 1, 2, 3]
     except ImportError:
@@ -19,9 +19,9 @@ class CardanoTxCertificateType(p.MessageType):
         self,
         *,
         type: EnumTypeCardanoCertificateType,
-        path: List[int] = None,
-        pool: bytes = None,
-        pool_parameters: CardanoPoolParametersType = None,
+        path: Optional[List[int]] = None,
+        pool: Optional[bytes] = None,
+        pool_parameters: Optional[CardanoPoolParametersType] = None,
     ) -> None:
         self.path = path if path is not None else []
         self.type = type
diff --git a/python/src/trezorlib/messages/CardanoTxInputType.py b/python/src/trezorlib/messages/CardanoTxInputType.py
index 7e0424ff98..8bee9f06e9 100644
--- a/python/src/trezorlib/messages/CardanoTxInputType.py
+++ b/python/src/trezorlib/messages/CardanoTxInputType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class CardanoTxInputType(p.MessageType):
         *,
         prev_hash: bytes,
         prev_index: int,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.prev_hash = prev_hash
diff --git a/python/src/trezorlib/messages/CardanoTxOutputType.py b/python/src/trezorlib/messages/CardanoTxOutputType.py
index 15f739e940..091d3c5dfd 100644
--- a/python/src/trezorlib/messages/CardanoTxOutputType.py
+++ b/python/src/trezorlib/messages/CardanoTxOutputType.py
@@ -7,7 +7,7 @@ from .CardanoAssetGroupType import CardanoAssetGroupType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,9 +19,9 @@ class CardanoTxOutputType(p.MessageType):
         self,
         *,
         amount: int,
-        token_bundle: List[CardanoAssetGroupType] = None,
-        address: str = None,
-        address_parameters: CardanoAddressParametersType = None,
+        token_bundle: Optional[List[CardanoAssetGroupType]] = None,
+        address: Optional[str] = None,
+        address_parameters: Optional[CardanoAddressParametersType] = None,
     ) -> None:
         self.token_bundle = token_bundle if token_bundle is not None else []
         self.amount = amount
diff --git a/python/src/trezorlib/messages/CardanoTxWithdrawalType.py b/python/src/trezorlib/messages/CardanoTxWithdrawalType.py
index 114e897308..b695f16a5e 100644
--- a/python/src/trezorlib/messages/CardanoTxWithdrawalType.py
+++ b/python/src/trezorlib/messages/CardanoTxWithdrawalType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class CardanoTxWithdrawalType(p.MessageType):
         self,
         *,
         amount: int,
-        path: List[int] = None,
+        path: Optional[List[int]] = None,
     ) -> None:
         self.path = path if path is not None else []
         self.amount = amount
diff --git a/python/src/trezorlib/messages/ChangePin.py b/python/src/trezorlib/messages/ChangePin.py
index a2c4327d54..8db9d7172e 100644
--- a/python/src/trezorlib/messages/ChangePin.py
+++ b/python/src/trezorlib/messages/ChangePin.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class ChangePin(p.MessageType):
     def __init__(
         self,
         *,
-        remove: bool = None,
+        remove: Optional[bool] = None,
     ) -> None:
         self.remove = remove
 
diff --git a/python/src/trezorlib/messages/ChangeWipeCode.py b/python/src/trezorlib/messages/ChangeWipeCode.py
index 5e345d8826..3c59687181 100644
--- a/python/src/trezorlib/messages/ChangeWipeCode.py
+++ b/python/src/trezorlib/messages/ChangeWipeCode.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class ChangeWipeCode(p.MessageType):
     def __init__(
         self,
         *,
-        remove: bool = None,
+        remove: Optional[bool] = None,
     ) -> None:
         self.remove = remove
 
diff --git a/python/src/trezorlib/messages/CipherKeyValue.py b/python/src/trezorlib/messages/CipherKeyValue.py
index c0123478b4..fbdb3aeb72 100644
--- a/python/src/trezorlib/messages/CipherKeyValue.py
+++ b/python/src/trezorlib/messages/CipherKeyValue.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,11 +18,11 @@ class CipherKeyValue(p.MessageType):
         *,
         key: str,
         value: bytes,
-        address_n: List[int] = None,
-        encrypt: bool = None,
-        ask_on_encrypt: bool = None,
-        ask_on_decrypt: bool = None,
-        iv: bytes = None,
+        address_n: Optional[List[int]] = None,
+        encrypt: Optional[bool] = None,
+        ask_on_encrypt: Optional[bool] = None,
+        ask_on_decrypt: Optional[bool] = None,
+        iv: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.key = key
diff --git a/python/src/trezorlib/messages/CipheredKeyValue.py b/python/src/trezorlib/messages/CipheredKeyValue.py
index b7016a0593..34d3eccd54 100644
--- a/python/src/trezorlib/messages/CipheredKeyValue.py
+++ b/python/src/trezorlib/messages/CipheredKeyValue.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/CosiCommit.py b/python/src/trezorlib/messages/CosiCommit.py
index b99808248d..e4a8781123 100644
--- a/python/src/trezorlib/messages/CosiCommit.py
+++ b/python/src/trezorlib/messages/CosiCommit.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class CosiCommit(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        data: bytes = None,
+        address_n: Optional[List[int]] = None,
+        data: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.data = data
diff --git a/python/src/trezorlib/messages/CosiCommitment.py b/python/src/trezorlib/messages/CosiCommitment.py
index fbc9b9cacd..44663f0054 100644
--- a/python/src/trezorlib/messages/CosiCommitment.py
+++ b/python/src/trezorlib/messages/CosiCommitment.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class CosiCommitment(p.MessageType):
     def __init__(
         self,
         *,
-        commitment: bytes = None,
-        pubkey: bytes = None,
+        commitment: Optional[bytes] = None,
+        pubkey: Optional[bytes] = None,
     ) -> None:
         self.commitment = commitment
         self.pubkey = pubkey
diff --git a/python/src/trezorlib/messages/CosiSign.py b/python/src/trezorlib/messages/CosiSign.py
index d9fcc00fce..bb59986c92 100644
--- a/python/src/trezorlib/messages/CosiSign.py
+++ b/python/src/trezorlib/messages/CosiSign.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,10 +16,10 @@ class CosiSign(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        data: bytes = None,
-        global_commitment: bytes = None,
-        global_pubkey: bytes = None,
+        address_n: Optional[List[int]] = None,
+        data: Optional[bytes] = None,
+        global_commitment: Optional[bytes] = None,
+        global_pubkey: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.data = data
diff --git a/python/src/trezorlib/messages/CosiSignature.py b/python/src/trezorlib/messages/CosiSignature.py
index 5b76661c52..bb6db6ed3c 100644
--- a/python/src/trezorlib/messages/CosiSignature.py
+++ b/python/src/trezorlib/messages/CosiSignature.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/DebugLinkDecision.py b/python/src/trezorlib/messages/DebugLinkDecision.py
index 08e424d7cf..647f2b2994 100644
--- a/python/src/trezorlib/messages/DebugLinkDecision.py
+++ b/python/src/trezorlib/messages/DebugLinkDecision.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeDebugSwipeDirection = Literal[0, 1, 2, 3]
     except ImportError:
@@ -17,13 +17,13 @@ class DebugLinkDecision(p.MessageType):
     def __init__(
         self,
         *,
-        yes_no: bool = None,
-        swipe: EnumTypeDebugSwipeDirection = None,
-        input: str = None,
-        x: int = None,
-        y: int = None,
-        wait: bool = None,
-        hold_ms: int = None,
+        yes_no: Optional[bool] = None,
+        swipe: Optional[EnumTypeDebugSwipeDirection] = None,
+        input: Optional[str] = None,
+        x: Optional[int] = None,
+        y: Optional[int] = None,
+        wait: Optional[bool] = None,
+        hold_ms: Optional[int] = None,
     ) -> None:
         self.yes_no = yes_no
         self.swipe = swipe
diff --git a/python/src/trezorlib/messages/DebugLinkEraseSdCard.py b/python/src/trezorlib/messages/DebugLinkEraseSdCard.py
index 37aa32f1cc..8aec29c50d 100644
--- a/python/src/trezorlib/messages/DebugLinkEraseSdCard.py
+++ b/python/src/trezorlib/messages/DebugLinkEraseSdCard.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkEraseSdCard(p.MessageType):
     def __init__(
         self,
         *,
-        format: bool = None,
+        format: Optional[bool] = None,
     ) -> None:
         self.format = format
 
diff --git a/python/src/trezorlib/messages/DebugLinkFlashErase.py b/python/src/trezorlib/messages/DebugLinkFlashErase.py
index 4521db54f4..3990118d43 100644
--- a/python/src/trezorlib/messages/DebugLinkFlashErase.py
+++ b/python/src/trezorlib/messages/DebugLinkFlashErase.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkFlashErase(p.MessageType):
     def __init__(
         self,
         *,
-        sector: int = None,
+        sector: Optional[int] = None,
     ) -> None:
         self.sector = sector
 
diff --git a/python/src/trezorlib/messages/DebugLinkGetState.py b/python/src/trezorlib/messages/DebugLinkGetState.py
index 4f5ef23c7c..3696884032 100644
--- a/python/src/trezorlib/messages/DebugLinkGetState.py
+++ b/python/src/trezorlib/messages/DebugLinkGetState.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class DebugLinkGetState(p.MessageType):
     def __init__(
         self,
         *,
-        wait_word_list: bool = None,
-        wait_word_pos: bool = None,
-        wait_layout: bool = None,
+        wait_word_list: Optional[bool] = None,
+        wait_word_pos: Optional[bool] = None,
+        wait_layout: Optional[bool] = None,
     ) -> None:
         self.wait_word_list = wait_word_list
         self.wait_word_pos = wait_word_pos
diff --git a/python/src/trezorlib/messages/DebugLinkLayout.py b/python/src/trezorlib/messages/DebugLinkLayout.py
index c83cf6ffd7..124c6326b5 100644
--- a/python/src/trezorlib/messages/DebugLinkLayout.py
+++ b/python/src/trezorlib/messages/DebugLinkLayout.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkLayout(p.MessageType):
     def __init__(
         self,
         *,
-        lines: List[str] = None,
+        lines: Optional[List[str]] = None,
     ) -> None:
         self.lines = lines if lines is not None else []
 
diff --git a/python/src/trezorlib/messages/DebugLinkLog.py b/python/src/trezorlib/messages/DebugLinkLog.py
index 86c18ef34f..4c0dcc19cb 100644
--- a/python/src/trezorlib/messages/DebugLinkLog.py
+++ b/python/src/trezorlib/messages/DebugLinkLog.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class DebugLinkLog(p.MessageType):
     def __init__(
         self,
         *,
-        level: int = None,
-        bucket: str = None,
-        text: str = None,
+        level: Optional[int] = None,
+        bucket: Optional[str] = None,
+        text: Optional[str] = None,
     ) -> None:
         self.level = level
         self.bucket = bucket
diff --git a/python/src/trezorlib/messages/DebugLinkMemory.py b/python/src/trezorlib/messages/DebugLinkMemory.py
index 8a8a4291a6..b75c77607a 100644
--- a/python/src/trezorlib/messages/DebugLinkMemory.py
+++ b/python/src/trezorlib/messages/DebugLinkMemory.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkMemory(p.MessageType):
     def __init__(
         self,
         *,
-        memory: bytes = None,
+        memory: Optional[bytes] = None,
     ) -> None:
         self.memory = memory
 
diff --git a/python/src/trezorlib/messages/DebugLinkMemoryRead.py b/python/src/trezorlib/messages/DebugLinkMemoryRead.py
index e9e261c0a6..9f7fa67021 100644
--- a/python/src/trezorlib/messages/DebugLinkMemoryRead.py
+++ b/python/src/trezorlib/messages/DebugLinkMemoryRead.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class DebugLinkMemoryRead(p.MessageType):
     def __init__(
         self,
         *,
-        address: int = None,
-        length: int = None,
+        address: Optional[int] = None,
+        length: Optional[int] = None,
     ) -> None:
         self.address = address
         self.length = length
diff --git a/python/src/trezorlib/messages/DebugLinkMemoryWrite.py b/python/src/trezorlib/messages/DebugLinkMemoryWrite.py
index 2563607d8f..f4b5f5418c 100644
--- a/python/src/trezorlib/messages/DebugLinkMemoryWrite.py
+++ b/python/src/trezorlib/messages/DebugLinkMemoryWrite.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class DebugLinkMemoryWrite(p.MessageType):
     def __init__(
         self,
         *,
-        address: int = None,
-        memory: bytes = None,
-        flash: bool = None,
+        address: Optional[int] = None,
+        memory: Optional[bytes] = None,
+        flash: Optional[bool] = None,
     ) -> None:
         self.address = address
         self.memory = memory
diff --git a/python/src/trezorlib/messages/DebugLinkRecordScreen.py b/python/src/trezorlib/messages/DebugLinkRecordScreen.py
index e18d084906..80b7401abe 100644
--- a/python/src/trezorlib/messages/DebugLinkRecordScreen.py
+++ b/python/src/trezorlib/messages/DebugLinkRecordScreen.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkRecordScreen(p.MessageType):
     def __init__(
         self,
         *,
-        target_directory: str = None,
+        target_directory: Optional[str] = None,
     ) -> None:
         self.target_directory = target_directory
 
diff --git a/python/src/trezorlib/messages/DebugLinkReseedRandom.py b/python/src/trezorlib/messages/DebugLinkReseedRandom.py
index 65b7ce0284..8d3483dc11 100644
--- a/python/src/trezorlib/messages/DebugLinkReseedRandom.py
+++ b/python/src/trezorlib/messages/DebugLinkReseedRandom.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkReseedRandom(p.MessageType):
     def __init__(
         self,
         *,
-        value: int = None,
+        value: Optional[int] = None,
     ) -> None:
         self.value = value
 
diff --git a/python/src/trezorlib/messages/DebugLinkState.py b/python/src/trezorlib/messages/DebugLinkState.py
index 8a8fbf7318..1cc8eab090 100644
--- a/python/src/trezorlib/messages/DebugLinkState.py
+++ b/python/src/trezorlib/messages/DebugLinkState.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,19 +18,19 @@ class DebugLinkState(p.MessageType):
     def __init__(
         self,
         *,
-        layout_lines: List[str] = None,
-        layout: bytes = None,
-        pin: str = None,
-        matrix: str = None,
-        mnemonic_secret: bytes = None,
-        node: HDNodeType = None,
-        passphrase_protection: bool = None,
-        reset_word: str = None,
-        reset_entropy: bytes = None,
-        recovery_fake_word: str = None,
-        recovery_word_pos: int = None,
-        reset_word_pos: int = None,
-        mnemonic_type: int = None,
+        layout_lines: Optional[List[str]] = None,
+        layout: Optional[bytes] = None,
+        pin: Optional[str] = None,
+        matrix: Optional[str] = None,
+        mnemonic_secret: Optional[bytes] = None,
+        node: Optional[HDNodeType] = None,
+        passphrase_protection: Optional[bool] = None,
+        reset_word: Optional[str] = None,
+        reset_entropy: Optional[bytes] = None,
+        recovery_fake_word: Optional[str] = None,
+        recovery_word_pos: Optional[int] = None,
+        reset_word_pos: Optional[int] = None,
+        mnemonic_type: Optional[int] = None,
     ) -> None:
         self.layout_lines = layout_lines if layout_lines is not None else []
         self.layout = layout
diff --git a/python/src/trezorlib/messages/DebugLinkStop.py b/python/src/trezorlib/messages/DebugLinkStop.py
index 3910038e1d..f1995fa4b3 100644
--- a/python/src/trezorlib/messages/DebugLinkStop.py
+++ b/python/src/trezorlib/messages/DebugLinkStop.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/DebugLinkWatchLayout.py b/python/src/trezorlib/messages/DebugLinkWatchLayout.py
index e6215ad0c0..d5466d3fb7 100644
--- a/python/src/trezorlib/messages/DebugLinkWatchLayout.py
+++ b/python/src/trezorlib/messages/DebugLinkWatchLayout.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class DebugLinkWatchLayout(p.MessageType):
     def __init__(
         self,
         *,
-        watch: bool = None,
+        watch: Optional[bool] = None,
     ) -> None:
         self.watch = watch
 
diff --git a/python/src/trezorlib/messages/DebugMoneroDiagAck.py b/python/src/trezorlib/messages/DebugMoneroDiagAck.py
index 5ec6c40e35..3b42b3aab9 100644
--- a/python/src/trezorlib/messages/DebugMoneroDiagAck.py
+++ b/python/src/trezorlib/messages/DebugMoneroDiagAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class DebugMoneroDiagAck(p.MessageType):
     def __init__(
         self,
         *,
-        pd: List[int] = None,
-        ins: int = None,
-        p1: int = None,
-        p2: int = None,
-        data1: bytes = None,
-        data2: bytes = None,
+        pd: Optional[List[int]] = None,
+        ins: Optional[int] = None,
+        p1: Optional[int] = None,
+        p2: Optional[int] = None,
+        data1: Optional[bytes] = None,
+        data2: Optional[bytes] = None,
     ) -> None:
         self.pd = pd if pd is not None else []
         self.ins = ins
diff --git a/python/src/trezorlib/messages/DebugMoneroDiagRequest.py b/python/src/trezorlib/messages/DebugMoneroDiagRequest.py
index da5f33ba08..ed2227306c 100644
--- a/python/src/trezorlib/messages/DebugMoneroDiagRequest.py
+++ b/python/src/trezorlib/messages/DebugMoneroDiagRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class DebugMoneroDiagRequest(p.MessageType):
     def __init__(
         self,
         *,
-        pd: List[int] = None,
-        ins: int = None,
-        p1: int = None,
-        p2: int = None,
-        data1: bytes = None,
-        data2: bytes = None,
+        pd: Optional[List[int]] = None,
+        ins: Optional[int] = None,
+        p1: Optional[int] = None,
+        p2: Optional[int] = None,
+        data1: Optional[bytes] = None,
+        data2: Optional[bytes] = None,
     ) -> None:
         self.pd = pd if pd is not None else []
         self.ins = ins
diff --git a/python/src/trezorlib/messages/Deprecated_PassphraseStateAck.py b/python/src/trezorlib/messages/Deprecated_PassphraseStateAck.py
index fa178ddf5d..85d93a5357 100644
--- a/python/src/trezorlib/messages/Deprecated_PassphraseStateAck.py
+++ b/python/src/trezorlib/messages/Deprecated_PassphraseStateAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py b/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py
index 579957ff06..114c4f1ab1 100644
--- a/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py
+++ b/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class Deprecated_PassphraseStateRequest(p.MessageType):
     def __init__(
         self,
         *,
-        state: bytes = None,
+        state: Optional[bytes] = None,
     ) -> None:
         self.state = state
 
diff --git a/python/src/trezorlib/messages/DoPreauthorized.py b/python/src/trezorlib/messages/DoPreauthorized.py
index 7add79a39c..b9872d1f63 100644
--- a/python/src/trezorlib/messages/DoPreauthorized.py
+++ b/python/src/trezorlib/messages/DoPreauthorized.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/ECDHSessionKey.py b/python/src/trezorlib/messages/ECDHSessionKey.py
index 84ee339f52..bbf807e3b6 100644
--- a/python/src/trezorlib/messages/ECDHSessionKey.py
+++ b/python/src/trezorlib/messages/ECDHSessionKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class ECDHSessionKey(p.MessageType):
         self,
         *,
         session_key: bytes,
-        public_key: bytes = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.session_key = session_key
         self.public_key = public_key
diff --git a/python/src/trezorlib/messages/EndSession.py b/python/src/trezorlib/messages/EndSession.py
index 667213f68a..07c1b4e912 100644
--- a/python/src/trezorlib/messages/EndSession.py
+++ b/python/src/trezorlib/messages/EndSession.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/Entropy.py b/python/src/trezorlib/messages/Entropy.py
index 8c8c53cbfd..837177694e 100644
--- a/python/src/trezorlib/messages/Entropy.py
+++ b/python/src/trezorlib/messages/Entropy.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/EntropyAck.py b/python/src/trezorlib/messages/EntropyAck.py
index 0e5ac296c6..0cc0cc0f39 100644
--- a/python/src/trezorlib/messages/EntropyAck.py
+++ b/python/src/trezorlib/messages/EntropyAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EntropyAck(p.MessageType):
     def __init__(
         self,
         *,
-        entropy: bytes = None,
+        entropy: Optional[bytes] = None,
     ) -> None:
         self.entropy = entropy
 
diff --git a/python/src/trezorlib/messages/EntropyRequest.py b/python/src/trezorlib/messages/EntropyRequest.py
index c747354488..1b6905e867 100644
--- a/python/src/trezorlib/messages/EntropyRequest.py
+++ b/python/src/trezorlib/messages/EntropyRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/EosActionBuyRam.py b/python/src/trezorlib/messages/EosActionBuyRam.py
index 05ed4dcfe7..d41a2eb197 100644
--- a/python/src/trezorlib/messages/EosActionBuyRam.py
+++ b/python/src/trezorlib/messages/EosActionBuyRam.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class EosActionBuyRam(p.MessageType):
     def __init__(
         self,
         *,
-        payer: int = None,
-        receiver: int = None,
-        quantity: EosAsset = None,
+        payer: Optional[int] = None,
+        receiver: Optional[int] = None,
+        quantity: Optional[EosAsset] = None,
     ) -> None:
         self.payer = payer
         self.receiver = receiver
diff --git a/python/src/trezorlib/messages/EosActionBuyRamBytes.py b/python/src/trezorlib/messages/EosActionBuyRamBytes.py
index 1d5addcc06..2b2dd3c4bb 100644
--- a/python/src/trezorlib/messages/EosActionBuyRamBytes.py
+++ b/python/src/trezorlib/messages/EosActionBuyRamBytes.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class EosActionBuyRamBytes(p.MessageType):
     def __init__(
         self,
         *,
-        payer: int = None,
-        receiver: int = None,
-        bytes: int = None,
+        payer: Optional[int] = None,
+        receiver: Optional[int] = None,
+        bytes: Optional[int] = None,
     ) -> None:
         self.payer = payer
         self.receiver = receiver
diff --git a/python/src/trezorlib/messages/EosActionCommon.py b/python/src/trezorlib/messages/EosActionCommon.py
index 90d664bfe6..2f264f41dc 100644
--- a/python/src/trezorlib/messages/EosActionCommon.py
+++ b/python/src/trezorlib/messages/EosActionCommon.py
@@ -6,7 +6,7 @@ from .EosPermissionLevel import EosPermissionLevel
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class EosActionCommon(p.MessageType):
     def __init__(
         self,
         *,
-        authorization: List[EosPermissionLevel] = None,
-        account: int = None,
-        name: int = None,
+        authorization: Optional[List[EosPermissionLevel]] = None,
+        account: Optional[int] = None,
+        name: Optional[int] = None,
     ) -> None:
         self.authorization = authorization if authorization is not None else []
         self.account = account
diff --git a/python/src/trezorlib/messages/EosActionDelegate.py b/python/src/trezorlib/messages/EosActionDelegate.py
index fc9b1e8887..95b5e75ed3 100644
--- a/python/src/trezorlib/messages/EosActionDelegate.py
+++ b/python/src/trezorlib/messages/EosActionDelegate.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,11 +17,11 @@ class EosActionDelegate(p.MessageType):
     def __init__(
         self,
         *,
-        sender: int = None,
-        receiver: int = None,
-        net_quantity: EosAsset = None,
-        cpu_quantity: EosAsset = None,
-        transfer: bool = None,
+        sender: Optional[int] = None,
+        receiver: Optional[int] = None,
+        net_quantity: Optional[EosAsset] = None,
+        cpu_quantity: Optional[EosAsset] = None,
+        transfer: Optional[bool] = None,
     ) -> None:
         self.sender = sender
         self.receiver = receiver
diff --git a/python/src/trezorlib/messages/EosActionDeleteAuth.py b/python/src/trezorlib/messages/EosActionDeleteAuth.py
index 7b5089742c..d17d37e3be 100644
--- a/python/src/trezorlib/messages/EosActionDeleteAuth.py
+++ b/python/src/trezorlib/messages/EosActionDeleteAuth.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosActionDeleteAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        permission: int = None,
+        account: Optional[int] = None,
+        permission: Optional[int] = None,
     ) -> None:
         self.account = account
         self.permission = permission
diff --git a/python/src/trezorlib/messages/EosActionLinkAuth.py b/python/src/trezorlib/messages/EosActionLinkAuth.py
index 82a0ca53c8..961dc928dd 100644
--- a/python/src/trezorlib/messages/EosActionLinkAuth.py
+++ b/python/src/trezorlib/messages/EosActionLinkAuth.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class EosActionLinkAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        code: int = None,
-        type: int = None,
-        requirement: int = None,
+        account: Optional[int] = None,
+        code: Optional[int] = None,
+        type: Optional[int] = None,
+        requirement: Optional[int] = None,
     ) -> None:
         self.account = account
         self.code = code
diff --git a/python/src/trezorlib/messages/EosActionNewAccount.py b/python/src/trezorlib/messages/EosActionNewAccount.py
index 89e432b721..54f0587966 100644
--- a/python/src/trezorlib/messages/EosActionNewAccount.py
+++ b/python/src/trezorlib/messages/EosActionNewAccount.py
@@ -6,7 +6,7 @@ from .EosAuthorization import EosAuthorization
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionNewAccount(p.MessageType):
     def __init__(
         self,
         *,
-        creator: int = None,
-        name: int = None,
-        owner: EosAuthorization = None,
-        active: EosAuthorization = None,
+        creator: Optional[int] = None,
+        name: Optional[int] = None,
+        owner: Optional[EosAuthorization] = None,
+        active: Optional[EosAuthorization] = None,
     ) -> None:
         self.creator = creator
         self.name = name
diff --git a/python/src/trezorlib/messages/EosActionRefund.py b/python/src/trezorlib/messages/EosActionRefund.py
index 95626072c3..d519a5b8c6 100644
--- a/python/src/trezorlib/messages/EosActionRefund.py
+++ b/python/src/trezorlib/messages/EosActionRefund.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,7 +15,7 @@ class EosActionRefund(p.MessageType):
     def __init__(
         self,
         *,
-        owner: int = None,
+        owner: Optional[int] = None,
     ) -> None:
         self.owner = owner
 
diff --git a/python/src/trezorlib/messages/EosActionSellRam.py b/python/src/trezorlib/messages/EosActionSellRam.py
index 8f283fb482..34610b2a15 100644
--- a/python/src/trezorlib/messages/EosActionSellRam.py
+++ b/python/src/trezorlib/messages/EosActionSellRam.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosActionSellRam(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        bytes: int = None,
+        account: Optional[int] = None,
+        bytes: Optional[int] = None,
     ) -> None:
         self.account = account
         self.bytes = bytes
diff --git a/python/src/trezorlib/messages/EosActionTransfer.py b/python/src/trezorlib/messages/EosActionTransfer.py
index e5e484a1dc..3987f681b3 100644
--- a/python/src/trezorlib/messages/EosActionTransfer.py
+++ b/python/src/trezorlib/messages/EosActionTransfer.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        sender: int = None,
-        receiver: int = None,
-        quantity: EosAsset = None,
-        memo: str = None,
+        sender: Optional[int] = None,
+        receiver: Optional[int] = None,
+        quantity: Optional[EosAsset] = None,
+        memo: Optional[str] = None,
     ) -> None:
         self.sender = sender
         self.receiver = receiver
diff --git a/python/src/trezorlib/messages/EosActionUndelegate.py b/python/src/trezorlib/messages/EosActionUndelegate.py
index 0982d83d58..c6fd25d932 100644
--- a/python/src/trezorlib/messages/EosActionUndelegate.py
+++ b/python/src/trezorlib/messages/EosActionUndelegate.py
@@ -6,7 +6,7 @@ from .EosAsset import EosAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionUndelegate(p.MessageType):
     def __init__(
         self,
         *,
-        sender: int = None,
-        receiver: int = None,
-        net_quantity: EosAsset = None,
-        cpu_quantity: EosAsset = None,
+        sender: Optional[int] = None,
+        receiver: Optional[int] = None,
+        net_quantity: Optional[EosAsset] = None,
+        cpu_quantity: Optional[EosAsset] = None,
     ) -> None:
         self.sender = sender
         self.receiver = receiver
diff --git a/python/src/trezorlib/messages/EosActionUnknown.py b/python/src/trezorlib/messages/EosActionUnknown.py
index 0cdb21125b..9d77d3177f 100644
--- a/python/src/trezorlib/messages/EosActionUnknown.py
+++ b/python/src/trezorlib/messages/EosActionUnknown.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EosActionUnknown(p.MessageType):
         self,
         *,
         data_size: int,
-        data_chunk: bytes = None,
+        data_chunk: Optional[bytes] = None,
     ) -> None:
         self.data_size = data_size
         self.data_chunk = data_chunk
diff --git a/python/src/trezorlib/messages/EosActionUnlinkAuth.py b/python/src/trezorlib/messages/EosActionUnlinkAuth.py
index 491b5d7e2e..7c3a14c24b 100644
--- a/python/src/trezorlib/messages/EosActionUnlinkAuth.py
+++ b/python/src/trezorlib/messages/EosActionUnlinkAuth.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class EosActionUnlinkAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        code: int = None,
-        type: int = None,
+        account: Optional[int] = None,
+        code: Optional[int] = None,
+        type: Optional[int] = None,
     ) -> None:
         self.account = account
         self.code = code
diff --git a/python/src/trezorlib/messages/EosActionUpdateAuth.py b/python/src/trezorlib/messages/EosActionUpdateAuth.py
index f34606851d..126f93d818 100644
--- a/python/src/trezorlib/messages/EosActionUpdateAuth.py
+++ b/python/src/trezorlib/messages/EosActionUpdateAuth.py
@@ -6,7 +6,7 @@ from .EosAuthorization import EosAuthorization
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,10 +17,10 @@ class EosActionUpdateAuth(p.MessageType):
     def __init__(
         self,
         *,
-        account: int = None,
-        permission: int = None,
-        parent: int = None,
-        auth: EosAuthorization = None,
+        account: Optional[int] = None,
+        permission: Optional[int] = None,
+        parent: Optional[int] = None,
+        auth: Optional[EosAuthorization] = None,
     ) -> None:
         self.account = account
         self.permission = permission
diff --git a/python/src/trezorlib/messages/EosActionVoteProducer.py b/python/src/trezorlib/messages/EosActionVoteProducer.py
index 81666e8360..143d0ac55c 100644
--- a/python/src/trezorlib/messages/EosActionVoteProducer.py
+++ b/python/src/trezorlib/messages/EosActionVoteProducer.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class EosActionVoteProducer(p.MessageType):
     def __init__(
         self,
         *,
-        producers: List[int] = None,
-        voter: int = None,
-        proxy: int = None,
+        producers: Optional[List[int]] = None,
+        voter: Optional[int] = None,
+        proxy: Optional[int] = None,
     ) -> None:
         self.producers = producers if producers is not None else []
         self.voter = voter
diff --git a/python/src/trezorlib/messages/EosAsset.py b/python/src/trezorlib/messages/EosAsset.py
index 159605b8a0..44354f3327 100644
--- a/python/src/trezorlib/messages/EosAsset.py
+++ b/python/src/trezorlib/messages/EosAsset.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosAsset(p.MessageType):
     def __init__(
         self,
         *,
-        amount: int = None,
-        symbol: int = None,
+        amount: Optional[int] = None,
+        symbol: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.symbol = symbol
diff --git a/python/src/trezorlib/messages/EosAuthorization.py b/python/src/trezorlib/messages/EosAuthorization.py
index 24b0e0a2a8..74442d2543 100644
--- a/python/src/trezorlib/messages/EosAuthorization.py
+++ b/python/src/trezorlib/messages/EosAuthorization.py
@@ -8,7 +8,7 @@ from .EosAuthorizationWait import EosAuthorizationWait
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,10 +19,10 @@ class EosAuthorization(p.MessageType):
     def __init__(
         self,
         *,
-        keys: List[EosAuthorizationKey] = None,
-        accounts: List[EosAuthorizationAccount] = None,
-        waits: List[EosAuthorizationWait] = None,
-        threshold: int = None,
+        keys: Optional[List[EosAuthorizationKey]] = None,
+        accounts: Optional[List[EosAuthorizationAccount]] = None,
+        waits: Optional[List[EosAuthorizationWait]] = None,
+        threshold: Optional[int] = None,
     ) -> None:
         self.keys = keys if keys is not None else []
         self.accounts = accounts if accounts is not None else []
diff --git a/python/src/trezorlib/messages/EosAuthorizationAccount.py b/python/src/trezorlib/messages/EosAuthorizationAccount.py
index f00d940051..d79ab2ff3a 100644
--- a/python/src/trezorlib/messages/EosAuthorizationAccount.py
+++ b/python/src/trezorlib/messages/EosAuthorizationAccount.py
@@ -6,7 +6,7 @@ from .EosPermissionLevel import EosPermissionLevel
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class EosAuthorizationAccount(p.MessageType):
     def __init__(
         self,
         *,
-        account: EosPermissionLevel = None,
-        weight: int = None,
+        account: Optional[EosPermissionLevel] = None,
+        weight: Optional[int] = None,
     ) -> None:
         self.account = account
         self.weight = weight
diff --git a/python/src/trezorlib/messages/EosAuthorizationKey.py b/python/src/trezorlib/messages/EosAuthorizationKey.py
index 32e7d5fad0..396d61fed6 100644
--- a/python/src/trezorlib/messages/EosAuthorizationKey.py
+++ b/python/src/trezorlib/messages/EosAuthorizationKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class EosAuthorizationKey(p.MessageType):
         *,
         type: int,
         weight: int,
-        address_n: List[int] = None,
-        key: bytes = None,
+        address_n: Optional[List[int]] = None,
+        key: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.type = type
diff --git a/python/src/trezorlib/messages/EosAuthorizationWait.py b/python/src/trezorlib/messages/EosAuthorizationWait.py
index ee9eae86e2..8bcc292805 100644
--- a/python/src/trezorlib/messages/EosAuthorizationWait.py
+++ b/python/src/trezorlib/messages/EosAuthorizationWait.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosAuthorizationWait(p.MessageType):
     def __init__(
         self,
         *,
-        wait_sec: int = None,
-        weight: int = None,
+        wait_sec: Optional[int] = None,
+        weight: Optional[int] = None,
     ) -> None:
         self.wait_sec = wait_sec
         self.weight = weight
diff --git a/python/src/trezorlib/messages/EosGetPublicKey.py b/python/src/trezorlib/messages/EosGetPublicKey.py
index d566ad3526..cd3bdd1534 100644
--- a/python/src/trezorlib/messages/EosGetPublicKey.py
+++ b/python/src/trezorlib/messages/EosGetPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EosGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/EosPermissionLevel.py b/python/src/trezorlib/messages/EosPermissionLevel.py
index 0f357a1ab2..71717af813 100644
--- a/python/src/trezorlib/messages/EosPermissionLevel.py
+++ b/python/src/trezorlib/messages/EosPermissionLevel.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class EosPermissionLevel(p.MessageType):
     def __init__(
         self,
         *,
-        actor: int = None,
-        permission: int = None,
+        actor: Optional[int] = None,
+        permission: Optional[int] = None,
     ) -> None:
         self.actor = actor
         self.permission = permission
diff --git a/python/src/trezorlib/messages/EosPublicKey.py b/python/src/trezorlib/messages/EosPublicKey.py
index 8d9640d141..bd93f22a7f 100644
--- a/python/src/trezorlib/messages/EosPublicKey.py
+++ b/python/src/trezorlib/messages/EosPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/EosSignTx.py b/python/src/trezorlib/messages/EosSignTx.py
index 80702d0921..5b064ca70a 100644
--- a/python/src/trezorlib/messages/EosSignTx.py
+++ b/python/src/trezorlib/messages/EosSignTx.py
@@ -6,7 +6,7 @@ from .EosTxHeader import EosTxHeader
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class EosSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        chain_id: bytes = None,
-        header: EosTxHeader = None,
-        num_actions: int = None,
+        address_n: Optional[List[int]] = None,
+        chain_id: Optional[bytes] = None,
+        header: Optional[EosTxHeader] = None,
+        num_actions: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.chain_id = chain_id
diff --git a/python/src/trezorlib/messages/EosSignedTx.py b/python/src/trezorlib/messages/EosSignedTx.py
index e0b87a3f95..3dc78c4d9a 100644
--- a/python/src/trezorlib/messages/EosSignedTx.py
+++ b/python/src/trezorlib/messages/EosSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/EosTxActionAck.py b/python/src/trezorlib/messages/EosTxActionAck.py
index 9f81ba357d..b023c70bd3 100644
--- a/python/src/trezorlib/messages/EosTxActionAck.py
+++ b/python/src/trezorlib/messages/EosTxActionAck.py
@@ -20,7 +20,7 @@ from .EosActionVoteProducer import EosActionVoteProducer
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -32,21 +32,21 @@ class EosTxActionAck(p.MessageType):
     def __init__(
         self,
         *,
-        common: EosActionCommon = None,
-        transfer: EosActionTransfer = None,
-        delegate: EosActionDelegate = None,
-        undelegate: EosActionUndelegate = None,
-        refund: EosActionRefund = None,
-        buy_ram: EosActionBuyRam = None,
-        buy_ram_bytes: EosActionBuyRamBytes = None,
-        sell_ram: EosActionSellRam = None,
-        vote_producer: EosActionVoteProducer = None,
-        update_auth: EosActionUpdateAuth = None,
-        delete_auth: EosActionDeleteAuth = None,
-        link_auth: EosActionLinkAuth = None,
-        unlink_auth: EosActionUnlinkAuth = None,
-        new_account: EosActionNewAccount = None,
-        unknown: EosActionUnknown = None,
+        common: Optional[EosActionCommon] = None,
+        transfer: Optional[EosActionTransfer] = None,
+        delegate: Optional[EosActionDelegate] = None,
+        undelegate: Optional[EosActionUndelegate] = None,
+        refund: Optional[EosActionRefund] = None,
+        buy_ram: Optional[EosActionBuyRam] = None,
+        buy_ram_bytes: Optional[EosActionBuyRamBytes] = None,
+        sell_ram: Optional[EosActionSellRam] = None,
+        vote_producer: Optional[EosActionVoteProducer] = None,
+        update_auth: Optional[EosActionUpdateAuth] = None,
+        delete_auth: Optional[EosActionDeleteAuth] = None,
+        link_auth: Optional[EosActionLinkAuth] = None,
+        unlink_auth: Optional[EosActionUnlinkAuth] = None,
+        new_account: Optional[EosActionNewAccount] = None,
+        unknown: Optional[EosActionUnknown] = None,
     ) -> None:
         self.common = common
         self.transfer = transfer
diff --git a/python/src/trezorlib/messages/EosTxActionRequest.py b/python/src/trezorlib/messages/EosTxActionRequest.py
index 26fb369031..ad038d2b32 100644
--- a/python/src/trezorlib/messages/EosTxActionRequest.py
+++ b/python/src/trezorlib/messages/EosTxActionRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EosTxActionRequest(p.MessageType):
     def __init__(
         self,
         *,
-        data_size: int = None,
+        data_size: Optional[int] = None,
     ) -> None:
         self.data_size = data_size
 
diff --git a/python/src/trezorlib/messages/EosTxHeader.py b/python/src/trezorlib/messages/EosTxHeader.py
index fc2f6a28be..8378353e51 100644
--- a/python/src/trezorlib/messages/EosTxHeader.py
+++ b/python/src/trezorlib/messages/EosTxHeader.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/EthereumAddress.py b/python/src/trezorlib/messages/EthereumAddress.py
index b09d2c3964..825c911937 100644
--- a/python/src/trezorlib/messages/EthereumAddress.py
+++ b/python/src/trezorlib/messages/EthereumAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EthereumAddress(p.MessageType):
     def __init__(
         self,
         *,
-        _old_address: bytes = None,
-        address: str = None,
+        _old_address: Optional[bytes] = None,
+        address: Optional[str] = None,
     ) -> None:
         self._old_address = _old_address
         self.address = address
diff --git a/python/src/trezorlib/messages/EthereumGetAddress.py b/python/src/trezorlib/messages/EthereumGetAddress.py
index c6631fb68b..e26f2b42a6 100644
--- a/python/src/trezorlib/messages/EthereumGetAddress.py
+++ b/python/src/trezorlib/messages/EthereumGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EthereumGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/EthereumGetPublicKey.py b/python/src/trezorlib/messages/EthereumGetPublicKey.py
index 34bba4382f..3622987743 100644
--- a/python/src/trezorlib/messages/EthereumGetPublicKey.py
+++ b/python/src/trezorlib/messages/EthereumGetPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EthereumGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/EthereumMessageSignature.py b/python/src/trezorlib/messages/EthereumMessageSignature.py
index 1c074f5cef..418f6daefe 100644
--- a/python/src/trezorlib/messages/EthereumMessageSignature.py
+++ b/python/src/trezorlib/messages/EthereumMessageSignature.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/EthereumPublicKey.py b/python/src/trezorlib/messages/EthereumPublicKey.py
index c6078d3a31..30ed25e376 100644
--- a/python/src/trezorlib/messages/EthereumPublicKey.py
+++ b/python/src/trezorlib/messages/EthereumPublicKey.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/EthereumSignMessage.py b/python/src/trezorlib/messages/EthereumSignMessage.py
index e32a82813e..8ac1dd95ed 100644
--- a/python/src/trezorlib/messages/EthereumSignMessage.py
+++ b/python/src/trezorlib/messages/EthereumSignMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class EthereumSignMessage(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        message: bytes = None,
+        address_n: Optional[List[int]] = None,
+        message: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.message = message
diff --git a/python/src/trezorlib/messages/EthereumSignTx.py b/python/src/trezorlib/messages/EthereumSignTx.py
index d8c16f4a87..41f1397761 100644
--- a/python/src/trezorlib/messages/EthereumSignTx.py
+++ b/python/src/trezorlib/messages/EthereumSignTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,16 +16,16 @@ class EthereumSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        nonce: bytes = None,
-        gas_price: bytes = None,
-        gas_limit: bytes = None,
-        to: str = None,
-        value: bytes = None,
-        data_initial_chunk: bytes = None,
-        data_length: int = None,
-        chain_id: int = None,
-        tx_type: int = None,
+        address_n: Optional[List[int]] = None,
+        nonce: Optional[bytes] = None,
+        gas_price: Optional[bytes] = None,
+        gas_limit: Optional[bytes] = None,
+        to: Optional[str] = None,
+        value: Optional[bytes] = None,
+        data_initial_chunk: Optional[bytes] = None,
+        data_length: Optional[int] = None,
+        chain_id: Optional[int] = None,
+        tx_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.nonce = nonce
diff --git a/python/src/trezorlib/messages/EthereumTxAck.py b/python/src/trezorlib/messages/EthereumTxAck.py
index fc7bbbb4b5..5424df411d 100644
--- a/python/src/trezorlib/messages/EthereumTxAck.py
+++ b/python/src/trezorlib/messages/EthereumTxAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class EthereumTxAck(p.MessageType):
     def __init__(
         self,
         *,
-        data_chunk: bytes = None,
+        data_chunk: Optional[bytes] = None,
     ) -> None:
         self.data_chunk = data_chunk
 
diff --git a/python/src/trezorlib/messages/EthereumTxRequest.py b/python/src/trezorlib/messages/EthereumTxRequest.py
index 56710a0198..0f4922d095 100644
--- a/python/src/trezorlib/messages/EthereumTxRequest.py
+++ b/python/src/trezorlib/messages/EthereumTxRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,10 +16,10 @@ class EthereumTxRequest(p.MessageType):
     def __init__(
         self,
         *,
-        data_length: int = None,
-        signature_v: int = None,
-        signature_r: bytes = None,
-        signature_s: bytes = None,
+        data_length: Optional[int] = None,
+        signature_v: Optional[int] = None,
+        signature_r: Optional[bytes] = None,
+        signature_s: Optional[bytes] = None,
     ) -> None:
         self.data_length = data_length
         self.signature_v = signature_v
diff --git a/python/src/trezorlib/messages/EthereumVerifyMessage.py b/python/src/trezorlib/messages/EthereumVerifyMessage.py
index f3b2f0746e..3ac8fdbe91 100644
--- a/python/src/trezorlib/messages/EthereumVerifyMessage.py
+++ b/python/src/trezorlib/messages/EthereumVerifyMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class EthereumVerifyMessage(p.MessageType):
     def __init__(
         self,
         *,
-        signature: bytes = None,
-        message: bytes = None,
-        address: str = None,
+        signature: Optional[bytes] = None,
+        message: Optional[bytes] = None,
+        address: Optional[str] = None,
     ) -> None:
         self.signature = signature
         self.message = message
diff --git a/python/src/trezorlib/messages/Failure.py b/python/src/trezorlib/messages/Failure.py
index d26cc3cb1e..7a4e3c49e4 100644
--- a/python/src/trezorlib/messages/Failure.py
+++ b/python/src/trezorlib/messages/Failure.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeFailureType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 99]
     except ImportError:
@@ -17,8 +17,8 @@ class Failure(p.MessageType):
     def __init__(
         self,
         *,
-        code: EnumTypeFailureType = None,
-        message: str = None,
+        code: Optional[EnumTypeFailureType] = None,
+        message: Optional[str] = None,
     ) -> None:
         self.code = code
         self.message = message
diff --git a/python/src/trezorlib/messages/Features.py b/python/src/trezorlib/messages/Features.py
index cbb9e6cf34..5356e3a14f 100644
--- a/python/src/trezorlib/messages/Features.py
+++ b/python/src/trezorlib/messages/Features.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeCapability = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
         EnumTypeBackupType = Literal[0, 1, 2]
@@ -22,41 +22,41 @@ class Features(p.MessageType):
         major_version: int,
         minor_version: int,
         patch_version: int,
-        capabilities: List[EnumTypeCapability] = None,
-        vendor: str = None,
-        bootloader_mode: bool = None,
-        device_id: str = None,
-        pin_protection: bool = None,
-        passphrase_protection: bool = None,
-        language: str = None,
-        label: str = None,
-        initialized: bool = None,
-        revision: bytes = None,
-        bootloader_hash: bytes = None,
-        imported: bool = None,
-        unlocked: bool = None,
-        firmware_present: bool = None,
-        needs_backup: bool = None,
-        flags: int = None,
-        model: str = None,
-        fw_major: int = None,
-        fw_minor: int = None,
-        fw_patch: int = None,
-        fw_vendor: str = None,
-        fw_vendor_keys: bytes = None,
-        unfinished_backup: bool = None,
-        no_backup: bool = None,
-        recovery_mode: bool = None,
-        backup_type: EnumTypeBackupType = None,
-        sd_card_present: bool = None,
-        sd_protection: bool = None,
-        wipe_code_protection: bool = None,
-        session_id: bytes = None,
-        passphrase_always_on_device: bool = None,
-        safety_checks: EnumTypeSafetyCheckLevel = None,
-        auto_lock_delay_ms: int = None,
-        display_rotation: int = None,
-        experimental_features: bool = None,
+        capabilities: Optional[List[EnumTypeCapability]] = None,
+        vendor: Optional[str] = None,
+        bootloader_mode: Optional[bool] = None,
+        device_id: Optional[str] = None,
+        pin_protection: Optional[bool] = None,
+        passphrase_protection: Optional[bool] = None,
+        language: Optional[str] = None,
+        label: Optional[str] = None,
+        initialized: Optional[bool] = None,
+        revision: Optional[bytes] = None,
+        bootloader_hash: Optional[bytes] = None,
+        imported: Optional[bool] = None,
+        unlocked: Optional[bool] = None,
+        firmware_present: Optional[bool] = None,
+        needs_backup: Optional[bool] = None,
+        flags: Optional[int] = None,
+        model: Optional[str] = None,
+        fw_major: Optional[int] = None,
+        fw_minor: Optional[int] = None,
+        fw_patch: Optional[int] = None,
+        fw_vendor: Optional[str] = None,
+        fw_vendor_keys: Optional[bytes] = None,
+        unfinished_backup: Optional[bool] = None,
+        no_backup: Optional[bool] = None,
+        recovery_mode: Optional[bool] = None,
+        backup_type: Optional[EnumTypeBackupType] = None,
+        sd_card_present: Optional[bool] = None,
+        sd_protection: Optional[bool] = None,
+        wipe_code_protection: Optional[bool] = None,
+        session_id: Optional[bytes] = None,
+        passphrase_always_on_device: Optional[bool] = None,
+        safety_checks: Optional[EnumTypeSafetyCheckLevel] = None,
+        auto_lock_delay_ms: Optional[int] = None,
+        display_rotation: Optional[int] = None,
+        experimental_features: Optional[bool] = None,
     ) -> None:
         self.capabilities = capabilities if capabilities is not None else []
         self.major_version = major_version
diff --git a/python/src/trezorlib/messages/FirmwareErase.py b/python/src/trezorlib/messages/FirmwareErase.py
index f5a4e8d33c..21a577833e 100644
--- a/python/src/trezorlib/messages/FirmwareErase.py
+++ b/python/src/trezorlib/messages/FirmwareErase.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class FirmwareErase(p.MessageType):
     def __init__(
         self,
         *,
-        length: int = None,
+        length: Optional[int] = None,
     ) -> None:
         self.length = length
 
diff --git a/python/src/trezorlib/messages/FirmwareRequest.py b/python/src/trezorlib/messages/FirmwareRequest.py
index 649019333c..65a52d5c96 100644
--- a/python/src/trezorlib/messages/FirmwareRequest.py
+++ b/python/src/trezorlib/messages/FirmwareRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class FirmwareRequest(p.MessageType):
     def __init__(
         self,
         *,
-        offset: int = None,
-        length: int = None,
+        offset: Optional[int] = None,
+        length: Optional[int] = None,
     ) -> None:
         self.offset = offset
         self.length = length
diff --git a/python/src/trezorlib/messages/FirmwareUpload.py b/python/src/trezorlib/messages/FirmwareUpload.py
index 34a406e36b..b8ea32bb7b 100644
--- a/python/src/trezorlib/messages/FirmwareUpload.py
+++ b/python/src/trezorlib/messages/FirmwareUpload.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class FirmwareUpload(p.MessageType):
         self,
         *,
         payload: bytes,
-        hash: bytes = None,
+        hash: Optional[bytes] = None,
     ) -> None:
         self.payload = payload
         self.hash = hash
diff --git a/python/src/trezorlib/messages/GetAddress.py b/python/src/trezorlib/messages/GetAddress.py
index 03d6cc531b..8bc798a5b9 100644
--- a/python/src/trezorlib/messages/GetAddress.py
+++ b/python/src/trezorlib/messages/GetAddress.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -19,12 +19,12 @@ class GetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
         coin_name: str = "Bitcoin",
-        show_display: bool = None,
-        multisig: MultisigRedeemScriptType = None,
+        show_display: Optional[bool] = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
         script_type: EnumTypeInputScriptType = 0,
-        ignore_xpub_magic: bool = None,
+        ignore_xpub_magic: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.coin_name = coin_name
diff --git a/python/src/trezorlib/messages/GetECDHSessionKey.py b/python/src/trezorlib/messages/GetECDHSessionKey.py
index 269376ee7d..02cbe75959 100644
--- a/python/src/trezorlib/messages/GetECDHSessionKey.py
+++ b/python/src/trezorlib/messages/GetECDHSessionKey.py
@@ -6,7 +6,7 @@ from .IdentityType import IdentityType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,7 +20,7 @@ class GetECDHSessionKey(p.MessageType):
         *,
         identity: IdentityType,
         peer_public_key: bytes,
-        ecdsa_curve_name: str = None,
+        ecdsa_curve_name: Optional[str] = None,
     ) -> None:
         self.identity = identity
         self.peer_public_key = peer_public_key
diff --git a/python/src/trezorlib/messages/GetEntropy.py b/python/src/trezorlib/messages/GetEntropy.py
index bc0628fe5c..2e89f6fe50 100644
--- a/python/src/trezorlib/messages/GetEntropy.py
+++ b/python/src/trezorlib/messages/GetEntropy.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/GetFeatures.py b/python/src/trezorlib/messages/GetFeatures.py
index 5b6a9dc067..d59dddb2ef 100644
--- a/python/src/trezorlib/messages/GetFeatures.py
+++ b/python/src/trezorlib/messages/GetFeatures.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/GetNextU2FCounter.py b/python/src/trezorlib/messages/GetNextU2FCounter.py
index 463fd60131..5d23264720 100644
--- a/python/src/trezorlib/messages/GetNextU2FCounter.py
+++ b/python/src/trezorlib/messages/GetNextU2FCounter.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/GetOwnershipId.py b/python/src/trezorlib/messages/GetOwnershipId.py
index 548ad5ad9c..f78e0bf964 100644
--- a/python/src/trezorlib/messages/GetOwnershipId.py
+++ b/python/src/trezorlib/messages/GetOwnershipId.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -19,9 +19,9 @@ class GetOwnershipId(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
         coin_name: str = "Bitcoin",
-        multisig: MultisigRedeemScriptType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
         script_type: EnumTypeInputScriptType = 0,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
diff --git a/python/src/trezorlib/messages/GetOwnershipProof.py b/python/src/trezorlib/messages/GetOwnershipProof.py
index 579373ac02..5a158cd18c 100644
--- a/python/src/trezorlib/messages/GetOwnershipProof.py
+++ b/python/src/trezorlib/messages/GetOwnershipProof.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -19,11 +19,11 @@ class GetOwnershipProof(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        ownership_ids: List[bytes] = None,
+        address_n: Optional[List[int]] = None,
+        ownership_ids: Optional[List[bytes]] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 3,
-        multisig: MultisigRedeemScriptType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
         user_confirmation: bool = False,
         commitment_data: bytes = b"",
     ) -> None:
diff --git a/python/src/trezorlib/messages/GetPublicKey.py b/python/src/trezorlib/messages/GetPublicKey.py
index 0c358237d8..c330440ccb 100644
--- a/python/src/trezorlib/messages/GetPublicKey.py
+++ b/python/src/trezorlib/messages/GetPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -17,12 +17,12 @@ class GetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        ecdsa_curve_name: str = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        ecdsa_curve_name: Optional[str] = None,
+        show_display: Optional[bool] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 0,
-        ignore_xpub_magic: bool = None,
+        ignore_xpub_magic: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.ecdsa_curve_name = ecdsa_curve_name
diff --git a/python/src/trezorlib/messages/HDNodePathType.py b/python/src/trezorlib/messages/HDNodePathType.py
index d0a6585a73..b4a71c6c52 100644
--- a/python/src/trezorlib/messages/HDNodePathType.py
+++ b/python/src/trezorlib/messages/HDNodePathType.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class HDNodePathType(p.MessageType):
         self,
         *,
         node: HDNodeType,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.node = node
diff --git a/python/src/trezorlib/messages/HDNodeType.py b/python/src/trezorlib/messages/HDNodeType.py
index 1a0c01f4b4..2489adb6f4 100644
--- a/python/src/trezorlib/messages/HDNodeType.py
+++ b/python/src/trezorlib/messages/HDNodeType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,7 +20,7 @@ class HDNodeType(p.MessageType):
         child_num: int,
         chain_code: bytes,
         public_key: bytes,
-        private_key: bytes = None,
+        private_key: Optional[bytes] = None,
     ) -> None:
         self.depth = depth
         self.fingerprint = fingerprint
diff --git a/python/src/trezorlib/messages/IdentityType.py b/python/src/trezorlib/messages/IdentityType.py
index 6ec7190c6d..6e1e66ec37 100644
--- a/python/src/trezorlib/messages/IdentityType.py
+++ b/python/src/trezorlib/messages/IdentityType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,11 +15,11 @@ class IdentityType(p.MessageType):
     def __init__(
         self,
         *,
-        proto: str = None,
-        user: str = None,
-        host: str = None,
-        port: str = None,
-        path: str = None,
+        proto: Optional[str] = None,
+        user: Optional[str] = None,
+        host: Optional[str] = None,
+        port: Optional[str] = None,
+        path: Optional[str] = None,
         index: int = 0,
     ) -> None:
         self.proto = proto
diff --git a/python/src/trezorlib/messages/Initialize.py b/python/src/trezorlib/messages/Initialize.py
index 7eb56aeb89..d36116b6ab 100644
--- a/python/src/trezorlib/messages/Initialize.py
+++ b/python/src/trezorlib/messages/Initialize.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class Initialize(p.MessageType):
     def __init__(
         self,
         *,
-        session_id: bytes = None,
+        session_id: Optional[bytes] = None,
     ) -> None:
         self.session_id = session_id
 
diff --git a/python/src/trezorlib/messages/LiskAddress.py b/python/src/trezorlib/messages/LiskAddress.py
index f66f62d8be..0342287e78 100644
--- a/python/src/trezorlib/messages/LiskAddress.py
+++ b/python/src/trezorlib/messages/LiskAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/LiskDelegateType.py b/python/src/trezorlib/messages/LiskDelegateType.py
index 804843fb6d..896c22edab 100644
--- a/python/src/trezorlib/messages/LiskDelegateType.py
+++ b/python/src/trezorlib/messages/LiskDelegateType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,7 +15,7 @@ class LiskDelegateType(p.MessageType):
     def __init__(
         self,
         *,
-        username: str = None,
+        username: Optional[str] = None,
     ) -> None:
         self.username = username
 
diff --git a/python/src/trezorlib/messages/LiskGetAddress.py b/python/src/trezorlib/messages/LiskGetAddress.py
index 8ba0e4a12d..fc1ae877ef 100644
--- a/python/src/trezorlib/messages/LiskGetAddress.py
+++ b/python/src/trezorlib/messages/LiskGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class LiskGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/LiskGetPublicKey.py b/python/src/trezorlib/messages/LiskGetPublicKey.py
index a9905f38eb..3fedca4946 100644
--- a/python/src/trezorlib/messages/LiskGetPublicKey.py
+++ b/python/src/trezorlib/messages/LiskGetPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class LiskGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/LiskMessageSignature.py b/python/src/trezorlib/messages/LiskMessageSignature.py
index e35fd2e911..7eb828323f 100644
--- a/python/src/trezorlib/messages/LiskMessageSignature.py
+++ b/python/src/trezorlib/messages/LiskMessageSignature.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/LiskMultisignatureType.py b/python/src/trezorlib/messages/LiskMultisignatureType.py
index 228a3c423c..48061f58bf 100644
--- a/python/src/trezorlib/messages/LiskMultisignatureType.py
+++ b/python/src/trezorlib/messages/LiskMultisignatureType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class LiskMultisignatureType(p.MessageType):
     def __init__(
         self,
         *,
-        keys_group: List[str] = None,
-        min: int = None,
-        life_time: int = None,
+        keys_group: Optional[List[str]] = None,
+        min: Optional[int] = None,
+        life_time: Optional[int] = None,
     ) -> None:
         self.keys_group = keys_group if keys_group is not None else []
         self.min = min
diff --git a/python/src/trezorlib/messages/LiskPublicKey.py b/python/src/trezorlib/messages/LiskPublicKey.py
index 14ec3dc460..2302ec9ef5 100644
--- a/python/src/trezorlib/messages/LiskPublicKey.py
+++ b/python/src/trezorlib/messages/LiskPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/LiskSignMessage.py b/python/src/trezorlib/messages/LiskSignMessage.py
index 3b7545249f..11ed32e403 100644
--- a/python/src/trezorlib/messages/LiskSignMessage.py
+++ b/python/src/trezorlib/messages/LiskSignMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class LiskSignMessage(p.MessageType):
         self,
         *,
         message: bytes,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.message = message
diff --git a/python/src/trezorlib/messages/LiskSignTx.py b/python/src/trezorlib/messages/LiskSignTx.py
index a90d247fcb..2e874e172a 100644
--- a/python/src/trezorlib/messages/LiskSignTx.py
+++ b/python/src/trezorlib/messages/LiskSignTx.py
@@ -6,7 +6,7 @@ from .LiskTransactionCommon import LiskTransactionCommon
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,7 +19,7 @@ class LiskSignTx(p.MessageType):
         self,
         *,
         transaction: LiskTransactionCommon,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.transaction = transaction
diff --git a/python/src/trezorlib/messages/LiskSignatureType.py b/python/src/trezorlib/messages/LiskSignatureType.py
index 65a99eeaf3..56eaff9150 100644
--- a/python/src/trezorlib/messages/LiskSignatureType.py
+++ b/python/src/trezorlib/messages/LiskSignatureType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,7 +15,7 @@ class LiskSignatureType(p.MessageType):
     def __init__(
         self,
         *,
-        public_key: bytes = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.public_key = public_key
 
diff --git a/python/src/trezorlib/messages/LiskSignedTx.py b/python/src/trezorlib/messages/LiskSignedTx.py
index 9ffb664edf..49e3f23ecb 100644
--- a/python/src/trezorlib/messages/LiskSignedTx.py
+++ b/python/src/trezorlib/messages/LiskSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/LiskTransactionAsset.py b/python/src/trezorlib/messages/LiskTransactionAsset.py
index b98fc7ffd1..dc1e4c95a9 100644
--- a/python/src/trezorlib/messages/LiskTransactionAsset.py
+++ b/python/src/trezorlib/messages/LiskTransactionAsset.py
@@ -8,7 +8,7 @@ from .LiskSignatureType import LiskSignatureType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,11 +19,11 @@ class LiskTransactionAsset(p.MessageType):
     def __init__(
         self,
         *,
-        votes: List[str] = None,
-        signature: LiskSignatureType = None,
-        delegate: LiskDelegateType = None,
-        multisignature: LiskMultisignatureType = None,
-        data: str = None,
+        votes: Optional[List[str]] = None,
+        signature: Optional[LiskSignatureType] = None,
+        delegate: Optional[LiskDelegateType] = None,
+        multisignature: Optional[LiskMultisignatureType] = None,
+        data: Optional[str] = None,
     ) -> None:
         self.votes = votes if votes is not None else []
         self.signature = signature
diff --git a/python/src/trezorlib/messages/LiskTransactionCommon.py b/python/src/trezorlib/messages/LiskTransactionCommon.py
index 5b86420f20..cfd927a79b 100644
--- a/python/src/trezorlib/messages/LiskTransactionCommon.py
+++ b/python/src/trezorlib/messages/LiskTransactionCommon.py
@@ -6,7 +6,7 @@ from .LiskTransactionAsset import LiskTransactionAsset
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeLiskTransactionType = Literal[0, 1, 2, 3, 4, 5, 6, 7]
     except ImportError:
@@ -18,15 +18,15 @@ class LiskTransactionCommon(p.MessageType):
     def __init__(
         self,
         *,
-        type: EnumTypeLiskTransactionType = None,
-        amount: int = None,
-        fee: int = None,
-        recipient_id: str = None,
-        sender_public_key: bytes = None,
-        requester_public_key: bytes = None,
-        signature: bytes = None,
-        timestamp: int = None,
-        asset: LiskTransactionAsset = None,
+        type: Optional[EnumTypeLiskTransactionType] = None,
+        amount: Optional[int] = None,
+        fee: Optional[int] = None,
+        recipient_id: Optional[str] = None,
+        sender_public_key: Optional[bytes] = None,
+        requester_public_key: Optional[bytes] = None,
+        signature: Optional[bytes] = None,
+        timestamp: Optional[int] = None,
+        asset: Optional[LiskTransactionAsset] = None,
     ) -> None:
         self.type = type
         self.amount = amount
diff --git a/python/src/trezorlib/messages/LiskVerifyMessage.py b/python/src/trezorlib/messages/LiskVerifyMessage.py
index f65ac768c0..7605515168 100644
--- a/python/src/trezorlib/messages/LiskVerifyMessage.py
+++ b/python/src/trezorlib/messages/LiskVerifyMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/LoadDevice.py b/python/src/trezorlib/messages/LoadDevice.py
index 748848e985..58c5e9b161 100644
--- a/python/src/trezorlib/messages/LoadDevice.py
+++ b/python/src/trezorlib/messages/LoadDevice.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,15 +16,15 @@ class LoadDevice(p.MessageType):
     def __init__(
         self,
         *,
-        mnemonics: List[str] = None,
-        pin: str = None,
-        passphrase_protection: bool = None,
+        mnemonics: Optional[List[str]] = None,
+        pin: Optional[str] = None,
+        passphrase_protection: Optional[bool] = None,
         language: str = "en-US",
-        label: str = None,
-        skip_checksum: bool = None,
-        u2f_counter: int = None,
-        needs_backup: bool = None,
-        no_backup: bool = None,
+        label: Optional[str] = None,
+        skip_checksum: Optional[bool] = None,
+        u2f_counter: Optional[int] = None,
+        needs_backup: Optional[bool] = None,
+        no_backup: Optional[bool] = None,
     ) -> None:
         self.mnemonics = mnemonics if mnemonics is not None else []
         self.pin = pin
diff --git a/python/src/trezorlib/messages/LockDevice.py b/python/src/trezorlib/messages/LockDevice.py
index cc12262232..affebb9102 100644
--- a/python/src/trezorlib/messages/LockDevice.py
+++ b/python/src/trezorlib/messages/LockDevice.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MessageSignature.py b/python/src/trezorlib/messages/MessageSignature.py
index e72088ee06..e07bc2fc5c 100644
--- a/python/src/trezorlib/messages/MessageSignature.py
+++ b/python/src/trezorlib/messages/MessageSignature.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroAccountPublicAddress.py b/python/src/trezorlib/messages/MoneroAccountPublicAddress.py
index 88b6dcb8fc..a041110ab5 100644
--- a/python/src/trezorlib/messages/MoneroAccountPublicAddress.py
+++ b/python/src/trezorlib/messages/MoneroAccountPublicAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroAccountPublicAddress(p.MessageType):
     def __init__(
         self,
         *,
-        spend_public_key: bytes = None,
-        view_public_key: bytes = None,
+        spend_public_key: Optional[bytes] = None,
+        view_public_key: Optional[bytes] = None,
     ) -> None:
         self.spend_public_key = spend_public_key
         self.view_public_key = view_public_key
diff --git a/python/src/trezorlib/messages/MoneroAddress.py b/python/src/trezorlib/messages/MoneroAddress.py
index cbfea93857..9a58022666 100644
--- a/python/src/trezorlib/messages/MoneroAddress.py
+++ b/python/src/trezorlib/messages/MoneroAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class MoneroAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address: bytes = None,
+        address: Optional[bytes] = None,
     ) -> None:
         self.address = address
 
diff --git a/python/src/trezorlib/messages/MoneroExportedKeyImage.py b/python/src/trezorlib/messages/MoneroExportedKeyImage.py
index 15df409daa..9c916c474c 100644
--- a/python/src/trezorlib/messages/MoneroExportedKeyImage.py
+++ b/python/src/trezorlib/messages/MoneroExportedKeyImage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroExportedKeyImage(p.MessageType):
     def __init__(
         self,
         *,
-        iv: bytes = None,
-        blob: bytes = None,
+        iv: Optional[bytes] = None,
+        blob: Optional[bytes] = None,
     ) -> None:
         self.iv = iv
         self.blob = blob
diff --git a/python/src/trezorlib/messages/MoneroGetAddress.py b/python/src/trezorlib/messages/MoneroGetAddress.py
index a622cd63b1..924fb1bfdf 100644
--- a/python/src/trezorlib/messages/MoneroGetAddress.py
+++ b/python/src/trezorlib/messages/MoneroGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class MoneroGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
-        network_type: int = None,
-        account: int = None,
-        minor: int = None,
-        payment_id: bytes = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
+        network_type: Optional[int] = None,
+        account: Optional[int] = None,
+        minor: Optional[int] = None,
+        payment_id: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/MoneroGetTxKeyAck.py b/python/src/trezorlib/messages/MoneroGetTxKeyAck.py
index d6913c5055..3adcaa0cdf 100644
--- a/python/src/trezorlib/messages/MoneroGetTxKeyAck.py
+++ b/python/src/trezorlib/messages/MoneroGetTxKeyAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class MoneroGetTxKeyAck(p.MessageType):
     def __init__(
         self,
         *,
-        salt: bytes = None,
-        tx_keys: bytes = None,
-        tx_derivations: bytes = None,
+        salt: Optional[bytes] = None,
+        tx_keys: Optional[bytes] = None,
+        tx_derivations: Optional[bytes] = None,
     ) -> None:
         self.salt = salt
         self.tx_keys = tx_keys
diff --git a/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py b/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py
index 089a177066..961a205a9d 100644
--- a/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py
+++ b/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,14 +16,14 @@ class MoneroGetTxKeyRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_type: int = None,
-        salt1: bytes = None,
-        salt2: bytes = None,
-        tx_enc_keys: bytes = None,
-        tx_prefix_hash: bytes = None,
-        reason: int = None,
-        view_public_key: bytes = None,
+        address_n: Optional[List[int]] = None,
+        network_type: Optional[int] = None,
+        salt1: Optional[bytes] = None,
+        salt2: Optional[bytes] = None,
+        tx_enc_keys: Optional[bytes] = None,
+        tx_prefix_hash: Optional[bytes] = None,
+        reason: Optional[int] = None,
+        view_public_key: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_type = network_type
diff --git a/python/src/trezorlib/messages/MoneroGetWatchKey.py b/python/src/trezorlib/messages/MoneroGetWatchKey.py
index 3d2ca972ae..e217ba6ccb 100644
--- a/python/src/trezorlib/messages/MoneroGetWatchKey.py
+++ b/python/src/trezorlib/messages/MoneroGetWatchKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroGetWatchKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_type: int = None,
+        address_n: Optional[List[int]] = None,
+        network_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_type = network_type
diff --git a/python/src/trezorlib/messages/MoneroKeyImageExportInitAck.py b/python/src/trezorlib/messages/MoneroKeyImageExportInitAck.py
index 1e08d8a162..7a61a22a2b 100644
--- a/python/src/trezorlib/messages/MoneroKeyImageExportInitAck.py
+++ b/python/src/trezorlib/messages/MoneroKeyImageExportInitAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py b/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py
index 6d8a21a864..4231b31704 100644
--- a/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py
+++ b/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py
@@ -6,7 +6,7 @@ from .MoneroSubAddressIndicesList import MoneroSubAddressIndicesList
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,11 +18,11 @@ class MoneroKeyImageExportInitRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        subs: List[MoneroSubAddressIndicesList] = None,
-        num: int = None,
-        hash: bytes = None,
-        network_type: int = None,
+        address_n: Optional[List[int]] = None,
+        subs: Optional[List[MoneroSubAddressIndicesList]] = None,
+        num: Optional[int] = None,
+        hash: Optional[bytes] = None,
+        network_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.subs = subs if subs is not None else []
diff --git a/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py
index 99b962597d..16e602d922 100644
--- a/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py
+++ b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class MoneroKeyImageSyncFinalAck(p.MessageType):
     def __init__(
         self,
         *,
-        enc_key: bytes = None,
+        enc_key: Optional[bytes] = None,
     ) -> None:
         self.enc_key = enc_key
 
diff --git a/python/src/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py
index d3b770f53a..90443fa8cf 100644
--- a/python/src/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py
+++ b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py b/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py
index 2bea8b23a2..040c835ca1 100644
--- a/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py
+++ b/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py
@@ -6,7 +6,7 @@ from .MoneroExportedKeyImage import MoneroExportedKeyImage
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroKeyImageSyncStepAck(p.MessageType):
     def __init__(
         self,
         *,
-        kis: List[MoneroExportedKeyImage] = None,
+        kis: Optional[List[MoneroExportedKeyImage]] = None,
     ) -> None:
         self.kis = kis if kis is not None else []
 
diff --git a/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py b/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py
index 18e370c359..31c277f581 100644
--- a/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py
+++ b/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransferDetails import MoneroTransferDetails
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroKeyImageSyncStepRequest(p.MessageType):
     def __init__(
         self,
         *,
-        tdis: List[MoneroTransferDetails] = None,
+        tdis: Optional[List[MoneroTransferDetails]] = None,
     ) -> None:
         self.tdis = tdis if tdis is not None else []
 
diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshFinalAck.py b/python/src/trezorlib/messages/MoneroLiveRefreshFinalAck.py
index dc4fdfd3f7..8c5fdce684 100644
--- a/python/src/trezorlib/messages/MoneroLiveRefreshFinalAck.py
+++ b/python/src/trezorlib/messages/MoneroLiveRefreshFinalAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshFinalRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshFinalRequest.py
index 14af01e7ac..6140b4913d 100644
--- a/python/src/trezorlib/messages/MoneroLiveRefreshFinalRequest.py
+++ b/python/src/trezorlib/messages/MoneroLiveRefreshFinalRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshStartAck.py b/python/src/trezorlib/messages/MoneroLiveRefreshStartAck.py
index 9784b79d0b..4e0d2f47d7 100644
--- a/python/src/trezorlib/messages/MoneroLiveRefreshStartAck.py
+++ b/python/src/trezorlib/messages/MoneroLiveRefreshStartAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py
index f7c0082343..63980a0f9c 100644
--- a/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py
+++ b/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroLiveRefreshStartRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_type: int = None,
+        address_n: Optional[List[int]] = None,
+        network_type: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_type = network_type
diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py b/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py
index d0c3a8735b..c007d3bd11 100644
--- a/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py
+++ b/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroLiveRefreshStepAck(p.MessageType):
     def __init__(
         self,
         *,
-        salt: bytes = None,
-        key_image: bytes = None,
+        salt: Optional[bytes] = None,
+        key_image: Optional[bytes] = None,
     ) -> None:
         self.salt = salt
         self.key_image = key_image
diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py
index 870c8ee603..dc9e75a131 100644
--- a/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py
+++ b/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,11 +16,11 @@ class MoneroLiveRefreshStepRequest(p.MessageType):
     def __init__(
         self,
         *,
-        out_key: bytes = None,
-        recv_deriv: bytes = None,
-        real_out_idx: int = None,
-        sub_addr_major: int = None,
-        sub_addr_minor: int = None,
+        out_key: Optional[bytes] = None,
+        recv_deriv: Optional[bytes] = None,
+        real_out_idx: Optional[int] = None,
+        sub_addr_major: Optional[int] = None,
+        sub_addr_minor: Optional[int] = None,
     ) -> None:
         self.out_key = out_key
         self.recv_deriv = recv_deriv
diff --git a/python/src/trezorlib/messages/MoneroMultisigKLRki.py b/python/src/trezorlib/messages/MoneroMultisigKLRki.py
index f8e78b0a75..54a65bafd2 100644
--- a/python/src/trezorlib/messages/MoneroMultisigKLRki.py
+++ b/python/src/trezorlib/messages/MoneroMultisigKLRki.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class MoneroMultisigKLRki(p.MessageType):
     def __init__(
         self,
         *,
-        K: bytes = None,
-        L: bytes = None,
-        R: bytes = None,
-        ki: bytes = None,
+        K: Optional[bytes] = None,
+        L: Optional[bytes] = None,
+        R: Optional[bytes] = None,
+        ki: Optional[bytes] = None,
     ) -> None:
         self.K = K
         self.L = L
diff --git a/python/src/trezorlib/messages/MoneroOutputEntry.py b/python/src/trezorlib/messages/MoneroOutputEntry.py
index 915059f388..fa13a4ce1c 100644
--- a/python/src/trezorlib/messages/MoneroOutputEntry.py
+++ b/python/src/trezorlib/messages/MoneroOutputEntry.py
@@ -6,7 +6,7 @@ from .MoneroRctKeyPublic import MoneroRctKeyPublic
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class MoneroOutputEntry(p.MessageType):
     def __init__(
         self,
         *,
-        idx: int = None,
-        key: MoneroRctKeyPublic = None,
+        idx: Optional[int] = None,
+        key: Optional[MoneroRctKeyPublic] = None,
     ) -> None:
         self.idx = idx
         self.key = key
diff --git a/python/src/trezorlib/messages/MoneroRctKeyPublic.py b/python/src/trezorlib/messages/MoneroRctKeyPublic.py
index 580e90e20b..d5cbde8ff8 100644
--- a/python/src/trezorlib/messages/MoneroRctKeyPublic.py
+++ b/python/src/trezorlib/messages/MoneroRctKeyPublic.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroRctKeyPublic(p.MessageType):
     def __init__(
         self,
         *,
-        dest: bytes = None,
-        commitment: bytes = None,
+        dest: Optional[bytes] = None,
+        commitment: Optional[bytes] = None,
     ) -> None:
         self.dest = dest
         self.commitment = commitment
diff --git a/python/src/trezorlib/messages/MoneroRingCtSig.py b/python/src/trezorlib/messages/MoneroRingCtSig.py
index b7fe2fb383..500f5c6618 100644
--- a/python/src/trezorlib/messages/MoneroRingCtSig.py
+++ b/python/src/trezorlib/messages/MoneroRingCtSig.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class MoneroRingCtSig(p.MessageType):
     def __init__(
         self,
         *,
-        txn_fee: int = None,
-        message: bytes = None,
-        rv_type: int = None,
+        txn_fee: Optional[int] = None,
+        message: Optional[bytes] = None,
+        rv_type: Optional[int] = None,
     ) -> None:
         self.txn_fee = txn_fee
         self.message = message
diff --git a/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py b/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py
index a1398040d3..b33b9fe868 100644
--- a/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py
+++ b/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,8 +15,8 @@ class MoneroSubAddressIndicesList(p.MessageType):
     def __init__(
         self,
         *,
-        minor_indices: List[int] = None,
-        account: int = None,
+        minor_indices: Optional[List[int]] = None,
+        account: Optional[int] = None,
     ) -> None:
         self.minor_indices = minor_indices if minor_indices is not None else []
         self.account = account
diff --git a/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py
index 6eb4b44592..7c44f42571 100644
--- a/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroTransactionAllInputsSetAck(p.MessageType):
     def __init__(
         self,
         *,
-        rsig_data: MoneroTransactionRsigData = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
     ) -> None:
         self.rsig_data = rsig_data
 
diff --git a/python/src/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py
index b1ddaec604..bab24f8dad 100644
--- a/python/src/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py b/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py
index c37884d43d..59df9eb1c8 100644
--- a/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py
@@ -6,7 +6,7 @@ from .MoneroRingCtSig import MoneroRingCtSig
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class MoneroTransactionAllOutSetAck(p.MessageType):
     def __init__(
         self,
         *,
-        extra: bytes = None,
-        tx_prefix_hash: bytes = None,
-        rv: MoneroRingCtSig = None,
-        full_message_hash: bytes = None,
+        extra: Optional[bytes] = None,
+        tx_prefix_hash: Optional[bytes] = None,
+        rv: Optional[MoneroRingCtSig] = None,
+        full_message_hash: Optional[bytes] = None,
     ) -> None:
         self.extra = extra
         self.tx_prefix_hash = tx_prefix_hash
diff --git a/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py b/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py
index 0650fb70cb..f03052042f 100644
--- a/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroTransactionAllOutSetRequest(p.MessageType):
     def __init__(
         self,
         *,
-        rsig_data: MoneroTransactionRsigData = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
     ) -> None:
         self.rsig_data = rsig_data
 
diff --git a/python/src/trezorlib/messages/MoneroTransactionData.py b/python/src/trezorlib/messages/MoneroTransactionData.py
index 84c6093b16..01c7f3912e 100644
--- a/python/src/trezorlib/messages/MoneroTransactionData.py
+++ b/python/src/trezorlib/messages/MoneroTransactionData.py
@@ -7,7 +7,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,21 +18,21 @@ class MoneroTransactionData(p.MessageType):
     def __init__(
         self,
         *,
-        outputs: List[MoneroTransactionDestinationEntry] = None,
-        minor_indices: List[int] = None,
-        integrated_indices: List[int] = None,
-        version: int = None,
-        payment_id: bytes = None,
-        unlock_time: int = None,
-        change_dts: MoneroTransactionDestinationEntry = None,
-        num_inputs: int = None,
-        mixin: int = None,
-        fee: int = None,
-        account: int = None,
-        rsig_data: MoneroTransactionRsigData = None,
-        client_version: int = None,
-        hard_fork: int = None,
-        monero_version: bytes = None,
+        outputs: Optional[List[MoneroTransactionDestinationEntry]] = None,
+        minor_indices: Optional[List[int]] = None,
+        integrated_indices: Optional[List[int]] = None,
+        version: Optional[int] = None,
+        payment_id: Optional[bytes] = None,
+        unlock_time: Optional[int] = None,
+        change_dts: Optional[MoneroTransactionDestinationEntry] = None,
+        num_inputs: Optional[int] = None,
+        mixin: Optional[int] = None,
+        fee: Optional[int] = None,
+        account: Optional[int] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
+        client_version: Optional[int] = None,
+        hard_fork: Optional[int] = None,
+        monero_version: Optional[bytes] = None,
     ) -> None:
         self.outputs = outputs if outputs is not None else []
         self.minor_indices = minor_indices if minor_indices is not None else []
diff --git a/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py b/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py
index 5d805417d5..d4ce45a02f 100644
--- a/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py
+++ b/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py
@@ -6,7 +6,7 @@ from .MoneroAccountPublicAddress import MoneroAccountPublicAddress
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,11 +17,11 @@ class MoneroTransactionDestinationEntry(p.MessageType):
     def __init__(
         self,
         *,
-        amount: int = None,
-        addr: MoneroAccountPublicAddress = None,
-        is_subaddress: bool = None,
-        original: bytes = None,
-        is_integrated: bool = None,
+        amount: Optional[int] = None,
+        addr: Optional[MoneroAccountPublicAddress] = None,
+        is_subaddress: Optional[bool] = None,
+        original: Optional[bytes] = None,
+        is_integrated: Optional[bool] = None,
     ) -> None:
         self.amount = amount
         self.addr = addr
diff --git a/python/src/trezorlib/messages/MoneroTransactionFinalAck.py b/python/src/trezorlib/messages/MoneroTransactionFinalAck.py
index 4227050297..68d495b16f 100644
--- a/python/src/trezorlib/messages/MoneroTransactionFinalAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionFinalAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,11 +16,11 @@ class MoneroTransactionFinalAck(p.MessageType):
     def __init__(
         self,
         *,
-        cout_key: bytes = None,
-        salt: bytes = None,
-        rand_mult: bytes = None,
-        tx_enc_keys: bytes = None,
-        opening_key: bytes = None,
+        cout_key: Optional[bytes] = None,
+        salt: Optional[bytes] = None,
+        rand_mult: Optional[bytes] = None,
+        tx_enc_keys: Optional[bytes] = None,
+        opening_key: Optional[bytes] = None,
     ) -> None:
         self.cout_key = cout_key
         self.salt = salt
diff --git a/python/src/trezorlib/messages/MoneroTransactionFinalRequest.py b/python/src/trezorlib/messages/MoneroTransactionFinalRequest.py
index 92f1a72aee..ff84d8d00b 100644
--- a/python/src/trezorlib/messages/MoneroTransactionFinalRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionFinalRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroTransactionInitAck.py b/python/src/trezorlib/messages/MoneroTransactionInitAck.py
index 380b28f3f7..fcf9a18041 100644
--- a/python/src/trezorlib/messages/MoneroTransactionInitAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionInitAck.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,8 +18,8 @@ class MoneroTransactionInitAck(p.MessageType):
     def __init__(
         self,
         *,
-        hmacs: List[bytes] = None,
-        rsig_data: MoneroTransactionRsigData = None,
+        hmacs: Optional[List[bytes]] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
     ) -> None:
         self.hmacs = hmacs if hmacs is not None else []
         self.rsig_data = rsig_data
diff --git a/python/src/trezorlib/messages/MoneroTransactionInitRequest.py b/python/src/trezorlib/messages/MoneroTransactionInitRequest.py
index 2e092a27e8..cee390c954 100644
--- a/python/src/trezorlib/messages/MoneroTransactionInitRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionInitRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionData import MoneroTransactionData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class MoneroTransactionInitRequest(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        version: int = None,
-        network_type: int = None,
-        tsx_data: MoneroTransactionData = None,
+        address_n: Optional[List[int]] = None,
+        version: Optional[int] = None,
+        network_type: Optional[int] = None,
+        tsx_data: Optional[MoneroTransactionData] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.version = version
diff --git a/python/src/trezorlib/messages/MoneroTransactionInputViniAck.py b/python/src/trezorlib/messages/MoneroTransactionInputViniAck.py
index c9a23ee8c4..6eb0c1d2c3 100644
--- a/python/src/trezorlib/messages/MoneroTransactionInputViniAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionInputViniAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py b/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py
index aa2e908979..76ef3e990f 100644
--- a/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionSourceEntry import MoneroTransactionSourceEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,12 +18,12 @@ class MoneroTransactionInputViniRequest(p.MessageType):
     def __init__(
         self,
         *,
-        src_entr: MoneroTransactionSourceEntry = None,
-        vini: bytes = None,
-        vini_hmac: bytes = None,
-        pseudo_out: bytes = None,
-        pseudo_out_hmac: bytes = None,
-        orig_idx: int = None,
+        src_entr: Optional[MoneroTransactionSourceEntry] = None,
+        vini: Optional[bytes] = None,
+        vini_hmac: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
+        pseudo_out_hmac: Optional[bytes] = None,
+        orig_idx: Optional[int] = None,
     ) -> None:
         self.src_entr = src_entr
         self.vini = vini
diff --git a/python/src/trezorlib/messages/MoneroTransactionInputsPermutationAck.py b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationAck.py
index ec57692148..64f9f0460d 100644
--- a/python/src/trezorlib/messages/MoneroTransactionInputsPermutationAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py
index 2f6c683288..5546427595 100644
--- a/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class MoneroTransactionInputsPermutationRequest(p.MessageType):
     def __init__(
         self,
         *,
-        perm: List[int] = None,
+        perm: Optional[List[int]] = None,
     ) -> None:
         self.perm = perm if perm is not None else []
 
diff --git a/python/src/trezorlib/messages/MoneroTransactionRsigData.py b/python/src/trezorlib/messages/MoneroTransactionRsigData.py
index fd5cd877ab..5b3b5f5e72 100644
--- a/python/src/trezorlib/messages/MoneroTransactionRsigData.py
+++ b/python/src/trezorlib/messages/MoneroTransactionRsigData.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,13 +15,13 @@ class MoneroTransactionRsigData(p.MessageType):
     def __init__(
         self,
         *,
-        grouping: List[int] = None,
-        rsig_parts: List[bytes] = None,
-        rsig_type: int = None,
-        offload_type: int = None,
-        mask: bytes = None,
-        rsig: bytes = None,
-        bp_version: int = None,
+        grouping: Optional[List[int]] = None,
+        rsig_parts: Optional[List[bytes]] = None,
+        rsig_type: Optional[int] = None,
+        offload_type: Optional[int] = None,
+        mask: Optional[bytes] = None,
+        rsig: Optional[bytes] = None,
+        bp_version: Optional[int] = None,
     ) -> None:
         self.grouping = grouping if grouping is not None else []
         self.rsig_parts = rsig_parts if rsig_parts is not None else []
diff --git a/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py b/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py
index 679831a7bf..55dec2389e 100644
--- a/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,12 +16,12 @@ class MoneroTransactionSetInputAck(p.MessageType):
     def __init__(
         self,
         *,
-        vini: bytes = None,
-        vini_hmac: bytes = None,
-        pseudo_out: bytes = None,
-        pseudo_out_hmac: bytes = None,
-        pseudo_out_alpha: bytes = None,
-        spend_key: bytes = None,
+        vini: Optional[bytes] = None,
+        vini_hmac: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
+        pseudo_out_hmac: Optional[bytes] = None,
+        pseudo_out_alpha: Optional[bytes] = None,
+        spend_key: Optional[bytes] = None,
     ) -> None:
         self.vini = vini
         self.vini_hmac = vini_hmac
diff --git a/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py
index ca1e9ae98f..bb6375971e 100644
--- a/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionSourceEntry import MoneroTransactionSourceEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class MoneroTransactionSetInputRequest(p.MessageType):
     def __init__(
         self,
         *,
-        src_entr: MoneroTransactionSourceEntry = None,
+        src_entr: Optional[MoneroTransactionSourceEntry] = None,
     ) -> None:
         self.src_entr = src_entr
 
diff --git a/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py b/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py
index 1dc0930ccb..1cf03089c1 100644
--- a/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py
@@ -6,7 +6,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,11 +18,11 @@ class MoneroTransactionSetOutputAck(p.MessageType):
     def __init__(
         self,
         *,
-        tx_out: bytes = None,
-        vouti_hmac: bytes = None,
-        rsig_data: MoneroTransactionRsigData = None,
-        out_pk: bytes = None,
-        ecdh_info: bytes = None,
+        tx_out: Optional[bytes] = None,
+        vouti_hmac: Optional[bytes] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
+        out_pk: Optional[bytes] = None,
+        ecdh_info: Optional[bytes] = None,
     ) -> None:
         self.tx_out = tx_out
         self.vouti_hmac = vouti_hmac
diff --git a/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py
index 6c613c94d7..34c31ed94a 100644
--- a/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py
@@ -7,7 +7,7 @@ from .MoneroTransactionRsigData import MoneroTransactionRsigData
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,10 +19,10 @@ class MoneroTransactionSetOutputRequest(p.MessageType):
     def __init__(
         self,
         *,
-        dst_entr: MoneroTransactionDestinationEntry = None,
-        dst_entr_hmac: bytes = None,
-        rsig_data: MoneroTransactionRsigData = None,
-        is_offloaded_bp: bool = None,
+        dst_entr: Optional[MoneroTransactionDestinationEntry] = None,
+        dst_entr_hmac: Optional[bytes] = None,
+        rsig_data: Optional[MoneroTransactionRsigData] = None,
+        is_offloaded_bp: Optional[bool] = None,
     ) -> None:
         self.dst_entr = dst_entr
         self.dst_entr_hmac = dst_entr_hmac
diff --git a/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py b/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py
index a5022897ba..a81f9fbee9 100644
--- a/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py
+++ b/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroTransactionSignInputAck(p.MessageType):
     def __init__(
         self,
         *,
-        signature: bytes = None,
-        pseudo_out: bytes = None,
+        signature: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
     ) -> None:
         self.signature = signature
         self.pseudo_out = pseudo_out
diff --git a/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py
index 05dbd0ef57..230298a237 100644
--- a/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py
+++ b/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py
@@ -6,7 +6,7 @@ from .MoneroTransactionSourceEntry import MoneroTransactionSourceEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,14 +18,14 @@ class MoneroTransactionSignInputRequest(p.MessageType):
     def __init__(
         self,
         *,
-        src_entr: MoneroTransactionSourceEntry = None,
-        vini: bytes = None,
-        vini_hmac: bytes = None,
-        pseudo_out: bytes = None,
-        pseudo_out_hmac: bytes = None,
-        pseudo_out_alpha: bytes = None,
-        spend_key: bytes = None,
-        orig_idx: int = None,
+        src_entr: Optional[MoneroTransactionSourceEntry] = None,
+        vini: Optional[bytes] = None,
+        vini_hmac: Optional[bytes] = None,
+        pseudo_out: Optional[bytes] = None,
+        pseudo_out_hmac: Optional[bytes] = None,
+        pseudo_out_alpha: Optional[bytes] = None,
+        spend_key: Optional[bytes] = None,
+        orig_idx: Optional[int] = None,
     ) -> None:
         self.src_entr = src_entr
         self.vini = vini
diff --git a/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py b/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py
index 446e78b651..386fbe121e 100644
--- a/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py
+++ b/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py
@@ -7,7 +7,7 @@ from .MoneroOutputEntry import MoneroOutputEntry
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,16 +18,16 @@ class MoneroTransactionSourceEntry(p.MessageType):
     def __init__(
         self,
         *,
-        outputs: List[MoneroOutputEntry] = None,
-        real_out_additional_tx_keys: List[bytes] = None,
-        real_output: int = None,
-        real_out_tx_key: bytes = None,
-        real_output_in_tx_index: int = None,
-        amount: int = None,
-        rct: bool = None,
-        mask: bytes = None,
-        multisig_kLRki: MoneroMultisigKLRki = None,
-        subaddr_minor: int = None,
+        outputs: Optional[List[MoneroOutputEntry]] = None,
+        real_out_additional_tx_keys: Optional[List[bytes]] = None,
+        real_output: Optional[int] = None,
+        real_out_tx_key: Optional[bytes] = None,
+        real_output_in_tx_index: Optional[int] = None,
+        amount: Optional[int] = None,
+        rct: Optional[bool] = None,
+        mask: Optional[bytes] = None,
+        multisig_kLRki: Optional[MoneroMultisigKLRki] = None,
+        subaddr_minor: Optional[int] = None,
     ) -> None:
         self.outputs = outputs if outputs is not None else []
         self.real_out_additional_tx_keys = real_out_additional_tx_keys if real_out_additional_tx_keys is not None else []
diff --git a/python/src/trezorlib/messages/MoneroTransferDetails.py b/python/src/trezorlib/messages/MoneroTransferDetails.py
index 7267a9bbbc..4f38dcf49b 100644
--- a/python/src/trezorlib/messages/MoneroTransferDetails.py
+++ b/python/src/trezorlib/messages/MoneroTransferDetails.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,12 +15,12 @@ class MoneroTransferDetails(p.MessageType):
     def __init__(
         self,
         *,
-        additional_tx_pub_keys: List[bytes] = None,
-        out_key: bytes = None,
-        tx_pub_key: bytes = None,
-        internal_output_index: int = None,
-        sub_addr_major: int = None,
-        sub_addr_minor: int = None,
+        additional_tx_pub_keys: Optional[List[bytes]] = None,
+        out_key: Optional[bytes] = None,
+        tx_pub_key: Optional[bytes] = None,
+        internal_output_index: Optional[int] = None,
+        sub_addr_major: Optional[int] = None,
+        sub_addr_minor: Optional[int] = None,
     ) -> None:
         self.additional_tx_pub_keys = additional_tx_pub_keys if additional_tx_pub_keys is not None else []
         self.out_key = out_key
diff --git a/python/src/trezorlib/messages/MoneroWatchKey.py b/python/src/trezorlib/messages/MoneroWatchKey.py
index e052546467..132de9f65a 100644
--- a/python/src/trezorlib/messages/MoneroWatchKey.py
+++ b/python/src/trezorlib/messages/MoneroWatchKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class MoneroWatchKey(p.MessageType):
     def __init__(
         self,
         *,
-        watch_key: bytes = None,
-        address: bytes = None,
+        watch_key: Optional[bytes] = None,
+        address: Optional[bytes] = None,
     ) -> None:
         self.watch_key = watch_key
         self.address = address
diff --git a/python/src/trezorlib/messages/MultisigRedeemScriptType.py b/python/src/trezorlib/messages/MultisigRedeemScriptType.py
index 614e45b69f..3289869c08 100644
--- a/python/src/trezorlib/messages/MultisigRedeemScriptType.py
+++ b/python/src/trezorlib/messages/MultisigRedeemScriptType.py
@@ -7,7 +7,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,10 +19,10 @@ class MultisigRedeemScriptType(p.MessageType):
         self,
         *,
         m: int,
-        pubkeys: List[HDNodePathType] = None,
-        signatures: List[bytes] = None,
-        nodes: List[HDNodeType] = None,
-        address_n: List[int] = None,
+        pubkeys: Optional[List[HDNodePathType]] = None,
+        signatures: Optional[List[bytes]] = None,
+        nodes: Optional[List[HDNodeType]] = None,
+        address_n: Optional[List[int]] = None,
     ) -> None:
         self.pubkeys = pubkeys if pubkeys is not None else []
         self.signatures = signatures if signatures is not None else []
diff --git a/python/src/trezorlib/messages/NEMAddress.py b/python/src/trezorlib/messages/NEMAddress.py
index 2aa5c1e972..8efe50e179 100644
--- a/python/src/trezorlib/messages/NEMAddress.py
+++ b/python/src/trezorlib/messages/NEMAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/NEMAggregateModification.py b/python/src/trezorlib/messages/NEMAggregateModification.py
index 1b03f7b843..83046bbb61 100644
--- a/python/src/trezorlib/messages/NEMAggregateModification.py
+++ b/python/src/trezorlib/messages/NEMAggregateModification.py
@@ -6,7 +6,7 @@ from .NEMCosignatoryModification import NEMCosignatoryModification
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class NEMAggregateModification(p.MessageType):
     def __init__(
         self,
         *,
-        modifications: List[NEMCosignatoryModification] = None,
-        relative_change: int = None,
+        modifications: Optional[List[NEMCosignatoryModification]] = None,
+        relative_change: Optional[int] = None,
     ) -> None:
         self.modifications = modifications if modifications is not None else []
         self.relative_change = relative_change
diff --git a/python/src/trezorlib/messages/NEMCosignatoryModification.py b/python/src/trezorlib/messages/NEMCosignatoryModification.py
index 17dbd96239..f52636a3e8 100644
--- a/python/src/trezorlib/messages/NEMCosignatoryModification.py
+++ b/python/src/trezorlib/messages/NEMCosignatoryModification.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMModificationType = Literal[1, 2]
     except ImportError:
@@ -16,8 +16,8 @@ class NEMCosignatoryModification(p.MessageType):
     def __init__(
         self,
         *,
-        type: EnumTypeNEMModificationType = None,
-        public_key: bytes = None,
+        type: Optional[EnumTypeNEMModificationType] = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.type = type
         self.public_key = public_key
diff --git a/python/src/trezorlib/messages/NEMDecryptMessage.py b/python/src/trezorlib/messages/NEMDecryptMessage.py
index f8c809734d..8afbe25d41 100644
--- a/python/src/trezorlib/messages/NEMDecryptMessage.py
+++ b/python/src/trezorlib/messages/NEMDecryptMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,10 +16,10 @@ class NEMDecryptMessage(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network: int = None,
-        public_key: bytes = None,
-        payload: bytes = None,
+        address_n: Optional[List[int]] = None,
+        network: Optional[int] = None,
+        public_key: Optional[bytes] = None,
+        payload: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network = network
diff --git a/python/src/trezorlib/messages/NEMDecryptedMessage.py b/python/src/trezorlib/messages/NEMDecryptedMessage.py
index a4a0644d5c..5ea53274ae 100644
--- a/python/src/trezorlib/messages/NEMDecryptedMessage.py
+++ b/python/src/trezorlib/messages/NEMDecryptedMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/NEMGetAddress.py b/python/src/trezorlib/messages/NEMGetAddress.py
index 2fe0b87fe9..92ab44105f 100644
--- a/python/src/trezorlib/messages/NEMGetAddress.py
+++ b/python/src/trezorlib/messages/NEMGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class NEMGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network: int = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        network: Optional[int] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network = network
diff --git a/python/src/trezorlib/messages/NEMImportanceTransfer.py b/python/src/trezorlib/messages/NEMImportanceTransfer.py
index 64edfc6256..ffc2fbb071 100644
--- a/python/src/trezorlib/messages/NEMImportanceTransfer.py
+++ b/python/src/trezorlib/messages/NEMImportanceTransfer.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMImportanceTransferMode = Literal[1, 2]
     except ImportError:
@@ -16,8 +16,8 @@ class NEMImportanceTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        mode: EnumTypeNEMImportanceTransferMode = None,
-        public_key: bytes = None,
+        mode: Optional[EnumTypeNEMImportanceTransferMode] = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.mode = mode
         self.public_key = public_key
diff --git a/python/src/trezorlib/messages/NEMMosaic.py b/python/src/trezorlib/messages/NEMMosaic.py
index a8a756caa1..b3386c4dd1 100644
--- a/python/src/trezorlib/messages/NEMMosaic.py
+++ b/python/src/trezorlib/messages/NEMMosaic.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class NEMMosaic(p.MessageType):
     def __init__(
         self,
         *,
-        namespace: str = None,
-        mosaic: str = None,
-        quantity: int = None,
+        namespace: Optional[str] = None,
+        mosaic: Optional[str] = None,
+        quantity: Optional[int] = None,
     ) -> None:
         self.namespace = namespace
         self.mosaic = mosaic
diff --git a/python/src/trezorlib/messages/NEMMosaicCreation.py b/python/src/trezorlib/messages/NEMMosaicCreation.py
index ea14df4a3c..a6ced13971 100644
--- a/python/src/trezorlib/messages/NEMMosaicCreation.py
+++ b/python/src/trezorlib/messages/NEMMosaicCreation.py
@@ -6,7 +6,7 @@ from .NEMMosaicDefinition import NEMMosaicDefinition
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class NEMMosaicCreation(p.MessageType):
     def __init__(
         self,
         *,
-        definition: NEMMosaicDefinition = None,
-        sink: str = None,
-        fee: int = None,
+        definition: Optional[NEMMosaicDefinition] = None,
+        sink: Optional[str] = None,
+        fee: Optional[int] = None,
     ) -> None:
         self.definition = definition
         self.sink = sink
diff --git a/python/src/trezorlib/messages/NEMMosaicDefinition.py b/python/src/trezorlib/messages/NEMMosaicDefinition.py
index bdbe135b58..54ae8c80a1 100644
--- a/python/src/trezorlib/messages/NEMMosaicDefinition.py
+++ b/python/src/trezorlib/messages/NEMMosaicDefinition.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMMosaicLevy = Literal[1, 2]
     except ImportError:
@@ -16,21 +16,21 @@ class NEMMosaicDefinition(p.MessageType):
     def __init__(
         self,
         *,
-        networks: List[int] = None,
-        name: str = None,
-        ticker: str = None,
-        namespace: str = None,
-        mosaic: str = None,
-        divisibility: int = None,
-        levy: EnumTypeNEMMosaicLevy = None,
-        fee: int = None,
-        levy_address: str = None,
-        levy_namespace: str = None,
-        levy_mosaic: str = None,
-        supply: int = None,
-        mutable_supply: bool = None,
-        transferable: bool = None,
-        description: str = None,
+        networks: Optional[List[int]] = None,
+        name: Optional[str] = None,
+        ticker: Optional[str] = None,
+        namespace: Optional[str] = None,
+        mosaic: Optional[str] = None,
+        divisibility: Optional[int] = None,
+        levy: Optional[EnumTypeNEMMosaicLevy] = None,
+        fee: Optional[int] = None,
+        levy_address: Optional[str] = None,
+        levy_namespace: Optional[str] = None,
+        levy_mosaic: Optional[str] = None,
+        supply: Optional[int] = None,
+        mutable_supply: Optional[bool] = None,
+        transferable: Optional[bool] = None,
+        description: Optional[str] = None,
     ) -> None:
         self.networks = networks if networks is not None else []
         self.name = name
diff --git a/python/src/trezorlib/messages/NEMMosaicSupplyChange.py b/python/src/trezorlib/messages/NEMMosaicSupplyChange.py
index 89a21880ad..47de01cf64 100644
--- a/python/src/trezorlib/messages/NEMMosaicSupplyChange.py
+++ b/python/src/trezorlib/messages/NEMMosaicSupplyChange.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeNEMSupplyChangeType = Literal[1, 2]
     except ImportError:
@@ -16,10 +16,10 @@ class NEMMosaicSupplyChange(p.MessageType):
     def __init__(
         self,
         *,
-        namespace: str = None,
-        mosaic: str = None,
-        type: EnumTypeNEMSupplyChangeType = None,
-        delta: int = None,
+        namespace: Optional[str] = None,
+        mosaic: Optional[str] = None,
+        type: Optional[EnumTypeNEMSupplyChangeType] = None,
+        delta: Optional[int] = None,
     ) -> None:
         self.namespace = namespace
         self.mosaic = mosaic
diff --git a/python/src/trezorlib/messages/NEMProvisionNamespace.py b/python/src/trezorlib/messages/NEMProvisionNamespace.py
index 788c595312..2212294f8e 100644
--- a/python/src/trezorlib/messages/NEMProvisionNamespace.py
+++ b/python/src/trezorlib/messages/NEMProvisionNamespace.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class NEMProvisionNamespace(p.MessageType):
     def __init__(
         self,
         *,
-        namespace: str = None,
-        parent: str = None,
-        sink: str = None,
-        fee: int = None,
+        namespace: Optional[str] = None,
+        parent: Optional[str] = None,
+        sink: Optional[str] = None,
+        fee: Optional[int] = None,
     ) -> None:
         self.namespace = namespace
         self.parent = parent
diff --git a/python/src/trezorlib/messages/NEMSignTx.py b/python/src/trezorlib/messages/NEMSignTx.py
index 4a4a826bcc..5a9eaf4ed2 100644
--- a/python/src/trezorlib/messages/NEMSignTx.py
+++ b/python/src/trezorlib/messages/NEMSignTx.py
@@ -12,7 +12,7 @@ from .NEMTransfer import NEMTransfer
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -24,15 +24,15 @@ class NEMSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        transaction: NEMTransactionCommon = None,
-        multisig: NEMTransactionCommon = None,
-        transfer: NEMTransfer = None,
-        cosigning: bool = None,
-        provision_namespace: NEMProvisionNamespace = None,
-        mosaic_creation: NEMMosaicCreation = None,
-        supply_change: NEMMosaicSupplyChange = None,
-        aggregate_modification: NEMAggregateModification = None,
-        importance_transfer: NEMImportanceTransfer = None,
+        transaction: Optional[NEMTransactionCommon] = None,
+        multisig: Optional[NEMTransactionCommon] = None,
+        transfer: Optional[NEMTransfer] = None,
+        cosigning: Optional[bool] = None,
+        provision_namespace: Optional[NEMProvisionNamespace] = None,
+        mosaic_creation: Optional[NEMMosaicCreation] = None,
+        supply_change: Optional[NEMMosaicSupplyChange] = None,
+        aggregate_modification: Optional[NEMAggregateModification] = None,
+        importance_transfer: Optional[NEMImportanceTransfer] = None,
     ) -> None:
         self.transaction = transaction
         self.multisig = multisig
diff --git a/python/src/trezorlib/messages/NEMSignedTx.py b/python/src/trezorlib/messages/NEMSignedTx.py
index 166e8622db..9a3c1de8cd 100644
--- a/python/src/trezorlib/messages/NEMSignedTx.py
+++ b/python/src/trezorlib/messages/NEMSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/NEMTransactionCommon.py b/python/src/trezorlib/messages/NEMTransactionCommon.py
index d8bcbe0cc4..ddcca608f3 100644
--- a/python/src/trezorlib/messages/NEMTransactionCommon.py
+++ b/python/src/trezorlib/messages/NEMTransactionCommon.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,12 +15,12 @@ class NEMTransactionCommon(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network: int = None,
-        timestamp: int = None,
-        fee: int = None,
-        deadline: int = None,
-        signer: bytes = None,
+        address_n: Optional[List[int]] = None,
+        network: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        fee: Optional[int] = None,
+        deadline: Optional[int] = None,
+        signer: Optional[bytes] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network = network
diff --git a/python/src/trezorlib/messages/NEMTransfer.py b/python/src/trezorlib/messages/NEMTransfer.py
index 7af35383ed..7b0e48b3d1 100644
--- a/python/src/trezorlib/messages/NEMTransfer.py
+++ b/python/src/trezorlib/messages/NEMTransfer.py
@@ -6,7 +6,7 @@ from .NEMMosaic import NEMMosaic
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,11 +17,11 @@ class NEMTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        mosaics: List[NEMMosaic] = None,
-        recipient: str = None,
-        amount: int = None,
-        payload: bytes = None,
-        public_key: bytes = None,
+        mosaics: Optional[List[NEMMosaic]] = None,
+        recipient: Optional[str] = None,
+        amount: Optional[int] = None,
+        payload: Optional[bytes] = None,
+        public_key: Optional[bytes] = None,
     ) -> None:
         self.mosaics = mosaics if mosaics is not None else []
         self.recipient = recipient
diff --git a/python/src/trezorlib/messages/NextU2FCounter.py b/python/src/trezorlib/messages/NextU2FCounter.py
index 8433f84889..84a6fa16a7 100644
--- a/python/src/trezorlib/messages/NextU2FCounter.py
+++ b/python/src/trezorlib/messages/NextU2FCounter.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class NextU2FCounter(p.MessageType):
     def __init__(
         self,
         *,
-        u2f_counter: int = None,
+        u2f_counter: Optional[int] = None,
     ) -> None:
         self.u2f_counter = u2f_counter
 
diff --git a/python/src/trezorlib/messages/OwnershipId.py b/python/src/trezorlib/messages/OwnershipId.py
index dcffb16b8a..ae141cd4ca 100644
--- a/python/src/trezorlib/messages/OwnershipId.py
+++ b/python/src/trezorlib/messages/OwnershipId.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/OwnershipProof.py b/python/src/trezorlib/messages/OwnershipProof.py
index eca7fbfb1d..6c375f2554 100644
--- a/python/src/trezorlib/messages/OwnershipProof.py
+++ b/python/src/trezorlib/messages/OwnershipProof.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/PassphraseAck.py b/python/src/trezorlib/messages/PassphraseAck.py
index 9370e6914b..1b597e9062 100644
--- a/python/src/trezorlib/messages/PassphraseAck.py
+++ b/python/src/trezorlib/messages/PassphraseAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class PassphraseAck(p.MessageType):
     def __init__(
         self,
         *,
-        passphrase: str = None,
-        _state: bytes = None,
-        on_device: bool = None,
+        passphrase: Optional[str] = None,
+        _state: Optional[bytes] = None,
+        on_device: Optional[bool] = None,
     ) -> None:
         self.passphrase = passphrase
         self._state = _state
diff --git a/python/src/trezorlib/messages/PassphraseRequest.py b/python/src/trezorlib/messages/PassphraseRequest.py
index c65034a7a6..14310148b7 100644
--- a/python/src/trezorlib/messages/PassphraseRequest.py
+++ b/python/src/trezorlib/messages/PassphraseRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class PassphraseRequest(p.MessageType):
     def __init__(
         self,
         *,
-        _on_device: bool = None,
+        _on_device: Optional[bool] = None,
     ) -> None:
         self._on_device = _on_device
 
diff --git a/python/src/trezorlib/messages/PinMatrixAck.py b/python/src/trezorlib/messages/PinMatrixAck.py
index 910988cf13..a4db72ece4 100644
--- a/python/src/trezorlib/messages/PinMatrixAck.py
+++ b/python/src/trezorlib/messages/PinMatrixAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/PinMatrixRequest.py b/python/src/trezorlib/messages/PinMatrixRequest.py
index 5d3d5a1945..7b5768bbce 100644
--- a/python/src/trezorlib/messages/PinMatrixRequest.py
+++ b/python/src/trezorlib/messages/PinMatrixRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypePinMatrixRequestType = Literal[1, 2, 3, 4, 5]
     except ImportError:
@@ -17,7 +17,7 @@ class PinMatrixRequest(p.MessageType):
     def __init__(
         self,
         *,
-        type: EnumTypePinMatrixRequestType = None,
+        type: Optional[EnumTypePinMatrixRequestType] = None,
     ) -> None:
         self.type = type
 
diff --git a/python/src/trezorlib/messages/Ping.py b/python/src/trezorlib/messages/Ping.py
index 387037fa5c..b6c0fe3233 100644
--- a/python/src/trezorlib/messages/Ping.py
+++ b/python/src/trezorlib/messages/Ping.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class Ping(p.MessageType):
         self,
         *,
         message: str = "",
-        button_protection: bool = None,
+        button_protection: Optional[bool] = None,
     ) -> None:
         self.message = message
         self.button_protection = button_protection
diff --git a/python/src/trezorlib/messages/PreauthorizedRequest.py b/python/src/trezorlib/messages/PreauthorizedRequest.py
index d65af252e0..f12f271e87 100644
--- a/python/src/trezorlib/messages/PreauthorizedRequest.py
+++ b/python/src/trezorlib/messages/PreauthorizedRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/PrevInput.py b/python/src/trezorlib/messages/PrevInput.py
index afb23312d4..cf10ffc935 100644
--- a/python/src/trezorlib/messages/PrevInput.py
+++ b/python/src/trezorlib/messages/PrevInput.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,7 +19,7 @@ class PrevInput(p.MessageType):
         prev_index: int,
         script_sig: bytes,
         sequence: int,
-        decred_tree: int = None,
+        decred_tree: Optional[int] = None,
     ) -> None:
         self.prev_hash = prev_hash
         self.prev_index = prev_index
diff --git a/python/src/trezorlib/messages/PrevOutput.py b/python/src/trezorlib/messages/PrevOutput.py
index 34ba0bfbd7..758767fada 100644
--- a/python/src/trezorlib/messages/PrevOutput.py
+++ b/python/src/trezorlib/messages/PrevOutput.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class PrevOutput(p.MessageType):
         *,
         amount: int,
         script_pubkey: bytes,
-        decred_script_version: int = None,
+        decred_script_version: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.script_pubkey = script_pubkey
diff --git a/python/src/trezorlib/messages/PrevTx.py b/python/src/trezorlib/messages/PrevTx.py
index 8db1327ae5..a35c141bcd 100644
--- a/python/src/trezorlib/messages/PrevTx.py
+++ b/python/src/trezorlib/messages/PrevTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,10 +20,10 @@ class PrevTx(p.MessageType):
         inputs_count: int,
         outputs_count: int,
         extra_data_len: int = 0,
-        expiry: int = None,
-        version_group_id: int = None,
-        timestamp: int = None,
-        branch_id: int = None,
+        expiry: Optional[int] = None,
+        version_group_id: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        branch_id: Optional[int] = None,
     ) -> None:
         self.version = version
         self.lock_time = lock_time
diff --git a/python/src/trezorlib/messages/PublicKey.py b/python/src/trezorlib/messages/PublicKey.py
index a7faa75bf1..0c60704e13 100644
--- a/python/src/trezorlib/messages/PublicKey.py
+++ b/python/src/trezorlib/messages/PublicKey.py
@@ -6,7 +6,7 @@ from .HDNodeType import HDNodeType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -20,7 +20,7 @@ class PublicKey(p.MessageType):
         *,
         node: HDNodeType,
         xpub: str,
-        root_fingerprint: int = None,
+        root_fingerprint: Optional[int] = None,
     ) -> None:
         self.node = node
         self.xpub = xpub
diff --git a/python/src/trezorlib/messages/RebootToBootloader.py b/python/src/trezorlib/messages/RebootToBootloader.py
index 880c0edd71..40b82e5c34 100644
--- a/python/src/trezorlib/messages/RebootToBootloader.py
+++ b/python/src/trezorlib/messages/RebootToBootloader.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/RecoveryDevice.py b/python/src/trezorlib/messages/RecoveryDevice.py
index a4f6b69bcb..fe44afc410 100644
--- a/python/src/trezorlib/messages/RecoveryDevice.py
+++ b/python/src/trezorlib/messages/RecoveryDevice.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeRecoveryDeviceType = Literal[0, 1]
     except ImportError:
@@ -17,15 +17,15 @@ class RecoveryDevice(p.MessageType):
     def __init__(
         self,
         *,
-        word_count: int = None,
-        passphrase_protection: bool = None,
-        pin_protection: bool = None,
-        language: str = None,
-        label: str = None,
-        enforce_wordlist: bool = None,
-        type: EnumTypeRecoveryDeviceType = None,
-        u2f_counter: int = None,
-        dry_run: bool = None,
+        word_count: Optional[int] = None,
+        passphrase_protection: Optional[bool] = None,
+        pin_protection: Optional[bool] = None,
+        language: Optional[str] = None,
+        label: Optional[str] = None,
+        enforce_wordlist: Optional[bool] = None,
+        type: Optional[EnumTypeRecoveryDeviceType] = None,
+        u2f_counter: Optional[int] = None,
+        dry_run: Optional[bool] = None,
     ) -> None:
         self.word_count = word_count
         self.passphrase_protection = passphrase_protection
diff --git a/python/src/trezorlib/messages/ResetDevice.py b/python/src/trezorlib/messages/ResetDevice.py
index e8a29d5249..05e75f2d88 100644
--- a/python/src/trezorlib/messages/ResetDevice.py
+++ b/python/src/trezorlib/messages/ResetDevice.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeBackupType = Literal[0, 1, 2]
     except ImportError:
@@ -17,15 +17,15 @@ class ResetDevice(p.MessageType):
     def __init__(
         self,
         *,
-        display_random: bool = None,
+        display_random: Optional[bool] = None,
         strength: int = 256,
-        passphrase_protection: bool = None,
-        pin_protection: bool = None,
+        passphrase_protection: Optional[bool] = None,
+        pin_protection: Optional[bool] = None,
         language: str = "en-US",
-        label: str = None,
-        u2f_counter: int = None,
-        skip_backup: bool = None,
-        no_backup: bool = None,
+        label: Optional[str] = None,
+        u2f_counter: Optional[int] = None,
+        skip_backup: Optional[bool] = None,
+        no_backup: Optional[bool] = None,
         backup_type: EnumTypeBackupType = 0,
     ) -> None:
         self.display_random = display_random
diff --git a/python/src/trezorlib/messages/RippleAddress.py b/python/src/trezorlib/messages/RippleAddress.py
index 88172e66aa..b25212b9c3 100644
--- a/python/src/trezorlib/messages/RippleAddress.py
+++ b/python/src/trezorlib/messages/RippleAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/RippleGetAddress.py b/python/src/trezorlib/messages/RippleGetAddress.py
index f55c5c61fd..c0fc7d78f1 100644
--- a/python/src/trezorlib/messages/RippleGetAddress.py
+++ b/python/src/trezorlib/messages/RippleGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class RippleGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/RipplePayment.py b/python/src/trezorlib/messages/RipplePayment.py
index c7960168c1..b1579599e7 100644
--- a/python/src/trezorlib/messages/RipplePayment.py
+++ b/python/src/trezorlib/messages/RipplePayment.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class RipplePayment(p.MessageType):
         *,
         amount: int,
         destination: str,
-        destination_tag: int = None,
+        destination_tag: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.destination = destination
diff --git a/python/src/trezorlib/messages/RippleSignTx.py b/python/src/trezorlib/messages/RippleSignTx.py
index 20fa5e7c6e..a2bc7a329f 100644
--- a/python/src/trezorlib/messages/RippleSignTx.py
+++ b/python/src/trezorlib/messages/RippleSignTx.py
@@ -6,7 +6,7 @@ from .RipplePayment import RipplePayment
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,12 +18,12 @@ class RippleSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        fee: int = None,
-        flags: int = None,
-        sequence: int = None,
-        last_ledger_sequence: int = None,
-        payment: RipplePayment = None,
+        address_n: Optional[List[int]] = None,
+        fee: Optional[int] = None,
+        flags: Optional[int] = None,
+        sequence: Optional[int] = None,
+        last_ledger_sequence: Optional[int] = None,
+        payment: Optional[RipplePayment] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.fee = fee
diff --git a/python/src/trezorlib/messages/RippleSignedTx.py b/python/src/trezorlib/messages/RippleSignedTx.py
index c3c1580c0e..39a2c09fe7 100644
--- a/python/src/trezorlib/messages/RippleSignedTx.py
+++ b/python/src/trezorlib/messages/RippleSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/SdProtect.py b/python/src/trezorlib/messages/SdProtect.py
index 73590def2f..d128104062 100644
--- a/python/src/trezorlib/messages/SdProtect.py
+++ b/python/src/trezorlib/messages/SdProtect.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeSdProtectOperationType = Literal[0, 1, 2]
     except ImportError:
@@ -17,7 +17,7 @@ class SdProtect(p.MessageType):
     def __init__(
         self,
         *,
-        operation: EnumTypeSdProtectOperationType = None,
+        operation: Optional[EnumTypeSdProtectOperationType] = None,
     ) -> None:
         self.operation = operation
 
diff --git a/python/src/trezorlib/messages/SelfTest.py b/python/src/trezorlib/messages/SelfTest.py
index 4cd7d20c89..e881c77105 100644
--- a/python/src/trezorlib/messages/SelfTest.py
+++ b/python/src/trezorlib/messages/SelfTest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class SelfTest(p.MessageType):
     def __init__(
         self,
         *,
-        payload: bytes = None,
+        payload: Optional[bytes] = None,
     ) -> None:
         self.payload = payload
 
diff --git a/python/src/trezorlib/messages/SetU2FCounter.py b/python/src/trezorlib/messages/SetU2FCounter.py
index 26c259780d..6a326d245c 100644
--- a/python/src/trezorlib/messages/SetU2FCounter.py
+++ b/python/src/trezorlib/messages/SetU2FCounter.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class SetU2FCounter(p.MessageType):
     def __init__(
         self,
         *,
-        u2f_counter: int = None,
+        u2f_counter: Optional[int] = None,
     ) -> None:
         self.u2f_counter = u2f_counter
 
diff --git a/python/src/trezorlib/messages/SignIdentity.py b/python/src/trezorlib/messages/SignIdentity.py
index 0d7711dd3d..5646b8843c 100644
--- a/python/src/trezorlib/messages/SignIdentity.py
+++ b/python/src/trezorlib/messages/SignIdentity.py
@@ -6,7 +6,7 @@ from .IdentityType import IdentityType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -21,7 +21,7 @@ class SignIdentity(p.MessageType):
         identity: IdentityType,
         challenge_hidden: bytes = b"",
         challenge_visual: str = "",
-        ecdsa_curve_name: str = None,
+        ecdsa_curve_name: Optional[str] = None,
     ) -> None:
         self.identity = identity
         self.challenge_hidden = challenge_hidden
diff --git a/python/src/trezorlib/messages/SignMessage.py b/python/src/trezorlib/messages/SignMessage.py
index 7e20ad3464..0f5ccf169d 100644
--- a/python/src/trezorlib/messages/SignMessage.py
+++ b/python/src/trezorlib/messages/SignMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
     except ImportError:
@@ -18,7 +18,7 @@ class SignMessage(p.MessageType):
         self,
         *,
         message: bytes,
-        address_n: List[int] = None,
+        address_n: Optional[List[int]] = None,
         coin_name: str = "Bitcoin",
         script_type: EnumTypeInputScriptType = 0,
     ) -> None:
diff --git a/python/src/trezorlib/messages/SignTx.py b/python/src/trezorlib/messages/SignTx.py
index d1e4b71985..3f8d61bb8e 100644
--- a/python/src/trezorlib/messages/SignTx.py
+++ b/python/src/trezorlib/messages/SignTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeAmountUnit = Literal[0, 1, 2, 3]
     except ImportError:
@@ -22,11 +22,11 @@ class SignTx(p.MessageType):
         coin_name: str = "Bitcoin",
         version: int = 1,
         lock_time: int = 0,
-        expiry: int = None,
-        overwintered: bool = None,
-        version_group_id: int = None,
-        timestamp: int = None,
-        branch_id: int = None,
+        expiry: Optional[int] = None,
+        overwintered: Optional[bool] = None,
+        version_group_id: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        branch_id: Optional[int] = None,
         amount_unit: EnumTypeAmountUnit = 0,
         decred_staking_ticket: bool = False,
     ) -> None:
diff --git a/python/src/trezorlib/messages/SignedIdentity.py b/python/src/trezorlib/messages/SignedIdentity.py
index 139ea1239c..1cb4e3a759 100644
--- a/python/src/trezorlib/messages/SignedIdentity.py
+++ b/python/src/trezorlib/messages/SignedIdentity.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class SignedIdentity(p.MessageType):
         *,
         public_key: bytes,
         signature: bytes,
-        address: str = None,
+        address: Optional[str] = None,
     ) -> None:
         self.public_key = public_key
         self.signature = signature
diff --git a/python/src/trezorlib/messages/StellarAccountMergeOp.py b/python/src/trezorlib/messages/StellarAccountMergeOp.py
index 75995d2f22..79b4831e34 100644
--- a/python/src/trezorlib/messages/StellarAccountMergeOp.py
+++ b/python/src/trezorlib/messages/StellarAccountMergeOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarAccountMergeOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        destination_account: str = None,
+        source_account: Optional[str] = None,
+        destination_account: Optional[str] = None,
     ) -> None:
         self.source_account = source_account
         self.destination_account = destination_account
diff --git a/python/src/trezorlib/messages/StellarAddress.py b/python/src/trezorlib/messages/StellarAddress.py
index 2e625b1e65..bf8fab6039 100644
--- a/python/src/trezorlib/messages/StellarAddress.py
+++ b/python/src/trezorlib/messages/StellarAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/StellarAllowTrustOp.py b/python/src/trezorlib/messages/StellarAllowTrustOp.py
index 59aa2e8c0c..6581201224 100644
--- a/python/src/trezorlib/messages/StellarAllowTrustOp.py
+++ b/python/src/trezorlib/messages/StellarAllowTrustOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,11 +16,11 @@ class StellarAllowTrustOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        trusted_account: str = None,
-        asset_type: int = None,
-        asset_code: str = None,
-        is_authorized: int = None,
+        source_account: Optional[str] = None,
+        trusted_account: Optional[str] = None,
+        asset_type: Optional[int] = None,
+        asset_code: Optional[str] = None,
+        is_authorized: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.trusted_account = trusted_account
diff --git a/python/src/trezorlib/messages/StellarAssetType.py b/python/src/trezorlib/messages/StellarAssetType.py
index 2c0cc4d380..b5ed6db97f 100644
--- a/python/src/trezorlib/messages/StellarAssetType.py
+++ b/python/src/trezorlib/messages/StellarAssetType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarAssetType(p.MessageType):
         self,
         *,
         type: int,
-        code: str = None,
-        issuer: str = None,
+        code: Optional[str] = None,
+        issuer: Optional[str] = None,
     ) -> None:
         self.type = type
         self.code = code
diff --git a/python/src/trezorlib/messages/StellarBumpSequenceOp.py b/python/src/trezorlib/messages/StellarBumpSequenceOp.py
index e54d59adfe..bfe512aea2 100644
--- a/python/src/trezorlib/messages/StellarBumpSequenceOp.py
+++ b/python/src/trezorlib/messages/StellarBumpSequenceOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarBumpSequenceOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        bump_to: int = None,
+        source_account: Optional[str] = None,
+        bump_to: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.bump_to = bump_to
diff --git a/python/src/trezorlib/messages/StellarChangeTrustOp.py b/python/src/trezorlib/messages/StellarChangeTrustOp.py
index 98f4512f12..1986b72890 100644
--- a/python/src/trezorlib/messages/StellarChangeTrustOp.py
+++ b/python/src/trezorlib/messages/StellarChangeTrustOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,9 +18,9 @@ class StellarChangeTrustOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        asset: StellarAssetType = None,
-        limit: int = None,
+        source_account: Optional[str] = None,
+        asset: Optional[StellarAssetType] = None,
+        limit: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.asset = asset
diff --git a/python/src/trezorlib/messages/StellarCreateAccountOp.py b/python/src/trezorlib/messages/StellarCreateAccountOp.py
index e667ee51ec..ec80793d89 100644
--- a/python/src/trezorlib/messages/StellarCreateAccountOp.py
+++ b/python/src/trezorlib/messages/StellarCreateAccountOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class StellarCreateAccountOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        new_account: str = None,
-        starting_balance: int = None,
+        source_account: Optional[str] = None,
+        new_account: Optional[str] = None,
+        starting_balance: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.new_account = new_account
diff --git a/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py b/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py
index 08e4743b1d..ada0b59dc7 100644
--- a/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py
+++ b/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,12 +18,12 @@ class StellarCreatePassiveOfferOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        selling_asset: StellarAssetType = None,
-        buying_asset: StellarAssetType = None,
-        amount: int = None,
-        price_n: int = None,
-        price_d: int = None,
+        source_account: Optional[str] = None,
+        selling_asset: Optional[StellarAssetType] = None,
+        buying_asset: Optional[StellarAssetType] = None,
+        amount: Optional[int] = None,
+        price_n: Optional[int] = None,
+        price_d: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.selling_asset = selling_asset
diff --git a/python/src/trezorlib/messages/StellarGetAddress.py b/python/src/trezorlib/messages/StellarGetAddress.py
index 12dd2b01b9..0a1a1174fd 100644
--- a/python/src/trezorlib/messages/StellarGetAddress.py
+++ b/python/src/trezorlib/messages/StellarGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class StellarGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/StellarManageDataOp.py b/python/src/trezorlib/messages/StellarManageDataOp.py
index 59c543022c..2640d3c15f 100644
--- a/python/src/trezorlib/messages/StellarManageDataOp.py
+++ b/python/src/trezorlib/messages/StellarManageDataOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,9 +16,9 @@ class StellarManageDataOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        key: str = None,
-        value: bytes = None,
+        source_account: Optional[str] = None,
+        key: Optional[str] = None,
+        value: Optional[bytes] = None,
     ) -> None:
         self.source_account = source_account
         self.key = key
diff --git a/python/src/trezorlib/messages/StellarManageOfferOp.py b/python/src/trezorlib/messages/StellarManageOfferOp.py
index 145e287aa1..d1d25686f9 100644
--- a/python/src/trezorlib/messages/StellarManageOfferOp.py
+++ b/python/src/trezorlib/messages/StellarManageOfferOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,13 +18,13 @@ class StellarManageOfferOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        selling_asset: StellarAssetType = None,
-        buying_asset: StellarAssetType = None,
-        amount: int = None,
-        price_n: int = None,
-        price_d: int = None,
-        offer_id: int = None,
+        source_account: Optional[str] = None,
+        selling_asset: Optional[StellarAssetType] = None,
+        buying_asset: Optional[StellarAssetType] = None,
+        amount: Optional[int] = None,
+        price_n: Optional[int] = None,
+        price_d: Optional[int] = None,
+        offer_id: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.selling_asset = selling_asset
diff --git a/python/src/trezorlib/messages/StellarPathPaymentOp.py b/python/src/trezorlib/messages/StellarPathPaymentOp.py
index c5b3fbb698..6ca7260467 100644
--- a/python/src/trezorlib/messages/StellarPathPaymentOp.py
+++ b/python/src/trezorlib/messages/StellarPathPaymentOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,13 +18,13 @@ class StellarPathPaymentOp(p.MessageType):
     def __init__(
         self,
         *,
-        paths: List[StellarAssetType] = None,
-        source_account: str = None,
-        send_asset: StellarAssetType = None,
-        send_max: int = None,
-        destination_account: str = None,
-        destination_asset: StellarAssetType = None,
-        destination_amount: int = None,
+        paths: Optional[List[StellarAssetType]] = None,
+        source_account: Optional[str] = None,
+        send_asset: Optional[StellarAssetType] = None,
+        send_max: Optional[int] = None,
+        destination_account: Optional[str] = None,
+        destination_asset: Optional[StellarAssetType] = None,
+        destination_amount: Optional[int] = None,
     ) -> None:
         self.paths = paths if paths is not None else []
         self.source_account = source_account
diff --git a/python/src/trezorlib/messages/StellarPaymentOp.py b/python/src/trezorlib/messages/StellarPaymentOp.py
index 660f653cb0..ea83888784 100644
--- a/python/src/trezorlib/messages/StellarPaymentOp.py
+++ b/python/src/trezorlib/messages/StellarPaymentOp.py
@@ -6,7 +6,7 @@ from .StellarAssetType import StellarAssetType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,10 +18,10 @@ class StellarPaymentOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        destination_account: str = None,
-        asset: StellarAssetType = None,
-        amount: int = None,
+        source_account: Optional[str] = None,
+        destination_account: Optional[str] = None,
+        asset: Optional[StellarAssetType] = None,
+        amount: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.destination_account = destination_account
diff --git a/python/src/trezorlib/messages/StellarSetOptionsOp.py b/python/src/trezorlib/messages/StellarSetOptionsOp.py
index b2f9cce452..2e68d868fa 100644
--- a/python/src/trezorlib/messages/StellarSetOptionsOp.py
+++ b/python/src/trezorlib/messages/StellarSetOptionsOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,18 +16,18 @@ class StellarSetOptionsOp(p.MessageType):
     def __init__(
         self,
         *,
-        source_account: str = None,
-        inflation_destination_account: str = None,
-        clear_flags: int = None,
-        set_flags: int = None,
-        master_weight: int = None,
-        low_threshold: int = None,
-        medium_threshold: int = None,
-        high_threshold: int = None,
-        home_domain: str = None,
-        signer_type: int = None,
-        signer_key: bytes = None,
-        signer_weight: int = None,
+        source_account: Optional[str] = None,
+        inflation_destination_account: Optional[str] = None,
+        clear_flags: Optional[int] = None,
+        set_flags: Optional[int] = None,
+        master_weight: Optional[int] = None,
+        low_threshold: Optional[int] = None,
+        medium_threshold: Optional[int] = None,
+        high_threshold: Optional[int] = None,
+        home_domain: Optional[str] = None,
+        signer_type: Optional[int] = None,
+        signer_key: Optional[bytes] = None,
+        signer_weight: Optional[int] = None,
     ) -> None:
         self.source_account = source_account
         self.inflation_destination_account = inflation_destination_account
diff --git a/python/src/trezorlib/messages/StellarSignTx.py b/python/src/trezorlib/messages/StellarSignTx.py
index a91bf7bccf..27b1ba5043 100644
--- a/python/src/trezorlib/messages/StellarSignTx.py
+++ b/python/src/trezorlib/messages/StellarSignTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,18 +16,18 @@ class StellarSignTx(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        network_passphrase: str = None,
-        source_account: str = None,
-        fee: int = None,
-        sequence_number: int = None,
-        timebounds_start: int = None,
-        timebounds_end: int = None,
-        memo_type: int = None,
-        memo_text: str = None,
-        memo_id: int = None,
-        memo_hash: bytes = None,
-        num_operations: int = None,
+        address_n: Optional[List[int]] = None,
+        network_passphrase: Optional[str] = None,
+        source_account: Optional[str] = None,
+        fee: Optional[int] = None,
+        sequence_number: Optional[int] = None,
+        timebounds_start: Optional[int] = None,
+        timebounds_end: Optional[int] = None,
+        memo_type: Optional[int] = None,
+        memo_text: Optional[str] = None,
+        memo_id: Optional[int] = None,
+        memo_hash: Optional[bytes] = None,
+        num_operations: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.network_passphrase = network_passphrase
diff --git a/python/src/trezorlib/messages/StellarSignedTx.py b/python/src/trezorlib/messages/StellarSignedTx.py
index e8bf48d95b..88e6912feb 100644
--- a/python/src/trezorlib/messages/StellarSignedTx.py
+++ b/python/src/trezorlib/messages/StellarSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/StellarTxOpRequest.py b/python/src/trezorlib/messages/StellarTxOpRequest.py
index ade0bab6f5..4fab697547 100644
--- a/python/src/trezorlib/messages/StellarTxOpRequest.py
+++ b/python/src/trezorlib/messages/StellarTxOpRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/Success.py b/python/src/trezorlib/messages/Success.py
index f4375b73e1..45c42fcf08 100644
--- a/python/src/trezorlib/messages/Success.py
+++ b/python/src/trezorlib/messages/Success.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TezosAddress.py b/python/src/trezorlib/messages/TezosAddress.py
index d81a9e7c46..c4a8491fbf 100644
--- a/python/src/trezorlib/messages/TezosAddress.py
+++ b/python/src/trezorlib/messages/TezosAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TezosBallotOp.py b/python/src/trezorlib/messages/TezosBallotOp.py
index daa84a22cc..6e7659e986 100644
--- a/python/src/trezorlib/messages/TezosBallotOp.py
+++ b/python/src/trezorlib/messages/TezosBallotOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeTezosBallotType = Literal[0, 1, 2]
     except ImportError:
@@ -16,10 +16,10 @@ class TezosBallotOp(p.MessageType):
     def __init__(
         self,
         *,
-        source: bytes = None,
-        period: int = None,
-        proposal: bytes = None,
-        ballot: EnumTypeTezosBallotType = None,
+        source: Optional[bytes] = None,
+        period: Optional[int] = None,
+        proposal: Optional[bytes] = None,
+        ballot: Optional[EnumTypeTezosBallotType] = None,
     ) -> None:
         self.source = source
         self.period = period
diff --git a/python/src/trezorlib/messages/TezosContractID.py b/python/src/trezorlib/messages/TezosContractID.py
index 33bb622493..3fd518244c 100644
--- a/python/src/trezorlib/messages/TezosContractID.py
+++ b/python/src/trezorlib/messages/TezosContractID.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeTezosContractType = Literal[0, 1]
     except ImportError:
diff --git a/python/src/trezorlib/messages/TezosDelegationOp.py b/python/src/trezorlib/messages/TezosDelegationOp.py
index 872cd695d4..d787120c5c 100644
--- a/python/src/trezorlib/messages/TezosDelegationOp.py
+++ b/python/src/trezorlib/messages/TezosDelegationOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TezosGetAddress.py b/python/src/trezorlib/messages/TezosGetAddress.py
index f4bb351668..0b4873d7a0 100644
--- a/python/src/trezorlib/messages/TezosGetAddress.py
+++ b/python/src/trezorlib/messages/TezosGetAddress.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class TezosGetAddress(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/TezosGetPublicKey.py b/python/src/trezorlib/messages/TezosGetPublicKey.py
index fa0a2f6f64..2a5152a079 100644
--- a/python/src/trezorlib/messages/TezosGetPublicKey.py
+++ b/python/src/trezorlib/messages/TezosGetPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,8 +16,8 @@ class TezosGetPublicKey(p.MessageType):
     def __init__(
         self,
         *,
-        address_n: List[int] = None,
-        show_display: bool = None,
+        address_n: Optional[List[int]] = None,
+        show_display: Optional[bool] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.show_display = show_display
diff --git a/python/src/trezorlib/messages/TezosManagerTransfer.py b/python/src/trezorlib/messages/TezosManagerTransfer.py
index cadf464689..178fdad570 100644
--- a/python/src/trezorlib/messages/TezosManagerTransfer.py
+++ b/python/src/trezorlib/messages/TezosManagerTransfer.py
@@ -6,7 +6,7 @@ from .TezosContractID import TezosContractID
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,8 +17,8 @@ class TezosManagerTransfer(p.MessageType):
     def __init__(
         self,
         *,
-        destination: TezosContractID = None,
-        amount: int = None,
+        destination: Optional[TezosContractID] = None,
+        amount: Optional[int] = None,
     ) -> None:
         self.destination = destination
         self.amount = amount
diff --git a/python/src/trezorlib/messages/TezosOriginationOp.py b/python/src/trezorlib/messages/TezosOriginationOp.py
index 6d73a8fde5..9682b018ae 100644
--- a/python/src/trezorlib/messages/TezosOriginationOp.py
+++ b/python/src/trezorlib/messages/TezosOriginationOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -22,10 +22,10 @@ class TezosOriginationOp(p.MessageType):
         storage_limit: int,
         balance: int,
         script: bytes,
-        manager_pubkey: bytes = None,
-        spendable: bool = None,
-        delegatable: bool = None,
-        delegate: bytes = None,
+        manager_pubkey: Optional[bytes] = None,
+        spendable: Optional[bool] = None,
+        delegatable: Optional[bool] = None,
+        delegate: Optional[bytes] = None,
     ) -> None:
         self.source = source
         self.fee = fee
diff --git a/python/src/trezorlib/messages/TezosParametersManager.py b/python/src/trezorlib/messages/TezosParametersManager.py
index 2e6ff6c0d5..698c988305 100644
--- a/python/src/trezorlib/messages/TezosParametersManager.py
+++ b/python/src/trezorlib/messages/TezosParametersManager.py
@@ -6,7 +6,7 @@ from .TezosManagerTransfer import TezosManagerTransfer
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,9 +17,9 @@ class TezosParametersManager(p.MessageType):
     def __init__(
         self,
         *,
-        set_delegate: bytes = None,
-        cancel_delegate: bool = None,
-        transfer: TezosManagerTransfer = None,
+        set_delegate: Optional[bytes] = None,
+        cancel_delegate: Optional[bool] = None,
+        transfer: Optional[TezosManagerTransfer] = None,
     ) -> None:
         self.set_delegate = set_delegate
         self.cancel_delegate = cancel_delegate
diff --git a/python/src/trezorlib/messages/TezosProposalOp.py b/python/src/trezorlib/messages/TezosProposalOp.py
index 574f018165..dd06626a5f 100644
--- a/python/src/trezorlib/messages/TezosProposalOp.py
+++ b/python/src/trezorlib/messages/TezosProposalOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class TezosProposalOp(p.MessageType):
     def __init__(
         self,
         *,
-        proposals: List[bytes] = None,
-        source: bytes = None,
-        period: int = None,
+        proposals: Optional[List[bytes]] = None,
+        source: Optional[bytes] = None,
+        period: Optional[int] = None,
     ) -> None:
         self.proposals = proposals if proposals is not None else []
         self.source = source
diff --git a/python/src/trezorlib/messages/TezosPublicKey.py b/python/src/trezorlib/messages/TezosPublicKey.py
index 25efa72fab..b5f76de139 100644
--- a/python/src/trezorlib/messages/TezosPublicKey.py
+++ b/python/src/trezorlib/messages/TezosPublicKey.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TezosRevealOp.py b/python/src/trezorlib/messages/TezosRevealOp.py
index 77169104f5..4ca755ad61 100644
--- a/python/src/trezorlib/messages/TezosRevealOp.py
+++ b/python/src/trezorlib/messages/TezosRevealOp.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TezosSignTx.py b/python/src/trezorlib/messages/TezosSignTx.py
index 14e62a2cfa..ba2b839f5f 100644
--- a/python/src/trezorlib/messages/TezosSignTx.py
+++ b/python/src/trezorlib/messages/TezosSignTx.py
@@ -11,7 +11,7 @@ from .TezosTransactionOp import TezosTransactionOp
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -24,13 +24,13 @@ class TezosSignTx(p.MessageType):
         self,
         *,
         branch: bytes,
-        address_n: List[int] = None,
-        reveal: TezosRevealOp = None,
-        transaction: TezosTransactionOp = None,
-        origination: TezosOriginationOp = None,
-        delegation: TezosDelegationOp = None,
-        proposal: TezosProposalOp = None,
-        ballot: TezosBallotOp = None,
+        address_n: Optional[List[int]] = None,
+        reveal: Optional[TezosRevealOp] = None,
+        transaction: Optional[TezosTransactionOp] = None,
+        origination: Optional[TezosOriginationOp] = None,
+        delegation: Optional[TezosDelegationOp] = None,
+        proposal: Optional[TezosProposalOp] = None,
+        ballot: Optional[TezosBallotOp] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.branch = branch
diff --git a/python/src/trezorlib/messages/TezosSignedTx.py b/python/src/trezorlib/messages/TezosSignedTx.py
index 4534f033c1..12acad8a80 100644
--- a/python/src/trezorlib/messages/TezosSignedTx.py
+++ b/python/src/trezorlib/messages/TezosSignedTx.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TezosTransactionOp.py b/python/src/trezorlib/messages/TezosTransactionOp.py
index db259795e4..e20cb03486 100644
--- a/python/src/trezorlib/messages/TezosTransactionOp.py
+++ b/python/src/trezorlib/messages/TezosTransactionOp.py
@@ -7,7 +7,7 @@ from .TezosParametersManager import TezosParametersManager
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -25,8 +25,8 @@ class TezosTransactionOp(p.MessageType):
         storage_limit: int,
         amount: int,
         destination: TezosContractID,
-        parameters: bytes = None,
-        parameters_manager: TezosParametersManager = None,
+        parameters: Optional[bytes] = None,
+        parameters_manager: Optional[TezosParametersManager] = None,
     ) -> None:
         self.source = source
         self.fee = fee
diff --git a/python/src/trezorlib/messages/TransactionType.py b/python/src/trezorlib/messages/TransactionType.py
index 3f20698434..7b68ef5349 100644
--- a/python/src/trezorlib/messages/TransactionType.py
+++ b/python/src/trezorlib/messages/TransactionType.py
@@ -8,7 +8,7 @@ from .TxOutputType import TxOutputType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -19,20 +19,20 @@ class TransactionType(p.MessageType):
     def __init__(
         self,
         *,
-        inputs: List[TxInputType] = None,
-        bin_outputs: List[TxOutputBinType] = None,
-        outputs: List[TxOutputType] = None,
-        version: int = None,
-        lock_time: int = None,
-        inputs_cnt: int = None,
-        outputs_cnt: int = None,
-        extra_data: bytes = None,
-        extra_data_len: int = None,
-        expiry: int = None,
-        overwintered: bool = None,
-        version_group_id: int = None,
-        timestamp: int = None,
-        branch_id: int = None,
+        inputs: Optional[List[TxInputType]] = None,
+        bin_outputs: Optional[List[TxOutputBinType]] = None,
+        outputs: Optional[List[TxOutputType]] = None,
+        version: Optional[int] = None,
+        lock_time: Optional[int] = None,
+        inputs_cnt: Optional[int] = None,
+        outputs_cnt: Optional[int] = None,
+        extra_data: Optional[bytes] = None,
+        extra_data_len: Optional[int] = None,
+        expiry: Optional[int] = None,
+        overwintered: Optional[bool] = None,
+        version_group_id: Optional[int] = None,
+        timestamp: Optional[int] = None,
+        branch_id: Optional[int] = None,
     ) -> None:
         self.inputs = inputs if inputs is not None else []
         self.bin_outputs = bin_outputs if bin_outputs is not None else []
diff --git a/python/src/trezorlib/messages/TxAck.py b/python/src/trezorlib/messages/TxAck.py
index 99fa626a6a..3d1b7bfa0e 100644
--- a/python/src/trezorlib/messages/TxAck.py
+++ b/python/src/trezorlib/messages/TxAck.py
@@ -6,7 +6,7 @@ from .TransactionType import TransactionType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class TxAck(p.MessageType):
     def __init__(
         self,
         *,
-        tx: TransactionType = None,
+        tx: Optional[TransactionType] = None,
     ) -> None:
         self.tx = tx
 
diff --git a/python/src/trezorlib/messages/TxAckInput.py b/python/src/trezorlib/messages/TxAckInput.py
index b7f84b30e3..f7e2dd58dc 100644
--- a/python/src/trezorlib/messages/TxAckInput.py
+++ b/python/src/trezorlib/messages/TxAckInput.py
@@ -6,7 +6,7 @@ from .TxAckInputWrapper import TxAckInputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckInputWrapper.py b/python/src/trezorlib/messages/TxAckInputWrapper.py
index cdfd0f1d79..63a72c6578 100644
--- a/python/src/trezorlib/messages/TxAckInputWrapper.py
+++ b/python/src/trezorlib/messages/TxAckInputWrapper.py
@@ -6,7 +6,7 @@ from .TxInput import TxInput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckOutput.py b/python/src/trezorlib/messages/TxAckOutput.py
index aeb5542bed..6dbf905d17 100644
--- a/python/src/trezorlib/messages/TxAckOutput.py
+++ b/python/src/trezorlib/messages/TxAckOutput.py
@@ -6,7 +6,7 @@ from .TxAckOutputWrapper import TxAckOutputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckOutputWrapper.py b/python/src/trezorlib/messages/TxAckOutputWrapper.py
index 6f2baced30..8171697d85 100644
--- a/python/src/trezorlib/messages/TxAckOutputWrapper.py
+++ b/python/src/trezorlib/messages/TxAckOutputWrapper.py
@@ -6,7 +6,7 @@ from .TxOutput import TxOutput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckPrevExtraData.py b/python/src/trezorlib/messages/TxAckPrevExtraData.py
index 4bb6d0f8bf..699dc97f63 100644
--- a/python/src/trezorlib/messages/TxAckPrevExtraData.py
+++ b/python/src/trezorlib/messages/TxAckPrevExtraData.py
@@ -6,7 +6,7 @@ from .TxAckPrevExtraDataWrapper import TxAckPrevExtraDataWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckPrevExtraDataWrapper.py b/python/src/trezorlib/messages/TxAckPrevExtraDataWrapper.py
index 47b720e248..431efe64ca 100644
--- a/python/src/trezorlib/messages/TxAckPrevExtraDataWrapper.py
+++ b/python/src/trezorlib/messages/TxAckPrevExtraDataWrapper.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckPrevInput.py b/python/src/trezorlib/messages/TxAckPrevInput.py
index c51a252dca..45a505a804 100644
--- a/python/src/trezorlib/messages/TxAckPrevInput.py
+++ b/python/src/trezorlib/messages/TxAckPrevInput.py
@@ -6,7 +6,7 @@ from .TxAckPrevInputWrapper import TxAckPrevInputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckPrevInputWrapper.py b/python/src/trezorlib/messages/TxAckPrevInputWrapper.py
index 20aa165cdc..628009a916 100644
--- a/python/src/trezorlib/messages/TxAckPrevInputWrapper.py
+++ b/python/src/trezorlib/messages/TxAckPrevInputWrapper.py
@@ -6,7 +6,7 @@ from .PrevInput import PrevInput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckPrevMeta.py b/python/src/trezorlib/messages/TxAckPrevMeta.py
index 380e2e2794..cbaa74c70b 100644
--- a/python/src/trezorlib/messages/TxAckPrevMeta.py
+++ b/python/src/trezorlib/messages/TxAckPrevMeta.py
@@ -6,7 +6,7 @@ from .PrevTx import PrevTx
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckPrevOutput.py b/python/src/trezorlib/messages/TxAckPrevOutput.py
index f951526416..421b083068 100644
--- a/python/src/trezorlib/messages/TxAckPrevOutput.py
+++ b/python/src/trezorlib/messages/TxAckPrevOutput.py
@@ -6,7 +6,7 @@ from .TxAckPrevOutputWrapper import TxAckPrevOutputWrapper
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxAckPrevOutputWrapper.py b/python/src/trezorlib/messages/TxAckPrevOutputWrapper.py
index 6fbe1053b5..d8399f0d98 100644
--- a/python/src/trezorlib/messages/TxAckPrevOutputWrapper.py
+++ b/python/src/trezorlib/messages/TxAckPrevOutputWrapper.py
@@ -6,7 +6,7 @@ from .PrevOutput import PrevOutput
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/TxInput.py b/python/src/trezorlib/messages/TxInput.py
index 021557a1c2..42443d1b58 100644
--- a/python/src/trezorlib/messages/TxInput.py
+++ b/python/src/trezorlib/messages/TxInput.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
         EnumTypeDecredStakingSpendType = Literal[0, 1]
@@ -22,18 +22,18 @@ class TxInput(p.MessageType):
         prev_hash: bytes,
         prev_index: int,
         amount: int,
-        address_n: List[int] = None,
-        script_sig: bytes = None,
+        address_n: Optional[List[int]] = None,
+        script_sig: Optional[bytes] = None,
         sequence: int = 4294967295,
         script_type: EnumTypeInputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        decred_tree: int = None,
-        witness: bytes = None,
-        ownership_proof: bytes = None,
-        commitment_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
-        decred_staking_spend: EnumTypeDecredStakingSpendType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        decred_tree: Optional[int] = None,
+        witness: Optional[bytes] = None,
+        ownership_proof: Optional[bytes] = None,
+        commitment_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
+        decred_staking_spend: Optional[EnumTypeDecredStakingSpendType] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.prev_hash = prev_hash
diff --git a/python/src/trezorlib/messages/TxInputType.py b/python/src/trezorlib/messages/TxInputType.py
index 6becb2335b..8081de30af 100644
--- a/python/src/trezorlib/messages/TxInputType.py
+++ b/python/src/trezorlib/messages/TxInputType.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4]
         EnumTypeDecredStakingSpendType = Literal[0, 1]
@@ -21,19 +21,19 @@ class TxInputType(p.MessageType):
         *,
         prev_hash: bytes,
         prev_index: int,
-        address_n: List[int] = None,
-        script_sig: bytes = None,
+        address_n: Optional[List[int]] = None,
+        script_sig: Optional[bytes] = None,
         sequence: int = 4294967295,
         script_type: EnumTypeInputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        amount: int = None,
-        decred_tree: int = None,
-        witness: bytes = None,
-        ownership_proof: bytes = None,
-        commitment_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
-        decred_staking_spend: EnumTypeDecredStakingSpendType = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        amount: Optional[int] = None,
+        decred_tree: Optional[int] = None,
+        witness: Optional[bytes] = None,
+        ownership_proof: Optional[bytes] = None,
+        commitment_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
+        decred_staking_spend: Optional[EnumTypeDecredStakingSpendType] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.prev_hash = prev_hash
diff --git a/python/src/trezorlib/messages/TxOutput.py b/python/src/trezorlib/messages/TxOutput.py
index 5430d1cd42..d762e83480 100644
--- a/python/src/trezorlib/messages/TxOutput.py
+++ b/python/src/trezorlib/messages/TxOutput.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeOutputScriptType = Literal[0, 1, 2, 3, 4, 5]
     except ImportError:
@@ -19,13 +19,13 @@ class TxOutput(p.MessageType):
         self,
         *,
         amount: int,
-        address_n: List[int] = None,
-        address: str = None,
+        address_n: Optional[List[int]] = None,
+        address: Optional[str] = None,
         script_type: EnumTypeOutputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        op_return_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        op_return_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.amount = amount
diff --git a/python/src/trezorlib/messages/TxOutputBinType.py b/python/src/trezorlib/messages/TxOutputBinType.py
index edcaaee88f..0747510c75 100644
--- a/python/src/trezorlib/messages/TxOutputBinType.py
+++ b/python/src/trezorlib/messages/TxOutputBinType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -17,7 +17,7 @@ class TxOutputBinType(p.MessageType):
         *,
         amount: int,
         script_pubkey: bytes,
-        decred_script_version: int = None,
+        decred_script_version: Optional[int] = None,
     ) -> None:
         self.amount = amount
         self.script_pubkey = script_pubkey
diff --git a/python/src/trezorlib/messages/TxOutputType.py b/python/src/trezorlib/messages/TxOutputType.py
index 7da908d4a4..de1649f933 100644
--- a/python/src/trezorlib/messages/TxOutputType.py
+++ b/python/src/trezorlib/messages/TxOutputType.py
@@ -6,7 +6,7 @@ from .MultisigRedeemScriptType import MultisigRedeemScriptType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeOutputScriptType = Literal[0, 1, 2, 3, 4, 5]
     except ImportError:
@@ -19,13 +19,13 @@ class TxOutputType(p.MessageType):
         self,
         *,
         amount: int,
-        address_n: List[int] = None,
-        address: str = None,
+        address_n: Optional[List[int]] = None,
+        address: Optional[str] = None,
         script_type: EnumTypeOutputScriptType = 0,
-        multisig: MultisigRedeemScriptType = None,
-        op_return_data: bytes = None,
-        orig_hash: bytes = None,
-        orig_index: int = None,
+        multisig: Optional[MultisigRedeemScriptType] = None,
+        op_return_data: Optional[bytes] = None,
+        orig_hash: Optional[bytes] = None,
+        orig_index: Optional[int] = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.amount = amount
diff --git a/python/src/trezorlib/messages/TxRequest.py b/python/src/trezorlib/messages/TxRequest.py
index b3229239d2..28a947cc5e 100644
--- a/python/src/trezorlib/messages/TxRequest.py
+++ b/python/src/trezorlib/messages/TxRequest.py
@@ -7,7 +7,7 @@ from .TxRequestSerializedType import TxRequestSerializedType
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeRequestType = Literal[0, 1, 2, 3, 4, 5, 6]
     except ImportError:
@@ -20,9 +20,9 @@ class TxRequest(p.MessageType):
     def __init__(
         self,
         *,
-        request_type: EnumTypeRequestType = None,
-        details: TxRequestDetailsType = None,
-        serialized: TxRequestSerializedType = None,
+        request_type: Optional[EnumTypeRequestType] = None,
+        details: Optional[TxRequestDetailsType] = None,
+        serialized: Optional[TxRequestSerializedType] = None,
     ) -> None:
         self.request_type = request_type
         self.details = details
diff --git a/python/src/trezorlib/messages/TxRequestDetailsType.py b/python/src/trezorlib/messages/TxRequestDetailsType.py
index 9c4c9fb4e0..5e70229705 100644
--- a/python/src/trezorlib/messages/TxRequestDetailsType.py
+++ b/python/src/trezorlib/messages/TxRequestDetailsType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,10 +15,10 @@ class TxRequestDetailsType(p.MessageType):
     def __init__(
         self,
         *,
-        request_index: int = None,
-        tx_hash: bytes = None,
-        extra_data_len: int = None,
-        extra_data_offset: int = None,
+        request_index: Optional[int] = None,
+        tx_hash: Optional[bytes] = None,
+        extra_data_len: Optional[int] = None,
+        extra_data_offset: Optional[int] = None,
     ) -> None:
         self.request_index = request_index
         self.tx_hash = tx_hash
diff --git a/python/src/trezorlib/messages/TxRequestSerializedType.py b/python/src/trezorlib/messages/TxRequestSerializedType.py
index 179698032b..ee64c62d1e 100644
--- a/python/src/trezorlib/messages/TxRequestSerializedType.py
+++ b/python/src/trezorlib/messages/TxRequestSerializedType.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,9 +15,9 @@ class TxRequestSerializedType(p.MessageType):
     def __init__(
         self,
         *,
-        signature_index: int = None,
-        signature: bytes = None,
-        serialized_tx: bytes = None,
+        signature_index: Optional[int] = None,
+        signature: Optional[bytes] = None,
+        serialized_tx: Optional[bytes] = None,
     ) -> None:
         self.signature_index = signature_index
         self.signature = signature
diff --git a/python/src/trezorlib/messages/VerifyMessage.py b/python/src/trezorlib/messages/VerifyMessage.py
index c24505b11d..f2ffaebad6 100644
--- a/python/src/trezorlib/messages/VerifyMessage.py
+++ b/python/src/trezorlib/messages/VerifyMessage.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py b/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py
index fa9694bd4f..34c43381ed 100644
--- a/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py
+++ b/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class WebAuthnAddResidentCredential(p.MessageType):
     def __init__(
         self,
         *,
-        credential_id: bytes = None,
+        credential_id: Optional[bytes] = None,
     ) -> None:
         self.credential_id = credential_id
 
diff --git a/python/src/trezorlib/messages/WebAuthnCredential.py b/python/src/trezorlib/messages/WebAuthnCredential.py
index 3a769a59a2..479ef797fe 100644
--- a/python/src/trezorlib/messages/WebAuthnCredential.py
+++ b/python/src/trezorlib/messages/WebAuthnCredential.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -15,18 +15,18 @@ class WebAuthnCredential(p.MessageType):
     def __init__(
         self,
         *,
-        index: int = None,
-        id: bytes = None,
-        rp_id: str = None,
-        rp_name: str = None,
-        user_id: bytes = None,
-        user_name: str = None,
-        user_display_name: str = None,
-        creation_time: int = None,
-        hmac_secret: bool = None,
-        use_sign_count: bool = None,
-        algorithm: int = None,
-        curve: int = None,
+        index: Optional[int] = None,
+        id: Optional[bytes] = None,
+        rp_id: Optional[str] = None,
+        rp_name: Optional[str] = None,
+        user_id: Optional[bytes] = None,
+        user_name: Optional[str] = None,
+        user_display_name: Optional[str] = None,
+        creation_time: Optional[int] = None,
+        hmac_secret: Optional[bool] = None,
+        use_sign_count: Optional[bool] = None,
+        algorithm: Optional[int] = None,
+        curve: Optional[int] = None,
     ) -> None:
         self.index = index
         self.id = id
diff --git a/python/src/trezorlib/messages/WebAuthnCredentials.py b/python/src/trezorlib/messages/WebAuthnCredentials.py
index b89ea58adf..1da555aa94 100644
--- a/python/src/trezorlib/messages/WebAuthnCredentials.py
+++ b/python/src/trezorlib/messages/WebAuthnCredentials.py
@@ -6,7 +6,7 @@ from .WebAuthnCredential import WebAuthnCredential
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -18,7 +18,7 @@ class WebAuthnCredentials(p.MessageType):
     def __init__(
         self,
         *,
-        credentials: List[WebAuthnCredential] = None,
+        credentials: Optional[List[WebAuthnCredential]] = None,
     ) -> None:
         self.credentials = credentials if credentials is not None else []
 
diff --git a/python/src/trezorlib/messages/WebAuthnListResidentCredentials.py b/python/src/trezorlib/messages/WebAuthnListResidentCredentials.py
index 44d8c717f4..33a2c6f965 100644
--- a/python/src/trezorlib/messages/WebAuthnListResidentCredentials.py
+++ b/python/src/trezorlib/messages/WebAuthnListResidentCredentials.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py b/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py
index 8a1c7bd0ec..d36623bb64 100644
--- a/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py
+++ b/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
@@ -16,7 +16,7 @@ class WebAuthnRemoveResidentCredential(p.MessageType):
     def __init__(
         self,
         *,
-        index: int = None,
+        index: Optional[int] = None,
     ) -> None:
         self.index = index
 
diff --git a/python/src/trezorlib/messages/WipeDevice.py b/python/src/trezorlib/messages/WipeDevice.py
index 5763181288..e5c213ae8d 100644
--- a/python/src/trezorlib/messages/WipeDevice.py
+++ b/python/src/trezorlib/messages/WipeDevice.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/WordAck.py b/python/src/trezorlib/messages/WordAck.py
index fb912debf8..84f261e0d7 100644
--- a/python/src/trezorlib/messages/WordAck.py
+++ b/python/src/trezorlib/messages/WordAck.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
     except ImportError:
         pass
diff --git a/python/src/trezorlib/messages/WordRequest.py b/python/src/trezorlib/messages/WordRequest.py
index 1fc4d38806..ea7a3442b9 100644
--- a/python/src/trezorlib/messages/WordRequest.py
+++ b/python/src/trezorlib/messages/WordRequest.py
@@ -4,7 +4,7 @@ from .. import protobuf as p
 
 if __debug__:
     try:
-        from typing import Dict, List  # noqa: F401
+        from typing import Dict, List, Optional  # noqa: F401
         from typing_extensions import Literal  # noqa: F401
         EnumTypeWordRequestType = Literal[0, 1, 2]
     except ImportError:
@@ -17,7 +17,7 @@ class WordRequest(p.MessageType):
     def __init__(
         self,
         *,
-        type: EnumTypeWordRequestType = None,
+        type: Optional[EnumTypeWordRequestType] = None,
     ) -> None:
         self.type = type