clean up

Zondax · May 3, 2024 · ea43db2 · ea43db2
1 parent eeb91ce
commit ea43db2
Show file tree

Hide file tree

Showing 29 changed files with 1,038 additions and 280 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,11 @@
+BasedOnStyle: Google
+IndentWidth: 4
+ColumnLimit: 120
+DerivePointerAlignment: false
+PointerAlignment: Right
+AllowShortFunctionsOnASingleLine: None
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: false
+
diff --git a/.clang-tidy b/.clang-tidy
@@ -0,0 +1,21 @@
+Checks: "-*,
+  clang-analyzer-*,
+  clang-diagnostic-*,
+  cppcoreguidelines-init-variables,
+  google-readability-avoid-underscore-in-googletest-name,
+  google-runtime-int,
+  misc-*,
+  performance-*,
+  portability-*,
+  readability-*,
+  -misc-no-recursion,
+  -readability-function-cognitive-complexity
+  -readability-magic-numbers"
+WarningsAsErrors: "*"
+CheckOptions:
+  - key: readability-identifier-length.MinimumVariableNameLength
+    value: 2
+  - key: readability-identifier-length.MinimumParameterNameLength
+    value: 2
+  - key: readability-identifier-length.MinimumLoopCounterNameLength
+    value: 1
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitmodules b/.gitmodules
@@ -1,18 +1,6 @@
 [submodule "deps/BLAKE2"]
 	path = deps/BLAKE2
 	url = https://github.com/BLAKE2/BLAKE2
-[submodule "deps/nanos-secure-sdk"]
-	path = deps/nanos-secure-sdk
-	url = https://github.com/LedgerHQ/nanos-secure-sdk.git
-[submodule "deps/nanox-secure-sdk"]
-	path = deps/nanox-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk.git
-[submodule "deps/nanosplus-secure-sdk"]
-	path = deps/nanosplus-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk.git
 [submodule "deps/ledger-zxlib"]
 	path = deps/ledger-zxlib
-	url = https://github.com/Zondax/ledger-zxlib.git
-[submodule "deps/stax-secure-sdk"]
-	path = deps/stax-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk.git
+	url = https://github.com/zondax/ledger-zxlib
diff --git a/.sonarcloud.properties b/.sonarcloud.properties
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2020 Zondax AG
+   Copyright 2018-2024 Zondax AG
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#*   (c) 2018 -2022 Zondax AG
+#*   (c) 2019 - 2024 Zondax AG
 #*
 #*  Licensed under the Apache License, Version 2.0 (the "License");
 #*  you may not use this file except in compliance with the License.

diff --git a/app/.gitignore b/app/.gitignore
@@ -48,4 +48,4 @@ bin/app.sha256
 bin/app.apdu
 
 \output/app.*
-pkg/installer_*.sh
+pkg/*.sh
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -1,6 +1,6 @@
 # This is the major version of this release
-APPVERSION_M=3
+APPVERSION_M=4
 # This is the minor version of this release
-APPVERSION_N=3
+APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=6
+APPVERSION_P=0
diff --git a/app/rust/.cargo/config → app/rust/.cargo/config.toml b/app/rust/.cargo/config → app/rust/.cargo/config.toml
diff --git a/app/rust/Cargo.toml b/app/rust/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Zondax AG <[email protected]>"]
 name = "rslib"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 readme = "README.md"
 
 [lib]
@@ -18,7 +18,7 @@ binary-ff1 = { version = "0.1.0", default-features = false }
 aes = { version = "0.3", default-features = false }
 byteorder = { version = "1", default-features = false }
 hex = { version = "0.4.2", default-features = false }
-nom = { version = "5.1.1", default-features = false }
+nom = { version = "5.1", default-features = false }
 group = { version = "0.12", default-features = false }
 
 [dependencies.chacha20poly1305]

diff --git a/app/src/c_api/rust.c b/app/src/c_api/rust.c
@@ -1,20 +1,21 @@
+#include <bolos_target.h>
+#include <inttypes.h>
+#include <zxformat.h>
+#include <zxmacros.h>
+
 #include "aes.h"
 #include "coin.h"
 #include "cx.h"
 #include "jubjub.h"
 #include "os.h"
-#include <bolos_target.h>
-#include <inttypes.h>
-#include <zxformat.h>
-#include <zxmacros.h>
-#include "zcash_utils.h"
+#include "zxerror.h"
 
-#define CTX_REDJUBJUB "Zcash_RedJubjubH"
-#define CTX_REDJUBJUB_LEN 16
-#define CTX_REDJUBJUB_HASH_LEN 64
+#define CTX_REDJUBJUB            "Zcash_RedJubjubH"
+#define CTX_REDJUBJUB_LEN        16
+#define CTX_REDJUBJUB_HASH_LEN   64
 
-#define CTX_EXPAND_SEED "Zcash_ExpandSeed"
-#define CTX_EXPAND_SEED_LEN 16
+#define CTX_EXPAND_SEED          "Zcash_ExpandSeed"
+#define CTX_EXPAND_SEED_LEN      16
 #define CTX_EXPAND_SEED_HASH_LEN 64
 
 #include <bolos_target.h>

diff --git a/app/src/sighash.c b/app/src/sighash.c
@@ -15,14 +15,16 @@
  ********************************************************************************/
 
 #include "sighash.h"
