Merge pull request coderofstuff#61 from LedgerHQ/develop

Merge in Ledger's changes in their "develop"

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+# Checklist
+<!-- Put an `x` in each box when you have completed the items. -->
+- [ ] App update process has been followed <!-- See comment below -->
+- [ ] Target branch is `develop` <!-- unless you have a very good reason -->
+- [ ] Application version has been bumped <!-- required if your changes are to be deployed -->
+
+<!-- Make sure you followed the process described in https://developers.ledger.com/docs/embedded-app/maintenance/ before opening your Pull Request.
+Don't hesitate to contact us directly on Discord if you have any questions ! https://developers.ledger.com/discord -->

Makefile

@@ -30,7 +30,7 @@ APPNAME = "Kaspa"
 # Application version
 APPVERSION_M = 1
 APPVERSION_N = 0
-APPVERSION_P = 0
+APPVERSION_P = 1
 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)

src/apdu/dispatcher.h

@@ -24,6 +24,7 @@
 #pragma once
 
 #include "../types.h"
+#include "parser.h"
 
 /**
  * Parameter 2 for last APDU to receive.

src/app_main.c

@@ -32,7 +32,7 @@
 #include "io.h"
 #include "sw.h"
 #include "ui/menu.h"
-#include "apdu/parser.h"
+#include "parser.h"
 #include "apdu/dispatcher.h"
 
 global_ctx_t G_context;

src/types.h

@@ -44,18 +44,6 @@ typedef enum {
     SIGN_MESSAGE = 0x07     /// sign a personal message with BIP32 path
 } command_e;
 
-/**
- * Structure with fields of APDU command.
- */
-typedef struct {
-    uint8_t cla;    /// Instruction class
-    command_e ins;  /// Instruction code
-    uint8_t p1;     /// Instruction parameter 1
-    uint8_t p2;     /// Instruction parameter 2
-    uint8_t lc;     /// Length of command data
-    uint8_t *data;  /// Command data
-} command_t;
-
 /**
  * Enumeration with parsing state.
  */

tests/test_name_version.py

@@ -12,4 +12,4 @@ def test_get_app_and_version(backend, backend_name):
     app_name, version = unpack_get_app_and_version_response(response.data)
 
     assert app_name == "Kaspa"
-    assert version == "1.0.0"
+    assert version == "1.0.1"

tests/test_version_cmd.py

@@ -4,7 +4,7 @@
 # Taken from the Makefile, to update every time the Makefile version is bumped
 MAJOR = 1
 MINOR = 0
-PATCH = 0
+PATCH = 1
 
 # In this test we check the behavior of the device when asked to provide the app version
 def test_version(backend):

unit-tests/CMakeLists.txt

@@ -62,7 +62,7 @@ add_library(sighash SHARED ../src/sighash.c)
 add_library(personal_message SHARED ../src/personal_message.c)
 add_library(write SHARED /opt/ledger-secure-sdk/lib_standard_app/write.c)
 add_library(format_local SHARED ../src/common/format_local.c)
-add_library(apdu_parser SHARED ../src/apdu/parser.c)
+add_library(apdu_parser SHARED /opt/ledger-secure-sdk/lib_standard_app/parser.c)
 add_library(transaction_deserialize ../src/transaction/deserialize.c)
 add_library(transaction_serialize ../src/transaction/serialize.c)
 add_library(transaction_utils ../src/transaction/utils.c)

unit-tests/test_apdu_parser.c

@@ -31,7 +31,7 @@
 #include <cmocka.h>
 
 #include "types.h"
-#include "apdu/parser.h"
+#include "parser.h"
 
 static void test_apdu_parser(void **state) {
     (void) state;
@@ -42,10 +42,11 @@ static void test_apdu_parser(void **state) {
     command_t cmd;
 
     memset(&cmd, 0, sizeof(cmd));
-    assert_false(apdu_parser(&cmd, apdu_bad_min_len, sizeof(apdu_bad_min_len)));
+    assert_true(apdu_parser(&cmd, apdu_bad_min_len, sizeof(apdu_bad_min_len)));
+    assert_int_equal(cmd.lc, 0);
 
     memset(&cmd, 0, sizeof(cmd));
-    assert_false(apdu_parser(&cmd, apdu_bad_lc, sizeof(apdu_bad_min_len)));
+    assert_false(apdu_parser(&cmd, apdu_bad_lc, sizeof(apdu_bad_lc)));
 
     memset(&cmd, 0, sizeof(cmd));
     assert_true(apdu_parser(&cmd, apdu, sizeof(apdu)));