Feat/blindsign flow (#19)

* update submodules

* add blindsign ui

* update tests

* update snapshots

* update test and snapshots for sign hash

* fix error return

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "deps/ledger-zxlib"]
 	path = deps/ledger-zxlib
 	url = https://github.com/Zondax/ledger-zxlib.git
-[submodule "cmake/cmake-modules"]
-	path = cmake/cmake-modules
-	url = https://github.com/bilke/cmake-modules
 [submodule "deps/picohash"]
 	path = deps/picohash
 	url = https://github.com/kazuho/picohash
@@ -12,4 +9,4 @@
 	url = https://github.com/LedgerHQ/ledger-secure-sdk
 [submodule "js"]
 	path = js
-	url = https://github.com/Zondax/ledger-flare-js
+	url = https://github.com/Zondax/ledger-flare-js

app/Makefile

@@ -40,7 +40,7 @@ endif
 
 # Add the PRODUCTION_BUILD definition to the compiler flags
 DEFINES += PRODUCTION_BUILD=$(PRODUCTION_BUILD)
-
+DEFINES += APP_BLINDSIGN_MODE_ENABLED
 
 ifndef COIN
 COIN=FLR

app/Makefile.version

@@ -1,6 +1,6 @@
 # This is the major version
 APPVERSION_M=2
 # This is the minor version
-APPVERSION_N=1
+APPVERSION_N=2
 # This is the patch version
-APPVERSION_P=3
+APPVERSION_P=0

app/src/apdu_handler.c

@@ -35,9 +35,6 @@
 #include "view_internal.h"
 #include "zxmacros.h"
 
