Display missing fields in Become Validator. Only print IBC memo in ex…

…pert mode. Update test vectors to Namada v0.41.0.
heliaxdev · Aug 12, 2024 · 0335979 · 0335979
1 parent 1e7d3b4
commit 0335979
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 49,863 deletions.
diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c
@@ -52,7 +52,7 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
                 items += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_outputs; // print from outputs
                 items += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends; // print from spends
 
-                *numItems = (app_mode_expert() ? items + 5 : items);
+                *numItems = (app_mode_expert() ? items + 4 : items);
             } else {
                 *numItems = (app_mode_expert() ? TRANSFER_EXPERT_PARAMS : TRANSFER_NORMAL_PARAMS);
             }
@@ -93,6 +93,9 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
 
         case BecomeValidator: {
             *numItems = (app_mode_expert() ? BECOME_VALIDATOR_EXPERT_PARAMS : BECOME_VALIDATOR_NORMAL_PARAMS);
+            if(ctx->tx_obj->becomeValidator.name.ptr) {
+                (*numItems)++;
+            }
             if(ctx->tx_obj->becomeValidator.description.ptr) {
                 (*numItems)++;
             }
@@ -102,6 +105,9 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
             if(ctx->tx_obj->becomeValidator.website.ptr) {
                 (*numItems)++;
             }
+            if(ctx->tx_obj->becomeValidator.avatar.ptr) {
+                (*numItems)++;
+            }
             break;
         }
         case UpdateVP: {
@@ -125,8 +131,9 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
                 *numItems += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends; // print from spends
             }
             *numItems += ctx->tx_obj->ibc.transfer.non_masp_sources_len*2 + ctx->tx_obj->ibc.transfer.non_masp_targets_len*2 + ctx->tx_obj->ibc.transfer.no_symbol_sources + ctx->tx_obj->ibc.transfer.no_symbol_targets;
+            *numItems += ctx->tx_obj->ibc.memo.len > 0 && app_mode_expert();
             if(ctx->tx_obj->ibc.is_nft) {
-                *numItems += (ctx->tx_obj->ibc.n_token_id - (ctx->tx_obj->ibc.memo.len == 0 ? 1 : 0));
+                *numItems += ctx->tx_obj->ibc.n_token_id;
             }
             break;
 
@@ -190,7 +197,7 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
       (*numItems)++;
     }
 
