Support for Flex device (#321)

* support for Flex

* update deps

* update Zemu tests

* Nano snapshots

* Stax snapshots

* Flex snapshots

* bump version & update snapshots

.github/workflows/main.yml

@@ -263,7 +263,7 @@ jobs:
   build_package_stax:
     needs: [configure, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
     if: ${{ github.ref == 'refs/heads/main' }}
-    runs-on: zondax-runners
+    runs-on: ubuntu-latest
     container:
       image: zondax/ledger-app-builder:latest
       options: --user ${{ needs.configure.outputs.uid_gid }}
@@ -295,3 +295,39 @@ jobs:
           tag_name: ${{ steps.stax.outputs.tag_name }}
           draft: false
           prerelease: false
+
+  build_package_flex:
+    needs: [configure, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
+    if: ${{ github.ref == 'refs/heads/main' }}
+    runs-on: ubuntu-latest
+    container:
+      image: zondax/ledger-app-builder:latest
+      options: --user ${{ needs.configure.outputs.uid_gid }}
+      env:
+        BOLOS_SDK: /opt/flex-secure-sdk
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install deps
+        run: pip install ledgerblue
+
+      - name: Build Flex
+        shell: bash -l {0}
+        run: |
+          make PRODUCTION_BUILD=0
+      - name: Set tag
+        id: flex
+        run: echo "tag_name=$(./app/pkg/installer_flex.sh version)" >> $GITHUB_OUTPUT
+      - name: Update Release
+        id: update_release_3
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          files: |
+            ./app/pkg/installer_flex.sh
+          tag_name: ${{ steps.flex.outputs.tag_name }}
+          draft: false
+          prerelease: false

.gitmodules

@@ -1,24 +1,15 @@
 [submodule "deps/ledger-rust"]
 	path = deps/ledger-rust
 	url = https://github.com/Zondax/ledger-rust
-[submodule "deps/nanos-secure-sdk"]
-	path = deps/nanos-secure-sdk
-	url = https://github.com/LedgerHQ/nanos-secure-sdk
-[submodule "deps/nanox-secure-sdk"]
-	path = deps/nanox-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk
-[submodule "deps/nanosplus-secure-sdk"]
-	path = deps/nanosplus-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk
 [submodule "deps/ledger-zxlib"]
 	path = deps/ledger-zxlib
 	url = https://github.com/Zondax/ledger-zxlib.git
-[submodule "deps/stax-secure-sdk"]
-	path = deps/stax-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk
 [submodule "cmake/cmake-modules"]
 	path = cmake/cmake-modules
 	url = https://github.com/bilke/cmake-modules
 [submodule "deps/ethereum"]
 	path = deps/ethereum
 	url = https://github.com/Zondax/app-ethereum.git
+[submodule "deps/ledger-secure-sdk"]
+	path = deps/ledger-secure-sdk
+	url = https://github.com/LedgerHQ/ledger-secure-sdk

Makefile

@@ -25,10 +25,7 @@ ifeq ($(BOLOS_SDK),)
 # In this case, there is not predefined SDK and we run dockerized
 # When not using the SDK, we override and build the XL complete app
 
-ZXLIB_COMPILE_STAX ?= 1
-# by default builds are not production ready
-PRODUCTION_BUILD ?= 0 
-
+PRODUCTION_BUILD ?= 1
 include $(CURDIR)/deps/ledger-zxlib/dockerized_build.mk
 
 else
@@ -41,8 +38,8 @@ endif
 
 test_all:
 	make clean
-	make PRODUCTION_BUILD=1
 	make zemu_install
+	make
 	make zemu_test
 
 prod:

app/Makefile

@@ -69,6 +69,13 @@ endif
 
 APP_LOAD_PARAMS = $(COMMON_LOAD_PARAMS) --curve secp256k1
 
+# Configure minimun stack size
+ifeq ($(TARGET_NAME),TARGET_NANOS)
+	APP_STACK_MIN_SIZE := 1752
+else
+	APP_STACK_MIN_SIZE := 2000
+endif
+
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
 
 $(info TARGET_NAME  = [$(TARGET_NAME)])
@@ -82,13 +89,6 @@ endif
 DEFINES += HAVE_HASH HAVE_BLAKE2
 INCLUDES_PATH += $(BOLOS_SDK)/lib_cxng/src
 
-# Configure minimun stack size
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-	APP_STACK_MIN_SIZE := 1752
-else
-	APP_STACK_MIN_SIZE := 2000
-endif
-
 ifeq ($(APP_TESTING), 1)
 DEFINES += APP_TESTING ZEMU_LOGGING
 $(info ************ LOGGING ENABLED ************)
@@ -99,24 +99,29 @@ ifeq ($(TARGET_NAME), TARGET_NANOS)
 RUST_TARGET := thumbv6m-none-eabi
 APP_FULL := 1
 APP_SOURCE_PATH += $(MY_DIR)/../deps/zxlib/view_s.c
+RUST_TARGET_NAME := TARGET_NANOS
 endif
 
 ifeq ($(TARGET_NAME), TARGET_NANOX)
 RUST_TARGET := thumbv6m-none-eabi
 APP_FULL := 1
+RUST_TARGET_NAME := TARGET_NANOX
 endif
 
 ifeq ($(TARGET_NAME), TARGET_NANOS2)
 RUST_TARGET := thumbv6m-none-eabi
 APP_FULL := 1
+RUST_TARGET_NAME := TARGET_NANOS2
 endif
 
-ifeq ($(TARGET_NAME), TARGET_STAX)
+NBGL_TARGETS := TARGET_STAX TARGET_FLEX
+ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME), $(NBGL_TARGETS)))
 RUST_TARGET := thumbv6m-none-eabi
 APP_FULL := 1
 DEFINES += ICONGLYPH=C_icon_stax_64
 DEFINES += ICONBITMAP=C_icon_stax_64
 DEFINES += ICONGLYPH_SMALL=C_icon_stax_32
+RUST_TARGET_NAME := TARGET_STAX
 endif
 
 ifeq ($(APP_TESTING), 1)
@@ -175,7 +180,7 @@ APP_SOURCE_PATH += $(MY_DIR)/../deps/ethereum/ethereum-plugin-sdk
 
 SDK_SOURCE_PATH += lib_u2f lib_standard_app
 
-ifeq ($(TARGET_NAME), TARGET_STAX)
+ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME), $(NBGL_TARGETS)))
 	NBGL_SRC_DIR := $(MY_DIR)/../deps/ethereum/src_nbgl
 	NBGL_SRC_FILES := $(filter-out $(NBGL_SRC_DIR)/network_icons.c, $(shell find $(NBGL_SRC_DIR) -name '*.c'))
 	NBGL_SRC_FILES := $(filter-out $(NBGL_SRC_DIR)/ui_idle.c, $(NBGL_SRC_FILES))
@@ -230,7 +235,7 @@ APP_CUSTOM_LINK_DEPENDENCIES := rust
 
 .PHONY: rust
 rust:
-	cd rust && RUSTC_BOOTSTRAP=1 CARGO_HOME="$(CURDIR)/rust/.cargo" TARGET_NAME=$(TARGET_NAME) ZEMU_LOGGING=$(ZEMU_LOGGING) \
+	cd rust && RUSTC_BOOTSTRAP=1 CARGO_HOME="$(CURDIR)/rust/.cargo" TARGET_NAME=$(RUST_TARGET_NAME) ZEMU_LOGGING=$(ZEMU_LOGGING) \
 	cargo build --release --target $(RUST_TARGET) \
 	--no-default-features $(RUST_FEATURES)
 

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=0
 # Minor
 APPVERSION_N=8
 # Patch
-APPVERSION_P=3
+APPVERSION_P=4

app/src/common/tx.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
-*  (c) 2018 - 2023 Zondax AG
+*  (c) 2018 - 2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 #include <string.h>
 #include "zxmacros.h"
 
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX)
-#define RAM_BUFFER_SIZE 8192
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
+#define RAM_BUFFER_SIZE 7168
 #define FLASH_BUFFER_SIZE 16384
 #elif defined(TARGET_NANOS)
 #define RAM_BUFFER_SIZE 256
@@ -38,7 +38,7 @@ typedef struct {
     uint8_t buffer[FLASH_BUFFER_SIZE];
 } storage_t;
 
