Update zxlib #5

relatko · 2024-08-06T11:03:04Z

Update zxlib. Flex almost works

this version does not work, it is here just as zxlib changes reference.

deps/ledger-zxlib/app/ui/view_internal.h

-static const char* review_addrvalue = REVIEW_SCREEN_ADDR_VALUE;
-static const char* review_keyconfig = "Review";
-static const char* review_configvalue = "configuration";
+static const char *review_key = REVIEW_SCREEN_TITLE;


deps/ledger-zxlib/app/ui/view_internal.h

-static const char* review_keyconfig = "Review";
-static const char* review_configvalue = "configuration";
+static const char *review_key = REVIEW_SCREEN_TITLE;
+static const char *review_txvalue = REVIEW_SCREEN_TXN_VALUE;


deps/ledger-zxlib/app/ui/view_internal.h

-static const char* review_configvalue = "configuration";
+static const char *review_key = REVIEW_SCREEN_TITLE;
+static const char *review_txvalue = REVIEW_SCREEN_TXN_VALUE;
+static const char *review_addrvalue = REVIEW_SCREEN_ADDR_VALUE;


deps/ledger-zxlib/app/ui/view_internal.h

+#define INTRO_PAGES 0
+#endif
+
+// FIXME: Wait to be fixed on SDK:


deps/ledger-zxlib/app/ui/view_nano.c

@@ -85,7 +84,11 @@
    }

    // passed page count, go to next index
