From 2e63a428b21a64d99c0210a7e4d1d14f95a0a450 Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Tue, 15 Feb 2022 14:09:43 +0100
Subject: [PATCH] Removed useless header include in shared_context.h

Could easily create a circular header dependency
---
 src/eth_plugin_handler.c                                   | 1 +
 src/shared_context.h                                       | 1 -
 src/stark_crypto.c                                         | 7 ++++---
 src_features/getPublicKey/cmd_getPublicKey.c               | 1 +
 .../stark_provideQuantum/cmd_stark_provideQuantum.c        | 1 +
 src_features/stark_sign/cmd_stark_sign.c                   | 1 +
 src_features/stark_sign/ui_flow_stark_sign.c               | 1 +
 src_plugins/compound/compound_plugin.c                     | 1 +
 src_plugins/starkware/starkware_plugin.c                   | 1 +
 9 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/eth_plugin_handler.c b/src/eth_plugin_handler.c
index b82c6a5..accc232 100644
--- a/src/eth_plugin_handler.c
+++ b/src/eth_plugin_handler.c
@@ -3,6 +3,7 @@
 #include "eth_plugin_internal.h"
 #include "shared_context.h"
 #include "network.h"
+#include "ethUtils.h"
 
 void eth_plugin_prepare_init(ethPluginInitContract_t *init, uint8_t *selector, uint32_t dataSize) {
     memset((uint8_t *) init, 0, sizeof(ethPluginInitContract_t));
diff --git a/src/shared_context.h b/src/shared_context.h
index 035f7c2..43dc533 100644
--- a/src/shared_context.h
+++ b/src/shared_context.h
@@ -10,7 +10,6 @@
 #include "cx.h"
 #include "os_io_seproxyhal.h"
 #include "ethUstream.h"
-#include "ethUtils.h"
 #include "uint256.h"
 #include "tokens.h"
 #include "chainConfig.h"
diff --git a/src/stark_crypto.c b/src/stark_crypto.c
index 990216a..8f33a01 100644
--- a/src/stark_crypto.c
+++ b/src/stark_crypto.c
@@ -4,6 +4,7 @@
 #include "stark_utils.h"
 #include "ui_callbacks.h"
 #include "utils.h"
+#include "ethUtils.h"
 
 static unsigned char const C_cx_Stark256_n[] = {
     // n: 0x0800000000000010ffffffffffffffffb781126dcae7b2321e66a241adc64d2f
@@ -16,13 +17,13 @@ static unsigned char const STARK_DERIVE_BIAS[] = {
     0x38, 0xa1, 0x3b, 0x4b, 0x92, 0x0e, 0x94, 0x11, 0xae, 0x6d, 0xa5, 0xf4, 0x0b, 0x03, 0x58, 0xb1};
 
 void starkDerivePrivateKey(uint32_t *bip32Path, uint32_t bip32PathLength, uint8_t *privateKeyData) {
-#if 0  
-  // Sanity check 
+#if 0
+  // Sanity check
   if (bip32Path[0] != STARK_BIP32_PATH_0)  {
     PRINTF("Invalid Stark derivation path %d\n", bip32Path[0]);
     THROW(0x6a80);
   }
-  os_perso_derive_node_bip32(CX_CURVE_256K1, bip32Path, bip32PathLength, privateKeyData, NULL);  
+  os_perso_derive_node_bip32(CX_CURVE_256K1, bip32Path, bip32PathLength, privateKeyData, NULL);
   PRINTF("Private key before processing %.*H\n", 32, privateKeyData);
   // TODO - support additional schemes
   cx_math_modm(privateKeyData, 32, C_cx_Stark256_n, 32);
diff --git a/src_features/getPublicKey/cmd_getPublicKey.c b/src_features/getPublicKey/cmd_getPublicKey.c
index ef521c4..59c9fb8 100644
--- a/src_features/getPublicKey/cmd_getPublicKey.c
+++ b/src_features/getPublicKey/cmd_getPublicKey.c
@@ -3,6 +3,7 @@
 
 #include "ui_flow.h"
 #include "feature_getPublicKey.h"
+#include "ethUtils.h"
 
 void handleGetPublicKey(uint8_t p1,
                         uint8_t p2,
diff --git a/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c b/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c
index 4d390dd..1796fe5 100644
--- a/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c
+++ b/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c
@@ -3,6 +3,7 @@
 #include "shared_context.h"
 #include "apdu_constants.h"
 #include "ui_flow.h"
+#include "ethUtils.h"
 
 void handleStarkwareProvideQuantum(uint8_t p1,
                                    __attribute__((unused)) uint8_t p2,
diff --git a/src_features/stark_sign/cmd_stark_sign.c b/src_features/stark_sign/cmd_stark_sign.c
index 9329838..58ca944 100644
--- a/src_features/stark_sign/cmd_stark_sign.c
+++ b/src_features/stark_sign/cmd_stark_sign.c
@@ -6,6 +6,7 @@
 #include "ui_flow.h"
 #include "poorstream.h"
 #include "ui_callbacks.h"
+#include "ethUtils.h"
 
 #define U8BE(buf, off) \
     (uint64_t)((((uint64_t) U4BE(buf, off)) << 32) | (((uint64_t) U4BE(buf, off + 4)) & 0xFFFFFFFF))
diff --git a/src_features/stark_sign/ui_flow_stark_sign.c b/src_features/stark_sign/ui_flow_stark_sign.c
index 4ef5ddc..23c9319 100644
--- a/src_features/stark_sign/ui_flow_stark_sign.c
+++ b/src_features/stark_sign/ui_flow_stark_sign.c
@@ -2,6 +2,7 @@
 
 #include "shared_context.h"
 #include "ui_callbacks.h"
+#include "ethUtils.h"
 
 unsigned int io_seproxyhal_touch_stark_ok(const bagl_element_t *e);
 
diff --git a/src_plugins/compound/compound_plugin.c b/src_plugins/compound/compound_plugin.c
index a933d89..cbb68dd 100644
--- a/src_plugins/compound/compound_plugin.c
+++ b/src_plugins/compound/compound_plugin.c
@@ -3,6 +3,7 @@
 #include "shared_context.h"       // TODO : rewrite as independant code
 #include "eth_plugin_internal.h"  // TODO : rewrite as independant code
 #include "utils.h"
+#include "ethUtils.h"
 
 typedef enum {
     COMPOUND_REDEEM_UNDERLYING = 0,
diff --git a/src_plugins/starkware/starkware_plugin.c b/src_plugins/starkware/starkware_plugin.c
index f4ba5f1..104675b 100644
--- a/src_plugins/starkware/starkware_plugin.c
+++ b/src_plugins/starkware/starkware_plugin.c
@@ -4,6 +4,7 @@
 #include "eth_plugin_internal.h"  // TODO : rewrite as independant code
 #include "stark_utils.h"
 #include "utils.h"
+#include "ethUtils.h"
 
 #ifdef HAVE_STARKWARE