Merge pull request #2 from Zondax/main

Blind Sign UI Fixes

.github/workflows/main.yml

@@ -18,6 +18,12 @@ jobs:
       - id: get-user
         run: echo "uid_gid=$(id -u):$(id -g)" >> $GITHUB_OUTPUT
 
+  build_application:
+    name: Build application using the reusable workflow
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_build.yml@v1
+    with:
+      upload_app_binaries_artifact: "compiled_app_binaries"
+
   build:
     runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
     steps:
@@ -48,7 +54,7 @@ jobs:
         run: mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug .. && make
       - run: make cpp_test
 
-  build_ledger:
+  build_nanoS:
     needs: configure
     runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
     container:
@@ -71,14 +77,14 @@ jobs:
           echo "size=$(python3 deps/ledger-zxlib/scripts/getSize.py s)" >> $GITHUB_OUTPUT
 
   size_nano_s:
-    needs: build_ledger
+    needs: build_nanoS
     runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
     env:
       NANOS_LIMIT_SIZE: 136
     steps:
       - run: |
-          echo "LNS app size: ${{needs.build_ledger.outputs.size}} KiB"
-          [ ${{needs.build_ledger.outputs.size}} -le $NANOS_LIMIT_SIZE ]
+          echo "LNS app size: ${{needs.build_nanoS.outputs.size}} KiB"
+          [ ${{needs.build_nanoS.outputs.size}} -le $NANOS_LIMIT_SIZE ]
 
   test_zemu:
     runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
@@ -119,13 +125,13 @@ jobs:
           make zemu_test
       - name: Upload Snapshots (only failure)
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: snapshots-tmp
           path: tests_zemu/snapshots-tmp/
 
   build_package_nanos:
-    needs: [configure, build, build_ledger, test_zemu]
+    needs: [configure, build, test_zemu]
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
     container:
@@ -161,7 +167,7 @@ jobs:
           prerelease: false
 
   build_package_nanosp:
-    needs: [configure, build, build_ledger, test_zemu]
+    needs: [configure, build, test_zemu]
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
     container:
@@ -197,7 +203,7 @@ jobs:
           prerelease: false
 
   build_package_stax:
-    needs: [configure, build, build_ledger, test_zemu]
+    needs: [configure, build, test_zemu]
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: zondax-runners
     container:
@@ -233,7 +239,7 @@ jobs:
           prerelease: false
 
   build_package_flex:
-    needs: [configure, build, build_ledger, test_zemu]
+    needs: [configure, build, test_zemu]
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
     container:

.gitignore

@@ -76,3 +76,4 @@ tests_zemu/yarn.lock
 tests_tools/target
 fuzz-*.log
 /scan-build
+.venv

app/Makefile

@@ -22,15 +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 0 if not already defined
 PRODUCTION_BUILD ?= 1
 
-$(info ************ KADENA_NAME  = [$(TARGET_NAME)])
-
 # Display whether this is a production build or for internal use
 ifeq ($(PRODUCTION_BUILD), 1)
     $(info ************ PRODUCTION_BUILD  = [PRODUCTION BUILD])
@@ -39,9 +33,8 @@ else
 endif
 
 # Display whether swap functionality is enabled or not
-ifdef HAVE_SWAP
+ifeq ($(ENABLE_SWAP), 1)
     $(info ************ HAVE_SWAP  = [ENABLED])
-    DEFINES += HAVE_SWAP=$(HAVE_SWAP)
 else
     $(info ************ HAVE_SWAP  = [DISABLED])
 endif
@@ -56,6 +49,9 @@ ifndef COIN
 COIN=kadena
 endif
 
+VARIANT_PARAM=COIN
+VARIANT_VALUES=$(COIN)
+
 include $(CURDIR)/Makefile.version
 
 $(info COIN  = [$(COIN)])
@@ -78,32 +74,32 @@ $(info PATHS LIST = $(APPPATH))
 
 APP_LOAD_PARAMS =  --curve ed25519 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH)
 
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-	APP_STACK_MIN_SIZE := 1600
-else
-	APP_STACK_MIN_SIZE := 1752
-endif
-
-include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
-
-$(info TARGET_NAME  = [$(TARGET_NAME)])
-$(info ICONNAME  = [$(ICONNAME)])
-
-ifndef ICONNAME
-$(error ICONNAME is not set)
-endif
-
 # DEFINES += BLAKE3_NO_SSE2 BLAKE3_NO_SSE41 BLAKE3_NO_AVX2 BLAKE3_NO_AVX512 BLAKE3_USE_NEON=0
 # BLAKE3_DIR := $(CURDIR)/../deps/BLAKE3-c
 # INCLUDES_PATH += $(BLAKE3_DIR)
 # APP_SOURCE_FILES += $(BLAKE3_DIR)/blake3.c $(BLAKE3_DIR)/blake3_dispatch.c $(BLAKE3_DIR)/blake3_portable.c
 
