Updated master with dev branch code

.clang-format

@@ -0,0 +1,12 @@
+---
+BasedOnStyle: Google
+IndentWidth: 4
+---
+Language: Cpp
+ColumnLimit: 100
+PointerAlignment: Right
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: true
+AllowAllParametersOfDeclarationOnNextLine: false
+SortIncludes: false
+---

.gitignore

@@ -0,0 +1,20 @@
+# Compilation of Ledger's app
+src/glyphs.c
+src/glyphs.h
+bin/
+debug/
+dep/
+obj/
+
+
+# Editors
+.vscode/
+.idea/
+
+# Python
+*.pyc[cod]
+*.egg
+__pycache__/
+*.egg-info/
+.eggs/
+.python-version

CHANGELOG.md

@@ -0,0 +1,160 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## 1.7.6 - 2021-03-30
+
+- Support of Monero client version `0.17.2.*`
+
+## 1.7.5 - 2020-11-16
+
+- Support of firmware 1.2.4-5
+
+## 1.7.4 - 2020-10-13
+
+- Support of Monero client version `0.17.1.*`
+
+## 1.7.3 - 2020-10-06
+
+- Fix garbage when displaying destination address on Nano
+
+## 1.7.2 - 2020-10-02
+
+- Fix behavior without `DEBUG_HWDEVICE` flag
+
+
+## 1.7.1 - 2020-09-24
+
+- Fix `clsag_hash()` behavior which is different than MLSAG
+
+## 1.7.0 - 2020-09-13
+
+- Update to protocol v4 to support both MLSAG and CLSAG
+- Add CLSAG signature algorithm with `INS_CLSAG`
+- Update InProofv1 to InProofv2
+
+## 1.6.0 - 2020-06-04
+
+ Add Timelock verification on device
+
+## 1.5.1 - 2020-02-28
+
+ Security Enhancement
+
+## 1.4.2
+
+ Compatibility check with client version now discards the fourth sub-version number.
+
+ Release for client 0.15.0+
+ firmware LNS 1.6.0 et LNX 1.2.4
+
+## 1.4.1
+
+ Release for client 0.15
+ firmware LNS 1.6.0 et LNX 1.2.4
+
+## 1.4.0
+
+- Add address display
+- Enhance protocol security
+- Remove double ask for view key
+
+## 1.3.2
+
+--
+
+## 1.3.1
+
+Add Tx proof support Monero post 0.14.0.2
+
+## 1.3.0
+
+Targeted Client: Monero post 0.14.0.2
+
+## 1.2.2
+
+Targeted Client: Monero 0.14.0.2
+
+Partial bug Fixes in change destination address computation: Only one destination
+is allowed in transfer command
+
+## 1.2.0
+
+Targeted Client: Monero 0.14.0.0+
+
+- V11 fork integration
+- Fix change address issue.
+
+## 1.1.3
+
+- Remove rolling address display
+- Allow STEALTH instruction outside TX
+- Doc fix
+
+## 1.1.2
+
+Fix stack overflow for 1.5.5 SDK
+
+## 1.1.1
+
+Allow transaction parsing when screen is locked
+
+## 1.1.0
+
+Initial Release
+
+Targeted Client: Monero 0.13.0.0+
+
+- Security fix: Screen lock management
+- Optimisation: New protocol V2 for future
+- Fix bug in large amount display that was truncated
+- Remove confirmation for zero amount (fake sweep change)
+- Better handling for change address to not display them
+- Dual id (PIN based) management
+- Add onscreen seed words display
+
+
+## 1.0.0
+
+Initial Release
+
+Targeted Client: Monero 0.13.0.0+
+
+
+## 0.12.4 / Beta 5
+
+Targeted Client: Monero 0.12.1
+
+- U2F support
+- Fix Windows detection problem
+- activate Mainnet 'Beta stage: USE AT YOUR OWN RISK'
+
+## 0.12.3 / Beta 4
+
+Targeted Client: Monero 0.12.1
+
+- SDK 1.4.2.1 port
+
+## 0.12.2 / Beta 3
+
+Targeted Client: Monero 0.12.1
+
+- Activate security command chain control
+
+
+## 0.12.1 / Beta 2
+
+Targeted Client: Monero 0.12.1
+
+- Add second PIN support
+- Remove key storage  in NVRAM, always recompute secret key at boot
+- Export secret viewkey, with agreement of user, to speed up tx scan
+- Clean-up RAM usage
+- Change some naming according to Monero client convention
+
+## Beta 1
+
+Targeted Client: Monero 0.12.0
+
+- Initial Beta.
+

