fix(legacy): fix ada swap issue and add common path check for chains (#549)

* fix(legacy): fix ada issue

* fix(legacy): add common path check for chains

* feat(legacy): add dnx support

* fix(legacy): remove `EthereumSignMessageEIP712` support

* fix(legacy): fix xpub display format when get multisig address

* fix(legacy): add double confirm for safety_check settings

* fix(legacy): fix evm dispay with raw data

* chore(legacy): remove the export tracking key feature of dnx

* fix(protob): fix lint issue

* chore(legacy): bump version to 3.8.0

Author: somebodyLi

common/protob/check.py

@@ -21,6 +21,8 @@
             prefix = "NEM"
         elif prefix == "Webauthn":
             prefix = "WebAuthn"
+        elif prefix == "Dynex":
+            prefix = "Dnx"
         for line in f:
             line = line.strip().split(" ")
             if line[0] not in ("enum", "message"):

common/protob/messages-dynex.proto

@@ -0,0 +1,90 @@
+syntax = "proto2";
+package hw.trezor.messages.dynex;
+
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.lib.protobuf";
+option java_outer_classname = "TrezorMessageDynex";
+
+/**
+ * Request: Address at the specified index
+ * @start
+ * @next DnxAddress
+ */
+message DnxGetAddress {
+    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
+}
+
+/**
+ * Response: Address for the given index
+ * @end
+ */
+message DnxAddress {
+    optional string address = 1;                // Dnx address as hex-encoded string
+}
+
+/**
+ * Request: Sign a transaction
+ * @start
+ * @next DnxInputRequest
+ */
+message DnxSignTx {
+     repeated uint32 address_n = 1;              // BIP-32 path to derive the key from master node
+     required uint32 inputs_count = 2;           // number of transaction inputs
+     required string to_address = 3;             // address to send to
+     required uint64 amount = 4;                 // amount to send in nanoDnx
+     required uint64 fee = 5;                    // fee to pay in nanoDnx
+     optional bytes payment_id = 6;              // payment ID to use for the transaction
+ }
+
+ /**
+  * Request: Ask client for corresponding input details
+  * @start
+  * @next DnxInputAck
+  */
+ message DnxInputRequest {
+     optional uint32 request_index = 1;
+     optional DnxTxKey tx_key = 2;
+     optional DnxComputedKeyImage computed_key_image = 3;
+     message DnxTxKey {
+        optional bytes ephemeral_tx_sec_key = 1;
+        optional bytes ephemeral_tx_pub_key = 2;
+     }
+     message DnxComputedKeyImage {
+        optional bytes key_image = 1;
+    }
+ }
+
+/**
+ * Response: Input details
+ * @next DnxInputRequest
+ * @end
+ *
+**/
+message DnxInputAck {
+    required uint32 prev_index = 1;
+    required uint32 global_index = 2;
+    required bytes tx_pubkey = 3;
+    required bytes prev_out_pubkey = 4;
+    required uint64 amount = 5;
+}
+
+/**
+ * Request: requset for signature and output key
+ * @start
+ * @next DnxSignedTx
+ */
+message DnxRTSigsRequest {
+
+}
+
+
+/**
+ * Response: Signature and output key
+ * @end
+ *
+**/
+message DnxSignedTx {
+    repeated bytes signatures = 1;
+    repeated bytes output_keys = 2;
+}

common/protob/messages-ethereum-onekey.proto

@@ -175,17 +175,3 @@ message EthereumTypedDataSignatureOneKey {
     required bytes signature = 1;    // signature of the typed data
     required string address = 2;     // address used to sign the typed data
 }
-
-
-/**
- * Request: Ask device to sign message EIP712
- * @start
- * @next EthereumMessageSignature
- * @next Failure
- */
-message EthereumSignMessageEIP712 {
-    repeated uint32 address_n = 1;      // BIP-32 path to derive the key from master node
-    optional bytes domain_hash = 2;     // domainSeparator hash
-    optional bytes message_hash = 3;    // message hash
-}
-

common/protob/messages.proto

@@ -420,7 +420,7 @@ enum MessageType {
     MessageType_BixinBackupDeviceAck = 915 [(wire_out) = true];
 
     MessageType_BixinPinInputOnDevice = 10000 [(wire_in) = true, (wire_tiny) = true, (wire_no_fsm) = true];
-    MessageType_EthereumSignMessageEIP712 = 10200 [(wire_in) = true];
+    MessageType_Deprecated_EthereumSignMessageEIP712 = 10200 [deprecated = true];
     MessageType_GetPublicKeyMultiple = 10210 [(wire_in) = true];
     MessageType_PublicKeyMultiple = 10211 [(wire_out) = true];
 
@@ -521,7 +521,14 @@ enum MessageType {
     MessageType_NervosTxRequest = 11705 [(wire_out) = true];
     MessageType_NervosTxAck = 11706 [(wire_in) = true];
 
-
+    // dnx
+    MessageType_DnxGetAddress = 11800 [(wire_in) = true];
+    MessageType_DnxAddress = 11801 [(wire_out) = true];
+    MessageType_DnxSignTx = 11802 [(wire_in) = true];
+    MessageType_DnxInputRequest = 11803 [(wire_out) = true];
+    MessageType_DnxInputAck = 11804 [(wire_in) = true];
+    MessageType_DnxRTSigsRequest = 11805 [(wire_in) = true];
+    MessageType_DnxSignedTx = 11806 [(wire_out) = true];
     //onekey
     MessageType_DeviceEraseSector= 10026 [deprecated = true];
 

core/src/trezor/enums/MessageType.py

@@ -280,7 +280,6 @@
     BixinBackupDevice = 914
     BixinBackupDeviceAck = 915
     BixinPinInputOnDevice = 10000
-    EthereumSignMessageEIP712 = 10200
     GetPublicKeyMultiple = 10210
     PublicKeyMultiple = 10211
     ConfluxGetAddress = 10112
@@ -355,3 +354,10 @@
     NervosSignedTx = 11704
     NervosTxRequest = 11705
     NervosTxAck = 11706
+    DnxGetAddress = 11800
+    DnxAddress = 11801
+    DnxSignTx = 11802
+    DnxInputRequest = 11803
+    DnxInputAck = 11804
+    DnxRTSigsRequest = 11805
+    DnxSignedTx = 11806

core/src/trezor/enums/__init__.py

@@ -298,7 +298,7 @@ class MessageType(IntEnum):
         BixinBackupDevice = 914
         BixinBackupDeviceAck = 915
         BixinPinInputOnDevice = 10000
-        EthereumSignMessageEIP712 = 10200
+        Deprecated_EthereumSignMessageEIP712 = 10200
         GetPublicKeyMultiple = 10210
         PublicKeyMultiple = 10211
         ConfluxGetAddress = 10112
@@ -373,6 +373,13 @@ class MessageType(IntEnum):
         NervosSignedTx = 11704
         NervosTxRequest = 11705
         NervosTxAck = 11706
+        DnxGetAddress = 11800
+        DnxAddress = 11801
+        DnxSignTx = 11802
+        DnxInputRequest = 11803
+        DnxInputAck = 11804
+        DnxRTSigsRequest = 11805
+        DnxSignedTx = 11806
         DeviceEraseSector = 10026
 
     class FailureType(IntEnum):

core/src/trezor/messages.py

@@ -3470,6 +3470,152 @@ def __init__(
         def is_type_of(cls, msg: Any) -> TypeGuard["DebugLinkWatchLayout"]:
             return isinstance(msg, cls)
 
+    class DnxGetAddress(protobuf.MessageType):
+        address_n: "list[int]"
+        show_display: "bool | None"
+
+        def __init__(
+            self,
+            *,
+            address_n: "list[int] | None" = None,
+            show_display: "bool | None" = None,
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxGetAddress"]:
+            return isinstance(msg, cls)
+
+    class DnxAddress(protobuf.MessageType):
+        address: "str | None"
+
+        def __init__(
+            self,
+            *,
+            address: "str | None" = None,
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxAddress"]:
+            return isinstance(msg, cls)
+
+    class DnxSignTx(protobuf.MessageType):
+        address_n: "list[int]"
+        inputs_count: "int"
+        to_address: "str"
+        amount: "int"
+        fee: "int"
+        payment_id: "bytes | None"
+
+        def __init__(
+            self,
+            *,
+            inputs_count: "int",
+            to_address: "str",
+            amount: "int",
+            fee: "int",
+            address_n: "list[int] | None" = None,
+            payment_id: "bytes | None" = None,
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxSignTx"]:
+            return isinstance(msg, cls)
+
+    class DnxInputRequest(protobuf.MessageType):
+        request_index: "int | None"
+        tx_key: "DnxTxKey | None"
+        computed_key_image: "DnxComputedKeyImage | None"
+
+        def __init__(
+            self,
+            *,
+            request_index: "int | None" = None,
+            tx_key: "DnxTxKey | None" = None,
+            computed_key_image: "DnxComputedKeyImage | None" = None,
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxInputRequest"]:
+            return isinstance(msg, cls)
+
+    class DnxInputAck(protobuf.MessageType):
+        prev_index: "int"
+        global_index: "int"
+        tx_pubkey: "bytes"
+        prev_out_pubkey: "bytes"
+        amount: "int"
+
+        def __init__(
+            self,
+            *,
+            prev_index: "int",
+            global_index: "int",
+            tx_pubkey: "bytes",
+            prev_out_pubkey: "bytes",
+            amount: "int",
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxInputAck"]:
+            return isinstance(msg, cls)
+
+    class DnxRTSigsRequest(protobuf.MessageType):
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxRTSigsRequest"]:
+            return isinstance(msg, cls)
+
+    class DnxSignedTx(protobuf.MessageType):
+        signatures: "list[bytes]"
+        output_keys: "list[bytes]"
+
+        def __init__(
+            self,
+            *,
+            signatures: "list[bytes] | None" = None,
+            output_keys: "list[bytes] | None" = None,
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxSignedTx"]:
+            return isinstance(msg, cls)
+
+    class DnxTxKey(protobuf.MessageType):
+        ephemeral_tx_sec_key: "bytes | None"
+        ephemeral_tx_pub_key: "bytes | None"
+
+        def __init__(
+            self,
+            *,
+            ephemeral_tx_sec_key: "bytes | None" = None,
+            ephemeral_tx_pub_key: "bytes | None" = None,
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxTxKey"]:
+            return isinstance(msg, cls)
+
+    class DnxComputedKeyImage(protobuf.MessageType):
+        key_image: "bytes | None"
+
+        def __init__(
+            self,
+            *,
+            key_image: "bytes | None" = None,
+        ) -> None:
+            pass
+
+        @classmethod
+        def is_type_of(cls, msg: Any) -> TypeGuard["DnxComputedKeyImage"]:
+            return isinstance(msg, cls)
+
     class EosGetPublicKey(protobuf.MessageType):
         address_n: "list[int]"
         show_display: "bool | None"
@@ -4536,24 +4682,6 @@ def __init__(
         def is_type_of(cls, msg: Any) -> TypeGuard["EthereumTypedDataSignatureOneKey"]:
             return isinstance(msg, cls)
 
-    class EthereumSignMessageEIP712(protobuf.MessageType):
-        address_n: "list[int]"
-        domain_hash: "bytes | None"
-        message_hash: "bytes | None"
-
-        def __init__(
-            self,
-            *,
-            address_n: "list[int] | None" = None,
-            domain_hash: "bytes | None" = None,
-            message_hash: "bytes | None" = None,
-        ) -> None:
-            pass
-
-        @classmethod
-        def is_type_of(cls, msg: Any) -> TypeGuard["EthereumSignMessageEIP712"]:
-            return isinstance(msg, cls)
-
     class EthereumAccessListOneKey(protobuf.MessageType):
         address: "str"
         storage_keys: "list[bytes]"

legacy/buttons.h

@@ -94,3 +94,33 @@ bool isLongPress(uint8_t key);
 #endif
 
 #endif
+
+#define HANDLE_KEY(bubble_key)                          \
+  uint8_t key = KEY_NULL;                               \
+  key = bubble_key ? bubble_key : protectWaitKey(0, 0); \
+  switch (key) {                                        \
+    case KEY_UP:                                        \
+    case KEY_DOWN:                                      \
+      goto refresh_menu;                                \
+    case KEY_CONFIRM:                                   \
+      if (max_index == index) {                         \
+        result = true;                                  \
+        break;                                          \
+      }                                                 \
+      if (index < max_index) {                          \
+        index++;                                        \
+      }                                                 \
+      goto refresh_menu;                                \
+    case KEY_CANCEL:                                    \
+      if (0 == index || max_index == index) {           \
+        result = false;                                 \
+        break;                                          \
+      }                                                 \
+      if (index > 0) {                                  \
+        index--;                                        \
+      }                                                 \
+      goto refresh_menu;                                \
+    default:                                            \
+      break;                                            \
+  }                                                     \
+  return result;