-static const char *msg_error1 = "Expert Mode";
-static const char *msg_error2 = "Required";
-
 static bool tx_initialized = false;
 
 void extractHDPath(uint32_t rx, uint32_t offset) {
@@ -303,7 +300,8 @@ __Z_INLINE void handleSign(volatile uint32_t *flags, volatile uint32_t *tx, uint
         THROW(APDU_CODE_DATA_INVALID);
     }
 
-    const char *error_msg = tx_parse();
+    uint8_t error_code;
+    const char *error_msg = tx_parse(&error_code);
     CHECK_APP_CANARY()
     if (error_msg != NULL) {
         const int error_msg_length = strnlen(error_msg, sizeof(G_io_apdu_buffer));
@@ -323,9 +321,9 @@ __Z_INLINE void handleSignHash(volatile uint32_t *flags, volatile uint32_t *tx,
         THROW(APDU_CODE_OK);
     }
 
-    if (!app_mode_expert()) {
+    if (!app_mode_blindsign()) {
         *flags |= IO_ASYNCH_REPLY;
-        view_custom_error_show(PIC(msg_error1), PIC(msg_error2));
+        view_blindsign_error_show();
         THROW(APDU_CODE_DATA_INVALID);
     }
 
@@ -350,14 +348,18 @@ __Z_INLINE void handleSignEth(volatile uint32_t *flags, volatile uint32_t *tx, u
     }
 
     CHECK_APP_CANARY()
-
-    const char *error_msg = tx_parse();
+    uint8_t error_code;
+    const char *error_msg = tx_parse(&error_code);
     CHECK_APP_CANARY()
 
     if (error_msg != NULL) {
         const int error_msg_length = strnlen(error_msg, sizeof(G_io_apdu_buffer));
         MEMCPY(G_io_apdu_buffer, error_msg, error_msg_length);
         *tx += (error_msg_length);
+        if (error_code == parser_blindsign_required) {
+            *flags |= IO_ASYNCH_REPLY;
+            view_blindsign_error_show();
+        }
         THROW(APDU_CODE_DATA_INVALID);
     }
 

app/src/common/parser_common.h

@@ -67,6 +67,7 @@ typedef enum {
     parser_invalid_stake_amount,
     parser_unexpected_output_locked,
     parser_unsupported_tx,
+    parser_blindsign_required,
 
     parser_invalid_rs_values,
     parser_invalid_chain_id,

app/src/common/tx.c

@@ -69,7 +69,7 @@ uint32_t tx_get_buffer_length() { return buffering_get_buffer()->pos; }
 
 uint8_t *tx_get_buffer() { return buffering_get_buffer()->data; }
 
-const char *tx_parse() {
+const char *tx_parse(uint8_t *error_code) {
     MEMZERO(&tx_obj, sizeof(tx_obj));
 
     uint8_t err = parser_parse(&ctx_parsed_tx, tx_get_buffer(), tx_get_buffer_length(), &tx_obj);
@@ -81,6 +81,7 @@ const char *tx_parse() {
     }
 
     err = parser_validate(&ctx_parsed_tx);
+    *error_code = err;
     CHECK_APP_CANARY()
 
     if (err != parser_ok) {

app/src/common/tx.h

@@ -44,7 +44,7 @@ uint8_t *tx_get_buffer();
 /// Parse message stored in transaction buffer
 /// This function should be called as soon as full buffer data is loaded.
 /// \return It returns NULL if data is valid or error message otherwise.
-const char *tx_parse();
+const char *tx_parse(uint8_t *error_code);
 
 /// Return the number of items in the transaction
 zxerr_t tx_getNumItems(uint8_t *num_items);

app/src/parser_impl_eth.c

@@ -177,8 +177,8 @@ parser_error_t _readEth(parser_context_t *ctx, eth_tx_t *tx_obj) {
 }
 
 parser_error_t _validateTxEth() {
-    if (!validateERC20(&eth_tx_obj) && !app_mode_expert()) {
-        return parser_unsupported_tx;
+    if (!validateERC20(&eth_tx_obj) && !app_mode_blindsign()) {
+        return parser_blindsign_required;
     }
 
     return parser_ok;
@@ -351,11 +351,6 @@ static parser_error_t printWarningHash(const parser_context_t *ctx, uint8_t disp
 
     switch (displayIdx) {
         case 0:
-            snprintf(outKey, outKeyLen, "Warning:");
-            pageString(outVal, outValLen, "Blind-signing EVM Tx", pageIdx, pageCount);
-            break;
-
-        case 1:
             CHECK_ERROR(printEthHash(ctx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount));
             break;
 
@@ -373,7 +368,7 @@ parser_error_t _getItemEth(const parser_context_t *ctx, uint8_t displayIdx, char
     }
 
     // Otherwise, check that ExpertMode is enabled
-    if (!app_mode_expert()) return parser_unsupported_tx;
+    if (!app_mode_blindsign()) return parser_blindsign_required;
 
     if (eth_tx_obj.tx_type == legacy) {
         CHECK_ERROR(printGeneric(ctx, displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount));
@@ -400,7 +395,7 @@ parser_error_t _getNumItemsEth(uint8_t *numItems) {
     if (eth_tx_obj.tx_type == legacy) {
         *numItems = 5 + ((eth_tx_obj.legacy.data.rlpLen != 0) ? 1 : 0) + ((eth_tx_obj.legacy.to.rlpLen != 0) ? 1 : 0);
     } else {
-        *numItems = 2;
+        *numItems = 1;
     }
 
     return parser_ok;

tests_zemu/package.json

@@ -22,24 +22,24 @@
     "@zondax/zemu": "^0.51.0"
   },
   "devDependencies": {
-    "@ethereumjs/common": "^2.4.0",
-    "@ethereumjs/tx": "^3.2.0",
+    "@ethereumjs/common": "^4.4.0",
+    "@ethereumjs/tx": "^5.4.0",
     "@types/elliptic": "^6.4.14",
     "@types/jest": "^29.5.12",
     "@types/ledgerhq__hw-transport": "^4.21.4",
     "@types/secp256k1": "^4.0.6",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
+    "@typescript-eslint/eslint-plugin": "^8.14.0",
+    "@typescript-eslint/parser": "^8.14.0",
     "blakejs": "^1.1.1",
     "crypto-js": "4.2.0",
     "ed25519-supercop": "^2.0.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.14.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jest": "^27.9.0",
+    "eslint-plugin-jest": "^28.9.0",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "29.7.0",
-    "js-sha256": "0.9.0",
+    "js-sha256": "0.11.0",
     "jssha": "^3.2.0",
     "prettier": "^3.2.5",
     "secp256k1": "^5.0.0",