Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
if: github.event.repository.private == false
strategy:
matrix:
sdk: ["$NANOS_SDK", "$NANOX_SDK", "$NANOSP_SDK", "$STAX_SDK", "$FLEX_SDK"]
sdk: ["$NANOX_SDK", "$NANOSP_SDK", "$STAX_SDK", "$FLEX_SDK"]
container:
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-legacy:latest

Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,18 @@ jobs:
with:
upload_app_binaries_artifact: "compiled_app_binaries"


cpp_tests:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true
- name: Install deps
run: |
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
make deps
- run: make cpp_test

build:
runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
Expand Down Expand Up @@ -54,7 +65,6 @@ jobs:
make deps
- name: Run CMake
run: mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug .. && make
- run: make cpp_test

build_ledger:
needs: configure
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "deps/ledger-secure-sdk"]
path = deps/ledger-secure-sdk
url = https://github.com/LedgerHQ/ledger-secure-sdk.git
[submodule "js"]
path = js
url = https://github.com/Zondax/ledger-sovereign-js.git
13 changes: 12 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#*******************************************************************************
#* (c) 2018 -2024 Zondax AG
#* (c) 2018 - 2025 Zondax AG
#*
#* Licensed under the Apache License, Version 2.0 (the "License");
#* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -138,6 +138,15 @@ file(GLOB_RECURSE LIB_SRC
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/crypto_helper.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/schema_reader.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/borsh.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/schema_proof.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/schema_helper.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/schema_txn_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/ui_item_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/ui_item_buffer.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/stack_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/render.c
)

add_library(app_lib STATIC ${LIB_SRC})
Expand All @@ -147,6 +156,8 @@ target_include_directories(app_lib PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/app/src
${CMAKE_CURRENT_SOURCE_DIR}/app/src/lib
${CMAKE_CURRENT_SOURCE_DIR}/app/src/common
${CMAKE_CURRENT_SOURCE_DIR}/app/src/txdefs
${CMAKE_CURRENT_SOURCE_DIR}/app/src/modules
${CMAKE_CURRENT_SOURCE_DIR}/deps/picohash
)

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018-2024 Zondax AG
Copyright 2018-2025 Zondax AG

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#*******************************************************************************
#* (c) 2018 -2024 Zondax AG
#* (c) 2018 - 2025 Zondax AG
#*
#* Licensed under the Apache License, Version 2.0 (the "License");
#* you may not use this file except in compliance with the License.
Expand All @@ -18,8 +18,8 @@
# BOLOS_SDK IS DEFINED We use the plain Makefile for Ledger
# BOLOS_SDK NOT DEFINED We use a containerized build approach

TESTS_JS_PACKAGE = "@zondax/ledger-sovereign"
TESTS_JS_DIR = $(CURDIR)/../ledger-sovereign-js
# TESTS_JS_PACKAGE = "@zondax/ledger-sovereign"
# TESTS_JS_DIR = $(CURDIR)/../ledger-sovereign-js

ifeq ($(BOLOS_SDK),)
# In this case, there is not predefined SDK and we run dockerized
Expand Down
2 changes: 1 addition & 1 deletion app/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018-2023 Zondax AG
Copyright 2018- 2025 Zondax AG

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
3 changes: 2 additions & 1 deletion app/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#*******************************************************************************
# Ledger App
# (c) 2018 - 2024 Zondax AG
# (c) 2018 - 2025 Zondax AG
# (c) 2017 Ledger
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -76,6 +76,7 @@ VARIANT_PARAM=COIN
VARIANT_VALUES=$(COIN)

INCLUDES_PATH += $(CURDIR)/src/common
INCLUDES_PATH += $(BOLOS_SDK)/lib_cxng/src

########################################
# Application communication interfaces #
Expand Down
2 changes: 1 addition & 1 deletion app/Makefile.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ APPVERSION_M=0
# This is the minor version
APPVERSION_N=0
# This is the patch version
APPVERSION_P=1
APPVERSION_P=2
1 change: 0 additions & 1 deletion app/rust/.gitignore

This file was deleted.

Loading
Loading