+
+#include <zxformat.h>
+#include <zxmacros.h>
+
 #include "cx.h"
 #include "index_sapling.h"
 #include "nvdata.h"
 #include "os.h"
 #include "txid.h"
-#include <zxformat.h>
-#include <zxmacros.h>
-#include "zcash_utils.h"
+#include "zxerror.h"
 
 const uint8_t PERSONALIZATION_SIZE = 16;
 const uint8_t ZCASH_PREVOUTS_HASH_PERSONALIZATION[] = "ZcashPrevoutHash";

diff --git a/app/src/sighash.h b/app/src/sighash.h
@@ -17,11 +17,12 @@
 #pragma once
 
 #include <stdint.h>
+
 #include "zxerror.h"
 
 typedef enum {
-  transparent = 0,
-  shielded = 1,
+    transparent = 0,
+    shielded = 1,
 } signable_input;
 
 zxerr_t sapling_transparent_prevouts_hash(const uint8_t *input, uint8_t *output);

diff --git a/app/src/txid.c b/app/src/txid.c
@@ -1,43 +1,44 @@
+#include <inttypes.h>
+#include <zxformat.h>
+#include <zxmacros.h>
+
 #include "constants.h"
 #include "cx.h"
 #include "index_NU5.h"
 #include "index_sapling.h"
 #include "nvdata.h"
 #include "os.h"
 #include "sighash.h"
-#include <inttypes.h>
-#include <zxformat.h>
-#include <zxmacros.h>
-#include "zcash_utils.h"
+#include "zxerror.h"
 
 #define PERSONALIZATION_SIZE 16
 
 // TxId level 1 node personalization
-#define ZCASH_HEADERS_HASH_PERSONALIZATION "ZTxIdHeadersHash"
+#define ZCASH_HEADERS_HASH_PERSONALIZATION     "ZTxIdHeadersHash"
 #define ZCASH_TRANSPARENT_HASH_PERSONALIZATION "ZTxIdTranspaHash"
-#define ZCASH_SAPLING_HASH_PERSONALIZATION "ZTxIdSaplingHash"
-#define ZCASH_ORCHARD_HASH_PERSONALIZATION "ZTxIdOrchardHash"
+#define ZCASH_SAPLING_HASH_PERSONALIZATION     "ZTxIdSaplingHash"
+#define ZCASH_ORCHARD_HASH_PERSONALIZATION     "ZTxIdOrchardHash"
 
 // TxId transparent level 2 node personalization
 #define ZCASH_PREVOUTS_HASH_PERSONALIZATION "ZTxIdPrevoutHash"
 #define ZCASH_SEQUENCE_HASH_PERSONALIZATION "ZTxIdSequencHash"
-#define ZCASH_OUTPUTS_HASH_PERSONALIZATION "ZTxIdOutputsHash"
+#define ZCASH_OUTPUTS_HASH_PERSONALIZATION  "ZTxIdOutputsHash"
 
 // TxId sapling level 2 node personalization
-#define ZCASH_SAPLING_SPENDS_HASH_PERSONALIZATION "ZTxIdSSpendsHash"
-#define ZCASH_SAPLING_SPENDS_COMPACT_HASH_PERSONALIZATION "ZTxIdSSpendCHash"
-#define ZCASH_SAPLING_SPENDS_NONCOMPACT_HASH_PERSONALIZATION "ZTxIdSSpendNHash"
+#define ZCASH_SAPLING_SPENDS_HASH_PERSONALIZATION             "ZTxIdSSpendsHash"
+#define ZCASH_SAPLING_SPENDS_COMPACT_HASH_PERSONALIZATION     "ZTxIdSSpendCHash"
+#define ZCASH_SAPLING_SPENDS_NONCOMPACT_HASH_PERSONALIZATION  "ZTxIdSSpendNHash"
 
-#define ZCASH_SAPLING_OUTPUTS_HASH_PERSONALIZATION "ZTxIdSOutputHash"
-#define ZCASH_SAPLING_OUTPUTS_COMPACT_HASH_PERSONALIZATION "ZTxIdSOutC__Hash"
-#define ZCASH_SAPLING_OUTPUTS_MEMOS_HASH_PERSONALIZATION "ZTxIdSOutM__Hash"
+#define ZCASH_SAPLING_OUTPUTS_HASH_PERSONALIZATION            "ZTxIdSOutputHash"
+#define ZCASH_SAPLING_OUTPUTS_COMPACT_HASH_PERSONALIZATION    "ZTxIdSOutC__Hash"
+#define ZCASH_SAPLING_OUTPUTS_MEMOS_HASH_PERSONALIZATION      "ZTxIdSOutM__Hash"
 #define ZCASH_SAPLING_OUTPUTS_NONCOMPACT_HASH_PERSONALIZATION "ZTxIdSOutN__Hash"
 
