Skip to content

Commit 80a0395

Browse files
abensoabenso
committed
updates
1 parent 0ef71a7 commit 80a0395

20 files changed

Lines changed: 38 additions & 59 deletions

File tree

‎app/src/common/parser_common.h‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,13 @@ typedef enum {
6969
parser_push_item_too_long,
7070

7171
// parser specific
72-
parser_schema_fixed_point_unknown_type,
73-
parser_schema_integer_display_unknown_type,
74-
parser_schema_byte_display_unknown_type,
75-
parser_schema_primitive_unknown_type,
76-
parser_schema_linking_scheme_unknown_type,
77-
parser_schema_link_unknown_type,
72+
parser_schema_unknown_type,
7873
parser_schema_parser_txn_failed,
7974
parser_schema_merkle_proofs_indices_mismatch,
8075

8176
// ui specific
8277
parser_ui_item_title_empty,
83-
parser_ui_open_bracket_not_found,
84-
parser_ui_close_bracket_not_found,
85-
parser_ui_find_bracket_buffer_too_small,
78+
parser_ui_separator_not_found,
8679
parser_ui_buffer_not_initialized,
8780
parser_ui_buffer_init_failed,
8881
parser_ui_buffer_too_small,

‎app/src/parser_impl.c‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,8 @@ const char *parser_getErrorDescription(parser_error_t err) {
9898
return "push item too long";
9999

100100
// parser specific
101-
case parser_schema_fixed_point_unknown_type:
102-
return "fixed point unknown type";
103-
case parser_schema_integer_display_unknown_type:
104-
return "integer display unknown type";
105-
case parser_schema_byte_display_unknown_type:
106-
return "byte display unknown type";
107-
case parser_schema_primitive_unknown_type:
108-
return "primitive unknown type";
109-
case parser_schema_linking_scheme_unknown_type:
110-
return "linking scheme unknown type";
111-
case parser_schema_link_unknown_type:
112-
return "link unknown type";
101+
case parser_schema_unknown_type:
102+
return "unknown type";
113103
case parser_schema_parser_txn_failed:
114104
return "parser txn failed";
115105
case parser_schema_merkle_proofs_indices_mismatch:
@@ -118,12 +108,8 @@ const char *parser_getErrorDescription(parser_error_t err) {
118108
// ui specific
119109
case parser_ui_item_title_empty:
120110
return "item title empty";
121-
case parser_ui_open_bracket_not_found:
122-
return "open bracket not found";
123-
case parser_ui_close_bracket_not_found:
124-
return "close bracket not found";
125-
case parser_ui_find_bracket_buffer_too_small:
126-
return "find bracket buffer too small";
111+
case parser_ui_separator_not_found:
112+
return "separator not found";
127113
case parser_ui_buffer_not_initialized:
128114
return "buffer not initialized";
129115
case parser_ui_buffer_init_failed:

‎app/src/schema_helper.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,18 @@ parser_error_t find_bracket_content(const char *input, uint8_t index, char *cont
145145
const char *current = input;
146146
for (uint8_t i = 0; i <= index; i++) {
147147
current = strchr(current, '{');
148-
if (current == NULL) return parser_ui_open_bracket_not_found;
148+
if (current == NULL) return parser_ui_separator_not_found;
149149

150150
if (i < index) {
151151
current++;
152152
continue;
153153
}
154154

155155
const char *close = strchr(current, '}');
156-
if (close == NULL) return parser_ui_close_bracket_not_found;
156+
if (close == NULL) return parser_ui_separator_not_found;
157157

158158
size_t len = close - current - 1;
159-
if (len >= content_len) return parser_ui_find_bracket_buffer_too_small;
159+
if (len >= content_len) return parser_ui_buffer_too_small;
160160

161161
strncpy(content, current + 1, len);
162162
content[len] = '\0';

‎app/src/schema_reader.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ parser_error_t read_fixed_point_display(parser_context_t *ctx, fixed_point_displ
3838
CHECK_ERROR(read_u64(ctx, (uint64_t *)&display->from_sibling_field.byte_offset));
3939
break;
4040
default:
41-
return parser_schema_fixed_point_unknown_type;
41+
return parser_schema_unknown_type;
4242
}
4343

4444
return parser_ok;
@@ -62,7 +62,7 @@ parser_error_t read_integer_display(parser_context_t *ctx, integer_display_t *di
6262
CHECK_ERROR(read_fixed_point_display(ctx, &display->fixed_point));
6363
break;
6464
default:
65-
return parser_schema_integer_display_unknown_type;
65+
return parser_schema_unknown_type;
6666
}
6767
return parser_ok;
6868
}
@@ -104,7 +104,7 @@ parser_error_t read_byte_display(parser_context_t *ctx, byte_display_t *display)
104104
print_string("byte display base58");
105105
return parser_no_data;
106106
default:
107-
return parser_schema_byte_display_unknown_type;
107+
return parser_schema_unknown_type;
108108
}
109109

110110
return parser_ok;
@@ -224,7 +224,7 @@ parser_error_t read_immediate(parser_context_t *ctx, primitive_t *primitive) {
224224
case PRIMITIVE_SKIP:
225225
break;
226226
default:
227-
return parser_schema_primitive_unknown_type;
227+
return parser_schema_unknown_type;
228228
}
229229
return parser_ok;
230230
}
@@ -245,7 +245,7 @@ parser_error_t read_link(parser_context_t *ctx, link_t *link) {
245245
CHECK_ERROR(read_immediate(ctx, &link->data.immediate));
246246
break;
247247
default:
248-
return parser_schema_link_unknown_type;
248+
return parser_schema_unknown_type;
249249
}
250250

251251
return parser_ok;
@@ -686,7 +686,7 @@ parser_error_t read_schema_type(parser_context_t *ctx, uint8_t type) {
686686
break;
687687
}
688688
default: {
689-
return parser_schema_primitive_unknown_type;
689+
return parser_schema_unknown_type;
690690
}
691691
}
692692

‎app/src/schema_txn_parser.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ parser_error_t schema_display_primitive(parser_context_t *ctx, parser_tx_t *txOb
176176
print_string("schema_display_primitive IMPLEMENT ME 4");
177177
return parser_unexpected_type;
178178
default:
179-
return parser_schema_primitive_unknown_type;
179+
return parser_schema_unknown_type;
180180
}
181181

182182
CHECK_ERROR(push_item(txObj, primitive, &ctx_to_push));
@@ -266,7 +266,7 @@ parser_error_t schema_display_struct(parser_context_t *ctx, parser_tx_t *txObj)
266266
CHECK_ERROR(schema_display_primitive(ctx, txObj, &named_field.value.data.immediate));
267267
break;
268268
default:
269-
return parser_schema_link_unknown_type;
269+
return parser_schema_unknown_type;
270270
}
271271

