Merge to master

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ruff
+b52f9071f50b11058dd8bd689281c52cbfb6c5f2

.github/workflows/build_and_functional_tests.yml

@@ -41,4 +41,3 @@ jobs:
     with:
       download_app_binaries_artifact: "app_tezos_binaries"
       regenerate_snapshots: ${{ github.event_name == 'workflow_dispatch' && inputs.golden_run == 'Open a PR' }}
-      test_dir: "tests/standalone"

.github/workflows/coding_style_checks.yml

@@ -21,4 +21,3 @@ jobs:
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_lint.yml@v1
     with:
       source: './app/src'
-      extensions: 'h,c'

.github/workflows/pre-commit.yml

@@ -6,10 +6,8 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
-      - run: python -m pip install pre-commit
-      - run: python -m pip freeze --local
-      - run: SKIP=clang-format,pylint pre-commit run --all-files
+          python-version: '3.12'
+      - uses: pre-commit/action@v3.0.1

.github/workflows/python_client_checks.yml

@@ -18,7 +18,6 @@ jobs:
     name: Call Ledger Python linters
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_python_checks.yml@v1
     with:
-      run_linter: pylint
       run_type_check: true
       src_directory: .
       setup_directory: tests/standalone

.github/workflows/unit_tests.yml

@@ -13,4 +13,6 @@ jobs:
   job_unit_test:
     name: Call Ledger unit_test
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_unit_tests.yml@v1
-    secrets: inherit
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
+      codecov_token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -27,6 +27,16 @@ ledger/
 
 tags
 __pycache__
+
+# .vscode
+.vscode/
+
+# tmp
+tmp/
+
+# Claude
+.claude/
+build-unit-tests/
 **/.pytest_cache/
 **/.mypy_cache/
 **/.coverage

.pre-commit-config.yaml

@@ -4,27 +4,43 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
+        args: ['--markdown-linebreak-ext=md']
       - id: end-of-file-fixer
+      - id: mixed-line-ending
       - id: check-yaml
       - id: check-added-large-files
-  - repo: local
+      - id: check-merge-conflict
+      - id: check-case-conflict
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.4.2
+    hooks:
+      - id: codespell
+        args: ['--ignore-words-list', 'cips', '3sT']
+
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v21.1.8
     hooks:
       - id: clang-format
-        name: clang-format
-        description: Run `clang-format` on C/C++/CUDA files.
-        entry: clang-format -i
-        language: system
-        files: ^
-        types: [file, c]
+        types_or: [c]
 
-      - id: pylint
-        name: pylint
-        description: Run pylint with custom .pylintrc configuration
-        entry: pylint
-        language: system
-        pass_filenames: false
-        args: ["--errors-only", "--rcfile=tests/integration/.pylintrc", "tests/standalone/"]
-        types: [python]
+  - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
+    rev: v1.7.12.24
+    hooks:
+      - id: actionlint
+        types_or: [yaml]
+        args: [-shellcheck="" -pyflakes=""]
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.20
+    hooks:
+      # Run the linter.
+      - id: ruff-check
+        types_or: [ python, pyi ]
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
+        types_or: [ python, pyi ]

app/Makefile

@@ -32,7 +32,7 @@ APPNAME = "Tezos Wallet"
 # Application version
 APPVERSION_M=3
 APPVERSION_N=2
-APPVERSION_P=0
+APPVERSION_P=2
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 # COMMIT
@@ -166,3 +166,12 @@ include $(BOLOS_SDK)/Makefile.standard_app
 .PHONY: mrproper
 mrproper: clean
 	rm -f .target
+
+
+.PHONY: app-size-report
+app-size-report: $(BIN_TARGETS) $(DBG_TARGETS)
+	@echo ""
+	@echo "Finished Concordium Ledger app ($(TARGET_NAME)) → $(BIN_DIR)/app.elf"
+	$(L)$(GCCPATH)arm-none-eabi-size $(BIN_DIR)/app.elf
+
+default: app-size-report

app/src/app_format.c

@@ -0,0 +1,34 @@
+/* Tezos Ledger application - Tezos-specific formatting function set
+
+   Copyright 2024 Functori <contact@functori.com>
+
+   With code excerpts from:
+    - Legacy Tezos app, Copyright 2019 Obsidian Systems
+    - Ledger Blue sample apps, Copyright 2016 Ledger
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License. */
+
+#include "format.h"
+#include "app_format.h"
+
+bool
+tz_mutez_to_string(char *obuf, size_t olen, uint64_t amount)
+{
+    if (!format_fpu64_trimmed(obuf, olen, amount, 6 /*DECIMALS*/)) {
+        memset(obuf, '\0', olen);
+        return false;
+    }
+
+    strlcat(obuf, " XTZ", olen);
+    return true;
+}

