Rename utils to common_utils

fbeutin-ledger · fbeutin-ledger · commit 3bcf12ce1d83 · 2024-02-02T11:23:30.000+01:00
diff --git a/src/ethUstream.c b/src/ethUstream.c
@@ -20,7 +20,7 @@
 
 #include "ethUstream.h"
 #include "rlp_utils.h"
-#include "utils.h"
+#include "common_utils.h"
 
 #define MAX_INT256  32
 #define MAX_ADDRESS 20
diff --git a/src/ethUstream.h b/src/ethUstream.h
@@ -22,7 +22,7 @@
 
 #include "os.h"
 #include "cx.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "tx_content.h"
 
 struct txContext_t;
diff --git a/src/handle_get_printable_amount.c b/src/handle_get_printable_amount.c
@@ -4,7 +4,7 @@
 #include "swap_utils.h"
 #include "handle_get_printable_amount.h"
 #include "shared_context.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "uint256.h"
 #include "string.h"
 
diff --git a/src/handle_swap_sign_transaction.c b/src/handle_swap_sign_transaction.c
@@ -4,7 +4,7 @@
 #include "swap_utils.h"
 #include "handle_swap_sign_transaction.h"
 #include "shared_context.h"
-#include "utils.h"
+#include "common_utils.h"
 #ifdef HAVE_NBGL
 #include "nbgl_use_case.h"
 #endif  // HAVE_NBGL
diff --git a/src/main.c b/src/main.c
@@ -22,7 +22,7 @@
 #include "os_io_seproxyhal.h"
 
 #include "glyphs.h"
-#include "utils.h"
+#include "common_utils.h"
 
 #include "swap_lib_calls.h"
 #include "handle_swap_sign_transaction.h"
diff --git a/src/network.c b/src/network.c
@@ -3,7 +3,7 @@
 #include "os_pic.h"
 #include "network.h"
 #include "shared_context.h"