Makefile

@@ -24,7 +24,7 @@ endif
 include $(BOLOS_SDK)/Makefile.defines
 
 #Swap /44'/10343'
-APP_LOAD_PARAMS=  --path "2147483692/2147493991" --curve secp256k1 $(COMMON_LOAD_PARAMS) --appFlags 0x40
+APP_LOAD_PARAMS=  --path "2147483692/2147493991" --curve secp256k1 $(COMMON_LOAD_PARAMS) --appFlags 0x240
 APPNAME = "Swap"
 
 ifeq ($(TARGET_NAME),TARGET_BLUE)
@@ -36,10 +36,11 @@ ICONNAME = images/icon_monero.gif
 endif
 
 #DEFINES += MONERO_ALPHA
+#DEFINES += MONERO_BETA
 
 APPVERSION_M=1
-APPVERSION_N=4
-APPVERSION_P=2
+APPVERSION_N=7
+APPVERSION_P=6
 
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 SPECVERSION="1.0"
@@ -52,18 +53,14 @@ DEFINES   += SPEC_VERSION=$(SPECVERSION)
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
 DEFINES   += UI_NANO_X
+TARGET_UI := FLOW
 else ifeq ($(TARGET_NAME),TARGET_BLUE)
 DEFINES   += UI_BLUE
 else
 DEFINES   += UI_NANO_S
 endif
 
-
 #DEFINES += IOCRYPT
-## Debug options
-#DEFINES   += DEBUG_HWDEVICE
-DEFINES   += IODUMMYCRYPT
-#DEFINES   += IONOCRYPT
 
 ################
 # Default rule #
@@ -103,13 +100,15 @@ DEFINES       += HAVE_BAGL_ELLIPSIS # long label truncation feature
 DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
 DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
 DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
-DEFINES		  += HAVE_UX_FLOW
 DEFINES       += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
 DEFINES       += HAVE_BLE_APDU # basic ledger apdu transport over BLE
 else
 DEFINES		  += IO_SEPROXYHAL_BUFFER_SIZE_B=128
 endif
 
+ifeq ($(TARGET_UI),FLOW)
+DEFINES		  += HAVE_UX_FLOW
+endif
 
 # Enabling debug PRINTF
 DEBUG = 0
@@ -121,7 +120,11 @@ ifneq ($(DEBUG),0)
 		DEFINES   += HAVE_PRINTF PRINTF=screen_printf
 	endif
 	DEFINES += PLINE="PRINTF(\"FILE:%s..LINE:%d\n\",__FILE__,__LINE__)"
-
+  # Debug options
+  DEFINES += DEBUG_HWDEVICE
+  DEFINES += IODUMMYCRYPT  # or IONOCRYPT
+  # Stagenet network by default
+  DEFINES += MONERO_BETA
 else
 
 	DEFINES   += PRINTF\(...\)=
@@ -156,7 +159,6 @@ CFLAGS   += -O3 -Os
 AS     := $(GCCPATH)arm-none-eabi-gcc
 
 LD       := $(GCCPATH)arm-none-eabi-gcc
-#SCRIPT_LD:=script.ld
 
 #LDFLAGS  += -O0 -gdwarf-2  -gstrict-dwarf
 LDFLAGS  += -O3 -Os
@@ -169,11 +171,15 @@ include $(BOLOS_SDK)/Makefile.glyphs
 APP_SOURCE_PATH  += src
 SDK_SOURCE_PATH  += lib_stusb lib_stusb_impl lib_u2f
 
-ifeq ($(TARGET_NAME),TARGET_NANOX)
+ifeq ($(TARGET_UI),FLOW)
 SDK_SOURCE_PATH  += lib_ux
+endif
+
+ifeq ($(TARGET_NAME),TARGET_NANOX)
 SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
 endif
 
+
 load: all
 	python -m ledgerblue.loadApp $(APP_LOAD_PARAMS)