Merge pull request #660 from LedgerHQ/lpa/update_api_level_18

Update API_LEVEL_18

.github/workflows/build_all_apps.yml

@@ -21,7 +21,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install tomlq
         run: |
@@ -105,24 +105,18 @@ jobs:
 
     steps:
       - name: Clone App
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: LedgerHQ/${{ matrix.repo_info.repo_name }}
           ref: ${{ matrix.repo_info.default_branch }}
           submodules: true
 
       - name: Clone SDK
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: sdk
           ref: ${{ inputs.sdk_branch }}
 
-      - name: Build NanoS
-        if: "startsWith(matrix.repo_info.devices, 'nanos,')"
-        run: |
-          [ -n '${{ matrix.repo_info.build_directory }}' ] && cd ${{ matrix.repo_info.build_directory }}
-          TARGET=nanos BOLOS_SDK=$GITHUB_WORKSPACE/sdk make
-
       - name: Build NanoX
         if: "contains(matrix.repo_info.devices, 'nanox')"
         run: |

.github/workflows/check_clang_static_analyzer.yml

@@ -13,21 +13,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [nanos, nanox, nanos2, stax, flex]
+        target: [nanox, nanos2, stax, flex]
         debug: [0, 1]
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 
     steps:
       - name: Clone Boilerplate
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: LedgerHQ/app-boilerplate
           ref: master
 
       - name: Clone SDK
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: sdk
 

.github/workflows/pre-commit.yml

@@ -6,7 +6,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'

.github/workflows/unit_tests.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build unit tests
         run: |

Makefile.defines

@@ -1,6 +1,6 @@
 #*******************************************************************************
 #   Ledger SDK
-#   (c) 2017 Ledger
+#   (c) 2024 Ledger
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -15,34 +15,12 @@
 #  limitations under the License.
 #*******************************************************************************
 
-# TARGET should be set as an environment variable otherwise it will be read from a `.target`
-# file in the SDK root repository
-TARGETS := nanos nanox nanos2 stax flex
-ifeq ($(TARGET),)
-ifeq ("$(wildcard $(BOLOS_SDK)/.target)","")
-$(error No TARGET specified and no .target file in SDK repository $(BOLOS_SDK))
-else
-TARGET := $(shell cat $(BOLOS_SDK)/.target)
-endif
-endif
+ifeq ($(__MAKEFILE_DEFINES__),)
+__MAKEFILE_DEFINES__ := 1
 
-ifeq ($(filter $(TARGET),$(TARGETS)),)
-$(error TARGET not set to a valid value (possible values: $(TARGETS)))
-endif
+include $(BOLOS_SDK)/Makefile.target
 
-API_LEVEL   := 18
-TARGET_PATH := $(BOLOS_SDK)/target/$(TARGET)
-TARGET_ID   := $(shell cat $(TARGET_PATH)/include/bolos_target.h | grep TARGET_ID | cut -f3 -d' ')
-TARGET_NAME := $(sort $(shell cat $(TARGET_PATH)/include/bolos_target.h | grep TARGET_ | grep -v TARGET_ID | cut -f2 -d' '))
-SDK_NAME    := "ledger-secure-sdk"
-SDK_VERSION := $(shell git -C $(BOLOS_SDK) describe --tags --exact-match  --match "v[0-9]*" --dirty)
-SDK_HASH    := $(shell git -C $(BOLOS_SDK) describe --always --dirty --exclude '*' --abbrev=40)
-ifeq ($(SDK_VERSION),)
-SDK_VERSION := "None"
-endif
-ifeq ($(SDK_HASH),)
-SDK_HASH := "None"
-endif
+API_LEVEL := 18
 
 # APPNAME exposed to the app as a CFLAG because it might contain spaces
 CFLAGS += -DAPPNAME=\"$(APPNAME)\"