272272
if (remove_title) {
@@ -315,7 +315,7 @@ parser_error_t schema_display_tuple(parser_context_t *ctx, parser_tx_t *txObj) {
315315
CHECK_ERROR(schema_display_primitive(ctx, txObj, &unnamed_field.value.data.immediate));
316316
break;
317317
default:
318-
return parser_schema_link_unknown_type;
318+
return parser_schema_unknown_type;
319319
}
320320

321321
if (remove_title) {
@@ -350,7 +350,7 @@ parser_error_t schema_display_option(parser_context_t *ctx, parser_tx_t *txObj)
350350
CHECK_ERROR(schema_display_primitive(ctx, txObj, &option_type.value.data.immediate));
351351
break;
352352
default:
353-
return parser_schema_link_unknown_type;
353+
return parser_schema_unknown_type;
354354
}
355355

356356
return parser_ok;
@@ -374,7 +374,7 @@ parser_error_t schema_display_array(parser_context_t *ctx, parser_tx_t *txObj) {
374374
CHECK_ERROR(schema_display_primitive(ctx, txObj, &array_type.value.data.immediate));
375375
break;
376376
default:
377-
return parser_schema_link_unknown_type;
377+
return parser_schema_unknown_type;
378378
}
379379

380380
CHECK_ERROR(remove_last_item_title())
@@ -405,7 +405,7 @@ parser_error_t schema_display_vec(parser_context_t *ctx, parser_tx_t *txObj) {
405405
CHECK_ERROR(schema_display_primitive(ctx, txObj, &vec_type.value.data.immediate));
406406
break;
407407
default:
408-
return parser_schema_link_unknown_type;
408+
return parser_schema_unknown_type;
409409
}
410410
CHECK_ERROR(remove_last_item_title())
411411
}
@@ -450,7 +450,7 @@ parser_error_t schema_display_generic_by_index(parser_context_t *ctx, parser_tx_
450450
CHECK_ERROR(schema_display_vec(ctx, txObj));
451451
break;
452452
default:
453-
return parser_schema_linking_scheme_unknown_type;
453+
return parser_schema_unknown_type;
454454
}
455455

456456
return parser_ok;

