Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit dda0c92

Browse files
authored
Merge pull request #197 from Zondax/update-9420
2 parents 08d6c19 + 682b2b6 commit dda0c92

297 files changed

Lines changed: 91207 additions & 86422 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/check_version.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
container:
2323
image: zondax/ledger-app-builder:latest
2424
options: --user ${{ needs.configure.outputs.uid_gid }}
25-
env:
26-
SDK_VARNAME: NANOSP_SDK
2725
outputs:
2826
version: ${{ steps.store-version.outputs.version }}
2927
steps:

.github/workflows/codeql.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: "CodeQL"
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
pull_request:
7+
branches:
8+
- main
9+
- develop
10+
11+
jobs:
12+
analyse:
13+
name: Analyse
14+
strategy:
15+
matrix:
16+
sdk: ["$NANOS_SDK", "$NANOX_SDK", "$NANOSP_SDK"]
17+
runs-on: ubuntu-latest
18+
container:
19+
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-legacy:latest
20+
21+
steps:
22+
- name: Clone
23+
uses: actions/checkout@v3
24+
with:
25+
submodules: recursive
26+
27+
- name: Initialize CodeQL
28+
uses: github/codeql-action/init@v2
29+
with:
30+
languages: cpp
31+
queries: security-and-quality
32+
33+
- name: Build
34+
run: |
35+
make -j BOLOS_SDK=${{ matrix.sdk }}
36+
- name: Perform CodeQL Analysis
37+
uses: github/codeql-action/analyze@v2
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Ensure compliance with Ledger guidelines
2+
3+
# This workflow is mandatory in all applications
4+
# It calls a reusable workflow guidelines_enforcer developed by Ledger's internal developer team.
5+
# The successful completion of the reusable workflow is a mandatory step for an app to be available on the Ledger
6+
# application store.
7+
#
8+
# More information on the guidelines can be found in the repository:
9+
# LedgerHQ/ledger-app-workflows/
10+
11+
on:
12+
workflow_dispatch:
13+
push:
14+
branches:
15+
- master
16+
- main
17+
- develop
18+
pull_request:
19+
20+
jobs:
21+
guidelines_enforcer:
22+
name: Call Ledger guidelines_enforcer
23+
uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1
24+
with:
25+
relative_app_directory: app
26+
run_for_devices: '["nanos", "nanosp", "nanox"]'

.github/workflows/ledger.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@ zemu_install: tests_tools_build
4747
test_all:
4848
make zemu_install
4949
SUBSTRATE_PARSER_FULL=1 make
50+
make clean_glyphs
5051
SUBSTRATE_PARSER_FULL=1 SUPPORT_SR25519=1 make buildS
5152
make zemu_test

README.md

Lines changed: 111 additions & 180 deletions
Large diffs are not rendered by default.

app/Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,17 @@ endif
9090

9191
include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
9292
LDFLAGS += -z muldefs
93+
94+
ifeq ($(SUPPORT_SR25519),1)
95+
APP_CUSTOM_LINK_DEPENDENCIES = rust
9396
LDLIBS += -Lrust/target/thumbv6m-none-eabi/release -lrslib
94-
CFLAGS += -Wvla
9597
APP_SOURCE_PATH += $(CURDIR)/rust/include
98+
endif
9699

97100
.PHONY: rust
98101
rust:
99102
cd rust && CARGO_HOME="$(CURDIR)/rust/.cargo" cargo build --target thumbv6m-none-eabi --release
100103

101-
# Force rust dependency before c compilation in parallel mode (-j option).
102-
.DEFAULT_GOAL := build_with_rust
103-
.PHONY: build_with_rust
104-
build_with_rust: rust
105-
$(MAKE) all
106-
107104
.PHONY: rust_clean
108105
rust_clean:
109106
cd rust && CARGO_HOME="$(CURDIR)/rust/.cargo" cargo clean

app/Makefile.version

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is the `transaction_version` field of `Runtime`
2-
APPVERSION_M=20
2+
APPVERSION_M=22
33
# This is the `spec_version` field of `Runtime`
4-
APPVERSION_N=9391
4+
APPVERSION_N=9420
55
# This is the patch version of this release
66
APPVERSION_P=0

app/glyphs/icon_back.gif

-74 Bytes
Binary file not shown.

app/glyphs/icon_crossmark.gif

-1.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)