fix: display subwallet id even when blind signing

ton-blockchain · Feb 27, 2024 · 9ac7eef · 9ac7eef
1 parent a610433
commit 9ac7eef
Show file tree

Hide file tree

Showing 40 changed files with 16 additions and 19 deletions.
diff --git a/src/transaction/deserialize.c b/src/transaction/deserialize.c
@@ -40,6 +40,8 @@ parser_status_e transaction_deserialize(buffer_t *buf, transaction_t *tx) {
         return TAG_PARSING_ERROR;
     }
 
+    tx->hints.hints_count = 0;
+
     if (tx->tag == 0x01) {
         SAFE(buffer_read_u32(buf, &tx->subwallet_id, BE), GENERAL_ERROR);
         SAFE(buffer_read_bool(buf, &tx->include_wallet_op), GENERAL_ERROR);

diff --git a/src/transaction/transaction_hints.c b/src/transaction/transaction_hints.c
@@ -51,7 +51,6 @@ bool process_hints(transaction_t* tx) {
     BitString_t bits;
     bool hasCell = false;
     bool tmp = false;
-    tx->hints.hints_count = 0;
     buffer_t buf = {.ptr = tx->hints_data, .size = tx->hints_len, .offset = 0};
 
     //

diff --git a/src/ui/display_bagl.c b/src/ui/display_bagl.c
@@ -239,16 +239,13 @@ int ui_display_transaction() {
     }
     ux_approval_flow[step++] = &ux_display_address_step;
     ux_approval_flow[step++] = &ux_display_amount_step;
-    if (G_context.tx_info.transaction.has_payload) {
-        if (G_context.tx_info.transaction.is_blind) {
-            ux_approval_flow[step++] = &ux_display_payload_step;
-        } else {
-            g_hint_holder = &G_context.tx_info.transaction.hints;
-            g_hint_offset = -3;
-            for (uint16_t i = 0; i < G_context.tx_info.transaction.hints.hints_count; i++) {
-                ux_approval_flow[step++] = &ux_display_hint_step;
-            }
-        }
+    if (G_context.tx_info.transaction.has_payload && G_context.tx_info.transaction.is_blind) {
+        ux_approval_flow[step++] = &ux_display_payload_step;
+    }
+    g_hint_holder = &G_context.tx_info.transaction.hints;
+    g_hint_offset = -step;
+    for (uint16_t i = 0; i < G_context.tx_info.transaction.hints.hints_count; i++) {
+        ux_approval_flow[step++] = &ux_display_hint_step;
     }
     ux_approval_flow[step++] = &ux_display_approve_step;
     ux_approval_flow[step++] = &ux_display_reject_step;

diff --git a/src/ui/display_transaction_nbgl.c b/src/ui/display_transaction_nbgl.c
@@ -77,16 +77,14 @@ static void start_regular_review(void) {
     pairs[pairIndex].value = g_address;
     pairIndex++;
 
-    if (G_context.tx_info.transaction.has_payload) {
-        if (G_context.tx_info.transaction.is_blind) {
-            pairs[pairIndex].item = "Payload";
-            pairs[pairIndex].value = g_payload;
-            pairIndex++;
-        } else {
-            print_hints(&G_context.tx_info.transaction.hints, &pairs[pairIndex]);
-        }
+    if (G_context.tx_info.transaction.has_payload && G_context.tx_info.transaction.is_blind) {
+        pairs[pairIndex].item = "Payload";
+        pairs[pairIndex].value = g_payload;
+        pairIndex++;
     }
 
+    print_hints(&G_context.tx_info.transaction.hints, &pairs[pairIndex]);
+
     pairList.pairs = pairs;
     pairList.nbPairs = pairIndex + G_context.tx_info.transaction.hints.hints_count;
     pairList.smallCaseForValue = false;

diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00000.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00000.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00001.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00001.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00002.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00002.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00003.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00003.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00004.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00004.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00005.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00005.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00006.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00006.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00007.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00007.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00008.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00008.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00009.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00009.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00010.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00010.png
diff --git a/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00011.png b/tests/snapshots/nanos/test_sign_tx_subwallet_id/part1/00011.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00000.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00000.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00001.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00001.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00002.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00002.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00003.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00003.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00004.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00004.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00005.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00005.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00006.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00006.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00007.png b/tests/snapshots/nanosp/test_sign_tx_subwallet_id/part1/00007.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00000.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00000.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00001.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00001.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00002.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00002.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00003.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00003.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00004.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00004.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00005.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00005.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00006.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00006.png
diff --git a/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00007.png b/tests/snapshots/nanox/test_sign_tx_subwallet_id/part1/00007.png
diff --git a/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00000.png b/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00000.png
diff --git a/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00001.png b/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00001.png
diff --git a/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00002.png b/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00002.png
diff --git a/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00003.png b/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00003.png
diff --git a/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00004.png b/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00004.png
diff --git a/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00005.png b/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00005.png
diff --git a/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00006.png b/tests/snapshots/stax/test_sign_tx_subwallet_id/part1/00006.png
diff --git a/tests/test_sign_cmd.py b/tests/test_sign_cmd.py
@@ -195,6 +195,7 @@ def test_sign_tx_subwallet_id(firmware, backend, navigator, test_name):
 
     payloads: List[Payload] = [
         CommentPayload("test"),
+        CustomUnsafePayload(Cell()),
     ]
 
     # Enable blind signing and expert mode