Merge pull request #112 from cosmos/tokens-textual

Increase Tokens & remove textual for nanoS

CMakeLists.txt

@@ -151,6 +151,7 @@ target_link_libraries(unittests PRIVATE
 
 add_compile_definitions(TESTVECTORS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/")
 add_compile_definitions(APP_TESTING=1)
+add_compile_definitions(COMPILE_TEXTUAL=1)
 add_test(unittests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittests)
 set_tests_properties(unittests PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests)
 

README.md

@@ -205,5 +205,8 @@ The Makefile will build the firmware in a docker container and leave the binary
 
 ## APDU Specifications
 
+### DISCLAIMER
+Ledger NanoS does not support Cosmos Textual Mode due to memory restriction
+
 - [APDU Protocol](docs/APDUSPEC.md)
 - [Transaction format](docs/TXSPEC.md)

app/Makefile

@@ -61,8 +61,16 @@ ifndef ICONNAME
 $(error ICONNAME is not set)
 endif
 
+# Compile textual mode for all devices excetpt Nano S, 
+# and define a Min stack size for Nano S with some margin
+# to get an error if app grows too much
+ifneq ($(TARGET_NAME),TARGET_NANOS)
+    DEFINES += COMPILE_TEXTUAL
+endif
+
+APP_STACK_MIN_SIZE := 1600
+
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
-DEFINES += HAVE_HASH HAVE_BLAKE2 HAVE_SHA256 HAVE_SHA512
 CFLAGS += -I$(MY_DIR)/../deps/tinycbor/src
 APP_SOURCE_PATH += $(MY_DIR)/../deps/tinycbor-ledger
 APP_SOURCE_PATH += $(MY_DIR)/../deps/jsmn/src

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=35
 # This is the patch version of this release
-APPVERSION_P=18
+APPVERSION_P=19

app/src/chain_config.c

@@ -26,7 +26,12 @@ typedef struct {
 static const chain_config_t chainConfig[] = {
     // {118, cosmos, BECH32_COSMOS},
     {60, "inj", BECH32_ETH},
-    {60, "evmos", BECH32_ETH}
+    {60, "evmos", BECH32_ETH},
+    {60, "xpla", BECH32_ETH},
+    {60, "dym", BECH32_ETH},
+    {60, "zeta", BECH32_ETH},
+    {60, "bera", BECH32_ETH},
+    {60, "human", BECH32_ETH} 
 };
 
 static const uint32_t chainConfigLen = sizeof(chainConfig) / sizeof(chainConfig[0]);

app/src/coin.h

@@ -14,7 +14,6 @@
 *  limitations under the License.
 ********************************************************************************/
 #pragma once
-
 #ifdef __cplusplus
 extern "C" {
 #endif

app/src/common/parser.h

@@ -24,19 +24,13 @@ extern "C" {
 #include "coin.h"
 
 #define OUTPUT_HANDLER_SIZE 600
-#if defined(TARGET_NANOS)
-#undef OUTPUT_HANDLER_SIZE
-#define OUTPUT_HANDLER_SIZE 450
-#endif
-
 #define MAX_CONTENT_SIZE 550
 #define MAX_TITLE_SIZE 40
 #define PRINTABLE_TITLE_SIZE 17
 #define PRINTABLE_PAGINATED_TITLE_SIZE 10
 #define SCREEN_BREAK ":"
 #define SCREEN_INDENT ">"
 #define TITLE_TRUNCATE_REPLACE "---"
-#define END_OF_STRING_SIZE
 
 const char *parser_getErrorDescription(parser_error_t err);
 

app/src/common/tx.c

@@ -25,7 +25,7 @@
 #define RAM_BUFFER_SIZE 8192
 #define FLASH_BUFFER_SIZE 16384
 #elif defined(TARGET_NANOS)
-#define RAM_BUFFER_SIZE 256
+#define RAM_BUFFER_SIZE 0
 #define FLASH_BUFFER_SIZE 8192
 #endif
 
@@ -78,9 +78,15 @@ static parser_tx_t tx_obj;
 
 const char *tx_parse(tx_type_e type)
 {
+#if defined(COMPILE_TEXTUAL)
     if (type != tx_json && type != tx_textual) {
         return parser_getErrorDescription(parser_value_out_of_range);
     }
+#else 
+    if (type != tx_json) {
+        return parser_getErrorDescription(parser_value_out_of_range);
+    }
+#endif
 
     MEMZERO(&tx_obj, sizeof(tx_obj));
     tx_obj.tx_type = type;

app/src/crypto.c

@@ -91,15 +91,7 @@ static zxerr_t crypto_hashBuffer(const uint8_t *input, const uint16_t inputLen,
         }
 
         case BECH32_ETH: {
-            cx_sha3_t sha3 = {0};
-            cx_err_t status = cx_keccak_init_no_throw(&sha3, 256);
-            if (status != CX_OK) {
-                 return zxerr_ledger_api_error;
-            }
-            status = cx_hash_no_throw((cx_hash_t*) &sha3, CX_LAST, input, inputLen, output, outputLen);
-            if (status != CX_OK) {
-                return zxerr_ledger_api_error;
-            }
+            CHECK_CX_OK(cx_keccak_256_hash(input, inputLen, output));
             break;
         }
 
@@ -163,13 +155,6 @@ zxerr_t crypto_sign(uint8_t *output,
     return error;
 }
 
-static zxerr_t ripemd160_32(uint8_t *out, uint8_t *in) {
-    cx_ripemd160_t rip160;
-    CHECK_CX_OK(cx_ripemd160_init_no_throw(&rip160));
-    CHECK_CX_OK(cx_hash_no_throw(&rip160.header, CX_LAST, in, CX_SHA256_SIZE, out, CX_RIPEMD160_SIZE));
-    return zxerr_ok;
-}
-
 zxerr_t crypto_fillAddress(uint8_t *buffer, uint16_t buffer_len, uint16_t *addrResponseLen) {
     if (buffer_len < PK_LEN_SECP256K1 + 50) {
         return zxerr_buffer_too_small;
@@ -188,17 +173,13 @@ zxerr_t crypto_fillAddress(uint8_t *buffer, uint16_t buffer_len, uint16_t *addrR
             // Hash it
             cx_hash_sha256(buffer, PK_LEN_SECP256K1, hashed1_pk, CX_SHA256_SIZE);
             uint8_t hashed2_pk[CX_RIPEMD160_SIZE] = {0};
-            CHECK_ZXERR(ripemd160_32(hashed2_pk, hashed1_pk));
+            CHECK_CX_OK(cx_ripemd160_hash(hashed1_pk, CX_SHA256_SIZE, hashed2_pk));
             CHECK_ZXERR(bech32EncodeFromBytes(addr, buffer_len - PK_LEN_SECP256K1, bech32_hrp, hashed2_pk, CX_RIPEMD160_SIZE, 1, BECH32_ENCODING_BECH32));
             break;
         }
 
         case BECH32_ETH: {
-            cx_sha3_t ctx;
-            if (cx_keccak_init_no_throw(&ctx, 256) != CX_OK) {
-                return zxerr_unknown;
-            }
-            CHECK_CX_OK(cx_hash_no_throw((cx_hash_t *)&ctx, CX_LAST, uncompressedPubkey+1, sizeof(uncompressedPubkey)-1, hashed1_pk, sizeof(hashed1_pk)));
+            CHECK_CX_OK(cx_keccak_256_hash(uncompressedPubkey+1, sizeof(uncompressedPubkey)-1, hashed1_pk));
             CHECK_ZXERR(bech32EncodeFromBytes(addr, buffer_len - PK_LEN_SECP256K1, bech32_hrp, hashed1_pk + 12, sizeof(hashed1_pk) - 12, 1, BECH32_ENCODING_BECH32));
             break;
         }

app/src/json/json_parser.h

@@ -36,7 +36,7 @@ extern "C" {
 // we must limit the number
 #if defined(TARGET_NANOS)
 #undef MAX_NUMBER_OF_TOKENS
-#define MAX_NUMBER_OF_TOKENS    70
+#define MAX_NUMBER_OF_TOKENS    96
 #endif
 
 #if defined(TARGET_STAX)

app/src/parser.c

@@ -311,6 +311,7 @@ __Z_INLINE parser_error_t parser_formatAmount(uint16_t amountToken,
     return parser_formatAmountItem(showItemTokenIdx, outVal, outValLen, showPageIdx, &dummy);
 }
 
+#if defined(COMPILE_TEXTUAL)
 __Z_INLINE parser_error_t parser_screenPrint(const parser_context_t *ctx,
                                             Cbor_container *container,
                                             char *outKey, uint16_t outKeyLen,
@@ -433,12 +434,24 @@ __Z_INLINE parser_error_t parser_getNextNonExpert(const parser_context_t *ctx,
     }
     return parser_ok;
 }
+#endif
 
 __Z_INLINE parser_error_t parser_getTextualItem(const parser_context_t *ctx,
                                             uint8_t displayIdx,
                                             char *outKey, uint16_t outKeyLen,
                                             char *outVal, uint16_t outValLen,
                                             uint8_t pageIdx, uint8_t *pageCount) {
+#if !defined(COMPILE_TEXTUAL)
+    UNUSED(ctx);
+    UNUSED(displayIdx);
+    UNUSED(outKey);
+    UNUSED(outKeyLen);
+    UNUSED(outVal);
+    UNUSED(outValLen);
+    UNUSED(pageIdx);
+    UNUSED(pageCount);
+    return parser_value_out_of_range;
+#else
     *pageCount = 0;
 
     MEMZERO(outKey, outKeyLen);
@@ -477,6 +490,7 @@ __Z_INLINE parser_error_t parser_getTextualItem(const parser_context_t *ctx,
     CHECK_PARSER_ERR(parser_screenPrint(ctx, &container, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount))
 
     return parser_ok;
+#endif
 }
 
 __Z_INLINE parser_error_t parser_getJsonItem(const parser_context_t *ctx,

app/src/parser_impl.c

@@ -117,6 +117,11 @@ parser_error_t _read_json_tx(parser_context_t *c, __Z_UNUSED parser_tx_t *v) {
 }
 
 parser_error_t _read_text_tx(parser_context_t *c, parser_tx_t *v) {
+#if !defined(COMPILE_TEXTUAL)
+    UNUSED(c);
+    UNUSED(v);
+    return parser_value_out_of_range;
+#else
     CborValue it;
     CborValue mapStruct_ptr;
     CHECK_APP_CANARY()
@@ -166,4 +171,5 @@ parser_error_t _read_text_tx(parser_context_t *c, parser_tx_t *v) {
     PARSER_ASSERT_OR_ERROR(it.source.ptr == c->buffer + c->bufferLen, parser_cbor_unexpected_EOF)
 
     return parser_ok;
+#endif
 }

tests_zemu/package.json

@@ -19,27 +19,27 @@
   },
   "dependencies": {
     "@zondax/ledger-cosmos-js": "^3.0.3",
-    "@zondax/zemu": "^0.46.0"
+    "@zondax/zemu": "^0.47.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
     "@types/ledgerhq__hw-transport": "^4.21.8",
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
     "bech32": "^2.0.0",
     "blakejs": "^1.1.1",
     "crypto-js": "4.2.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-prettier": "^5.1.2",
     "jest": "29.7.0",
     "jest-serial-runner": "^1.1.0",
     "js-sha3": "0.9.3",
     "jssha": "^3.2.0",
     "keccak256": "^1.0.6",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.5",
     "secp256k1": "^5.0.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.2",

tests_zemu/tests/textual.test.ts

@@ -28,7 +28,7 @@ jest.setTimeout(90000)
 
 describe('Textual', function () {
   // eslint-disable-next-line jest/expect-expect
-  test.concurrent.each(DEVICE_MODELS)('can start and stop container', async function (m) {
+  test.concurrent.each(DEVICE_MODELS.slice(1))('can start and stop container', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })
@@ -37,7 +37,7 @@ describe('Textual', function () {
     }
   })
 
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual', async function (m) {
+  test.concurrent.each(DEVICE_MODELS.slice(1))('sign basic textual', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })
@@ -83,7 +83,7 @@ describe('Textual', function () {
     }
   })
 
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual expert', async function (m) {
+  test.concurrent.each(DEVICE_MODELS.slice(1))('sign basic textual expert', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })
@@ -132,7 +132,7 @@ describe('Textual', function () {
     }
   })
 
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual eth ', async function (m) {
+  test.concurrent.each(DEVICE_MODELS.slice(1))('sign basic textual eth ', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })
@@ -181,7 +181,7 @@ describe('Textual', function () {
     }
   })
 
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual eth warning ', async function (m) {
+  test.concurrent.each(DEVICE_MODELS.slice(1))('sign basic textual eth warning ', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })
@@ -227,7 +227,7 @@ describe('Textual', function () {
     }
   })
 
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual evmos ', async function (m) {
+  test.concurrent.each(DEVICE_MODELS.slice(1))('sign basic textual evmos ', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })