Merge pull request #6 from Zondax/improvements

Improvements
algorand · Jul 27, 2022 · a1ea6fe · a1ea6fe
2 parents a01a794 + 41f2000
commit a1ea6fe
Show file tree

Hide file tree

Showing 13 changed files with 266,707 additions and 265,509 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -83,7 +83,7 @@ APP_LOAD_PARAMS =  --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH)
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)
 APP_LOAD_PARAMS += --appFlags 0x000
-APP_STACK_SIZE:=2590
+APP_STACK_SIZE:=2440
 ICONNAME:=$(CURDIR)/nanos_icon.gif
 OUTPUT_ELF ?= $(CURDIR)/output/app_s.elf
 OUTPUT_INSTALLER := $(CURDIR)/pkg/installer_s.sh
@@ -131,6 +131,9 @@ DEFINES       += HAVE_BOLOS_APP_STACK_CANARY
 
 DEFINES       += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
 
+# Support for U2F transport
+DEFINES += HAVE_U2F HAVE_IO_U2F U2F_PROXY_MAGIC=\"algo\" USB_SEGMENT_SIZE=64 BLE_SEGMENT_SIZE=32
+
 ifeq ($(TARGET_NAME),TARGET_NANOS)
 DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=128
 else
@@ -202,9 +205,7 @@ APP_SOURCE_PATH += $(MY_DIR)/../deps/ledger-zxlib/src
 APP_SOURCE_PATH += $(MY_DIR)/../deps/ledger-zxlib/app/common
 APP_SOURCE_PATH += $(MY_DIR)/../deps/sha512
 
-# SDK_SOURCE_PATH += lib_stusb lib_stusb_impl lib_u2f lib_ux
-SDK_SOURCE_PATH += lib_stusb lib_stusb_impl
-SDK_SOURCE_PATH  += lib_ux
+SDK_SOURCE_PATH += lib_stusb lib_stusb_impl lib_u2f lib_ux
 
 .PHONY: rust
 rust:

diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=2
+APPVERSION_P=3
diff --git a/app/src/msgpack.h b/app/src/msgpack.h
@@ -44,6 +44,9 @@ extern "C" {
 #define STR16       0xda
 #define STR32       0xdb
 
+#define ARR16       0xdc
+#define ARR32       0xdd
+
 #define MAP16       0xde
 #define MAP32       0xdf