Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tx data refactor3 #92

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Tx data refactor3 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
43fc64f
Compressed transaction data lookup and parsing
relatko May 25, 2022
fa8e4d4
Introduce PIC into template matching
relatko May 25, 2022
607263f
Improve naming: tx metadata
relatko May 26, 2022
e6f759b
Fix various minor review findings
relatko Jun 7, 2022
53ca57b
Ad consts into json parsing
relatko Jun 7, 2022
3142b37
dd static where aplicable in tx_metadata
relatko Jun 7, 2022
ba7d4f0
Refactor transaction displaying using metadata
relatko May 26, 2022
94a5db3
Several mostly data displaying code improvements
relatko May 27, 2022
b3f43b0
Improve addr internal and parser internal contract validation
relatko May 30, 2022
7169282
Minor review fixes
relatko Jun 7, 2022
b20c117
New general screen macros, applied to addr.c
relatko Jun 19, 2022
80e760a
Make SCREEN macro work for NanoX/S+
relatko Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ file(GLOB_RECURSE LIB_SRC
${CMAKE_CURRENT_SOURCE_DIR}/app/src/hdpath.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/json/json_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/tx_metadata.c
app/src/base32.c
app/src/crypto.c
)
Expand Down
171 changes: 77 additions & 94 deletions app/src/addr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,130 +22,113 @@
#include "app_mode.h"
#include "hdpath.h"

#include "screens.h"

bool hasPubkey;
uint8_t pubkey_to_display[SECP256_PK_LEN];