@@ -56,23 +34,12 @@ APP_METADATA_LIST := TARGET TARGET_NAME APPVERSION SDK_NAME SDK_VERSION SDK_HASH
 DEFINES += $(foreach item,$(APP_METADATA_LIST), $(item)=\"$($(item))\")
 
 
-BUILD_DIR := build
-TARGET_BUILD_DIR := $(BUILD_DIR)/$(TARGET)
-BIN_DIR := $(TARGET_BUILD_DIR)/bin
-OBJ_DIR := $(TARGET_BUILD_DIR)/obj
-DBG_DIR := $(TARGET_BUILD_DIR)/dbg
-DEP_DIR := $(TARGET_BUILD_DIR)/dep
-GEN_SRC_DIR := $(TARGET_BUILD_DIR)/gen_src
-
 ### platform definitions
 DEFINES += gcc __IO=volatile
 
 # no assert by default
 DEFINES += NDEBUG
 
-# Debug mode disabled by default
-DEBUG:=0
-
 # default is not to display make commands
 log = $(if $(strip $(VERBOSE)),$1,@$1) # kept for retrocompat
 L = $(if $(strip $(VERBOSE)),,@)
@@ -243,5 +210,4 @@ endif
 # include builtin CX libs options
 -include $(BOLOS_SDK)/Makefile.conf.cx
 
-# define the default makefile target (high in include to avoid glyph.h or what not specific target to be the default one when no target passed on the make command line)
-all: default
+endif

Makefile.standard_app

@@ -15,6 +15,8 @@
 #  limitations under the License.
 #*******************************************************************************
 
+include $(BOLOS_SDK)/Makefile.target
+
 #####################################################################
 #                            BLUETOOTH                              #
 #####################################################################
@@ -77,6 +79,34 @@ ifneq ($(DISABLE_DEFAULT_IO_SEPROXY_BUFFER_SIZE), 1)
     endif
 endif
 
+#####################################################################
+#                              NBGL                                 #
+#####################################################################
+ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOS TARGET_NANOX TARGET_NANOS2))
+ifeq ($(ENABLE_NBGL_FOR_NANO_DEVICES), 1)
+USE_NBGL = 1
+else
+USE_NBGL = 0
+endif
+else
+USE_NBGL = 1
+endif
+
+ifeq ($(ENABLE_NBGL_QRCODE), 1)
+ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX))
+    DEFINES += NBGL_QRCODE
+    SDK_SOURCE_PATH += qrcode
+endif
+endif
+
+ifeq ($(ENABLE_NBGL_KEYBOARD), 1)
+    DEFINES += NBGL_KEYBOARD
+endif
+
+ifeq ($(ENABLE_NBGL_KEYPAD), 1)
+    DEFINES += NBGL_KEYPAD
+endif
+
 #####################################################################
 #                          STANDARD DEFINES                         #
 #####################################################################
@@ -110,7 +140,7 @@ ifneq ($(DISABLE_STANDARD_WEBUSB), 1)
 endif
 
 ifneq ($(DISABLE_STANDARD_BAGL_UX_FLOW), 1)
-ifeq ($(USE_NBGL),0)
+ifneq ($(USE_NBGL), 1)
     DEFINES += HAVE_UX_FLOW
 endif
 endif
@@ -124,31 +154,15 @@ SDK_SOURCE_PATH += lib_standard_app
 endif
 
 ifneq ($(DISABLE_STANDARD_APP_SYNC_RAPDU), 1)
+# On LNS only activate it by default if using NBGL.
+# This impact stack usage and shouldn't be activated on all apps silently
 ifneq ($(TARGET_NAME),TARGET_NANOS)
 DEFINES += STANDARD_APP_SYNC_RAPDU
+else
+ifeq ($(ENABLE_NBGL_FOR_NANO_DEVICES), 1)
+DEFINES += STANDARD_APP_SYNC_RAPDU
 endif
 endif
