diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a6ec93..aee257a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ 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.11.0] - 2023-12-11 + +### Added + - Add ledgerctl to full and legacy images so that we can use cargo ledger sideload and apdu dump features. + +### Changed + - Lock installed version of cargo-ledger in full and legacy images. + - Bump Stax SDK version in lite image. + ## [3.10.2] - 2023-12-07 ### Changed diff --git a/full/Dockerfile b/full/Dockerfile index 2f880ed..61d22a6 100644 --- a/full/Dockerfile +++ b/full/Dockerfile @@ -27,8 +27,18 @@ RUN rustup target add thumbv6m-none-eabi --toolchain $RUST_NIGHTLY_VERSION # Adding rust-src component to nightly channel RUN rustup component add rust-src --toolchain $RUST_NIGHTLY_VERSION +# Python packages building dependencies, can be removed afterwards +RUN apk add -t python_build_deps python3-dev \ + libffi-dev + +# Install ledgerctl, which is used by cargo ledger for loading or dumping an APDU app file. +RUN pip3 install ledgerwallet==0.4.0 + +# Cleanup, remove packages that aren't needed anymore +RUN apk del python_build_deps + # Add cargo ledger (needs a version of Rust >= 1.70) -RUN cargo +$RUST_STABLE_VERSION install --locked --git=https://github.com/LedgerHQ/cargo-ledger.git --rev 1.1.1 cargo-ledger +RUN cargo +$RUST_STABLE_VERSION install --version 1.2.1 cargo-ledger # Setup cargo ledger (install JSON target files) RUN cargo ledger setup diff --git a/legacy/Dockerfile b/legacy/Dockerfile index 0b226e9..d57262e 100644 --- a/legacy/Dockerfile +++ b/legacy/Dockerfile @@ -62,8 +62,11 @@ RUN rustup target add thumbv6m-none-eabi --toolchain $RUST_NIGHTLY_VERSION # Adding rust-src component to nightly channel RUN rustup component add rust-src --toolchain $RUST_NIGHTLY_VERSION +# Add ledgerwallet python package used by cargo ledger to generate the app APDU file +RUN pip3 install ledgerwallet==0.4.0 + # Add cargo ledger (needs a version of Rust >= 1.70) -RUN cargo +$RUST_STABLE_VERSION install --locked --git=https://github.com/LedgerHQ/cargo-ledger.git --rev 1.1.1 cargo-ledger +RUN cargo +$RUST_STABLE_VERSION install --version 1.2.1 cargo-ledger # Setup cargo ledger (install JSON target files) RUN cargo ledger setup diff --git a/lite/Dockerfile b/lite/Dockerfile index 03f6302..9afc762 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -86,7 +86,7 @@ RUN echo nanos2 > $NANOSP_SDK/.target # Latest Stax SDK (OS stax_1.4.0-rc1 => based on API_LEVEL 14) ENV STAX_SDK=/opt/stax-secure-sdk -RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v14.1.0 +RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v14.1.1 RUN echo stax > $STAX_SDK/.target # Default SDK