-    if (viewdata.itemCount > 0 && viewdata.itemIdx < (viewdata.itemCount - 1 + INCLUDE_ACTIONS_COUNT)) {
+    uint8_t extraScreens = INCLUDE_ACTIONS_COUNT;
+    if (review_type == REVIEW_MSG && extraScreens > 0) {


deps/ledger-zxlib/app/ui/view_nano.c

@@ -104,7 +107,11 @@
    }

    // passed page count, go to next index
-    if (viewdata.itemCount > 0 && viewdata.itemIdx < (viewdata.itemCount - 1 + INCLUDE_ACTIONS_COUNT)) {
+    uint8_t extraScreens = INCLUDE_ACTIONS_COUNT;
+    if (review_type == REVIEW_MSG && extraScreens > 0) {


deps/ledger-zxlib/app/ui/view_x.c

@@ -183,6 +185,11 @@
 //////////////////////////
 //////////////////////////

+static void h_view_address() {
+    handleMenuShowAddress();
+//    view_review_show_impl();


deps/ledger-zxlib/src/timeutils.c

Update documentation.

cedelavergne-ledger · 2024-09-06T10:09:52Z

deps/README.md

@@ -0,0 +1,10 @@
+## Updating zx-lib
+
+Menu feaure requires us o change zxlib menu layout. Thus insead of a submodule, we have ledger-zxlib included as a copy. In case you need to update zxlib, this is the list of changes performed. 


Typo:
Menu feature requires us to... instead

And below:
Menu contains

Fixes an issue on stax on screens containing 6 entries.

Fixed too many arguments CI issue

STAX and FLEX menu feature not merged into zxlib yet

deps/ledger-zxlib/app/ui/view_internal.h

+static const char *review_key = REVIEW_SCREEN_TITLE;
+static const char *review_txvalue = REVIEW_SCREEN_TXN_VALUE;
+static const char *review_addrvalue = REVIEW_SCREEN_ADDR_VALUE;
+static const char *review_keyconfig = "Review";


deps/ledger-zxlib/app/ui/view_internal.h

+static const char *review_txvalue = REVIEW_SCREEN_TXN_VALUE;
+static const char *review_addrvalue = REVIEW_SCREEN_ADDR_VALUE;
+static const char *review_keyconfig = "Review";
+static const char *review_configvalue = "configuration";


deps/ledger-zxlib/app/ui/view_internal.h

+static const char *review_addrvalue = REVIEW_SCREEN_ADDR_VALUE;
+static const char *review_keyconfig = "Review";
+static const char *review_configvalue = "configuration";
+static const char *review_skip_key = "Warning";


deps/ledger-zxlib/app/ui/view_internal.h

+static const char *review_keyconfig = "Review";
+static const char *review_configvalue = "configuration";
+static const char *review_skip_key = "Warning";
+static const char *review_skip_value = "BlindSign";


deps/ledger-zxlib/app/ui/view_internal.h

+static const char *review_configvalue = "configuration";
+static const char *review_skip_key = "Warning";
+static const char *review_skip_value = "BlindSign";
+static const char *review_skip_key_msg = "Tx details";


deps/ledger-zxlib/include/utf8.h

+    } else if (((0x0100 <= cp) && (0x012f >= cp)) || ((0x0132 <= cp) && (0x0137 >= cp)) ||
+               ((0x014a <= cp) && (0x0177 >= cp)) || ((0x0182 <= cp) && (0x0185 >= cp)) ||
+               ((0x01a0 <= cp) && (0x01a5 >= cp)) || ((0x01de <= cp) && (0x01ef >= cp)) ||
+               ((0x01f8 <= cp) && (0x021f >= cp)) || ((0x0222 <= cp) && (0x0233 >= cp)) ||
+               ((0x0246 <= cp) && (0x024f >= cp)) || ((0x03d8 <= cp) && (0x03ef >= cp)) ||
+               ((0x0460 <= cp) && (0x0481 >= cp)) || ((0x048a <= cp) && (0x04ff >= cp))) {


deps/ledger-zxlib/src/bignum.c

@@ -69,20 +68,19 @@
        // get bit
        const uint16_t byteIdx = bitIdx >> 3u;
        const uint8_t mask = 0x80u >> (bitIdx & 0x7u);
-        carry = (uint8_t) ((binValue[binValueLen - byteIdx - 1] & mask) > 0);
+        carry = (uint8_t)((binValue[binValueLen - byteIdx - 1] & mask) > 0);


deps/ledger-zxlib/src/bignum.c

@@ -135,11 +132,11 @@
        // get bit
        const uint16_t byteIdx = bitIdx >> 3u;
        const uint8_t mask = 0x80u >> (bitIdx & 0x7u);
-        carry = (uint8_t) ((binValue[byteIdx] & mask) > 0);
+        carry = (uint8_t)((binValue[byteIdx] & mask) > 0);


deps/ledger-zxlib/src/buffering.c

 #include <zxmacros.h>

 #ifdef __cplusplus
 extern "C" {
 #endif

-buffer_state_t ram;         // Ram
-buffer_state_t flash;       // Flash
+buffer_state_t ram;    // Ram


deps/ledger-zxlib/src/timeutils.c

-    while (date->tm_year < yearLookupSize && yearLookup[date->tm_year] <= time) date->tm_year++;
+    const uint16_t yearLookupSize = sizeof(yearLookup) / sizeof(yearLookup[0]);
+    while (date->tm_year < yearLookupSize && yearLookup[date->tm_year] <= time) {
+        date->tm_year++;


deps/ledger-zxlib/app/ui/view_nbgl.c

+    switch (token) {
+        case EXPERT_MODE_TOKEN:
+            h_expert_toggle();
+            break;
+
+#ifdef APP_ACCOUNT_MODE_ENABLED
+        case ACCOUNT_MODE_TOKEN:
+            account_enabled();
+            break;
+#endif
+
+#ifdef APP_SECRET_MODE_ENABLED
+        case SECRET_MODE_TOKEN:
+            secret_enabled();
+            break;
+#endif
+
+#ifdef APP_BLINDSIGN_MODE_ENABLED
+        case BLINDSIGN_MODE_TOKEN:
+            h_blindsign_toggle();
+            break;
+#endif
+
+        default:
+            ZEMU_LOGF(50, "Toggling setting not found\n")
+            break;
+    }


cedelavergne-ledger · 2025-01-02T08:35:50Z

Good job 😉

Seems it is ready now to be merged?

Most probably, the next step will be to open a PR on LedgerHQ organization, from your develop branch?

New zxlib, no adjusmens

b51a0fc

this version does not work, it is here just as zxlib changes reference.

github-advanced-security bot found potential problems Aug 6, 2024

View reviewed changes

relatko force-pushed the update-zxlib branch 2 times, most recently from f33465a to 28e1712 Compare August 6, 2024 20:49

Update zxlib

8eacb32

relatko force-pushed the update-zxlib branch from 28e1712 to 8eacb32 Compare August 6, 2024 21:11

relatko added 2 commits August 6, 2024 23:49

Update build to reflect PRODUCTION_BUILD option

7eac5da

Update documentation.

Update snapshots

888a39a

cedelavergne-ledger reviewed Sep 6, 2024

View reviewed changes

Update zxlib and fix typos

ccaf8b7

Fixes an issue on stax on screens containing 6 entries.

relatko force-pushed the update-zxlib branch 2 times, most recently from 69c3416 to b39923a Compare September 27, 2024 13:32

Python client refactor

3c37d15

Fixed too many arguments CI issue

relatko force-pushed the update-zxlib branch from b39923a to 3c37d15 Compare September 27, 2024 13:33

Flex icon

c209e9f

relatko force-pushed the update-zxlib branch from b20f1e5 to c209e9f Compare October 28, 2024 07:43

Robert Lukoťka added 2 commits December 30, 2024 11:09

Update snapshots with latest ledger-dev-tools

a90c920

WIP Update zxlib

9cc3f06

STAX and FLEX menu feature not merged into zxlib yet

github-advanced-security bot found potential problems Dec 30, 2024

View reviewed changes

Robert Lukoťka added 2 commits December 31, 2024 11:19

Show address from menu in STAX and FLEX

ed4f518

Remove outdated menu entries, improve menu test

8c4c061

tarakby mentioned this pull request Jan 2, 2025

Update zxlib and fix breaking changes onflow/ledger-app-flow#112

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update zxlib #5

Update zxlib #5

relatko commented Aug 6, 2024

cedelavergne-ledger Sep 6, 2024

cedelavergne-ledger commented Jan 2, 2025 •

edited

Loading

		@@ -0,0 +1,10 @@
		## Updating zx-lib

		Menu feaure requires us o change zxlib menu layout. Thus insead of a submodule, we have ledger-zxlib included as a copy. In case you need to update zxlib, this is the list of changes performed.

Update zxlib #5

Are you sure you want to change the base?

Update zxlib #5

Conversation

relatko commented Aug 6, 2024

cedelavergne-ledger Sep 6, 2024

Choose a reason for hiding this comment

cedelavergne-ledger commented Jan 2, 2025 • edited Loading

cedelavergne-ledger commented Jan 2, 2025 •

edited

Loading