-#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX)
+#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
 storage_t NV_CONST N_appdata_impl __attribute__((aligned(64)));
 #define N_appdata (*(NV_VOLATILE storage_t *)PIC(&N_appdata_impl))
 #endif

app/src/eth_ui_patch.c

@@ -2,7 +2,7 @@
 #include "os_pic.h"
 
 // Replace functions from ethereum app to skip icon generation and UI idle menu
-#if defined(TARGET_STAX)
+#if defined(TARGET_STAX) || defined(TARGET_FLEX)
 #include "nbgl_types.h"
 #include "glyphs.h"
 #include "ui_nbgl.h"
@@ -12,24 +12,28 @@
 char g_stax_shared_buffer[SHARED_BUFFER_SIZE] = {0};
 nbgl_page_t *pageContext;
 
-const nbgl_icon_details_t *get_app_icon(bool caller_icon) {
+const nbgl_icon_details_t *get_app_icon(bool caller_icon)
+{
     UNUSED(caller_icon);
     const nbgl_icon_details_t *icon = NULL;
 
     icon = &ICONGLYPH;
-    if (icon == NULL) {
+    if (icon == NULL)
+    {
         PRINTF("%s(%s) returned NULL!\n", __func__, (caller_icon ? "true" : "false"));
     }
     return icon;
 }
 
-const nbgl_icon_details_t *get_network_icon_from_chain_id(const uint64_t *chain_id) {
+const nbgl_icon_details_t *get_network_icon_from_chain_id(const uint64_t *chain_id)
+{
     UNUSED(chain_id);
     return get_app_icon(false);
 }
 
 // Redirect ui_idle from eth app to ours UI
-void ui_idle(void) {
+void ui_idle(void)
+{
     view_idle_show(0, NULL);
 }
 #endif

app/src/handler.c

@@ -81,7 +81,7 @@ const internalStorage_t N_storage_real;
 caller_app_t *caller_app = NULL;
 #endif
 
-chain_config_t *chainConfig = NULL;
+const chain_config_t *chainConfig = NULL;
 chain_config_t config;
 
 // This function is only present in master branch
@@ -299,7 +299,6 @@ void handle_eth_apdu(uint32_t *flags, uint32_t *tx,
                             // use in develop but not present in master
                             // forget_known_assets();
                             // use in master instead of the above
-                            memset(tmpCtx.transactionContext.tokenSet, 0, MAX_ITEMS);
                             handleSignEIP712Message_v0(buffer[OFFSET_P1],
                                                        buffer[OFFSET_P2],
                                                        buffer + OFFSET_CDATA,

app/src/network_icons.c

@@ -2,16 +2,18 @@
 #include "os_pic.h"
 
 // Replace function from ethereum app to skip icon generation
-#if defined(TARGET_STAX)
+#if defined(TARGET_STAX) || defined(TARGET_FLEX)
 #include "nbgl_types.h"
 #include "glyphs.h"
 
-const nbgl_icon_details_t *get_network_icon_from_chain_id(const uint64_t *chain_id) {
+const nbgl_icon_details_t *get_network_icon_from_chain_id(const uint64_t *chain_id)
+{
     UNUSED(chain_id);
     const nbgl_icon_details_t *icon = NULL;
 
     icon = &ICONGLYPH;
-    if (icon == NULL) {
+    if (icon == NULL)
+    {
         PRINTF("%s(%s) returned NULL!\n", __func__, (caller_icon ? "true" : "false"));
     }
     return icon;

ledger_app.toml

@@ -1,4 +1,4 @@
 [app]
 build_directory = "./app/"
 sdk = "C"
-devices = ["nanos", "nanos+", "nanox", "stax"]
+devices = ["nanos", "nanos+", "nanox", "stax", "flex"]

tests_zemu/package.json

@@ -19,7 +19,7 @@
     "@ethersproject/wallet": "^5.7.0",
     "@types/node": "^18.14.6",
     "@zondax/ledger-avalanche-app": "link:../js",
-    "@zondax/zemu": "=0.48.0",
+    "@zondax/zemu": "0.50.2",
     "ethers": "^6.12.1"
   },
   "devDependencies": {