Merge branch 'Zondax:main' into nam-fork

Author: sug0

app/Makefile

@@ -22,14 +22,9 @@ endif
 
 MY_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.installer_script
-
-include $(BOLOS_SDK)/Makefile.defines
-
 # Set the default value for PRODUCTION_BUILD to 1 if not already defined
 PRODUCTION_BUILD ?= 1
 
-$(info ************ TARGET_NAME  = [$(TARGET_NAME)])
 # Display whether this is a production build or for internal use
 ifeq ($(PRODUCTION_BUILD), 1)
     $(info ************ PRODUCTION_BUILD  = [PRODUCTION BUILD])
@@ -39,19 +34,22 @@ endif
 
 # Add the PRODUCTION_BUILD definition to the compiler flags
 DEFINES += PRODUCTION_BUILD=$(PRODUCTION_BUILD)
+
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.app_testing
 
 ifndef COIN
 COIN=NAM
 endif
 
+VARIANT_PARAM=COIN
+VARIANT_VALUES=$(COIN)
+
 include $(CURDIR)/Makefile.version
 
 $(info COIN  = [$(COIN)])
 
 ifeq ($(COIN),NAM)
 # Main app configuration
-DEFINES += APP_STANDARD
 APPNAME = "Namada"
 APPPATH = "44'/877'" --path "44'/1'"
 
@@ -66,33 +64,44 @@ endif
 
 APP_LOAD_PARAMS =  --curve ed25519 $(COMMON_LOAD_PARAMS) --path $(APPPATH)
 
-include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
+# Enable QR code display for all devices
+ENABLE_NBGL_QRCODE ?= 1
 
-$(info TARGET_NAME  = [$(TARGET_NAME)])
-$(info ICONNAME  = [$(ICONNAME)])
+RUST_TARGET:=thumbv6m-none-eabi
 
-ifndef ICONNAME
-$(error ICONNAME is not set)
-endif
+$(info ************ RUST_TARGET  = [$(RUST_TARGET)])
+
+include $(BOLOS_SDK)/Makefile.target
+
+include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
+
+include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
 
 # Compile MASP mode for all devices excetpt Nano S, 
 ifneq ($(TARGET_NAME),TARGET_NANOS)
     DEFINES += COMPILE_MASP
 endif
 
-include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
 # Add SDK BLAKE2b
 DEFINES += HAVE_HASH HAVE_BLAKE2
 INCLUDES_PATH += $(BOLOS_SDK)/lib_cxng/src
 
-
 # Building Rust
 LDFLAGS += -z muldefs
 LDLIBS += -L$(MY_DIR)rust/target/$(RUST_TARGET)/release -lrslib
-
 APP_SOURCE_PATH += $(CURDIR)/rust/include
-APP_CUSTOM_LINK_DEPENDENCIES = rust
-RUST_TARGET:=thumbv6m-none-eabi
+
+include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.installer_script
+
+$(info TARGET_NAME  = [$(TARGET_NAME)])
+$(info ICONNAME  = [$(ICONNAME)])
+
+ifndef ICONNAME
+$(error ICONNAME is not set)
+endif
+
+# make rust a prerequisite for all object files
+$(OBJECT_FILES): | rust
 
 .PHONY: rust
 rust:
@@ -104,17 +113,9 @@ rust_clean:
 
 clean: rust_clean
 
-include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.side_loading
-
-# Import generic rules from the SDK
-include $(BOLOS_SDK)/Makefile.rules
-
 #add dependency on custom makefile filename
 dep/%.d: %.c Makefile
 
-listvariants:
-	@echo VARIANTS COIN NAM
-
 .PHONY: version
 version:
 	@echo "v$(APPVERSION)" > app.version

app/Makefile.version

@@ -1,6 +1,6 @@
 # This is the `transaction_version` field of `Runtime`
-APPVERSION_M=2
+APPVERSION_M=3
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=5
+APPVERSION_P=4

app/src/apdu_handler.c

