From 6e2e8c32b085026f96f3e46964d7b499a967e97d Mon Sep 17 00:00:00 2001 From: Sarah GLINER Date: Wed, 23 Aug 2023 12:13:03 +0200 Subject: [PATCH 1/4] Makefile: add pending review screen --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5cf6b16..722897a 100644 --- a/Makefile +++ b/Makefile @@ -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" From 88cf97f7773c81f3eaf7ec0aadb510ce8c647cb4 Mon Sep 17 00:00:00 2001 From: tdejoigny-ledger Date: Tue, 7 Nov 2023 14:06:37 +0100 Subject: [PATCH 2/4] Rename types.h in app_types.h to avoid conflict --- src/apdu/dispatcher.c | 2 +- src/apdu/dispatcher.h | 2 +- src/app_main.c | 2 +- src/{types.h => app_types.h} | 0 src/globals.h | 2 +- src/handler/get_address.c | 2 +- src/handler/get_app_name.c | 2 +- src/handler/get_public_key.c | 2 +- src/handler/get_version.c | 2 +- src/ui/transactions/vote_display.c | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename src/{types.h => app_types.h} (100%) diff --git a/src/apdu/dispatcher.c b/src/apdu/dispatcher.c index fd20df8..7ec927f 100644 --- a/src/apdu/dispatcher.c +++ b/src/apdu/dispatcher.c @@ -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" diff --git a/src/apdu/dispatcher.h b/src/apdu/dispatcher.h index f53e0db..97dabd4 100644 --- a/src/apdu/dispatcher.h +++ b/src/apdu/dispatcher.h @@ -2,7 +2,7 @@ #include "parser.h" -#include "types.h" +#include "app_types.h" /** * Parameter 2 for last APDU to receive. diff --git a/src/app_main.c b/src/app_main.c index cd6b961..d37f138 100644 --- a/src/app_main.c +++ b/src/app_main.c @@ -25,7 +25,7 @@ #include "context.h" #include "globals.h" #include "sw.h" -#include "types.h" +#include "app_types.h" #include "apdu/dispatcher.h" diff --git a/src/types.h b/src/app_types.h similarity index 100% rename from src/types.h rename to src/app_types.h diff --git a/src/globals.h b/src/globals.h index 049e812..5fafe70 100644 --- a/src/globals.h +++ b/src/globals.h @@ -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. diff --git a/src/handler/get_address.c b/src/handler/get_address.c index 0a43394..1292a0c 100644 --- a/src/handler/get_address.c +++ b/src/handler/get_address.c @@ -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" diff --git a/src/handler/get_app_name.c b/src/handler/get_app_name.c index 8ba2793..689ed22 100644 --- a/src/handler/get_app_name.c +++ b/src/handler/get_app_name.c @@ -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!"); diff --git a/src/handler/get_public_key.c b/src/handler/get_public_key.c index 4b2bd7c..e0f31cd 100644 --- a/src/handler/get_public_key.c +++ b/src/handler/get_public_key.c @@ -42,7 +42,7 @@ #include "context.h" #include "globals.h" -#include "types.h" +#include "app_types.h" #include "sw.h" #include "crypto/crypto.h" diff --git a/src/handler/get_version.c b/src/handler/get_version.c index b305229..b635128 100644 --- a/src/handler/get_version.c +++ b/src/handler/get_version.c @@ -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!"); diff --git a/src/ui/transactions/vote_display.c b/src/ui/transactions/vote_display.c index d8fc7df..2752c27 100644 --- a/src/ui/transactions/vote_display.c +++ b/src/ui/transactions/vote_display.c @@ -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" From 934d474144b71d4ae135d001bef7b1378e865ba5 Mon Sep 17 00:00:00 2001 From: Sarah Gliner <105934250+sgliner-ledger@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:46:38 +0100 Subject: [PATCH 3/4] [auto]: add PR template --- .github/PULL_REQUEST_TEMPLATE.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..98b720f --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,8 @@ +# Checklist + +- [ ] App update process has been followed +- [ ] Target branch is `develop` +- [ ] Application version has been bumped + + From 3052bf1650a932f58abd091f2fb242373c4b07dd Mon Sep 17 00:00:00 2001 From: Sarah GLINER Date: Wed, 13 Mar 2024 14:19:15 +0100 Subject: [PATCH 4/4] [auto] Add manifest --- ledger_app.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 ledger_app.toml diff --git a/ledger_app.toml b/ledger_app.toml new file mode 100644 index 0000000..8f4c403 --- /dev/null +++ b/ledger_app.toml @@ -0,0 +1,4 @@ +[app] +build_directory = "./" +sdk = "C" +devices = ["nanos", "nanox", "nanos+"]