Skip to content

Commit

Permalink
chore: merge ledgerhq updates (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepdefic1t authored May 17, 2024
1 parent 1ff7f87 commit 59aca44
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 10 deletions.
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Checklist
<!-- Put an `x` in each box when you have completed the items. -->
- [ ] App update process has been followed <!-- See comment below -->
- [ ] Target branch is `develop` <!-- unless you have a very good reason -->
- [ ] Application version has been bumped <!-- required if your changes are to be deployed -->

<!-- Make sure you followed the process described in https://developers.ledger.com/docs/embedded-app/maintenance/ before opening your Pull Request.
Don't hesitate to contact us directly on Discord if you have any questions ! https://developers.ledger.com/discord -->
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ include $(BOLOS_SDK)/Makefile.defines
########################################
# Mandatory configuration #
########################################
APP_LOAD_PARAMS += --tlvraw 9F:01

ENABLE_PENDING_REVIEW_SCREEN = 1

# Application name
APPNAME = "Solar"
Expand Down
4 changes: 4 additions & 0 deletions ledger_app.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[app]
build_directory = "./"
sdk = "C"
devices = ["nanos", "nanox", "nanos+"]
2 changes: 1 addition & 1 deletion src/apdu/dispatcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#include "constants.h"
#include "sw.h"
#include "types.h"
#include "app_types.h"

#include "handler/get_version.h"
#include "handler/get_app_name.h"
Expand Down
2 changes: 1 addition & 1 deletion src/apdu/dispatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "parser.h"

#include "types.h"
#include "app_types.h"

/**
* Parameter 2 for last APDU to receive.
Expand Down
2 changes: 1 addition & 1 deletion src/app_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "context.h"
#include "globals.h"
#include "sw.h"
#include "types.h"
#include "app_types.h"

#include "apdu/dispatcher.h"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "ux.h"

#include "constants.h"
#include "types.h"
#include "app_types.h"

/**
* Global buffer for interactions between SE and MCU.
Expand Down
2 changes: 1 addition & 1 deletion src/handler/get_address.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "context.h"
#include "globals.h"
#include "sw.h"
#include "types.h"
#include "app_types.h"

#include "crypto/crypto.h"
#include "helper/send_response.h"
Expand Down
2 changes: 1 addition & 1 deletion src/handler/get_app_name.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include "constants.h"
#include "sw.h"
#include "types.h"
#include "app_types.h"

int handler_get_app_name() {
_Static_assert(APPNAME_LEN < APPNAME_MAX_LEN, "APPNAME must be at most 64 characters!");
Expand Down
2 changes: 1 addition & 1 deletion src/handler/get_public_key.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

#include "context.h"
#include "globals.h"
#include "types.h"
#include "app_types.h"
#include "sw.h"

#include "crypto/crypto.h"
Expand Down
2 changes: 1 addition & 1 deletion src/handler/get_version.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "constants.h"
#include "sw.h"
#include "types.h"
#include "app_types.h"

int handler_get_version() {
_Static_assert(APPVERSION_LEN == 3, "Length of (MAJOR || MINOR || PATCH) must be 3!");
Expand Down
2 changes: 1 addition & 1 deletion src/ui/transactions/vote_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "read.h"

#include "constants.h"
#include "types.h"
#include "app_types.h"

#include "transaction/transaction_utils.h"
#include "transaction/types/vote.h"
Expand Down

0 comments on commit 59aca44

Please sign in to comment.