-#define ZCASH_TRANSPARENT_INPUT_HASH_PERSONALIZATION "Zcash___TxInHash"
-#define ZCASH_TRANSPARENT_AMOUNTS_HASH_PERSONALIZATION "ZTxTrAmountsHash"
-#define ZCASH_TRANSPARENT_SCRIPTS_HASH_PERSONALIZATION "ZTxTrScriptsHash"
+#define ZCASH_TRANSPARENT_INPUT_HASH_PERSONALIZATION          "Zcash___TxInHash"
+#define ZCASH_TRANSPARENT_AMOUNTS_HASH_PERSONALIZATION        "ZTxTrAmountsHash"
+#define ZCASH_TRANSPARENT_SCRIPTS_HASH_PERSONALIZATION        "ZTxTrScriptsHash"
 
-#define SIGHASH_ALL 0x01
+#define SIGHASH_ALL                                           0x01
 
 zxerr_t nu5_transparent_prevouts_hash(const uint8_t *input, uint8_t *output) {
   zemu_log_stack("nu5_transparent_prevouts_hash\n");

diff --git a/app/src/zcash_apdu_errors.h b/app/src/zcash_apdu_errors.h
@@ -17,18 +17,18 @@
 #pragma once
 
 // Specific APDU error codes for ZCash
-#define APDU_CODE_DATA_TOO_LONG 0x6988
+#define APDU_CODE_DATA_TOO_LONG            0x6988
 #define APDU_CODE_EXTRACT_TRANSACTION_FAIL 0x6989
-#define APDU_CODE_HASH_MSG_BUF_FAIL 0x6990
-#define APDU_CODE_UNPROCESSED_TX 0x6991
-#define APDU_CODE_PREVOUT_INVALID 0x6992
-#define APDU_CODE_SEQUENCE_INVALID 0x6993
-#define APDU_CODE_OUTPUTS_INVALID 0x6994
-#define APDU_CODE_JOINSPLIT_INVALID 0x6995
-#define APDU_CODE_SPEND_INVALID 0x6996
-#define APDU_CODE_OUTPUT_CONTENT_INVALID 0x6997
-#define APDU_CODE_ENCRYPTION_INVALID 0x6998
-#define APDU_CODE_CHECK_SIGN_TR_FAIL 0x6999
-#define APDU_SIGN_SPEND_FAIL 0x69A0
-#define APDU_CODE_BAD_VALUEBALANCE 0x69A1
-#define APDU_CODE_UNHANDLED_TX_VERSION 0x69A2
+#define APDU_CODE_HASH_MSG_BUF_FAIL        0x6990
+#define APDU_CODE_UNPROCESSED_TX           0x6991
+#define APDU_CODE_PREVOUT_INVALID          0x6992
+#define APDU_CODE_SEQUENCE_INVALID         0x6993
+#define APDU_CODE_OUTPUTS_INVALID          0x6994
+#define APDU_CODE_JOINSPLIT_INVALID        0x6995
+#define APDU_CODE_SPEND_INVALID            0x6996
+#define APDU_CODE_OUTPUT_CONTENT_INVALID   0x6997
+#define APDU_CODE_ENCRYPTION_INVALID       0x6998
+#define APDU_CODE_CHECK_SIGN_TR_FAIL       0x6999
+#define APDU_SIGN_SPEND_FAIL               0x69A0
+#define APDU_CODE_BAD_VALUEBALANCE         0x69A1
+#define APDU_CODE_UNHANDLED_TX_VERSION     0x69A2
diff --git a/app/src/zcash_utils.h b/app/src/zcash_utils.h
diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk
diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk
diff --git a/deps/nanox-secure-sdk b/deps/nanox-secure-sdk
diff --git a/deps/stax-secure-sdk b/deps/stax-secure-sdk
+5 −0		.clang-format
+21 −0		.clang-tidy
+27 −8		CMakeLists.txt
+1 −1		LICENSE
+1 −1		README.md
+1 −0		cmake/Hunter/config.cmake
+543 −0		cmake/HunterGate.cmake
+0 −31		cmake/gtest/CMakeLists.txt
+0 −16		cmake/gtest/CMakeLists.txt.gtest.in
+9 −3		dockerized_build.mk
+1 −1		include/zxversion.h
+22 −16		makefiles/Makefile.devices
+0 −2		scripts/install_deps.sh