feat(core): misc features add

1. expand the batch public key export interface to include BIP32 node info
2. add support for getting the Kaspa address the same as official ones
3. adjust the default auto shut-down time to 5 minutes

Author: somebodyLi

common/protob/messages-crypto.proto

@@ -8,7 +8,7 @@ option java_outer_classname = "TrezorMessageCrypto";
 option (include_in_bitcoin_only) = true;
 
 import "messages.proto";
-
+import "messages-common.proto";
 /**
  * Request: Ask device to encrypt or decrypt value of given key
  * @start
@@ -143,6 +143,7 @@ message BatchGetPublickeys {
     }
     optional string ecdsa_curve_name = 1 [default="ed25519"];
     repeated Path paths = 2;
+    optional bool include_node = 3 [default=false];
 }
 
 /**
@@ -151,4 +152,6 @@ message BatchGetPublickeys {
  */
 message EcdsaPublicKeys {
     repeated bytes public_keys = 1;
+    repeated common.HDNodeType hd_nodes = 2;
+    optional uint32 root_fingerprint = 3;
 }

common/protob/messages-kaspa.proto

@@ -15,7 +15,8 @@ message KaspaGetAddress {
     repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
     optional bool show_display = 2;                                     // optionally show on display before sending the result
     optional string prefix = 3 [default="kaspa"];                       // prefix for address
-    optional string scheme = 4 [default="schnorr"];                       // address scheme
+    optional string scheme = 4 [default="schnorr"];                     // address scheme
+    optional bool use_tweak = 5 [default=true];                         // use bip340 tweak
 }
 
 /**
@@ -38,7 +39,8 @@ message KaspaSignTx {
     required bytes raw_message = 2;                                     // the bip143-like pre-hashed message to be signed
     optional string scheme = 3 [default="schnorr"];                     // signature scheme
     optional string prefix = 4 [default="kaspa"];                       // prefix for address
-    optional uint32 input_count = 5 [default=1];                         // number of inputs in the transaction
+    optional uint32 input_count = 5 [default=1];                        // number of inputs in the transaction
+    optional bool use_tweak = 6 [default=true];                         // use bip340 tweak
 }
 
 /**

core/embed/firmware/main.c

@@ -199,7 +199,7 @@ int main(void) {
   mp_stack_set_limit((char *)&_estack - (char *)&_sstack - 1024);
 
 #if MICROPY_ENABLE_PYSTACK
-  static mp_obj_t pystack[1024];
+  static mp_obj_t pystack[2048];
   mp_pystack_init(pystack, &pystack[MP_ARRAY_SIZE(pystack)]);
 #endif
 

core/src/all_modules.py

@@ -773,6 +773,8 @@
 import apps.solana.spl.memo.memo_program
 apps.solana.spl.spl_token_program
 import apps.solana.spl.spl_token_program
+apps.solana.spl.spl_tokens
+import apps.solana.spl.spl_tokens
 apps.solana.stake.program
 import apps.solana.stake.program
 apps.solana.system._layouts

core/src/apps/kaspa/addresses.py

@@ -39,17 +39,20 @@ def is_valid(cls, prefix: str) -> bool:
 
 def encode_address(
     node: bip32.HDNode,
-    schema: str,
+    scheme: str,
     prefix: str = Prefix.Mainnet,
+    use_tweak: bool = True,
 ) -> str:
-    if schema == "schnorr":
-        pubkey = bip340.tweak_public_key(node.public_key()[1:])
+    raw_pubkey = node.public_key()
+    if scheme == "schnorr":
+        pubkey = (
+            bip340.tweak_public_key(raw_pubkey[1:]) if use_tweak else raw_pubkey[1:]
+        )
         assert len(pubkey) == Version.public_key_len(Version.PubKey)
         version = Version.PubKey
     else:
-        pubkey = node.public_key()
+        pubkey = raw_pubkey
         assert len(pubkey) == Version.public_key_len(Version.PubKeyECDSA)
         version = Version.PubKeyECDSA
 
-    address = cashaddr.encode(prefix, version, pubkey)
-    return address
+    return cashaddr.encode(prefix, version, pubkey)

core/src/apps/kaspa/get_address.py

@@ -30,7 +30,12 @@ async def get_address(
     if msg.scheme not in ALLOWED_SCHEMES:
         raise wire.DataError("Invalid address scheme provided.")
     node = keychain.derive(msg.address_n)
-    address = encode_address(node, prefix=msg.prefix, schema=msg.scheme)
+    address = encode_address(
+        node,
+        prefix=msg.prefix,
+        scheme=msg.scheme,
+        use_tweak=getattr(msg, "use_tweak", True),
+    )
 
     if msg.show_display:
         path = paths.address_n_to_str(msg.address_n)

core/src/apps/kaspa/sign_tx.py

@@ -5,7 +5,7 @@
 from trezor.messages import KaspaSignedTx, KaspaTxInputAck, KaspaTxInputRequest
 from trezor.ui.layouts import confirm_blind_sign_common, confirm_final
 
-from apps.bitcoin.common import bip340_sign, ecdsa_sign
+from apps.bitcoin.common import bip340_sign, bip340_sign_internal, ecdsa_sign
 from apps.common import paths
 from apps.common.keychain import auto_keychain
 
@@ -37,15 +37,16 @@ async def sign_tx(
         raise wire.DataError("Invalid prefix provided.")
 
     ctx.primary_color, ctx.icon_path = lv.color_hex(PRIMARY_COLOR), ICON
-    global address_prefix, schema, addresses, request_index, input_count
+    global address_prefix, scheme, addresses, request_index, input_count
     address_prefix = msg.prefix
-    schema = msg.scheme
+    scheme = msg.scheme
     input_count = msg.input_count
     request_index = 0
     addresses = []
     signature = b""
+    use_tweak = getattr(msg, "use_tweak", True)
     while input_count > 0:
-        signature = await sign_input(ctx, msg, keychain)
+        signature = await sign_input(ctx, msg, keychain, use_tweak=use_tweak)
         input_count -= 1
         request_index += 1
         if input_count > 0:
@@ -62,25 +63,31 @@ async def sign_tx(
     return KaspaSignedTx(signature=signature)
 
 
-async def sign_input(ctx, msg: Signable, keychain) -> bytes:
+async def sign_input(ctx, msg: Signable, keychain, use_tweak: bool = True) -> bytes:
     await paths.validate_path(ctx, keychain, msg.address_n)
     node = keychain.derive(msg.address_n)
     hasher = hashwriter()
     hasher.write(msg.raw_message)
     sig_hash = hasher.get_digest()
 
-    if schema == "ecdsa":
+    if scheme == "ecdsa":
         hasher_ecdsa = hashwriter_ecdsa()
         hasher_ecdsa.write(sig_hash)
         sig_hash = hasher_ecdsa.get_digest()
 
-    address = encode_address(node, prefix=address_prefix, schema=schema)
+    address = encode_address(
+        node, prefix=address_prefix, scheme=scheme, use_tweak=use_tweak
+    )
     if msg.address_n not in addresses:
         addresses.append(msg.address_n)
         await confirm_blind_sign_common(ctx, address, msg.raw_message)
 
-    if schema == "schnorr":
-        signature = bip340_sign(node, sig_hash)
+    if scheme == "schnorr":
+        signature = (
+            bip340_sign(node, sig_hash)
+            if use_tweak
+            else bip340_sign_internal(node, sig_hash)
+        )
     else:
         signature = ecdsa_sign(node, sig_hash)
     return signature

core/src/apps/misc/batch_get_pubkeys.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from trezor import wire
-from trezor.messages import EcdsaPublicKeys
+from trezor.messages import EcdsaPublicKeys, HDNodeType
 
 from apps.common import paths
 from apps.common.keychain import get_keychain
@@ -21,16 +21,37 @@ async def batch_get_pubkeys(
     validate(msg)
     keychain = await get_keychain(ctx, msg.ecdsa_curve_name, [AlwaysMatchingSchema])
     pubkeys = []
-
+    nodes = []
     translator = (
         (lambda pubkey: pubkey)
         if "secp256k1" == msg.ecdsa_curve_name
         else (lambda pubkey: pubkey[1:])
     )
+    include_node = False
+    root_fingerprint = None
+    if "ed25519" not in msg.ecdsa_curve_name and msg.include_node:
+        include_node = True
+        root_fingerprint = keychain.root_fingerprint()
     for path in msg.paths:
         node = keychain.derive(path.address_n)
-        pubkeys.append(translator(node.public_key()))
-    return EcdsaPublicKeys(public_keys=pubkeys)
+        pubkey = translator(node.public_key())
+        if include_node:
+            nodes.append(
+                HDNodeType(
+                    depth=node.depth(),
+                    child_num=node.child_num(),
+                    fingerprint=node.fingerprint(),
+                    chain_code=node.chain_code(),
+                    public_key=pubkey,
+                )
+            )
+        else:
+            pubkeys.append(pubkey)
+    return EcdsaPublicKeys(
+        public_keys=pubkeys or None,
+        hd_nodes=nodes or None,
+        root_fingerprint=root_fingerprint,
+    )
 
 
 def validate(msg: BatchGetPublickeys):

core/src/storage/device.py

@@ -74,13 +74,13 @@
     AUTOSHUTDOWN_DELAY_MINIMUM = 60 * 1000  # 1 minute
     AUTOLOCK_DELAY_MINIMUM = 30 * 1000  # 30 seconds
 
-AUTOSHUTDOWN_DELAY_DEFAULT = 10 * 60 * 1000  # 10 minutes
+AUTOSHUTDOWN_DELAY_DEFAULT = 5 * 60 * 1000  # 5 minutes
 AUTOLOCK_DELAY_DEFAULT = 60 * 1000  # 1 minute
 # autolock intervals larger than AUTOLOCK_DELAY_MAXIMUM cause issues in the scheduler
-if __debug__:
-    AUTOSHUTDOWN_DELAY_MAXIMUM = AUTOLOCK_DELAY_MAXIMUM = const(0x2000_0000)  # ~6 days
-else:
-    AUTOSHUTDOWN_DELAY_MAXIMUM = AUTOLOCK_DELAY_MAXIMUM = 0x1000_0000  # ~3 days
+# if __debug__:
+#     AUTOSHUTDOWN_DELAY_MAXIMUM = AUTOLOCK_DELAY_MAXIMUM = const(0x2000_0000)  # ~6 days
+# else:
+AUTOSHUTDOWN_DELAY_MAXIMUM = AUTOLOCK_DELAY_MAXIMUM = 0x1000_0000  # ~3 days
 
 # Length of SD salt auth tag.
 # Other SD-salt-related constants are in sd_salt.py

core/src/trezor/messages.py

@@ -2546,12 +2546,14 @@ def is_type_of(cls, msg: Any) -> TypeGuard["CosiSignature"]:
     class BatchGetPublickeys(protobuf.MessageType):
         ecdsa_curve_name: "str"
         paths: "list[Path]"
+        include_node: "bool"
 
         def __init__(
             self,
             *,
             paths: "list[Path] | None" = None,
             ecdsa_curve_name: "str | None" = None,
+            include_node: "bool | None" = None,
         ) -> None:
             pass
 
@@ -2561,11 +2563,15 @@ def is_type_of(cls, msg: Any) -> TypeGuard["BatchGetPublickeys"]:
 
     class EcdsaPublicKeys(protobuf.MessageType):
         public_keys: "list[bytes]"
+        hd_nodes: "list[HDNodeType]"
+        root_fingerprint: "int | None"
 
         def __init__(
             self,
             *,
             public_keys: "list[bytes] | None" = None,
+            hd_nodes: "list[HDNodeType] | None" = None,
+            root_fingerprint: "int | None" = None,
         ) -> None:
             pass
 
@@ -5414,6 +5420,7 @@ class KaspaGetAddress(protobuf.MessageType):
         show_display: "bool | None"
         prefix: "str"
         scheme: "str"
+        use_tweak: "bool"
 
         def __init__(
             self,
@@ -5422,6 +5429,7 @@ def __init__(
             show_display: "bool | None" = None,
             prefix: "str | None" = None,
             scheme: "str | None" = None,
+            use_tweak: "bool | None" = None,
         ) -> None:
             pass
 
@@ -5449,6 +5457,7 @@ class KaspaSignTx(protobuf.MessageType):
         scheme: "str"
         prefix: "str"
         input_count: "int"
+        use_tweak: "bool"
 
         def __init__(
             self,
@@ -5458,6 +5467,7 @@ def __init__(
             scheme: "str | None" = None,
             prefix: "str | None" = None,
             input_count: "int | None" = None,
+            use_tweak: "bool | None" = None,
         ) -> None:
             pass