-#include "utils.h"
+#include "common_utils.h"
 
 typedef struct network_info_s {
     const char *name;
diff --git a/src/stark_crypto.c b/src/stark_crypto.c
@@ -2,7 +2,7 @@
 
 #include "shared_context.h"
 #include "stark_utils.h"
-#include "utils.h"
+#include "common_utils.h"
 
 extraInfo_t *getKnownToken(uint8_t *contractAddress);
 
diff --git a/src/uint128.c b/src/uint128.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "uint128.h"
 #include "uint_common.h"
-#include "utils.h"  // HEXDIGITS
+#include "common_utils.h"  // HEXDIGITS
 
 void readu128BE(const uint8_t *const buffer, uint128_t *const target) {
     UPPER_P(target) = readUint64BE(buffer);
diff --git a/src_bagl/ui_flow.c b/src_bagl/ui_flow.c
@@ -1,7 +1,7 @@
 #include "shared_context.h"
 #include "ui_callbacks.h"
 #include "common_ui.h"
-#include "utils.h"
+#include "common_utils.h"
 
 #define ENABLED_STR   "Enabled"
 #define DISABLED_STR  "Disabled"
diff --git a/src_bagl/ui_flow_signTx.c b/src_bagl/ui_flow_signTx.c
@@ -1,7 +1,7 @@
 #include "shared_context.h"
 #include "ui_callbacks.h"
 #include "chainConfig.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "feature_signTx.h"
 #include "network.h"
 #include "eth_plugin_handler.h"
diff --git a/src_common/common_utils.c b/src_common/common_utils.c
@@ -21,7 +21,7 @@
 #include "uint128.h"
 #include "uint256.h"
 #include "tokens.h"
-#include "utils.h"
+#include "common_utils.h"
 
 void array_hexstr(char *strbuf, const void *bin, unsigned int len) {
     while (len--) {
diff --git a/src_common/common_utils.h b/src_common/common_utils.h
diff --git a/src_common/plugin_utils.c b/src_common/plugin_utils.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "utils.h"
+#include "common_utils.h"
 #include "plugin_utils.h"
 
 void copy_address(uint8_t* dst, const uint8_t* parameter, uint8_t dst_size) {
diff --git a/src_common/tokens.h b/src_common/tokens.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "utils.h"
+#include "common_utils.h"
 
 #define MAX_TICKER_LEN 11  // 10 characters + '\0'
 #define MAX_ITEMS      2
diff --git a/src_common/tx_content.h b/src_common/tx_content.h
@@ -22,7 +22,7 @@
 
 #include "os.h"
 #include "cx.h"
-#include "utils.h"
+#include "common_utils.h"
 
 typedef struct txInt256_t {
     uint8_t value[INT256_LENGTH];
diff --git a/src_features/getPublicKey/cmd_getPublicKey.c b/src_features/getPublicKey/cmd_getPublicKey.c
@@ -1,6 +1,6 @@
 #include "shared_context.h"
 #include "apdu_constants.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "feature_getPublicKey.h"
 #include "common_ui.h"
 #include "os_io_seproxyhal.h"
diff --git a/src_features/provideDomainName/cmd_provide_domain_name.c b/src_features/provideDomainName/cmd_provide_domain_name.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
-#include "utils.h"  // ARRAY_SIZE
+#include "common_utils.h"  // ARRAY_SIZE
 #include "apdu_constants.h"
 #include "domain_name.h"
 #include "challenge.h"
diff --git a/src_features/provideNFTInformation/cmd_provideNFTInfo.c b/src_features/provideNFTInformation/cmd_provideNFTInfo.c
@@ -3,7 +3,7 @@
 #include "shared_context.h"
 #include "apdu_constants.h"
 #include "tokens.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "common_ui.h"
 #include "os_io_seproxyhal.h"
 #include "network.h"
diff --git a/src_features/setPlugin/cmd_setPlugin.c b/src_features/setPlugin/cmd_setPlugin.c
@@ -4,7 +4,7 @@
 #include "eth_plugin_interface.h"
 #include "eth_plugin_internal.h"
 #include "plugin_utils.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "common_ui.h"
 #include "os_io_seproxyhal.h"
 #include "network.h"
diff --git a/src_features/signMessageEIP712/field_hash.c b/src_features/signMessageEIP712/field_hash.c
@@ -9,7 +9,7 @@
 #include "shared_context.h"
 #include "ui_logic.h"
 #include "context_712.h"     // contract_addr
-#include "utils.h"           // u64_from_BE
+#include "common_utils.h"    // u64_from_BE
 #include "apdu_constants.h"  // APDU response codes
 #include "typed_data.h"
 #include "commands_712.h"
diff --git a/src_features/signMessageEIP712/sol_typenames.c b/src_features/signMessageEIP712/sol_typenames.c
@@ -7,7 +7,7 @@
 #include "os_pic.h"
 #include "apdu_constants.h"  // APDU response codes
 #include "typed_data.h"
-#include "utils.h"  // ARRAY_SIZE
+#include "common_utils.h"  // ARRAY_SIZE
 
 // Bit indicating they are more types associated to this typename
 #define TYPENAME_MORE_TYPE (1 << 7)
diff --git a/src_features/signMessageEIP712/ui_logic.c b/src_features/signMessageEIP712/ui_logic.c
@@ -7,7 +7,7 @@
 #include "mem_utils.h"
 #include "os_io.h"
 #include "shared_context.h"
-#include "utils.h"  // uint256_to_decimal
+#include "common_utils.h"  // uint256_to_decimal
 #include "common_712.h"
 #include "context_712.h"     // eip712_context_deinit
 #include "uint256.h"         // tostring256 && tostring256_signed
diff --git a/src_features/signMessageEIP712_v0/cmd_signMessage712.c b/src_features/signMessageEIP712_v0/cmd_signMessage712.c
@@ -1,6 +1,6 @@
 #include "shared_context.h"
 #include "apdu_constants.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "common_ui.h"
 #include "common_712.h"
 
diff --git a/src_features/signTx/logic_signTx.c b/src_features/signTx/logic_signTx.c
@@ -1,6 +1,6 @@
 #include <ctype.h>
 #include "shared_context.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "feature_signTx.h"
 #ifdef HAVE_STARKWARE
 #include "stark_utils.h"
diff --git a/src_features/signTx/ui_common_signTx.c b/src_features/signTx/ui_common_signTx.c
@@ -1,7 +1,7 @@
 #include "lib_standard_app/crypto_helpers.h"
 #include "os_io_seproxyhal.h"
 #include "shared_context.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "common_ui.h"
 #include "handle_swap_sign_transaction.h"
 
diff --git a/src_plugins/erc1155/erc1155_provide_parameters.c b/src_plugins/erc1155/erc1155_provide_parameters.c
@@ -4,7 +4,7 @@
 #include "erc1155_plugin.h"
 #include "plugin_utils.h"
 #include "eth_plugin_internal.h"
-#include "utils.h"
+#include "common_utils.h"
 
 static void handle_safe_transfer(ethPluginProvideParameter_t *msg, erc1155_context_t *context) {
     uint8_t new_value[INT256_LENGTH];
diff --git a/src_plugins/erc1155/erc1155_ui.c b/src_plugins/erc1155/erc1155_ui.c
@@ -4,7 +4,7 @@
 #include "erc1155_plugin.h"
 #include "eth_plugin_internal.h"
 #include "eth_plugin_interface.h"
-#include "utils.h"
+#include "common_utils.h"
 
 static void set_approval_for_all_ui(ethQueryContractUI_t *msg, erc1155_context_t *context) {
     switch (msg->screenIndex) {
diff --git a/src_plugins/erc20/erc20_plugin.c b/src_plugins/erc20/erc20_plugin.c
@@ -4,7 +4,7 @@
 #include "shared_context.h"
 #include "plugin_utils.h"
 #include "ethUstream.h"
-#include "utils.h"
+#include "common_utils.h"
 
 typedef enum { ERC20_TRANSFER = 0, ERC20_APPROVE } erc20Selector_t;
 
diff --git a/src_plugins/erc721/erc721_ui.c b/src_plugins/erc721/erc721_ui.c
@@ -4,7 +4,7 @@
 #include "erc721_plugin.h"
 #include "eth_plugin_internal.h"
 #include "eth_plugin_interface.h"
-#include "utils.h"
+#include "common_utils.h"
 
 static void set_approval_ui(ethQueryContractUI_t *msg, erc721_context_t *context) {
     switch (msg->screenIndex) {
diff --git a/src_plugins/eth2/eth2_plugin.c b/src_plugins/eth2/eth2_plugin.c
@@ -4,7 +4,7 @@
 #include "eth_plugin_internal.h"
 #include "eth_plugin_handler.h"
 #include "shared_context.h"
-#include "utils.h"
+#include "common_utils.h"
 
 void getEth2PublicKey(uint32_t *bip32Path, uint8_t bip32PathLength, uint8_t *out);
 
diff --git a/src_plugins/starkware/starkware_plugin.c b/src_plugins/starkware/starkware_plugin.c
@@ -5,7 +5,7 @@
 #include "eth_plugin_internal.h"  // TODO : rewrite as independant code
 #include "stark_utils.h"
 #include "plugin_utils.h"
-#include "utils.h"
+#include "common_utils.h"
 #include "apdu_constants.h"
 
 #ifdef HAVE_STARKWARE
diff --git a/tools/build_sdk.py b/tools/build_sdk.py
@@ -155,7 +155,7 @@ def merge_c_files(sources, nodes_to_extract):
     # one, copied to sdk
     headers_to_merge = [
         "src_common/tokens.h",
-        "src_common/utils.h",
+        "src_common/common_utils.h",
         "src_common/tx_content.h",
         "src_common/plugin_utils.h",
         "src_common/nft.h",
@@ -199,7 +199,7 @@ def merge_c_files(sources, nodes_to_extract):
 
     # extract and merge function bodies
     c_files_to_merge = [
-        "src_common/utils.c",
+        "src_common/common_utils.c",
         "src_common/plugin_utils.c",
     ]
     merge_c_files(c_files_to_merge, nodes_to_extract["fn"])
