B2CA-2188: Multisig UI (#898)

* Fix crash with mem_free

* Add flag 'CHALLENGE_NO_CHECK' to bypass the challenge check

* Cleanup EIP712 calldata parameters

* Ensure UI alloacted tag/value buffers will be freeed

* Add Batch TX handling

* Support Batch transactions in EIP712

* Add GCS batch test

* Add eip712 batch test

* Add new snapshots

Author: cedelavergne-ledger

ledger_app.toml

@@ -11,6 +11,8 @@ dbg_use_test_keys = "DEBUG=1 CAL_TEST_KEY=1 TRUSTED_NAME_TEST_KEY=1 SET_PLUGIN_T
 cal_bypass = "BYPASS_SIGNATURES=1"
 dbg_cal_bypass = "DEBUG=1 BYPASS_SIGNATURES=1"
 memory_profiling = "DEBUG=1 EIP7702_TEST_WHITELIST=1 MEMORY_PROFILING=1"
+dbg_no_checks = "DEBUG=1 BYPASS_SIGNATURES=1 CHALLENGE_NO_CHECK=1"
+dbg_no_checks_profiling = "DEBUG=1 BYPASS_SIGNATURES=1 CHALLENGE_NO_CHECK=1 MEMORY_PROFILING=1"
 
 [tests]
 unit_directory = "./tests/unit"

makefile_conf/features.mk

@@ -6,6 +6,12 @@ ifneq ($(BYPASS_SIGNATURES),0)
     DEFINES += HAVE_BYPASS_SIGNATURES
 endif
 
+# Bypass the challenge verification
+CHALLENGE_NO_CHECK ?= 0
+ifneq ($(CHALLENGE_NO_CHECK),0)
+    DEFINES += HAVE_CHALLENGE_NO_CHECK
+endif
+
 # Enable the SET_PLUGIN test key
 SET_PLUGIN_TEST_KEY ?= 0
 ifneq ($(SET_PLUGIN_TEST_KEY),0)

src/features/generic_tx_parser/gtp_field.h

@@ -28,6 +28,7 @@ typedef enum {
     PARAM_TYPE_TRUSTED_NAME,
     PARAM_TYPE_CALLDATA,
     PARAM_TYPE_TOKEN,
+    PARAM_TYPE_INTENT,
 } e_param_type;
 
 typedef struct {

src/features/generic_tx_parser/gtp_field_table.c

@@ -5,6 +5,7 @@
 #include "list.h"
 #include "shared_context.h"  // appState
 #include "ui_logic.h"
+#include "tx_ctx.h"
 
 typedef struct {
     s_flist_node _list;
@@ -41,7 +42,13 @@ bool add_to_field_table(e_param_type type, const char *key, const char *value) {
         PRINTF("Error: NULL key/value!\n");
         return false;
     }
+    PRINTF(">>> \"%s\": \"%s\"\n", key, value);
     if (appState == APP_STATE_SIGNING_EIP712) {
+        if ((type == PARAM_TYPE_INTENT) && (txContext.current_batch_size > 1)) {
+            // Special handling for intent in EIP712 mode
+            ui_712_set_intent();
+            PRINTF(">>> [Intent] Start\n");
+        }
         ui_712_set_title(key, strlen(key));
         ui_712_set_value(value, strlen(value));
         return true;
@@ -61,7 +68,17 @@ bool add_to_field_table(e_param_type type, const char *key, const char *value) {
         app_mem_free(node);
         return false;
     }
-    PRINTF(">>> \"%s\": \"%s\"\n", key, value);
+    if (type == PARAM_TYPE_INTENT) {
+        // Special handling for intent
+        node->field.start_intent = true;
+        type = PARAM_TYPE_RAW;  // store as raw
+        PRINTF(">>> [Intent] Start\n");
+    } else {
+        node->field.end_intent = validate_instruction_hash();
+        if (node->field.end_intent) {
+            PRINTF(">>> [Intent] End\n");
+        }
+    }
 
     node->field.type = type;
     memcpy(node->field.key, key, key_len);
@@ -72,7 +89,13 @@ bool add_to_field_table(e_param_type type, const char *key, const char *value) {
 }
 
 bool set_intent_field(const char *value) {
-    return add_to_field_table(0, "Transaction type", value);
+    e_param_type type = PARAM_TYPE_INTENT;
+
+    if (txContext.current_batch_size == 1) {
+        // Only one transaction in the batch, no need to mark as intent
+        type = PARAM_TYPE_RAW;
+    }
+    return add_to_field_table(type, "Transaction type", value);
 }
 
 size_t field_table_size(void) {

src/features/generic_tx_parser/gtp_field_table.h

@@ -8,6 +8,8 @@ typedef struct {
     e_param_type type;
     char *key;
     char *value;
+    bool start_intent;  // This pair starts a new transaction in a batch
+    bool end_intent;    // This pair ends a transaction in a batch
 } s_field_table_entry;
 
 bool field_table_init(void);

src/features/generic_tx_parser/gtp_param_calldata.c

@@ -252,6 +252,11 @@ bool format_param_calldata(const s_param_calldata *param, const char *name) {
                            &selectors,
                            &amounts,
                            &spenders))) {
+        // Set batch size and number of transactions
+        if (calldatas.size > 1) {
+            txContext.batch_nb_tx += calldatas.size;
+        }
+        txContext.current_batch_size = calldatas.size;
         for (int i = 0; i < calldatas.size; ++i) {
             if (calldatas.value[i].length > 0) {
                 if (!process_nested_calldata(param,

src/features/generic_tx_parser/tx_ctx.c

@@ -114,7 +114,7 @@ bool find_matching_tx_ctx(const uint8_t *contract_addr,
     return false;
 }
 
-void tx_ctx_cleanup(void) {
+static void tx_ctx_cleanup(void) {
     flist_clear((s_flist_node **) &g_tx_ctx_list, (f_list_node_del) &delete_tx_ctx);
     g_tx_ctx_current = NULL;
 }

src/features/getChallenge/challenge.h

@@ -1,7 +1,9 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
 
 void roll_challenge(void);
 uint32_t get_challenge(void);
+bool check_challenge(uint32_t received_challenge);
 uint16_t handle_get_challenge(unsigned int *tx);

src/features/getChallenge/cmd_get_challenge.c

@@ -9,7 +9,11 @@ static uint32_t challenge;
  * Generate a new challenge from the Random Number Generator
  */
 void roll_challenge(void) {
+#ifdef HAVE_CHALLENGE_NO_CHECK
+    challenge = 0x12345678;
+#else
     challenge = cx_rng_u32();
+#endif
 }
 
 /**
@@ -21,6 +25,22 @@ uint32_t get_challenge(void) {
     return challenge;
 }
 
+/**
+ * Check the challenge
+ *
+ * @return whether the received challenge matches the current one
+ */
+bool check_challenge(uint32_t received_challenge) {
+    UNUSED(received_challenge);
+#ifndef HAVE_CHALLENGE_NO_CHECK
+    if (received_challenge != challenge) {
+        PRINTF("Error: challenge mismatch!\n");
+        return false;
+    }
+#endif
+    return true;
+}
+
 /**
  * Send back the current challenge
  */

src/features/provide_proxy_info/proxy_info.c

@@ -163,7 +163,6 @@ bool handle_proxy_info_struct(const s_tlv_data *data, s_proxy_info_ctx *context)
 
 bool verify_proxy_info_struct(const s_proxy_info_ctx *context) {
     uint8_t hash[INT256_LENGTH];
-    uint32_t challenge;
 
     if (cx_hash_no_throw((cx_hash_t *) &context->struct_hash,
                          CX_LAST,
@@ -178,12 +177,10 @@ bool verify_proxy_info_struct(const s_proxy_info_ctx *context) {
         PRINTF("Error: unknown struct type (%u)!\n", context->struct_type);
         return false;
     }
-    challenge = get_challenge();
-    roll_challenge();
-    if (context->challenge != challenge) {
-        PRINTF("Error: challenge mismatch!\n");
+    if (check_challenge(context->challenge) == false) {
         return false;
     }
+    roll_challenge();
     if (context->delegation_type != DELEGATION_TYPE_PROXY) {
         PRINTF("Error: unsupported delegation type (%u)!\n", context->delegation_type);
         return false;