+include $(BOLOS_SDK)/Makefile.target
+
+include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
+
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
+
 CFLAGS += -Wvla
 # LDFLAGS += -z muldefs
 # LDLIBS += -Lrust/target/thumbv6m-none-eabi/release -lrslib
 # APP_SOURCE_PATH += $(CURDIR)/rust/include
 
+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
+
+
 .PHONY: rust
 rust:
 	@echo "No rust code"
@@ -130,18 +126,9 @@ clean: 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
 
-.PHONY: listvariants
-listvariants:
-	@echo VARIANTS COIN kadena
-
 .PHONY: version
 version:
 	@echo "v$(APPVERSION)" > app.version

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=1
 # This is the minor version
 APPVERSION_N=0
 # This is the patch version
-APPVERSION_P=3
+APPVERSION_P=7

app/src/apdu_handler.c

@@ -24,6 +24,7 @@
 #include "addr.h"
 #include "apdu_handler_legacy.h"
 #include "app_main.h"
+#include "app_mode.h"
 #include "coin.h"
 #include "crypto.h"
 #include "parser_txdef.h"
@@ -126,6 +127,9 @@ __Z_INLINE void handleSign(volatile uint32_t *flags, volatile uint32_t *tx, uint
         THROW(APDU_CODE_OK);
     }
 
+    // Reset BLS UI for next transaction
+    app_mode_skip_blindsign_ui();
+
     uint8_t error_code;
     const char *error_msg = tx_parse(tx_get_buffer_length(), get_tx_type(), &error_code);
     CHECK_APP_CANARY()
@@ -152,14 +156,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;
 
     G_io_apdu_buffer[7] = !IS_UX_ALLOWED;
 

app/src/apdu_handler_legacy.c

@@ -299,9 +299,9 @@ bool legacy_process_transfer_chunk(uint32_t rx) {
 }
 
 void legacy_handleGetVersion(volatile uint32_t *tx) {
-    G_io_apdu_buffer[0] = (LEDGER_MAJOR_VERSION >> 0) & 0xFF;
-    G_io_apdu_buffer[1] = (LEDGER_MINOR_VERSION >> 0) & 0xFF;
-    G_io_apdu_buffer[2] = (LEDGER_PATCH_VERSION >> 0) & 0xFF;
+    G_io_apdu_buffer[0] = (MAJOR_VERSION >> 0) & 0xFF;
+    G_io_apdu_buffer[1] = (MINOR_VERSION >> 0) & 0xFF;
+    G_io_apdu_buffer[2] = (PATCH_VERSION >> 0) & 0xFF;
 
     *tx += 3;
     THROW(APDU_CODE_OK);

app/src/items.c

@@ -96,6 +96,8 @@ items_error_t items_storeItems(tx_type_t tx_type) {
         CHECK_ITEMS_ERROR(items_checkTxLengths());
     } else {
         CHECK_ITEMS_ERROR(items_storeHashWarning());
+
+        CHECK_ITEMS_ERROR(items_storeHash());
     }
 
     CHECK_ITEMS_ERROR(items_computeHash(tx_type));

app/src/items_defs.h

@@ -19,7 +19,11 @@
 
 #include "zxtypes.h"
 
-#define MAX_NUMBER_OF_ITEMS 65
+#if defined(TARGET_NANOS)
+#define MAX_NUMBER_OF_ITEMS 57
+#else
+#define MAX_NUMBER_OF_ITEMS 100
+#endif
 
 #define CHECK_ITEMS_ERROR(__CALL)            \
     {                                        \

app/src/items_format.c

@@ -18,8 +18,8 @@
 
 #include <zxformat.h>
 
+#include "common/parser.h"
 #include "crypto.h"
-#include "parser.h"
 
 extern char base64_hash[45];
 

app/src/parser.c

@@ -14,7 +14,7 @@
  *  limitations under the License.
  ********************************************************************************/
 
-#include "parser.h"
+#include "common/parser.h"
 
 #include <stdio.h>
 #include <zxformat.h>