-
-#####################################################################
-#                              NBGL                                 #
-#####################################################################
-ifeq ($(ENABLE_NBGL_QRCODE), 1)
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX))
-    DEFINES += NBGL_QRCODE
-    SDK_SOURCE_PATH += qrcode
-endif
-endif
-
-ifeq ($(ENABLE_NBGL_KEYBOARD), 1)
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX))
-    DEFINES += NBGL_KEYBOARD
-endif
-endif
-
-ifeq ($(ENABLE_NBGL_KEYPAD), 1)
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX))
-    DEFINES += NBGL_KEYPAD
-endif
 endif
 
 #####################################################################
@@ -212,6 +226,8 @@ ifeq ($(TARGET_NAME), TARGET_FLEX)
 ICONNAME ?= $(ICON_FLEX)
 endif
 
+include $(BOLOS_SDK)/Makefile.defines
+
 include $(BOLOS_SDK)/Makefile.glyphs
 
 load: all

Makefile.target

@@ -0,0 +1,63 @@
+#*******************************************************************************
+#   Ledger SDK
+#   (c) 2024 Ledger
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#*******************************************************************************
+
+ifeq ($(__MAKEFILE_TARGET__),)
+__MAKEFILE_TARGET__ := 1
+
+# TARGET should be set as an environment variable otherwise it will be read from a `.target`
+# file in the SDK root repository
+TARGETS := nanos nanox nanos2 stax flex
+ifeq ($(TARGET),)
+ifeq ("$(wildcard $(BOLOS_SDK)/.target)","")
+$(error No TARGET specified and no .target file in SDK repository $(BOLOS_SDK))
+else
+TARGET := $(shell cat $(BOLOS_SDK)/.target)
+endif
+endif
+
+ifeq ($(filter $(TARGET),$(TARGETS)),)
+$(error TARGET not set to a valid value (possible values: $(TARGETS)))
+endif
+
+TARGET_PATH := $(BOLOS_SDK)/target/$(TARGET)
+TARGET_ID   := $(shell cat $(TARGET_PATH)/include/bolos_target.h | grep TARGET_ID | cut -f3 -d' ')
+TARGET_NAME := $(sort $(shell cat $(TARGET_PATH)/include/bolos_target.h | grep TARGET_ | grep -v TARGET_ID | cut -f2 -d' '))
+SDK_NAME    := "ledger-secure-sdk"
+SDK_VERSION := $(shell git -C $(BOLOS_SDK) describe --tags --exact-match  --match "v[0-9]*" --dirty)
+SDK_HASH    := $(shell git -C $(BOLOS_SDK) describe --always --dirty --exclude '*' --abbrev=40)
+ifeq ($(SDK_VERSION),)
+SDK_VERSION := "None"
+endif
+ifeq ($(SDK_HASH),)
+SDK_HASH := "None"
+endif
+
+BUILD_DIR := build
+TARGET_BUILD_DIR := $(BUILD_DIR)/$(TARGET)
+BIN_DIR := $(TARGET_BUILD_DIR)/bin
+OBJ_DIR := $(TARGET_BUILD_DIR)/obj
+DBG_DIR := $(TARGET_BUILD_DIR)/dbg
+DEP_DIR := $(TARGET_BUILD_DIR)/dep
+GEN_SRC_DIR := $(TARGET_BUILD_DIR)/gen_src
+
+# Debug mode disabled by default
+DEBUG:=0
+
+# define the default makefile target (high in include to avoid glyph.h or what not specific target to be the default one when no target passed on the make command line)
+all: default
+
+endif

include/cx_errors.h

@@ -12,13 +12,24 @@
  * Checks the error code of a function.
  * @hideinitializer
  */
+#ifdef HAVE_BOLOS
 #define CX_CHECK(call) \
     do {               \
         error = call;  \
         if (error) {   \
             goto end;  \
         }              \
     } while (0)
+#else
+#define CX_CHECK(call)                                           \
+    do {                                                         \
+        error = call;                                            \
+        if (error) {                                             \
+            PRINTF("[CX_CHECK] - %s: %d\n", __FILE__, __LINE__); \
+            goto end;                                            \
+        }                                                        \
+    } while (0)
+#endif
 
 /**
  * Checks the error code of a function and ignore