‎app/src/ui_item_buffer.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ parser_error_t get_item_buffer_content(item_buffer_t *buffer, uint8_t index, cha
200200
while (*current && MEMCMP(current, buffer->separator_open, buffer->separator_open_len) != 0) {
201201
current++;
202202
}
203-
if (*current == '\0') return parser_ui_open_bracket_not_found;
203+
if (*current == '\0') return parser_ui_separator_not_found;
204204

205205
if (i < index) {
206206
current++;
@@ -211,10 +211,10 @@ parser_error_t get_item_buffer_content(item_buffer_t *buffer, uint8_t index, cha
211211
while (*close && MEMCMP(close, buffer->separator_close, buffer->separator_close_len) != 0) {
212212
close++;
213213
}
214-
if (*close == '\0') return parser_ui_close_bracket_not_found;
214+
if (*close == '\0') return parser_ui_separator_not_found;
215215

216216
size_t len = close - current - buffer->separator_open_len;
217-
if (len >= content_len) return parser_ui_find_bracket_buffer_too_small;
217+
if (len >= content_len) return parser_ui_buffer_too_small;
218218

219219
strncpy(content, current + buffer->separator_open_len, len);
220220
content[len] = '\0';
@@ -235,7 +235,7 @@ parser_error_t get_item_buffer_content_length(item_buffer_t *buffer, uint8_t ind
235235
while (*current && MEMCMP(current, buffer->separator_open, buffer->separator_open_len) != 0) {
236236
current++;
237237
}
238-
if (*current == '\0') return parser_ui_open_bracket_not_found;
238+
if (*current == '\0') return parser_ui_separator_not_found;
239239

240240
if (i < index) {
241241
current++;
@@ -246,7 +246,7 @@ parser_error_t get_item_buffer_content_length(item_buffer_t *buffer, uint8_t ind
246246
while (*close && MEMCMP(close, buffer->separator_close, buffer->separator_close_len) != 0) {
247247
close++;
248248
}
249-
if (*close == '\0') return parser_ui_close_bracket_not_found;
249+
if (*close == '\0') return parser_ui_separator_not_found;
250250

251251
*length = close - current - buffer->separator_open_len;
252252
return parser_ok;

‎deps/ledger-zxlib‎

‎tests_zemu/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,33 @@
2525
},
2626
"dependencies": {
2727
"@zondax/ledger-sovereign": "^0.0.2",
28-
"@zondax/zemu": "^0.55.0"
28+
"@zondax/zemu": "^0.55.3"
2929
},
3030
"devDependencies": {
3131
"@ledgerhq/hw-transport-node-hid": "^6.29.5",
3232
"@ledgerhq/logs": "^6.12.0",
33-
"@noble/curves": "^1.8.1",
33+
"@noble/curves": "^1.9.1",
3434
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
3535
"@types/jest": "^29.5.14",
3636
"@types/ledgerhq__hw-transport": "^4.21.8",
37-
"@typescript-eslint/eslint-plugin": "^8.27.0",
38-
"@typescript-eslint/parser": "^8.27.0",
37+
"@typescript-eslint/eslint-plugin": "^8.32.1",
38+
"@typescript-eslint/parser": "^8.32.1",
3939
"blakejs": "^1.2.1",
4040
"crypto-js": "4.2.0",
41-
"eslint": "^9.22.0",
42-
"eslint-config-prettier": "^10.1.1",
41+
"eslint": "^9.27.0",
42+
"eslint-config-prettier": "^10.1.5",
4343
"eslint-plugin-import": "^2.31.0",
4444
"eslint-plugin-jest": "^28.11.0",
45-
"eslint-plugin-prettier": "^5.2.3",
45+
"eslint-plugin-prettier": "^5.4.0",
4646
"eslint-plugin-promise": "^7.2.1",
4747
"eslint-plugin-tsdoc": "^0.4.0",
4848
"eslint-plugin-unused-imports": "^4.1.4",
4949
"jest": "29.7.0",
5050
"jssha": "^3.3.1",
5151
"prettier": "^3.5.3",
52-
"sort-package-json": "^3.0.0",
53-
"ts-jest": "^29.2.6",
52+
"sort-package-json": "^3.2.1",
53+
"ts-jest": "^29.3.4",
5454
"ts-node": "^10.9.2",
55-
"typescript": "^5.8.2"
55+
"typescript": "^5.8.3"
5656
}
5757
}

‎tests_zemu/snapshots/fl-sign_paymaster_register/00005.png‎

503 Bytes
Loading

‎tests_zemu/snapshots/fl-sign_paymaster_register/00006.png‎

241 Bytes
Loading

0 commit comments

Comments
 (0)