Merge pull request Concordium#117 from blooo-io/chore/LDG-790-resolve-merge-conflicts

Chore/ldg 790 resolve merge conflicts with Ledger's develop

Author: reffiek

.clang-format

@@ -1,16 +1,14 @@
 ---
 BasedOnStyle: Google
 IndentWidth: 4
----
 Language: Cpp
 ColumnLimit: 100
 PointerAlignment: Right
 AlignAfterOpenBracket: Align
 AlignConsecutiveMacros: true
 AllowAllParametersOfDeclarationOnNextLine: false
 SortIncludes: false
-SpaceAfterCStyleCast: false
-SpacesInCStyleCastParentheses: false
+SpaceAfterCStyleCast: true
 AllowShortCaseLabelsOnASingleLine: false
 AllowAllArgumentsOnNextLine: false
 AllowShortBlocksOnASingleLine: Never

.gitignore

@@ -25,6 +25,7 @@ __pycache__/
 *.egg-info/
 .eggs/
 .python-version
+.venv/
 
 # Doxygen
 doc/html
@@ -37,4 +38,7 @@ ledger/
 .DS_Store
 
 # Helpers
-diff
+diff
+
+# Vscode
+.vscode/

.vscode/c_cpp_properties.json

@@ -29,8 +29,9 @@ APPNAME = "Concordium"
 
 # Application version
 APPVERSION_M = 5
-APPVERSION_N = 5
-APPVERSION_P = 3
+APPVERSION_N = 6
+APPVERSION_P = 0
+
 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 DEFINES += APPVERSION=\"$(APPVERSION)\"

.vscode/extensions.json

@@ -0,0 +1,12 @@
+# Get application version
+
+## Protocol description
+
+- Single command
+
+| INS    | P1     | P2     | CDATA                                                                                                                                  | Comment                                                        |
+| ------ | ------ | ------ | -------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------- |
+| `0x40` | `0x00` | `0x00` | `--` |  |
+
+Returns [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION] as an array of three uint8.
+

.vscode/launch.json

@@ -1,6 +1,6 @@
 # Protocol Level Token (PLT)
 
-A transaction type for handling protocol llevel token operations. The transaction includes a token ID and CBOR-encoded operation data.
+A transaction type for handling protocol level token operations. The transaction includes a token ID and CBOR-encoded operation data.
 
 ## Protocol description
 

.vscode/settings.json

@@ -56,7 +56,7 @@ void app_main() {
         storage.dummy1_allowed = 0x00;
         storage.dummy2_allowed = 0x00;
         storage.initialized = 0x01;
-        nvm_write((void *)&N_storage, &storage, sizeof(internal_storage_t));
+        nvm_write((void *) &N_storage, &storage, sizeof(internal_storage_t));
     }
 
     for (;;) {
@@ -89,6 +89,10 @@ void app_main() {
             isInitialCall = true;
         }
 
+        if (cmd.cla != CLA) {
+            io_send_sw(ERROR_INVALID_CLA);
+        }
+
         // Dispatch structured APDU command to handler
         if (handler(cmd.ins, cmd.data, cmd.p1, cmd.p2, cmd.lc, &flags, isInitialCall) < 0) {
             PRINTF("=> handler failure\n");