fixed build for new SDK

ergoplatform · Mar 10, 2023 · 115e2ae · 115e2ae
1 parent a450a34
commit 115e2ae
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,7 @@
 # Compilation of Ledger's app
-src/glyphs.c
-src/glyphs.h
 bin/
+build/
 debug/
-dep/
-obj/
 
 # Unit tests and code coverage
 unit-tests/build/

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -9,6 +9,7 @@
             "name": "Nano S",
             "includePath": [
                 "${workspaceFolder}/src",
+                "${workspaceFolder}/build/**",
                 "${env:BOLOS_ENV}/${env:GCC_COMPILER_NAME}/arm-none-eabi/include",
                 "${env:BOLOS_SDK}/include/*",
                 "${env:BOLOS_SDK}/lib_ux/include/*",

diff --git a/src/commands/attestinput/ainpt_ui.c b/src/commands/attestinput/ainpt_ui.c
@@ -1,9 +1,9 @@
 #include <os.h>
 #include <ux.h>
+#include <glyphs.h>
 
 #include "ainpt_ui.h"
 #include "ainpt_response.h"
-#include "../../glyphs.h"
 #include "../../globals.h"
 #include "../../common/macros.h"
 #include "../../helpers/response.h"

diff --git a/src/commands/deriveaddress/da_ui.c b/src/commands/deriveaddress/da_ui.c
@@ -1,11 +1,11 @@
 #include <os.h>
 #include <ux.h>
+#include <glyphs.h>
 
 #include "da_ui.h"
 #include "da_response.h"
 #include "da_context.h"
 #include "../../sw.h"
-#include "../../glyphs.h"
 #include "../../globals.h"
 #include "../../context.h"
 #include "../../common/base58.h"

diff --git a/src/commands/extpubkey/epk_ui.c b/src/commands/extpubkey/epk_ui.c
@@ -1,10 +1,11 @@
 #include <os.h>
 #include <ux.h>
 #include <string.h>
+#include <glyphs.h>
 
 #include "epk_ui.h"
 #include "epk_response.h"
-#include "../../glyphs.h"
+
 #include "../../globals.h"
 #include "../../context.h"
 #include "../../sw.h"

diff --git a/src/commands/signtx/stx_ui.c b/src/commands/signtx/stx_ui.c
@@ -1,9 +1,10 @@
 #include <os.h>
 #include <ux.h>
+#include <glyphs.h>
 
 #include "stx_ui.h"
 #include "stx_response.h"
-#include "../../glyphs.h"
+
 #include "../../globals.h"
 #include "../../common/macros.h"
 #include "../../helpers/response.h"
@@ -52,7 +53,7 @@ static inline bool format_b58_id(const uint8_t* id, size_t id_len, char* out, si
 
 static inline bool format_erg_amount(uint64_t amount, char* out, size_t out_len) {
     int out_bytes = format_fpu64(out, out_len, amount, ERGO_ERG_FRACTION_DIGIT_COUNT);
-    if (out_bytes <= 0 || out_bytes > out_len - 5) return false;
+    if (out_bytes <= 0 || out_len < 5 || (size_t) out_bytes > out_len - 5) return false;
     out_len -= out_bytes;
     out += out_bytes;
     STRING_ADD_STATIC_TEXT(out, out_len, " ERG");

diff --git a/src/ui/ui_approve_reject.c b/src/ui/ui_approve_reject.c
@@ -1,5 +1,5 @@
+#include <glyphs.h>
 #include "ui_approve_reject.h"
-#include "../glyphs.h"
 
 static ui_approve_reject_callback G_ui_approve_reject_callback;
 static void* G_ui_approve_reject_callback_context;

diff --git a/src/ui/ui_menu.c b/src/ui/ui_menu.c
@@ -17,7 +17,7 @@
 
 #include <os.h>
 #include <ux.h>
-#include "../glyphs.h"
+#include <glyphs.h>
 
 #include "../globals.h"
 #include "ui_menu.h"