Remove msg prefix (#32)

* Remove prefix from sign_msg

* Sign_msg snapshots

* Bump Version

* Upgrade ledger-mina dependency on zemu tests

* Use standard Makefile

* New Snapshots (qr disabled)

* ragger tests snapshots

* Fix ragger version

Author: 0xPxt

Makefile

@@ -18,30 +18,49 @@
 ifeq ($(BOLOS_SDK),)
 $(error Environment variable BOLOS_SDK is not set)
 endif
-include $(BOLOS_SDK)/Makefile.defines
 
-APP_LOAD_PARAMS= --path "44'/12586'" --curve secp256k1 --appFlags 0x200 $(COMMON_LOAD_PARAMS)
+ifndef COIN
+COIN=mina
+endif
+
+VARIANT_PARAM=COIN
+VARIANT_VALUES=$(COIN)
 
 # Add and push a new git tag to update the app version
 GIT_DESCRIBE=$(shell git describe --tags --abbrev=8 --always --long --dirty 2>/dev/null)
 VERSION_TAG=$(shell echo $(GIT_DESCRIBE) | sed 's/^v//g')
 APPVERSION_M=1
 APPVERSION_N=4
-APPVERSION_P=3
+APPVERSION_P=4
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 APPNAME = "Mina"
 
-DEFINES += $(DEFINES_LIB) $(USER_DEFINES)
-
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-	ICONNAME=icons/nanos_app_mina.gif
-else ifeq ($(TARGET_NAME),TARGET_STAX)
-	ICONNAME=icons/stax_app_mina.gif
-else ifeq ($(TARGET_NAME),TARGET_FLEX)
-	ICONNAME=icons/flex_app_mina.gif
-else
-	ICONNAME=icons/nanox_app_mina.gif
-endif
+#APP_LOAD_PARAMS= --path "44'/12586'" --curve secp256k1 --appFlags 0x200 $(COMMON_LOAD_PARAMS)
+# Application allowed derivation curves.
+# Possibles curves are: secp256k1, secp256r1, ed25519 and bls12381g1
+# If your app needs it, you can specify multiple curves by using:
+# `CURVE_APP_LOAD_PARAMS = <curve1> <curve2>`
+CURVE_APP_LOAD_PARAMS = secp256k1
+
+# Application allowed derivation paths.
+# You should request a specific path for your app.
+# This serve as an isolation mechanism.
+# Most application will have to request a path according to the BIP-0044
+# and SLIP-0044 standards.
+# If your app needs it, you can specify multiple path by using:
+# `PATH_APP_LOAD_PARAMS = "44'/1'" "45'/1'"`
+
+APPPATH = "44'/12586'"
+$(info PATHS LIST = $(APPPATH))
+PATH_APP_LOAD_PARAMS = $(APPPATH)
+
+# Application icons following guidelines:
+# https://developers.ledger.com/docs/embedded-app/design-requirements/#device-icon
+ICON_NANOS = icons/nanos_app_mina.gif
+ICON_NANOX = icons/nanox_app_mina.gif
+ICON_NANOSP = icons/nanox_app_mina.gif
+ICON_STAX = icons/stax_app_mina.gif
+ICON_FLEX = icons/flex_app_mina.gif
 
 ################
 # Default rule #
@@ -95,68 +114,12 @@ else
 NO_STACK_CANARY=1
 endif
 
-DEFINES   += APPNAME=\"$(APPNAME)\"
+# App-specific defines
 DEFINES   += LEDGER_BUILD
-DEFINES   += OS_IO_SEPROXYHAL
-DEFINES   += HAVE_SPRINTF
-DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=6 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
-DEFINES   += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)
-
-# U2F
-DEFINES   += HAVE_U2F HAVE_IO_U2F
-DEFINES   += U2F_PROXY_MAGIC=\"BOIL\"
-DEFINES   += USB_SEGMENT_SIZE=64
-DEFINES   += BLE_SEGMENT_SIZE=32 #max MTU, min 20
-
-WEBUSB_URL     = www.ledgerwallet.com
-DEFINES       += HAVE_WEBUSB WEBUSB_URL_SIZE_B=$(shell echo -n $(WEBUSB_URL) | wc -c) WEBUSB_URL=$(shell echo -n $(WEBUSB_URL) | sed -e "s/./\\\'\0\\\',/g")
-
 DEFINES   += UNUSED\(x\)=\(void\)x