-    if(app_mode_expert() && ctx->tx_obj->transaction.header.fees.symbol == NULL && !ctx->tx_obj->transaction.isMasp && !ctx->tx_obj->ibc.is_ibc) {
+    if(app_mode_expert() && ctx->tx_obj->transaction.header.fees.symbol == NULL) {
         (*numItems)++;
     }
 

diff --git a/app/src/parser_impl_common.h b/app/src/parser_impl_common.h
@@ -60,8 +60,8 @@ extern "C" {
 #define UNJAIL_VALIDATOR_NORMAL_PARAMS  2
 #define UNJAIL_VALIDATOR_EXPERT_PARAMS  6
 
-#define IBC_NORMAL_PARAMS  9
-#define IBC_EXPERT_PARAMS  14
+#define IBC_NORMAL_PARAMS  8
+#define IBC_EXPERT_PARAMS  12
 
 #define REDELEGATE_NORMAL_PARAMS  5
 #define REDELEGATE_EXPERT_PARAMS  9

diff --git a/app/src/parser_impl_txn.c b/app/src/parser_impl_txn.c
@@ -828,7 +828,6 @@ __Z_INLINE parser_error_t readTimeouts(parser_context_t *ctx, parser_tx_t *v, ui
 static parser_error_t readIBCTxn(const bytes_t *data, parser_tx_t *v) {
     parser_context_t ctx = {.buffer = data->ptr, .bufferLen = data->len, .offset = 0, .tx_obj = NULL};
 
-    v->ibc.is_ibc = 1;
     uint32_t tmpValue;
     uint16_t tmpFieldLen = 0;
     CHECK_ERROR(readUint32(&ctx, &tmpValue));

diff --git a/app/src/parser_print_txn.c b/app/src/parser_print_txn.c
@@ -900,25 +900,31 @@ static parser_error_t printBecomeValidatorTxn(  const parser_context_t *ctx,
                                               char *outVal, uint16_t outValLen,
                                               uint8_t pageIdx, uint8_t *pageCount) {
 
-    if(displayIdx >= 9 && ctx->tx_obj->becomeValidator.description.ptr == NULL) {
+    if(displayIdx >= 9 && ctx->tx_obj->becomeValidator.name.ptr == NULL) {
         displayIdx++;
     }
-    if(displayIdx >= 10 && ctx->tx_obj->becomeValidator.website.ptr == NULL) {
+    if(displayIdx >= 10 && ctx->tx_obj->becomeValidator.description.ptr == NULL) {
         displayIdx++;
     }
-    if(displayIdx >= 11 && ctx->tx_obj->becomeValidator.discord_handle.ptr == NULL) {
+    if(displayIdx >= 11 && ctx->tx_obj->becomeValidator.website.ptr == NULL) {
+        displayIdx++;
+    }
+    if(displayIdx >= 12 && ctx->tx_obj->becomeValidator.discord_handle.ptr == NULL) {
+        displayIdx++;
+    }
+    if(displayIdx >= 13 && ctx->tx_obj->becomeValidator.avatar.ptr == NULL) {
         displayIdx++;
     }
 
     const bool hasMemo = ctx->tx_obj->transaction.header.memoSection != NULL;
-    if (displayIdx >= 12 && !hasMemo) {
+    if (displayIdx >= 14 && !hasMemo) {
         displayIdx++;
     }
 
     switch (displayIdx) {
         case 0:
             snprintf(outKey, outKeyLen, "Type");
-            snprintf(outVal, outValLen, "Init Validator");
+            snprintf(outVal, outValLen, "Become Validator");
             if (app_mode_expert()) {
                 CHECK_ERROR(printCodeHash(&ctx->tx_obj->transaction.sections.code, outKey, outKeyLen,
                                           outVal, outValLen, pageIdx, pageCount))
@@ -972,33 +978,45 @@ static parser_error_t printBecomeValidatorTxn(  const parser_context_t *ctx,
             break;
         }
         case 9: {
+            snprintf(outKey, outKeyLen, "Name");
+            snprintf(outVal, outValLen, "");
+            if (ctx->tx_obj->becomeValidator.name.len > 0) {
+                pageStringExt(outVal, outValLen, (const char*)ctx->tx_obj->becomeValidator.name.ptr, ctx->tx_obj->becomeValidator.name.len, pageIdx, pageCount);
+            }
+            break;
+        }
+        case 10: {
             snprintf(outKey, outKeyLen, "Description");
-            // snprintf(outVal, outValLen, "(none)");
             snprintf(outVal, outValLen, "");
             if (ctx->tx_obj->becomeValidator.description.len > 0) {
                 pageStringExt(outVal, outValLen, (const char*)ctx->tx_obj->becomeValidator.description.ptr, ctx->tx_obj->becomeValidator.description.len, pageIdx, pageCount);
             }
             break;
         }
-        case 10: {
+        case 11: {
             snprintf(outKey, outKeyLen, "Website");
             pageStringExt(outVal, outValLen, (const char*)ctx->tx_obj->becomeValidator.website.ptr, ctx->tx_obj->becomeValidator.website.len, pageIdx, pageCount);
             break;
         }
-        case 11: {
+        case 12: {
             snprintf(outKey, outKeyLen, "Discord handle");
             pageStringExt(outVal, outValLen, (const char*)ctx->tx_obj->becomeValidator.discord_handle.ptr, ctx->tx_obj->becomeValidator.discord_handle.len, pageIdx, pageCount);
             break;
         }
-        case 12:
+        case 13: {
+            snprintf(outKey, outKeyLen, "Avatar");
+            pageStringExt(outVal, outValLen, (const char*)ctx->tx_obj->becomeValidator.avatar.ptr, ctx->tx_obj->becomeValidator.avatar.len, pageIdx, pageCount);
+            break;
+        }
+        case 14:
             CHECK_ERROR(printMemo(ctx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount))
             break;
 
         default: {
             if (!app_mode_expert()) {
                 return parser_display_idx_out_of_range;
             }
-            displayIdx -= 13;
+            displayIdx -= 15;
             return printExpert(ctx, displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
         }
     }
@@ -1134,6 +1152,11 @@ static parser_error_t printIBCTxn( const parser_context_t *ctx,
     uint8_t amount_denom = 0;
     const char* symbol = NULL;
 
+    // Skip printing the IBC memo in normal mode
+    if (displayIdx >= 6 && !(app_mode_expert() && ctx->tx_obj->ibc.memo.len > 0)) {
+        displayIdx ++;
+    }
+
     const tx_ibc_t *ibc = &ctx->tx_obj->ibc;
     if (sourcesStart <= displayIdx && displayIdx < spendsStart) {
         displayIdx -= sourcesStart;
@@ -1451,7 +1474,7 @@ static parser_error_t printNFTIBCTxn( const parser_context_t *ctx,
         displayIdx -= (ibc->n_token_id -1);
     }
 
-    if(displayIdx >= 7 && ctx->tx_obj->ibc.memo.len == 0) {
+    if(displayIdx >= 7 && (ctx->tx_obj->ibc.memo.len == 0 || !app_mode_expert())) {
         displayIdx++;
     }
 

diff --git a/app/src/parser_types.h b/app/src/parser_types.h
@@ -349,7 +349,6 @@ typedef struct {
     bytes_t token_id;
     uint16_t n_token_id;
     uint8_t is_nft;
-    uint8_t is_ibc;
 } tx_ibc_t;
 
 typedef struct {

diff --git a/deps/ledger-secure-sdk b/deps/ledger-secure-sdk
diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk
diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk
diff --git a/deps/nanox-secure-sdk b/deps/nanox-secure-sdk
+0 −46		.github/workflows/documentation.yml
+0 −2		Makefile.defines
+2 −3		Makefile.target
+24 −25		README.md
+2 −2		doc/mainpage.dox
+0 −6		include/os_io_seproxyhal.h
+0 −230		include/os_pki.h
+0 −109		include/sdk_apdu_commands.h
+0 −5		include/syscalls.h
+1 −1		lib_blewbxx_impl/doc/mainpage.dox
+1 −1		lib_cxng/doc/mainpage.dox
+1 −1		lib_nbgl/doc/mainpage.dox
+517 −192		lib_nbgl/doc/nbgl_use_case.dox
+ −		lib_nbgl/doc/resources/UseCase-AddressConfirmation.png
+ −		lib_nbgl/doc/resources/UseCase-AddressConfirmationExt.png
+ −		lib_nbgl/doc/resources/UseCase-Choice.png
+ −		lib_nbgl/doc/resources/UseCase-HomeExt.png
+ −		lib_nbgl/doc/resources/UseCase-HomePlugIn.png
+ −		lib_nbgl/doc/resources/UseCase-HomeSettings.png
+ −		lib_nbgl/doc/resources/UseCase-HomeSettingsAPI.png
+ −		lib_nbgl/doc/resources/UseCase-Keypad.png
+ −		lib_nbgl/doc/resources/UseCase-Review-Status.png
+ −		lib_nbgl/doc/resources/UseCase-Review.png
+ −		lib_nbgl/doc/resources/UseCase-Review1.png
+ −		lib_nbgl/doc/resources/UseCase-ReviewForwardOnly.png
+ −		lib_nbgl/doc/resources/UseCase-ReviewLight.png
+ −		lib_nbgl/doc/resources/UseCase-ReviewStart.png
+ −		lib_nbgl/doc/resources/UseCase-Settings1.png
+ −		lib_nbgl/doc/resources/UseCase-Settings2.png
+ −		lib_nbgl/doc/resources/UseCase-Spinner.png
+ −		lib_nbgl/doc/resources/UseCase-Status.png
+ −		lib_nbgl/doc/resources/UseCase-Streaming.png
+0 −20		lib_nbgl/include/nbgl_content.h
+1 −3		lib_nbgl/include/nbgl_layout.h
+180 −289		lib_nbgl/src/nbgl_layout.c
+35 −51		lib_nbgl/src/nbgl_layout_keyboard.c
+23 −37		lib_nbgl/src/nbgl_layout_keypad.c
+12 −12		lib_nbgl/src/nbgl_layout_navigation.c
+8 −13		lib_nbgl/src/nbgl_obj.c
+2 −2		lib_nbgl/src/nbgl_obj_keyboard_nanos.c
+0 −1		lib_nbgl/src/nbgl_page.c
+107 −119		lib_nbgl/src/nbgl_use_case.c
+4 −13		lib_nbgl/tools/icon2glyph.py
+1 −1		lib_nfc/doc/mainpage.dox
+1 −1		lib_standard_app/doc/mainpage.dox
+1 −1		lib_stusb/doc/mainpage.dox
+1 −1		lib_stusb_impl/doc/mainpage.dox
+30 −1		lib_stusb_impl/usbd_impl.c
+1 −1		lib_u2f/doc/mainpage.dox
+1 −1		lib_ux/doc/mainpage.dox
+3 −3		lib_ux_nbgl/doc/mainpage.dox
+0 −4		lib_ux_sync/include/ux_sync.h
+0 −22		lib_ux_sync/src/ux_sync.c
+13 −42		src/os_io_seproxyhal.c
+0 −45		src/syscalls.c
+0 −4		target/flex/include/bolos_target.h
+0 −6		target/nanos/include/bolos_target.h
+0 −6		target/nanos2/include/bolos_target.h
+0 −6		target/nanox/include/bolos_target.h
+0 −4		target/stax/include/bolos_target.h
+0 −2		app/common/app_main.c
+53 −54		app/ui/view_internal.h
+191 −115		app/ui/view_stax.c
+4 −65		dockerized_build.mk
+0 −28		include/zxcanary.h
+45 −51		include/zxmacros.h
+46 −48		include/zxmacros_ledger.h
+16 −18		include/zxmacros_x64.h
+2 −2		include/zxversion.h
+4 −20		makefiles/Makefile.devices
+5 −6		makefiles/Makefile.platform
+49 −30		src/app_mode.c
+0 −60		src/zxcanary.c
+27 −38		src/zxmacros.c