Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ledgerctl (full, legacy) + Bump Stax SDK #91

Merged
merged 4 commits into from
Dec 11, 2023
Merged

Add ledgerctl (full, legacy) + Bump Stax SDK #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57bc15c
full : add ledgerctl (it is a dependency of cargo ledger)
agrojean-ledger Oct 12, 2023
81ae878
Use pypi to install latest ledgerwallet version and crates io for lat…
agrojean-ledger Dec 11, 2023
ba2dfeb
Lock cargo-ledger and ledgerwallet versions.
agrojean-ledger Dec 11, 2023
ad1814e
Update CHANGELOG
agrojean-ledger Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion full/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
agrojean-ledger marked this conversation as resolved.
Show resolved Hide resolved

# 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
Expand Down
5 changes: 4 additions & 1 deletion legacy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading