Skip to content

Commit

Permalink
Merge pull request #82 from Zondax/main
Browse files Browse the repository at this point in the history
Bring latest changes from Zondax repository
  • Loading branch information
gmalouf authored Mar 20, 2024
2 parents f55c4e6 + 62286ff commit 9ce6890
Show file tree
Hide file tree
Showing 120 changed files with 279,737 additions and 279,027 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/guidelines_enforcer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@ jobs:
guidelines_enforcer:
name: Call Ledger guidelines_enforcer
uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1
with:
relative_app_directory: 'app'
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ add_definitions(
# static libs
file(GLOB_RECURSE LIB_SRC
${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/app_mode.c
${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/base64.c
${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/base58.c
${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/bignum.c
${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/hexutils.c
Expand All @@ -115,7 +116,6 @@ file(GLOB_RECURSE LIB_SRC
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_encoding.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/algo_asa.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/base64.c
${CMAKE_CURRENT_SOURCE_DIR}/deps/sha512/sha512.c
${CMAKE_CURRENT_SOURCE_DIR}/app/src/base32.c
${CMAKE_CURRENT_SOURCE_DIR}/deps/picohash/
Expand Down
2 changes: 0 additions & 2 deletions app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ endif

APP_LOAD_PARAMS = --curve ed25519 $(COMMON_LOAD_PARAMS) --path $(APPPATH)

NANOS_STACK_SIZE := 2440

include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices

$(info TARGET_NAME = [$(TARGET_NAME)])
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=2
# This is the `spec_version` field of `Runtime`
APPVERSION_N=1
# This is the patch version of this release
APPVERSION_P=10
APPVERSION_P=12
170 changes: 0 additions & 170 deletions app/script_s2.ld

This file was deleted.

175 changes: 0 additions & 175 deletions app/script_x.ld

This file was deleted.

Loading

0 comments on commit 9ce6890

Please sign in to comment.