app/src/app_format.h

@@ -0,0 +1,51 @@
+/* Tezos Ledger application - Tezos-specific formatting function set
+
+   Copyright 2024 Functori <contact@functori.com>
+
+   With code excerpts from:
+    - Legacy Tezos app, Copyright 2019 Obsidian Systems
+    - Ledger Blue sample apps, Copyright 2016 Ledger
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License. */
+
+#pragma once
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+
+/**
+ * @brief Formats a fixed-point number, trimming trailing zeros
+ *
+ *        Provided by the Ledger standard-app library. Declared here because
+ *        the project's own format.h shadows the SDK header on the include
+ *        path; without this prototype, call sites emit an
+ * implicit-declaration warning (and wrongly assume an int return).
+ *
+ * @param dst: output buffer
+ * @param dst_len: length of the output buffer
+ * @param value: value to format
+ * @param decimals: number of decimals
+ * @return bool: true on success
+ */
+bool format_fpu64_trimmed(char *dst, size_t dst_len, const uint64_t value,
+                          uint8_t decimals);
+
+/**
+ * @brief Prints mutez as XTZ
+ *
+ * @param obuf: output buffer
+ * @param olen: length of the output buffer
+ * @param amount: amount in mutez
+ * @return bool: true on success
+ */
+bool tz_mutez_to_string(char *obuf, size_t olen, uint64_t amount);

app/src/globals.h

@@ -32,6 +32,15 @@
 #define TZ_SCREEN_LINES_11PX 5
 #endif
 
+/* Application logo used in NBGL flows. Apex only allows 24/32/48 px
+ * glyphs, so it uses a dedicated 48x48 icon; Stax and Flex keep the
+ * 64x64 one. */
+#ifdef TARGET_APEX_P
+#define C_TZ_APP_ICON C_tezos_48px
+#else
+#define C_TZ_APP_ICON C_tezos
+#endif
+
 #include "sign.h"
 #include "exception.h"
 #include "keys.h"

app/src/handle_swap.c

@@ -28,6 +28,7 @@
 #include <string.h>
 #include <swap.h>
 
+#include "format.h"
 #include "handle_swap.h"
 #include "keys.h"
 #include "utils.h"

app/src/handler/sign.c

@@ -34,7 +34,7 @@
 #include <swap.h>
 #endif
 
-#include "../format.h"
+#include "app_format.h"
 #include "globals.h"
 #include "handle_swap.h"
 #include "keys.h"
@@ -343,6 +343,13 @@ refill_error(void)
     }
 #endif
 
+    /* Do not offer blind-signing on a parse error when the user has disabled
+       the setting; reject immediately, matching the clear-sign flow (F-09).
+     */
+    if (!N_settings.blindsigning) {
+        TZ_FAIL(EXC_PARSE_ERROR);
+    }
+
     // clang-format off
 #ifdef HAVE_BAGL
     tz_ui_stream_init(stream_cb);
@@ -909,18 +916,18 @@ get_blindsign_type(char *type, size_t type_size)
     switch (global.keys.apdu.sign.tag) {
     case 0x01:
     case 0x11:
-        memcpy(type,"Block\nproposal", OPERATION_TYPE_STR_LENGTH);
+        strlcpy(type, "Block\nproposal", type_size);
         break;
     case 0x03:
-        memcpy(type,"Manager\noperation", OPERATION_TYPE_STR_LENGTH);
+        strlcpy(type, "Manager\noperation", type_size);
         break;
     case 0x02:
     case 0x12:
     case 0x13:
-        memcpy(type,"Consensus\noperation", OPERATION_TYPE_STR_LENGTH);
+        strlcpy(type, "Consensus\noperation", type_size);
         break;
     case 0x05:
-        memcpy(type,"Micheline\nexpression", OPERATION_TYPE_STR_LENGTH);
+        strlcpy(type, "Micheline\nexpression", type_size);
         break;
     default:
         break;
@@ -1081,7 +1088,7 @@ continue_blindsign_cb(void)
            useCaseTagValueList.nbPairs);
     useCaseTagValueList.smallCaseForValue = false;
     useCaseTagValueList.wrapping          = false;
-    nbgl_useCaseReviewBlindSigning(op, &useCaseTagValueList, &C_tezos,
+    nbgl_useCaseReviewBlindSigning(op, &useCaseTagValueList, &C_TZ_APP_ICON,
                                    REVIEW("Transaction"), NULL,
                                    SIGN("Transaction"), NULL, reviewChoice);