@@ -239,14 +239,14 @@ __Z_INLINE void handle_getversion(__Z_UNUSED volatile uint32_t *flags, volatile
     G_io_apdu_buffer[0] = 0x01;
 #endif
 
-    G_io_apdu_buffer[1] = (LEDGER_MAJOR_VERSION >> 8) & 0xFF;
-    G_io_apdu_buffer[2] = (LEDGER_MAJOR_VERSION >> 0) & 0xFF;
+    G_io_apdu_buffer[1] = (MAJOR_VERSION >> 8) & 0xFF;
+    G_io_apdu_buffer[2] = (MAJOR_VERSION >> 0) & 0xFF;
 
-    G_io_apdu_buffer[3] = (LEDGER_MINOR_VERSION >> 8) & 0xFF;
-    G_io_apdu_buffer[4] = (LEDGER_MINOR_VERSION >> 0) & 0xFF;
+    G_io_apdu_buffer[3] = (MINOR_VERSION >> 8) & 0xFF;
+    G_io_apdu_buffer[4] = (MINOR_VERSION >> 0) & 0xFF;
 
-    G_io_apdu_buffer[5] = (LEDGER_PATCH_VERSION >> 8) & 0xFF;
-    G_io_apdu_buffer[6] = (LEDGER_PATCH_VERSION >> 0) & 0xFF;
+    G_io_apdu_buffer[5] = (PATCH_VERSION >> 8) & 0xFF;
+    G_io_apdu_buffer[6] = (PATCH_VERSION >> 0) & 0xFF;
 
     // SDK won't reply if device is blocked ---> Always false
     G_io_apdu_buffer[7] = 0;

app/src/coin.h

@@ -34,6 +34,7 @@ extern "C" {
 #define HDPATH_4_DEFAULT     (0u)
 
 #define MASK_HARDENED 0x80000000
+#define MASK_HARDENED_ZIP32 (0x80000000u | 0x7FFFFFFF) // 2147483647
 
 #define SECP256K1_PK_LEN            65u
 #define COMPRESSED_SECP256K1_PK_LEN 33u

app/src/common/tx.c

@@ -17,15 +17,15 @@
 #include "tx.h"
 #include "apdu_codes.h"
 #include "buffering.h"
-#include "parser.h"
+#include "common/parser.h"
 #include <string.h>
 #include "zxmacros.h"
 
 #if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
 #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
 

app/src/crypto.c

@@ -566,7 +566,7 @@ zxerr_t crypto_fillDeviceSeed(uint8_t *device_seed) {
 
     // Generate randomness using a fixed path related to the device mnemonic
     const uint32_t path[HDPATH_LEN_DEFAULT] = {
-        HDPATH_0_DEFAULT, HDPATH_1_DEFAULT, MASK_HARDENED, MASK_HARDENED, MASK_HARDENED,
+        HDPATH_0_DEFAULT, HDPATH_1_DEFAULT, MASK_HARDENED, MASK_HARDENED, MASK_HARDENED_ZIP32,
     };
 
     MEMZERO(device_seed, KEY_LENGTH);
@@ -576,6 +576,7 @@ zxerr_t crypto_fillDeviceSeed(uint8_t *device_seed) {
     io_seproxyhal_io_heartbeat();
     CATCH_CXERROR(os_derive_bip32_with_seed_no_throw(HDW_ED25519_SLIP10, CX_CURVE_Ed25519, path, HDPATH_LEN_DEFAULT, raw_privkey, NULL,
                                                      NULL, 0));
+    io_seproxyhal_io_heartbeat();
     error = zxerr_ok;
     MEMCPY(device_seed, raw_privkey, KEY_LENGTH);
 
@@ -696,7 +697,9 @@ zxerr_t crypto_sign_spends_sapling(const parser_tx_t *txObj, keys_t *keys) {
         spend += spendLen;
         spend_item_t *item = spendlist_retrieve_rand_item(i);
 
+        io_seproxyhal_io_heartbeat();
         CHECK_ZXERR(sign_sapling_spend(keys, item->alpha, sign_hash, signature));
+        io_seproxyhal_io_heartbeat();
 
         // Save signature in flash
         CHECK_ZXERR(spend_signatures_append(signature));
@@ -766,11 +769,6 @@ parser_error_t checkSpends(const parser_tx_t *txObj, keys_t *keys, parser_contex
         CHECK_ERROR(computeRk(keys, item->alpha, rk));
 
         CTX_CHECK_AND_ADVANCE(tx_spends_ctx, CV_LEN + NULLIFIER_LEN);
-#ifndef APP_TESTING
-        if (MEMCMP(rk, tx_spends_ctx->buffer + tx_spends_ctx->offset, RK_LEN) != 0) {
-            return parser_invalid_rk;
-        }
-#endif
 
         builder_spends_ctx->offset = 0;
         tx_spends_ctx->offset = 0;
@@ -885,6 +883,7 @@ zxerr_t crypto_check_masp(const parser_tx_t *txObj, keys_t *keys) {
                                         .bufferLen = txObj->transaction.sections.maspBuilder.metadata.spends_indices.len,
                                         .offset = 0, 
                                         .tx_obj = NULL};
+    io_seproxyhal_io_heartbeat();
     CHECK_PARSER_OK(checkSpends(txObj, keys, &builder_spends_ctx, &tx_spends_ctx, &spends_indices_ctx));
 
     // Check outputs
@@ -900,6 +899,7 @@ zxerr_t crypto_check_masp(const parser_tx_t *txObj, keys_t *keys) {
                                 .bufferLen = txObj->transaction.sections.maspBuilder.metadata.outputs_indices.len,
                                 .offset = 0, 
                                 .tx_obj = NULL};
+    io_seproxyhal_io_heartbeat();
     CHECK_PARSER_OK(checkOutputs(txObj, &builder_outputs_ctx, &tx_outputs_ctx, &output_indices_ctx));
 
     // Check converts
@@ -915,6 +915,7 @@ zxerr_t crypto_check_masp(const parser_tx_t *txObj, keys_t *keys) {
                                            .bufferLen = txObj->transaction.sections.maspBuilder.metadata.converts_indices.len,
                                            .offset = 0, 
                                            .tx_obj = NULL};
+    io_seproxyhal_io_heartbeat();
     CHECK_PARSER_OK(checkConverts(txObj, &builder_converts_ctx, &tx_converts_ctx, &converts_indices_ctx));
     return zxerr_ok;
 }
@@ -933,9 +934,14 @@ zxerr_t crypto_sign_masp_spends(parser_tx_t *txObj, uint8_t *output, uint16_t ou
         return zxerr_unknown;
     }
 
-    if (get_state() != STATE_PROCESSED_RANDOMNESS) {
-        return zxerr_unknown;
-    }
+    // If a MASP signing has happened before, then device must be in either of two states
+    bool signed_before = get_state() == STATE_SIGNED_SPENDS || get_state() == STATE_EXTRACT_SPENDS;
+    // A state where signing has happened before and all signatures thereof have been extracted
+    bool completed_signing = signed_before && !spend_signatures_more_extract();
+    // We must either be signing for the first time, or fully completed the previous signing
+    if (!(get_state() == STATE_PROCESSED_RANDOMNESS || completed_signing)) {
+         return zxerr_unknown;
+     }
 
     // Get keys
     keys_t keys = {0};

app/src/parser.c

@@ -21,7 +21,7 @@
 
 #include "parser_common.h"
 #include "parser_impl.h"
-#include "parser.h"
+#include "common/parser.h"
 
 #include "crypto.h"
 #include "crypto_helper.h"

app/src/parser_impl.c

@@ -17,7 +17,7 @@
 #include "zxformat.h"
 #include "leb128.h"
 #include "app_mode.h"
-
+#include "crypto_helper.h"
 #include "parser_impl_common.h"
 
 parser_error_t _read(parser_context_t *ctx, parser_tx_t *v) {
@@ -52,6 +52,80 @@ bool hasMemoToPrint(const parser_context_t *ctx) {
     return false; // No memo to print
 }
 
+__attribute__((noinline)) parser_error_t getSpendfromIndex(uint32_t index, bytes_t *spend) {
+
+    for (uint32_t i = 0; i < index; i++) {
+        spend->ptr += EXTENDED_FVK_LEN + DIVERSIFIER_LEN + NOTE_LEN;
+        uint8_t tmp_len = spend->ptr[0];
+        spend->ptr++;
+        spend->ptr += (tmp_len * (32 + 1)) + sizeof(uint64_t);
+    }
+
+    return parser_ok;
+}
+
+__attribute__((noinline)) parser_error_t getOutputfromIndex(uint32_t index, bytes_t *out) {
+
+    for (uint32_t i = 0; i < index; i++) {
+        uint8_t has_ovk = out->ptr[0];
+        if(has_ovk) {
+            out->ptr += OVK_PLUS_CHECK_BYTE;
+        } else {
+            out->ptr++;
+        }
+        out->ptr += PAYMENT_ADDR_LEN + OUT_NOTE_LEN + MEMO_LEN;
+    }
+
+    return parser_ok;
+}
+
+__attribute__((noinline)) parser_error_t findAssetData(const masp_builder_section_t *maspBuilder, const uint8_t *stoken, masp_asset_data_t *asset_data, uint32_t *index) {
+    parser_context_t asset_data_ctx = {.buffer = maspBuilder->asset_data.ptr, .bufferLen = maspBuilder->asset_data.len, .offset = 0, .tx_obj = NULL};
+    for (*index = 0; *index < maspBuilder->n_asset_type; (*index)++) {
+        CHECK_ERROR(readAssetData(&asset_data_ctx, asset_data))
+        uint8_t identifier[32];
+        uint8_t nonce;
+        CHECK_ERROR(readToken(&asset_data->token, &asset_data->symbol));
+        CHECK_ERROR(derive_asset_type(asset_data, identifier, &nonce))
+        if(MEMCMP(identifier, stoken, ASSET_ID_LEN) == 0) {
+            return parser_ok;
+        }
+    }
+    return parser_ok;
+}
+
+parser_error_t checkMaspSpendsSymbols (const parser_context_t *ctx) {
+    bytes_t spend = ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.spends;
+    masp_asset_data_t asset_data = {0};
+    uint32_t asset_idx = 0;
+
+    for (uint32_t i = 0; i < ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends; i++) {
+        getSpendfromIndex(i, &spend);
+        const uint8_t *spend_token = spend.ptr + EXTENDED_FVK_LEN + DIVERSIFIER_LEN;
+        CHECK_ERROR(findAssetData(&ctx->tx_obj->transaction.sections.maspBuilder, spend_token, &asset_data, &asset_idx))
+        if(asset_data.symbol == NULL) {
+            ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.no_symbol_spends++;
+        }
+    }
+    return parser_ok;
+}
+
+parser_error_t checkMaspOutputsSymbols (const parser_context_t *ctx) {
+    bytes_t output = ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.outputs;
+    masp_asset_data_t asset_data = {0};
+    uint32_t asset_idx = 0;
+
+    for (uint32_t i = 0; i < ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_outputs; i++) {
+        getOutputfromIndex(i, &output);
+        const uint8_t *output_token = output.ptr + (output.ptr[0] ? OVK_PLUS_CHECK_BYTE : 1) + PAYMENT_ADDR_LEN;
+        CHECK_ERROR(findAssetData(&ctx->tx_obj->transaction.sections.maspBuilder, output_token, &asset_data, &asset_idx))
+        if(asset_data.symbol == NULL) {
+            ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.no_symbol_outputs++;
+        }
+    }
+    return parser_ok;
+}
+
 parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
     *numItems = 0;
     switch (ctx->tx_obj->typeTx) {
@@ -67,10 +141,10 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
         case Transfer:
             if(ctx->tx_obj->transaction.isMasp) {
                 uint8_t items = 1;
-                items += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_outputs; // print from outputs
-                items += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends; // print from spends
+                items += 2 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_outputs + ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.no_symbol_outputs; // print from outputs
+                items += 2 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends + ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.no_symbol_spends; // print from spends
 
-                *numItems = (app_mode_expert() ? items + 4 : items + 2);
+                *numItems = (app_mode_expert() ? items + TRANSFER_EXPERT_MASP_PARAMS : items + TRANSFER_NORMAL_MASP_PARAMS);
             } else {
                 *numItems = (app_mode_expert() ? TRANSFER_EXPERT_PARAMS : TRANSFER_NORMAL_PARAMS);
             }
@@ -145,8 +219,8 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
         case IBC:
             *numItems = (app_mode_expert() ?  IBC_EXPERT_PARAMS : IBC_NORMAL_PARAMS);
             if(ctx->tx_obj->transaction.isMasp) {
-                *numItems += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_outputs; // print from outputs
-                *numItems += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends; // print from spends
+                *numItems += 2 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_outputs + ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.no_symbol_outputs; // print from outputs
+                *numItems += 2 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends + ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.no_symbol_spends; // print from spends
             }
             *numItems += ctx->tx_obj->ibc.transfer.non_masp_sources_len*2 + ctx->tx_obj->ibc.transfer.non_masp_targets_len*2 + ctx->tx_obj->ibc.transfer.no_symbol_sources + ctx->tx_obj->ibc.transfer.no_symbol_targets;
             *numItems += ctx->tx_obj->ibc.memo.len > 0 && app_mode_expert();
@@ -215,7 +289,7 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
         (*numItems)++;
     }
 
-    if(app_mode_expert() && ctx->tx_obj->transaction.header.fees.symbol == NULL) {
+    if(ctx->tx_obj->transaction.header.fees.symbol == NULL) {
         (*numItems)++;
     }
 

app/src/parser_impl.h

@@ -27,6 +27,12 @@ extern "C" {
 parser_error_t _read(parser_context_t *c, parser_tx_t *v);
 parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems);
 bool hasMemoToPrint(const parser_context_t *ctx);
+parser_error_t checkMaspSpendsSymbols (const parser_context_t *ctx);
+parser_error_t checkMaspOutputsSymbols (const parser_context_t *ctx);
+parser_error_t findAssetData(const masp_builder_section_t *maspBuilder, const uint8_t *stoken, masp_asset_data_t *asset_data, uint32_t *index);
+parser_error_t getSpendfromIndex(uint32_t index, bytes_t *spend);
+parser_error_t getOutputfromIndex(uint32_t index, bytes_t *out);
+
 #ifdef __cplusplus
 }
 #endif