//Small trick to avoid duplicated code here which was quite error prone:
//displayIdx is either the index of page to display, or may be a negative integer.
//In the second case this is used to count the number of pages
//If displayIdx is negative, all other values are undefined
zxerr_t addr_getItem_internal(int8_t *displayIdx,
char *outKey, uint16_t outKeyLen,
char *outVal, uint16_t outValLen,
uint8_t pageIdx, uint8_t *pageCount) {
zemu_log_stack("addr_getItem_internal");

#define SCREEN(condition) if ((condition) && ((*displayIdx)--==0) && pageCount && (*pageCount = 1))
//this defines addr_internal function
BEGIN_SCREENS_FUNCTION(addr, zxerr_t, zxerr_ok, zxerr_no_data, zxerr_no_data)

uint8_t show_address_yes = (show_address == SHOW_ADDRESS_YES || show_address == SHOW_ADDRESS_YES_HASH_MISMATCH);

SCREEN(hasPubkey) {
snprintf(outKey, outKeyLen, "Pub Key");
// +1 is to skip 0x04 prefix that indicates uncompresed key
pageHexString(outVal, outValLen, pubkey_to_display+1, sizeof(pubkey_to_display)-1, pageIdx, pageCount);
return zxerr_ok;
if (hasPubkey) {
BEGIN_SCREEN
snprintf(outKey, outKeyLen, "Pub Key");
// +1 is to skip 0x04 prefix that indicates uncompresed key
pageHexString(outVal, outValLen, pubkey_to_display+1, sizeof(pubkey_to_display)-1, pageIdx, pageCount);
END_SCREEN
}

//this indicates error in pubkey derivation (possible only when in menu_handler - in apdu_handler we throw)
SCREEN(!hasPubkey && show_address_yes) {
snprintf(outKey, outKeyLen, "Error");
pageString(outVal, outValLen, " deriving public key.", pageIdx, pageCount);
return zxerr_ok;
if (!hasPubkey && show_address_yes) {
BEGIN_SCREEN
snprintf(outKey, outKeyLen, "Error");
pageString(outVal, outValLen, " deriving public key.", pageIdx, pageCount);
END_SCREEN
}

SCREEN(true) {
switch(show_address) {
case SHOW_ADDRESS_ERROR:
//this indicates error in pubkey derivation (possible only when in menu_handler - in apdu_handler we throw)
switch(show_address) {
case SHOW_ADDRESS_ERROR:
BEGIN_SCREEN
snprintf(outKey, outKeyLen, "Error reading");
pageString(outVal, outValLen, "account data.", pageIdx, pageCount);
return zxerr_ok;
case SHOW_ADDRESS_EMPTY_SLOT:
#if defined(TARGET_NANOS)
snprintf(outKey, outKeyLen, "Account data");
pageString(outVal, outValLen, "not saved on the device.", pageIdx, pageCount);
#else
snprintf(outKey, outKeyLen, "Address:");
pageString(outVal, outValLen, "Account data not saved on the device.", pageIdx, pageCount);
#endif
return zxerr_ok;
case SHOW_ADDRESS_HDPATHS_NOT_EQUAL:
END_SCREEN
break;
case SHOW_ADDRESS_EMPTY_SLOT:
BEGIN_SCREEN
#if defined(TARGET_NANOS)
snprintf(outKey, outKeyLen, "Account data");
pageString(outVal, outValLen, "not saved on the device.", pageIdx, pageCount);
#else
snprintf(outKey, outKeyLen, "Address:");
pageString(outVal, outValLen, "Account data not saved on the device.", pageIdx, pageCount);
#endif
END_SCREEN
break;
case SHOW_ADDRESS_HDPATHS_NOT_EQUAL:
BEGIN_SCREEN
snprintf(outKey, outKeyLen, "Address:");
pageString(outVal, outValLen, "Other path is saved on the device.", pageIdx, pageCount);
return zxerr_ok;
case SHOW_ADDRESS_YES:
case SHOW_ADDRESS_YES_HASH_MISMATCH:
END_SCREEN
break;
case SHOW_ADDRESS_YES:
case SHOW_ADDRESS_YES_HASH_MISMATCH:
BEGIN_SCREEN
snprintf(outKey, outKeyLen, "Address:");
pageHexString(outVal, outValLen, address_to_display.data, sizeof(address_to_display.data), pageIdx, pageCount);
return zxerr_ok;
default:
return zxerr_no_data;
}
END_SCREEN
break;
default:
return zxerr_unknown;
}

SCREEN(show_address_yes) {
#if defined(TARGET_NANOS)
snprintf(outKey, outKeyLen, "Verify if this");
snprintf(outVal, outValLen, " public key was added to");
#else
snprintf(outKey, outKeyLen, "Warning:");
snprintf(outVal, outValLen, "Verify if this public key was added to");
#endif
return zxerr_ok;
if (show_address_yes) {
BEGIN_SCREEN
#if defined(TARGET_NANOS)
snprintf(outKey, outKeyLen, "Verify if this");
snprintf(outVal, outValLen, " public key was added to");
#else
snprintf(outKey, outKeyLen, "Warning:");
snprintf(outVal, outValLen, "Verify if this public key was added to");
#endif
END_SCREEN
}

SCREEN(show_address_yes) {
#if defined(TARGET_NANOS)
array_to_hexstr(outKey, outKeyLen, address_to_display.data, sizeof(address_to_display.data));
snprintf(outVal, outValLen, " using any Flow blockch. explorer.");
#else
char buffer[2*sizeof(address_to_display.data)+1];
array_to_hexstr(buffer, sizeof(buffer), address_to_display.data, sizeof(address_to_display.data));
snprintf(outVal, outValLen, "%s using any Flow blockchain explorer.", buffer);
snprintf(outKey, outKeyLen, "");
#endif
return zxerr_ok;
if (show_address_yes) {
BEGIN_SCREEN
#if defined(TARGET_NANOS)
array_to_hexstr(outKey, outKeyLen, address_to_display.data, sizeof(address_to_display.data));
snprintf(outVal, outValLen, " using any Flow blockch. explorer.");
#else
char buffer[2*sizeof(address_to_display.data)+1];
array_to_hexstr(buffer, sizeof(buffer), address_to_display.data, sizeof(address_to_display.data));
snprintf(outVal, outValLen, "%s using any Flow blockchain explorer.", buffer);
snprintf(outKey, outKeyLen, "");
#endif
END_SCREEN
}

SCREEN(app_mode_expert() && hasPubkey) {
snprintf(outKey, outKeyLen, "Your Path");
char buffer[100];
path_options_to_string(buffer, sizeof(buffer), hdPath.data, HDPATH_LEN_DEFAULT, cryptoOptions & 0xFF00); //show curve only
pageString(outVal, outValLen, buffer, pageIdx, pageCount);
return zxerr_ok;
if (app_mode_expert() && hasPubkey) {
BEGIN_SCREEN
snprintf(outKey, outKeyLen, "Your Path");
char buffer[100];
path_options_to_string(buffer, sizeof(buffer), hdPath.data, HDPATH_LEN_DEFAULT, cryptoOptions & 0xFF00); //show curve only
pageString(outVal, outValLen, buffer, pageIdx, pageCount);
END_SCREEN
}

return zxerr_no_data;

#undef SCREEN
}
END_SCREENS_FUNCTION


#define ARBITRARY_NEGATIVE_INTEGER -1
zxerr_t addr_getNumItems(uint8_t *num_items) {
int8_t displays = ARBITRARY_NEGATIVE_INTEGER;
zxerr_t err = addr_getItem_internal(&displays, NULL, 0, NULL, 0, 0, NULL);

int8_t pages = ARBITRARY_NEGATIVE_INTEGER - displays;

if (pages < 0) {
num_items = 0;
return zxerr_unknown;
}

*num_items = (uint8_t) pages;

if (err == zxerr_no_data) {
return zxerr_ok;
}
if (err == zxerr_ok) {
return zxerr_unknown;
}
return err;
return addr_internal(MAX_DISPLAYS, NULL, 0, NULL, 0, 0, num_items);
}

zxerr_t addr_getItem(int8_t displayIdx,
zxerr_t addr_getItem(uint8_t displayIdx,
char *outKey, uint16_t outKeyLen,
char *outVal, uint16_t outValLen,
uint8_t pageIdx, uint8_t *pageCount) {
return addr_getItem_internal(&displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
return addr_internal(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
}
Loading