Merge pull request #944 from LedgerHQ/feat/apa/eip712_show_network

EIP-712 filtered flow - show network

Author: apaillier-ledger

src/features/signMessageEIP712/commands_712.c

@@ -147,6 +147,10 @@ uint16_t handle_eip712_struct_impl(uint8_t p1,
                             reply_apdu = false;
                         }
                     }
+                    if ((path_get_root_type() == ROOT_MESSAGE) &&
+                        (ui_712_get_filtering_mode() == EIP712_FILTERING_FULL)) {
+                        ret = ui_712_review_network(&eip712_context->chain_id);
+                    }
                     ui_712_field_flags_reset();
                 }
                 break;

src/features/signMessageEIP712/path.c

@@ -411,19 +411,25 @@ static bool path_update(bool skip_if_array, bool stop_at_array, bool do_typehash
  * @return boolean indicating if it was successful or not
  */
 bool path_set_root(const char *struct_name, uint8_t name_length) {
+    const s_struct_712 *new_root;
     uint8_t hash[KECCAK256_HASH_BYTESIZE];
 
     if (path_struct == NULL) {
         apdu_response_code = SWO_INCORRECT_DATA;
         return false;
     }
 
-    if ((path_struct->root_struct = get_structn(struct_name, name_length)) == NULL) {
+    if ((new_root = get_structn(struct_name, name_length)) == NULL) {
         return false;
     }
+    if (new_root == path_struct->root_struct) {
+        PRINTF("Error: already at that root struct!\n");
+        return false;
+    }
+    path_struct->root_struct = new_root;
 
     if (path_struct->root_struct == NULL) {
-        PRINTF("Struct name not found (");
+        PRINTF("Error: struct name not found (");
         for (int i = 0; i < name_length; ++i) {
             PRINTF("%c", struct_name[i]);
         }
@@ -451,8 +457,14 @@ bool path_set_root(const char *struct_name, uint8_t name_length) {
 
     if ((name_length == strlen(DOMAIN_STRUCT_NAME)) &&
         (strncmp(struct_name, DOMAIN_STRUCT_NAME, name_length) == 0)) {
+        if (path_struct->root_type != ROOT_NONE) {
+            return false;
+        }
         path_struct->root_type = ROOT_DOMAIN;
     } else {
+        if (path_struct->root_type != ROOT_DOMAIN) {
+            return false;
+        }
         path_struct->root_type = ROOT_MESSAGE;
     }
 
@@ -701,7 +713,7 @@ e_root_type path_get_root_type(void) {
  *
  * @return pointer to the root structure definition
  */
-const void *path_get_root(void) {
+const s_struct_712 *path_get_root(void) {
     if (path_struct == NULL) {
         return NULL;
     }

src/features/signMessageEIP712/path.h

@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "typed_data.h"
 #include "list.h"
 #include "cx.h"
 
@@ -14,14 +15,14 @@ typedef struct {
     uint8_t index;
 } s_array_depth;
 
-typedef enum { ROOT_DOMAIN, ROOT_MESSAGE } e_root_type;
+typedef enum { ROOT_NONE = 0, ROOT_DOMAIN, ROOT_MESSAGE } e_root_type;
 
 typedef struct {
     uint8_t depth_count;
     uint8_t depths[MAX_PATH_DEPTH];
     uint8_t array_depth_count;
     s_array_depth array_depths[MAX_ARRAY_DEPTH];
-    const void *root_struct;
+    const s_struct_712 *root_struct;
     e_root_type root_type;
 } s_path;
 
@@ -37,7 +38,7 @@ bool path_init(void);
 void path_deinit(void);
 bool path_new_array_depth(const uint8_t *data, uint8_t length);
 e_root_type path_get_root_type(void);
-const void *path_get_root(void);
+const s_struct_712 *path_get_root(void);
 const void *path_get_nth_field(uint8_t n);
 const void *path_backup_get_nth_field(uint8_t n);
 bool path_exists_in_backup(const char *path, size_t length);

src/features/signMessageEIP712/ui_logic.c

@@ -298,6 +298,24 @@ bool ui_712_review_struct(const s_struct_712 *struct_ptr) {
     return ui_712_redraw_generic_step();
 }
 
+bool ui_712_review_network(const uint64_t *chain_id) {
+    const char *title = "Network";
+    const char *buf;
+
+    if (*chain_id == chainConfig->chainId) {
+        return true;
+    }
+    ui_712_set_title(title, strlen(title));
+    if ((buf = get_network_name_from_chain_id(chain_id)) == NULL) {
+        if (!u64_to_string(*chain_id, strings.tmp.tmp, NETWORK_STRING_MAX_SIZE)) {
+            return false;
+        }
+        buf = strings.tmp.tmp;
+    }
+    ui_712_set_value(buf, strlen(buf));
+    return ui_712_redraw_generic_step();
+}
+
 /**
  * Show the hash of the message on the generic UI step
  */

src/features/signMessageEIP712/ui_logic.h

@@ -65,6 +65,7 @@ typedef struct {
 bool ui_712_init(void);
 void ui_712_deinit(void);
 bool ui_712_review_struct(const s_struct_712 *struct_ptr);
+bool ui_712_review_network(const uint64_t *chain_id);
 bool ui_712_feed_to_display(const s_struct_712_field *field_ptr,
                             const uint8_t *data,
                             uint8_t length,