+DEFINES   += APPNAME=\"$(APPNAME)\"
 DEFINES   += APPVERSION=\"$(APPVERSION)\"
 
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX TARGET_FLEX))
-DEFINES       += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
-DEFINES       += HAVE_BLE_APDU # basic ledger apdu transport over BLE
-endif
-
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-    DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=128
-else
-    DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300
-endif
-
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX))
-    DEFINES += NBGL_QRCODE
-    SDK_SOURCE_PATH += qrcode
-else
-    DEFINES += HAVE_BAGL HAVE_UX_FLOW
-    ifneq ($(TARGET_NAME),TARGET_NANOS)
-        DEFINES += BUILD_NANOX 
-        DEFINES += HAVE_GLO096
-        DEFINES += HAVE_BAGL BAGL_WIDTH=128 BAGL_HEIGHT=64
-        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
-    endif
-endif
-
-# Both nano S and X benefit from the flow.
-DEFINES       += HAVE_UX_FLOW
-
-# Enabling debug PRINTF
-DEBUG = 0
-ifneq ($(DEBUG),0)
-
-        ifeq ($(TARGET_NAME),TARGET_NANOS)
-                DEFINES   += HAVE_PRINTF PRINTF=screen_printf
-        else
-                DEFINES   += HAVE_PRINTF PRINTF=mcu_usb_printf
-        endif
-else
-        DEFINES   += PRINTF\(...\)=
-endif
-
 ifneq ("$(MAKECMDGOALS)", "clean")
 ifneq ("$(MAKECMDGOALS)", "allclean")
 $(info )
@@ -181,46 +144,8 @@ $(error HAVE_ON_DEVICE_UNIT_TESTS should not be used for release builds);
 endif
 endif
 
-##############
-#  Compiler  #
-##############
-ifneq ($(BOLOS_ENV),)
-$(info BOLOS_ENV=$(BOLOS_ENV))
-CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin/
-GCCPATH := $(BOLOS_ENV)/gcc-arm-none-eabi-10.3-2021.10/bin/
-else
-$(info BOLOS_ENV is not set: falling back to CLANGPATH and GCCPATH)
-endif
-ifeq ($(CLANGPATH),)
-$(info CLANGPATH is not set: clang will be used from PATH)
-endif
-ifeq ($(GCCPATH),)
-$(info GCCPATH is not set: arm-none-eabi-* will be used from PATH)
-endif
-
-CC       := $(CLANGPATH)clang
-
-CFLAGS   += -O3 -Os
-
-AS     := $(GCCPATH)arm-none-eabi-gcc
-
-LD       := $(GCCPATH)arm-none-eabi-gcc
-LDFLAGS  += -O3 -Os
-LDLIBS   += -lm -lgcc -lc
-
-# import rules to compile glyphs(/pone)
-include $(BOLOS_SDK)/Makefile.glyphs
-
 ### variables processed by the common makefile.rules of the SDK to grab source files and include dirs
 APP_SOURCE_PATH  += src
-SDK_SOURCE_PATH  += lib_stusb lib_stusb_impl lib_u2f
-ifneq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX))
-SDK_SOURCE_PATH += lib_ux
-endif
-
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX TARGET_FLEX))
-SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
-endif
 
 APP_LOAD_PARAMS_EVALUATED=$(shell printf '\\"%s\\" ' $(APP_LOAD_PARAMS))
 APP_DELETE_PARAMS_EVALUATED=$(shell printf '\\"%s\\" ' $(COMMON_DELETE_PARAMS))
@@ -254,6 +179,10 @@ read -p "Please unlock your Ledger device and exit any apps (press any key to co
 endef
 export RELEASE_DEPS
 
+HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
+
+include $(BOLOS_SDK)/Makefile.standard_app
+
 side_release: all
 	@# Must force clean like this because Ledger makefile always runs first
 	@echo
@@ -304,18 +233,3 @@ side_release: all
 	@rm -f install.sh
 	@rm -f uninstall.sh
 	@rm -f mina_ledger_wallet
-
-load: all
-	python3 -m ledgerblue.loadApp $(APP_LOAD_PARAMS)
-
-load-offline: all
-	python3 -m ledgerblue.loadApp $(APP_LOAD_PARAMS) --offline
-
-delete:
-	python3 -m ledgerblue.deleteApp $(COMMON_DELETE_PARAMS)
-
-# import generic rules from the sdk
-include $(BOLOS_SDK)/Makefile.rules
-
-listvariants:
-	@echo VARIANTS COIN mina

src/crypto.c

