d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now buffers the EIP-712 pairs to show more than one per screen

Browse Source
This commit is contained in:
Alexandre Paillier
2024-06-06 18:13:11 +02:00
parent c7f5ba67e8
commit ae359b481e
3 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src_nbgl/ui_sign_712.c
View File

@@ -7,11 +7,28 @@
#include "common_712.h"
#include "nbgl_use_case.h"
#include "ui_message_signing.h"
#include "ledger_assert.h"
static nbgl_contentTagValue_t pair;
static nbgl_contentTagValue_t pairs[6];
static nbgl_contentTagValueList_t pairs_list;
static uint8_t pair_idx;
static size_t buf_idx;
static void message_progress(bool confirm) {
char *buf;
size_t buf_size;
size_t shift_off;
if (pairs_list.nbPairs < pair_idx) {
buf = get_ui_pairs_buffer(&buf_size);
memmove(&pairs[0], &pairs[pairs_list.nbPairs], sizeof(pairs[0]));
memmove(buf, pairs[0].item, (buf + buf_idx) - pairs[0].item);
shift_off = pairs[0].item - buf;
buf_idx -= shift_off;
pairs[0].value -= shift_off;
pairs[0].item = buf;
pair_idx = 1;
}
if (confirm) {
if (ui_712_next_field() == EIP712_NO_MORE_FIELD) {
ui_712_switch_to_sign();
@@ -22,22 +39,40 @@ static void message_progress(bool confirm) {
}
static void message_update(bool confirm) {
if (confirm) {
explicit_bzero(&pair, sizeof(pair));
explicit_bzero(&pairs_list, sizeof(pairs_list));
char *buf;
size_t buf_size;
size_t buf_off;
bool flag;
pair.item = strings.tmp.tmp2;
pair.value = strings.tmp.tmp;
pairs_list.nbPairs = 1;
pairs_list.pairs = &pair;
pairs_list.wrapping = false;
nbgl_useCaseReviewStreamingContinue(&pairs_list, message_progress);
buf = get_ui_pairs_buffer(&buf_size);
if (confirm) {
buf_off = strlen(strings.tmp.tmp2) + 1;
LEDGER_ASSERT((buf_idx + buf_off) < buf_size, "UI pairs buffer overflow");
pairs[pair_idx].item = memmove(buf + buf_idx, strings.tmp.tmp2, buf_off);
buf_idx += buf_off;
buf_off = strlen(strings.tmp.tmp) + 1;
LEDGER_ASSERT((buf_idx + buf_off) < buf_size, "UI pairs buffer overflow");
pairs[pair_idx].value = memmove(buf + buf_idx, strings.tmp.tmp, buf_off);
buf_idx += buf_off;
pair_idx += 1;
pairs_list.nbPairs = nbgl_useCaseGetNbTagValuesInPage(pair_idx, &pairs_list, 0, &flag);
if (pairs_list.nbPairs < pair_idx) {
nbgl_useCaseReviewStreamingContinue(&pairs_list, message_progress);
} else {
message_progress(true);
}
} else {
ui_typed_message_review_choice(false);
}
}
void ui_712_start(void) {
explicit_bzero(&pairs, sizeof(pairs));
explicit_bzero(&pairs_list, sizeof(pairs_list));
pairs_list.pairs = pairs;
pair_idx = 0;
buf_idx = 0;
nbgl_useCaseReviewStreamingStart(TYPE_MESSAGE,
&C_Review_64px,
TEXT_REVIEW_EIP712,
@@ -50,7 +85,13 @@ void ui_712_switch_to_message(void) {
}
void ui_712_switch_to_sign(void) {
nbgl_useCaseReviewStreamingFinish(TEXT_SIGN_EIP712, ui_typed_message_review_choice);
if (pair_idx > 0) {
pairs_list.nbPairs = pair_idx;
pair_idx = 0;
nbgl_useCaseReviewStreamingContinue(&pairs_list, message_progress);
} else {
nbgl_useCaseReviewStreamingFinish(TEXT_SIGN_EIP712, ui_typed_message_review_choice);
}
}
#endif // HAVE_EIP712_FULL_SUPPORT