From 81a912a1e09c4d78c6103c8a1777413eb5f9b384 Mon Sep 17 00:00:00 2001 From: tdejoigny-ledger Date: Tue, 2 Apr 2024 18:05:33 +0200 Subject: [PATCH 1/3] add flex target --- CHANGELOG.md | 5 +++++ README.md | 8 +++++++- lite/Dockerfile | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c106a2..46b2210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.19.0] - 2024-04-02 + +### Changed + - add Flex target + ## [3.18.0] - 2024-03-27 ### Changed diff --git a/README.md b/README.md index 5945d6e..de2f906 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,12 @@ $ sudo docker run --rm -ti -v "$(realpath .):/app" --user $(id -u $USER):$(id -g bash$ BOLOS_SDK=$STAX_SDK make ``` +* For Flex +```bash +$ sudo docker run --rm -ti -v "$(realpath .):/app" --user $(id -u $USER):$(id -g $USER) ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest +bash$ BOLOS_SDK=$FLEX_SDK make +``` + ### Code static analysis The Docker images include the [Clang Static Analyzer](https://clang-analyzer.llvm.org/), which can be invoked with: @@ -116,7 +122,7 @@ bash$ source ./venv/bin/activate ## Load the app on a physical device -:warning: Only Nano S, Nano S+ and Stax devices allow application side-loading. This section will not work with a Nano X. +:warning: Only Nano S, Nano S+, Stax and Flex devices allow application side-loading. This section will not work with a Nano X. To load the app from the container, you will need additional docker arguments in order to allow Docker to access your USB port. Your physical device must be connected, unlocked and the screen showing the dashboard (not inside an application). Same as for compilation, `BOLOS_SDK` variable is used to specify the target device. Use the following docker command to load the app (here for Nano S device) : diff --git a/lite/Dockerfile b/lite/Dockerfile index c3a060c..db8b2f6 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -89,6 +89,11 @@ ENV STAX_SDK=/opt/stax-secure-sdk RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v15.2.0 RUN echo stax > $STAX_SDK/.target +# Latest Flex SDK (OS stax_1.4.0-rc3 => based on API_LEVEL 18) +ENV FLEX_SDK=/opt/flex-secure-sdk +RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" v18.0.1 +RUN echo flex > $FLEX_SDK/.target + # Default SDK ENV BOLOS_SDK=$NANOS_SDK From 926ec83c6fa4c3ee6f5f5751321b1924bc7494ca Mon Sep 17 00:00:00 2001 From: Lucas PASCAL Date: Wed, 3 Apr 2024 17:27:41 +0200 Subject: [PATCH 2/3] [update] Flex versions / OS name --- CHANGELOG.md | 10 +++++----- lite/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46b2210..e5bb9a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [3.19.0] - 2024-04-02 +## [3.19.0] - 2024-04-03 -### Changed - - add Flex target +### Added + - Flex target ## [3.18.0] - 2024-03-27 @@ -65,7 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [3.12.1] - 2024-01-11 ### Changed - - Update cargo-ledger + - Update cargo-ledger ## [3.12.0] - 2024-01-10 @@ -115,7 +115,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [3.9.0] - 2023-10-25 ### Added - - Add a Cargo config global file in full image + - Add a Cargo config global file in full image ## [3.8.0] - 2023-10-09 diff --git a/lite/Dockerfile b/lite/Dockerfile index db8b2f6..8a81490 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -89,9 +89,9 @@ ENV STAX_SDK=/opt/stax-secure-sdk RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v15.2.0 RUN echo stax > $STAX_SDK/.target -# Latest Flex SDK (OS stax_1.4.0-rc3 => based on API_LEVEL 18) +# Latest Flex SDK (OS europa_0.1.0-re3 => based on API_LEVEL 18) ENV FLEX_SDK=/opt/flex-secure-sdk -RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" v18.0.1 +RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" v18.1.0 RUN echo flex > $FLEX_SDK/.target # Default SDK From 4a1ff5031d5e63321991004dbc06870f10bd93cc Mon Sep 17 00:00:00 2001 From: Lucas PASCAL Date: Wed, 3 Apr 2024 17:41:54 +0200 Subject: [PATCH 3/3] [bump] Ragger dependency --- CHANGELOG.md | 3 +++ dev-tools/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5bb9a8..44104d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Flex target +### Changed + - dev-tools: Bump ragger version to 1.16+ + ## [3.18.0] - 2024-03-27 ### Changed diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile index cec8b04..4d79d8e 100644 --- a/dev-tools/Dockerfile +++ b/dev-tools/Dockerfile @@ -20,4 +20,4 @@ ARG PYTHON_BUILD_DEPS=libffi-dev,python3-dev,py3-virtualenv RUN apk add $(echo -n "$PYTHON_BUILD_DEPS" | tr , ' ') # Install test tools (Ragger framework, Speculos emulator, Ledgerblue...) -RUN pip3 install ragger[tests,all_backends]==1.16.0 +RUN pip3 install --no-cache-dir "ragger[tests,all_backends]~=1.16"