Renamed trusted name enums

Author: apaillier-ledger

src_bagl/ui_flow_signTx.c

@@ -267,7 +267,7 @@ void ux_approve_tx(bool fromPlugin) {
         }
 #ifdef HAVE_TRUSTED_NAME
         uint64_t chain_id = get_tx_chain_id();
-        e_name_type type = TYPE_ACCOUNT;
+        e_name_type type = TN_TYPE_ACCOUNT;
         if (has_trusted_name(1, &type, &chain_id, tmpContent.txContent.destination)) {
             ux_approval_tx_flow[step++] = &ux_trusted_name_step;
             if (N_storage.verbose_trusted_name) {

src_features/provideTrustedName/cmd_provide_trusted_name.c

@@ -132,7 +132,7 @@ bool has_trusted_name(uint8_t types_count,
         for (int i = 0; i < types_count; ++i) {
             switch (g_trusted_name_info.struct_version) {
                 case 1:
-                    if (types[i] == TYPE_ACCOUNT) {
+                    if (types[i] == TN_TYPE_ACCOUNT) {
                         // Check if chain ID is known to be Ethereum-compatible (same derivation
                         // path)
                         if ((chain_is_ethereum_compatible(chain_id)) &&
@@ -378,7 +378,7 @@ static bool handle_trusted_name(const s_tlv_data *data,
         return false;
     }
     if ((trusted_name_info->struct_version == 1) ||
-        (trusted_name_info->name_type == TYPE_ACCOUNT)) {
+        (trusted_name_info->name_type == TN_TYPE_ACCOUNT)) {
         // TODO: Remove once other domain name providers are supported
         if ((data->length < 5) ||
             (strncmp(".eth", (char *) &data->value[data->length - 4], 4) != 0)) {
@@ -474,10 +474,10 @@ static bool handle_trusted_name_type(const s_tlv_data *data,
         return false;
     }
     switch (value) {
-        case TYPE_ACCOUNT:
-        case TYPE_CONTRACT:
+        case TN_TYPE_ACCOUNT:
+        case TN_TYPE_CONTRACT:
             break;
-        case TYPE_NFT:
+        case TN_TYPE_NFT_COLLECTION:
         default:
             PRINTF("Error: unsupported trusted name type (%u)!\n", value);
             return false;
@@ -505,13 +505,13 @@ static bool handle_trusted_name_source(const s_tlv_data *data,
         return false;
     }
     switch (value) {
-        case SOURCE_CAL:
-        case SOURCE_ENS:
+        case TN_SOURCE_CAL:
+        case TN_SOURCE_ENS:
             break;
-        case SOURCE_LAB:
-        case SOURCE_UD:
-        case SOURCE_FN:
-        case SOURCE_DNS:
+        case TN_SOURCE_LAB:
+        case TN_SOURCE_UD:
+        case TN_SOURCE_FN:
+        case TN_SOURCE_DNS:
         default:
             PRINTF("Error: unsupported trusted name source (%u)!\n", value);
             return false;
@@ -651,8 +651,8 @@ static bool verify_struct(const s_trusted_name_info *trusted_name_info) {
                 return false;
             }
             switch (trusted_name_info->name_type) {
-                case TYPE_ACCOUNT:
-                    if (trusted_name_info->name_source == SOURCE_CAL) {
+                case TN_TYPE_ACCOUNT:
+                    if (trusted_name_info->name_source == TN_SOURCE_CAL) {
                         PRINTF("Error: cannot accept an account name from the CAL!\n");
                         return false;
                     }
@@ -661,8 +661,8 @@ static bool verify_struct(const s_trusted_name_info *trusted_name_info) {
                         return false;
                     }
                     break;
-                case TYPE_CONTRACT:
-                    if (trusted_name_info->name_source != SOURCE_CAL) {
+                case TN_TYPE_CONTRACT:
+                    if (trusted_name_info->name_source != TN_SOURCE_CAL) {
                         PRINTF("Error: cannot accept a contract name from given source (%u)!\n",
                                trusted_name_info->name_source);
                         return false;

src_features/provideTrustedName/trusted_name.h

@@ -9,18 +9,23 @@
 #define TRUSTED_NAME_MAX_LENGTH 30
 
 typedef enum {
-    TYPE_ACCOUNT = 1,
-    TYPE_CONTRACT,
-    TYPE_NFT,
+    TN_TYPE_ACCOUNT = 1,
+    TN_TYPE_CONTRACT,
+    TN_TYPE_NFT_COLLECTION,
+    _TN_TYPE_COUNT_,
 } e_name_type;
 
+// because the enum does not start at 0
+#define TN_TYPE_COUNT (_TN_TYPE_COUNT_ - TN_TYPE_ACCOUNT)
+
 typedef enum {
-    SOURCE_LAB = 0,
-    SOURCE_CAL,
-    SOURCE_ENS,
-    SOURCE_UD,
-    SOURCE_FN,
-    SOURCE_DNS,
+    TN_SOURCE_LAB = 0,
+    TN_SOURCE_CAL,
+    TN_SOURCE_ENS,
+    TN_SOURCE_UD,
+    TN_SOURCE_FN,
+    TN_SOURCE_DNS,
+    TN_SOURCE_COUNT,
 } e_name_source;
 
 bool has_trusted_name(uint8_t types_count,

src_features/signMessageEIP712/filtering.c

@@ -376,8 +376,8 @@ bool filtering_trusted_name(const uint8_t *payload,
     // sanity check
     for (int i = 0; i < types_count; ++i) {
         switch (types[i]) {
-            case TYPE_ACCOUNT:
-            case TYPE_CONTRACT:
+            case TN_TYPE_ACCOUNT:
+            case TN_TYPE_CONTRACT:
                 break;
             default:
                 return false;
@@ -395,12 +395,12 @@ bool filtering_trusted_name(const uint8_t *payload,
     // sanity check
     for (int i = 0; i < sources_count; ++i) {
         switch (sources[i]) {
-            case SOURCE_LAB:
-            case SOURCE_CAL:
-            case SOURCE_ENS:
-            case SOURCE_UD:
-            case SOURCE_FN:
-            case SOURCE_DNS:
+            case TN_SOURCE_LAB:
+            case TN_SOURCE_CAL:
+            case TN_SOURCE_ENS:
+            case TN_SOURCE_UD:
+            case TN_SOURCE_FN:
+            case TN_SOURCE_DNS:
                 break;
             default:
                 return false;

src_nbgl/ui_approve_tx.c

@@ -148,7 +148,7 @@ static uint8_t setTagValuePairs(void) {
 
 #ifdef HAVE_TRUSTED_NAME
         uint64_t chain_id = get_tx_chain_id();
-        e_name_type type = TYPE_ACCOUNT;
+        e_name_type type = TN_TYPE_ACCOUNT;
         tx_approval_context.trusted_name_match =
             has_trusted_name(1, &type, &chain_id, tmpContent.txContent.destination);
         if (tx_approval_context.trusted_name_match) {