@@ -749,6 +749,7 @@ bool sign(Signature *sig, const Keypair *kp, const ROInput *input, const uint8_t
             io_seproxyhal_io_heartbeat();
         }
         CATCH_OTHER(e) {
+            UNUSED(e);
             error = true;
         }
         FINALLY {

src/globals.c

@@ -1,9 +1,6 @@
 #include "globals.h"
 #include "menu.h"
 
-ux_state_t G_ux;
-bolos_ux_params_t G_ux_params;
-
 // display stepped screens
 unsigned int ux_step;
 unsigned int ux_step_count;

src/globals.h

@@ -7,7 +7,8 @@
 #define P1_FIRST 0x00
 #define P1_MORE 0x80
 
-extern ux_state_t ux;
+// Provided by the SDK
+extern ux_state_t G_ux;
 // display stepped screens
 extern unsigned int ux_step;
 extern unsigned int ux_step_count;

src/main.c

@@ -22,8 +22,6 @@
 #include "test_crypto.h"
 #include "menu.h"
 
-unsigned char G_io_seproxyhal_spi_buffer[IO_SEPROXYHAL_BUFFER_SIZE_B];
-
 #define CLA             0xe0
 #define INS_GET_CONF    0x01
 #define INS_GET_ADDR    0x02
@@ -58,9 +56,9 @@ void handleApdu(volatile unsigned int *flags, volatile unsigned int *tx,
 
             switch (G_io_apdu_buffer[OFFSET_INS]) {
                 case INS_GET_CONF:
-                    G_io_apdu_buffer[0] = LEDGER_MAJOR_VERSION;
-                    G_io_apdu_buffer[1] = LEDGER_MINOR_VERSION;
-                    G_io_apdu_buffer[2] = LEDGER_PATCH_VERSION;
+                    G_io_apdu_buffer[0] = MAJOR_VERSION;
+                    G_io_apdu_buffer[1] = MINOR_VERSION;
+                    G_io_apdu_buffer[2] = PATCH_VERSION;
                     *tx = 3;
                     THROW(APDU_CODE_OK);
                     break;

src/sign_msg.c

@@ -20,9 +20,7 @@ void handle_sign_msg(uint8_t p1, uint8_t p2, uint8_t *dataBuffer, uint8_t dataLe
 
     uint8_t msg_buffer[255] = {0};
 
-    const char prefix[] = PREFIX;
-
-    if (dataLength + strlen(prefix) > sizeof(msg_buffer)) {
+    if (dataLength > sizeof(msg_buffer)) {
         THROW(INVALID_PARAMETER);
     }
 
@@ -37,10 +35,9 @@ void handle_sign_msg(uint8_t p1, uint8_t p2, uint8_t *dataBuffer, uint8_t dataLe
         THROW(INVALID_PARAMETER);
     }
 
-    memcpy(msg_buffer, prefix, strlen(prefix));
-    memcpy(msg_buffer + strlen(prefix), dataBuffer + MSG_OFFSET, dataLength - (ACCOUNT_LENGTH + NETWORK_LENGTH));
+    memcpy(msg_buffer, dataBuffer + MSG_OFFSET, dataLength - (ACCOUNT_LENGTH + NETWORK_LENGTH));
 
-    ui_sign_msg(msg_buffer, strlen(prefix) + dataLength - (ACCOUNT_LENGTH + NETWORK_LENGTH), network);
+    ui_sign_msg(msg_buffer, dataLength - (ACCOUNT_LENGTH + NETWORK_LENGTH), network);
     *flags |= IO_ASYNCH_REPLY;
 }
 

src/sign_msg.h

@@ -8,8 +8,6 @@
 #define NETWORK_OFFSET 4
 #define MSG_OFFSET 5
 
-#define PREFIX "Message : "
-
 void handle_sign_msg(uint8_t p1, uint8_t p2, uint8_t *dataBuffer,
                     uint8_t dataLength, volatile unsigned int *flags);
 

src/sign_tx.c

@@ -49,6 +49,7 @@ void sign_transaction(tx_t* tx, ui_t* ui)
             }
         }
         CATCH_OTHER(e) {
+            UNUSED(e);
             error = true;
         }
         FINALLY {

src/utils.c

@@ -82,19 +82,9 @@ int b58_encode(const unsigned char *in, unsigned char length,
  */
 #define MAX_DEC_INPUT_SIZE 164
 
-uint8_t const BASE58_TABLE[] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  //
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  //
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  //
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  //
-    0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0xFF, 0xFF,  //
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,  //
-    0x10, 0xFF, 0x11, 0x12, 0x13, 0x14, 0x15, 0xFF, 0x16, 0x17, 0x18, 0x19,  //
-    0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  //
-    0xFF, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B,  //
-    0xFF, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,  //
-    0x37, 0x38, 0x39, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF                           //
-};
+// Use the SDK's version
+#define BASE58_TABLE_SIZE 128
+extern uint8_t const BASE58_TABLE[BASE58_TABLE_SIZE];
 
 int b58_decode(const char *in, size_t in_len, uint8_t *out, size_t out_len) {
     uint8_t tmp[MAX_DEC_INPUT_SIZE] = {0};

tests/requirements.txt

@@ -1,4 +1,4 @@
 base58
 bip32
-ragger[tests,speculos]
+ragger[tests,speculos]==1.32.1
 ledgerblue