diff --git a/src/eth_plugin_handler.c b/src/eth_plugin_handler.c index da1cac9..30c5bc0 100644 --- a/src/eth_plugin_handler.c +++ b/src/eth_plugin_handler.c @@ -128,7 +128,6 @@ eth_plugin_result_t eth_plugin_perform_init(uint8_t *contractAddress, eth_plugin_result_t eth_plugin_call(int method, void *parameter) { ethPluginSharedRW_t pluginRW; ethPluginSharedRO_t pluginRO; - char tmp[PLUGIN_ID_LENGTH]; char *alias; uint8_t i; uint8_t internalPlugin = 0; diff --git a/src/eth_plugin_internal.c b/src/eth_plugin_internal.c index d4d573f..1ed45cd 100644 --- a/src/eth_plugin_internal.c +++ b/src/eth_plugin_internal.c @@ -13,23 +13,20 @@ void starkware_plugin_call(int message, void* parameters); void eth2_plugin_call(int message, void* parameters); #endif -static const uint8_t const ERC20_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0xa9, 0x05, 0x9c, 0xbb}; -static const uint8_t const ERC20_APPROVE_SELECTOR[SELECTOR_SIZE] = {0x09, 0x5e, 0xa7, 0xb3}; +static const uint8_t ERC20_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0xa9, 0x05, 0x9c, 0xbb}; +static const uint8_t ERC20_APPROVE_SELECTOR[SELECTOR_SIZE] = {0x09, 0x5e, 0xa7, 0xb3}; const uint8_t* const ERC20_SELECTORS[NUM_ERC20_SELECTORS] = {ERC20_TRANSFER_SELECTOR, ERC20_APPROVE_SELECTOR}; -static const uint8_t const ERC721_APPROVE_SELECTOR[SELECTOR_SIZE] = {0x09, 0x5e, 0xa7, 0xb3}; +static const uint8_t ERC721_APPROVE_SELECTOR[SELECTOR_SIZE] = {0x09, 0x5e, 0xa7, 0xb3}; const uint8_t* const ERC721_SELECTORS[NUM_ERC721_SELECTORS] = {ERC721_APPROVE_SELECTOR}; -static const uint8_t const COMPOUND_REDEEM_UNDERLYING_SELECTOR[SELECTOR_SIZE] = {0x85, - 0x2a, - 0x12, - 0xe3}; -static const uint8_t const COMPOUND_REDEEM_SELECTOR[SELECTOR_SIZE] = {0xdb, 0x00, 0x6a, 0x75}; -static const uint8_t const COMPOUND_MINT_SELECTOR[SELECTOR_SIZE] = {0xa0, 0x71, 0x2d, 0x68}; -static const uint8_t const CETH_MINT_SELECTOR[SELECTOR_SIZE] = {0x12, 0x49, 0xc5, 0x8b}; +static const uint8_t COMPOUND_REDEEM_UNDERLYING_SELECTOR[SELECTOR_SIZE] = {0x85, 0x2a, 0x12, 0xe3}; +static const uint8_t COMPOUND_REDEEM_SELECTOR[SELECTOR_SIZE] = {0xdb, 0x00, 0x6a, 0x75}; +static const uint8_t COMPOUND_MINT_SELECTOR[SELECTOR_SIZE] = {0xa0, 0x71, 0x2d, 0x68}; +static const uint8_t CETH_MINT_SELECTOR[SELECTOR_SIZE] = {0x12, 0x49, 0xc5, 0x8b}; const uint8_t* const COMPOUND_SELECTORS[NUM_COMPOUND_SELECTORS] = { COMPOUND_REDEEM_UNDERLYING_SELECTOR, @@ -39,7 +36,7 @@ const uint8_t* const COMPOUND_SELECTORS[NUM_COMPOUND_SELECTORS] = { #ifdef HAVE_ETH2 -static const uint8_t const ETH2_DEPOSIT_SELECTOR[SELECTOR_SIZE] = {0x22, 0x89, 0x51, 0x18}; +static const uint8_t ETH2_DEPOSIT_SELECTOR[SELECTOR_SIZE] = {0x22, 0x89, 0x51, 0x18}; const uint8_t* const ETH2_SELECTORS[NUM_ETH2_SELECTORS] = {ETH2_DEPOSIT_SELECTOR}; @@ -47,39 +44,33 @@ const uint8_t* const ETH2_SELECTORS[NUM_ETH2_SELECTORS] = {ETH2_DEPOSIT_SELECTOR #ifdef HAVE_STARKWARE -static const uint8_t const STARKWARE_REGISTER_ID[SELECTOR_SIZE] = {0xdd, 0x24, 0x14, 0xd4}; -static const uint8_t const STARKWARE_DEPOSIT_TOKEN_ID[SELECTOR_SIZE] = {0x25, 0x05, 0xc3, 0xd9}; -static const uint8_t const STARKWARE_DEPOSIT_ETH_ID[SELECTOR_SIZE] = {0x00, 0xae, 0xef, 0x8a}; -static const uint8_t const STARKWARE_DEPOSIT_CANCEL_ID[SELECTOR_SIZE] = {0x7d, 0xf7, 0xdc, 0x04}; -static const uint8_t const STARKWARE_DEPOSIT_RECLAIM_ID[SELECTOR_SIZE] = {0xae, 0x87, 0x38, 0x16}; -static const uint8_t const STARKWARE_WITHDRAW_ID[SELECTOR_SIZE] = {0x44, 0x1a, 0x3e, 0x70}; -static const uint8_t const STARKWARE_FULL_WITHDRAWAL_ID[SELECTOR_SIZE] = {0xa9, 0x33, 0x10, 0xc4}; -static const uint8_t const STARKWARE_FREEZE_ID[SELECTOR_SIZE] = {0x93, 0xc1, 0xe4, 0x66}; -static const uint8_t const STARKWARE_ESCAPE_ID[SELECTOR_SIZE] = {0x9e, 0x3a, 0xda, 0xc4}; -static const uint8_t const STARKWARE_VERIFY_ESCAPE_ID[SELECTOR_SIZE] = {0x2d, 0xd5, 0x30, 0x06}; +static const uint8_t STARKWARE_REGISTER_ID[SELECTOR_SIZE] = {0xdd, 0x24, 0x14, 0xd4}; +static const uint8_t STARKWARE_DEPOSIT_TOKEN_ID[SELECTOR_SIZE] = {0x25, 0x05, 0xc3, 0xd9}; +static const uint8_t STARKWARE_DEPOSIT_ETH_ID[SELECTOR_SIZE] = {0x00, 0xae, 0xef, 0x8a}; +static const uint8_t STARKWARE_DEPOSIT_CANCEL_ID[SELECTOR_SIZE] = {0x7d, 0xf7, 0xdc, 0x04}; +static const uint8_t STARKWARE_DEPOSIT_RECLAIM_ID[SELECTOR_SIZE] = {0xae, 0x87, 0x38, 0x16}; +static const uint8_t STARKWARE_WITHDRAW_ID[SELECTOR_SIZE] = {0x44, 0x1a, 0x3e, 0x70}; +static const uint8_t STARKWARE_FULL_WITHDRAWAL_ID[SELECTOR_SIZE] = {0xa9, 0x33, 0x10, 0xc4}; +static const uint8_t STARKWARE_FREEZE_ID[SELECTOR_SIZE] = {0x93, 0xc1, 0xe4, 0x66}; +static const uint8_t STARKWARE_ESCAPE_ID[SELECTOR_SIZE] = {0x9e, 0x3a, 0xda, 0xc4}; +static const uint8_t STARKWARE_VERIFY_ESCAPE_ID[SELECTOR_SIZE] = {0x2d, 0xd5, 0x30, 0x06}; -static const uint8_t const STARKWARE_WITHDRAW_TO_ID[SELECTOR_SIZE] = {0x14, 0xcd, 0x70, 0xe4}; -static const uint8_t const STARKWARE_DEPOSIT_NFT_ID[SELECTOR_SIZE] = {0xae, 0x1c, 0xdd, 0xe6}; -static const uint8_t const STARKWARE_DEPOSIT_NFT_RECLAIM_ID[SELECTOR_SIZE] = {0xfc, - 0xb0, - 0x58, - 0x22}; -static const uint8_t const STARKWARE_WITHDRAW_AND_MINT_ID[SELECTOR_SIZE] = {0xd9, 0x14, 0x43, 0xb7}; -static const uint8_t const STARKWARE_WITHDRAW_NFT_ID[SELECTOR_SIZE] = {0x01, 0x9b, 0x41, 0x7a}; -static const uint8_t const STARKWARE_WITHDRAW_NFT_TO_ID[SELECTOR_SIZE] = {0xeb, 0xef, 0x0f, 0xd0}; -static const uint8_t const STARKWARE_REGISTER_AND_DEPOSIT_TOKEN_ID[SELECTOR_SIZE] = {0x10, - 0x82, - 0x08, - 0xcf}; -static const uint8_t const STARKWARE_REGISTER_AND_DEPOSIT_ETH_ID[SELECTOR_SIZE] = {0xa7, - 0x78, - 0xc0, - 0xc3}; -static const uint8_t const STARKWARE_PROXY_DEPOSIT_TOKEN_ID[SELECTOR_SIZE] = {0xdc, - 0xca, - 0xd5, - 0x24}; -static const uint8_t const STARKWARE_PROXY_DEPOSIT_ETH_ID[SELECTOR_SIZE] = {0x6c, 0xe5, 0xd9, 0x57}; +static const uint8_t STARKWARE_WITHDRAW_TO_ID[SELECTOR_SIZE] = {0x14, 0xcd, 0x70, 0xe4}; +static const uint8_t STARKWARE_DEPOSIT_NFT_ID[SELECTOR_SIZE] = {0xae, 0x1c, 0xdd, 0xe6}; +static const uint8_t STARKWARE_DEPOSIT_NFT_RECLAIM_ID[SELECTOR_SIZE] = {0xfc, 0xb0, 0x58, 0x22}; +static const uint8_t STARKWARE_WITHDRAW_AND_MINT_ID[SELECTOR_SIZE] = {0xd9, 0x14, 0x43, 0xb7}; +static const uint8_t STARKWARE_WITHDRAW_NFT_ID[SELECTOR_SIZE] = {0x01, 0x9b, 0x41, 0x7a}; +static const uint8_t STARKWARE_WITHDRAW_NFT_TO_ID[SELECTOR_SIZE] = {0xeb, 0xef, 0x0f, 0xd0}; +static const uint8_t STARKWARE_REGISTER_AND_DEPOSIT_TOKEN_ID[SELECTOR_SIZE] = {0x10, + 0x82, + 0x08, + 0xcf}; +static const uint8_t STARKWARE_REGISTER_AND_DEPOSIT_ETH_ID[SELECTOR_SIZE] = {0xa7, + 0x78, + 0xc0, + 0xc3}; +static const uint8_t STARKWARE_PROXY_DEPOSIT_TOKEN_ID[SELECTOR_SIZE] = {0xdc, 0xca, 0xd5, 0x24}; +static const uint8_t STARKWARE_PROXY_DEPOSIT_ETH_ID[SELECTOR_SIZE] = {0x6c, 0xe5, 0xd9, 0x57}; const uint8_t* const STARKWARE_SELECTORS[NUM_STARKWARE_SELECTORS] = { STARKWARE_REGISTER_ID, @@ -107,7 +98,7 @@ const uint8_t* const STARKWARE_SELECTORS[NUM_STARKWARE_SELECTORS] = { // All internal alias names start with 'minus' -const internalEthPlugin_t const INTERNAL_ETH_PLUGINS[] = { +const internalEthPlugin_t INTERNAL_ETH_PLUGINS[] = { {erc20_plugin_available_check, (const uint8_t**) ERC20_SELECTORS, NUM_ERC20_SELECTORS, diff --git a/src/main.c b/src/main.c index e5344eb..377d535 100644 --- a/src/main.c +++ b/src/main.c @@ -93,28 +93,12 @@ void ui_idle(void) { ux_flow_init(0, ux_idle_flow, NULL); } -unsigned int io_seproxyhal_touch_exit(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_exit(__attribute__((unused)) const bagl_element_t *e) { // Go back to the dashboard os_sched_exit(0); return 0; // do not redraw the widget } -#if defined(TARGET_NANOS) -unsigned int ui_address_nanos_button(unsigned int button_mask, unsigned int button_mask_counter) { - switch (button_mask) { - case BUTTON_EVT_RELEASED | BUTTON_LEFT: // CANCEL - io_seproxyhal_touch_address_cancel(NULL); - break; - - case BUTTON_EVT_RELEASED | BUTTON_RIGHT: { // OK - io_seproxyhal_touch_address_ok(NULL); - break; - } - } - return 0; -} -#endif // #if defined(TARGET_NANOS) - void io_seproxyhal_send_status(uint32_t sw) { G_io_apdu_buffer[0] = ((sw >> 8) & 0xff); G_io_apdu_buffer[1] = (sw & 0xff); @@ -682,7 +666,7 @@ void io_seproxyhal_display(const bagl_element_t *element) { io_seproxyhal_display_default((bagl_element_t *) element); } -unsigned char io_event(unsigned char channel) { +unsigned char io_event(__attribute__((unused)) unsigned char channel) { // nothing done with the event, throw an error on the transport layer if // needed diff --git a/src/tokens.h b/src/tokens.h index 8c69127..e7507db 100644 --- a/src/tokens.h +++ b/src/tokens.h @@ -43,7 +43,7 @@ extern tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA]; #ifndef HAVE_TOKENS_LIST #ifndef LEDGER_TEST_PUBLIC_KEY -static const uint8_t const LEDGER_SIGNATURE_PUBLIC_KEY[] = { +static const uint8_t LEDGER_SIGNATURE_PUBLIC_KEY[] = { // production key 2019-01-11 03:07PM (erc20signer) 0x04, 0x5e, 0x6c, 0x10, 0x20, 0xc1, 0x4d, 0xc4, 0x64, 0x42, 0xfe, 0x89, 0xf9, 0x7c, 0x0b, 0x68, 0xcd, 0xb1, 0x59, 0x76, 0xdc, 0x24, 0xf2, 0x4c, 0x31, 0x6e, @@ -52,7 +52,7 @@ static const uint8_t const LEDGER_SIGNATURE_PUBLIC_KEY[] = { 0xcd, 0x09, 0x8f, 0xce, 0x8f, 0xd0, 0xf8, 0x1d, 0xaa, 0x94, 0x97, 0x91, 0x83}; #else -static const uint8_t const LEDGER_SIGNATURE_PUBLIC_KEY[] = { +static const uint8_t LEDGER_SIGNATURE_PUBLIC_KEY[] = { // test key 2019-01-11 03:07PM (erc20signer) 0x04, 0x20, 0xda, 0x62, 0x00, 0x3c, 0x0c, 0xe0, 0x97, 0xe3, 0x36, 0x44, 0xa1, 0x0f, 0xe4, 0xc3, 0x04, 0x54, 0x06, 0x9a, 0x44, 0x54, 0xf0, 0xfa, 0x9d, 0x4e, diff --git a/src_common/ethUstream.c b/src_common/ethUstream.c index dd23d5c..83e9055 100644 --- a/src_common/ethUstream.c +++ b/src_common/ethUstream.c @@ -411,7 +411,6 @@ static parserStatus_e parseRLP(txContext_t *context) { } // Ready to process this field if (!rlpDecodeLength(context->rlpBuffer, - context->rlpBufferPos, &context->currentFieldLength, &offset, &context->currentFieldIsList)) { diff --git a/src_common/ethUtils.c b/src_common/ethUtils.c index 07797c4..2c88821 100644 --- a/src_common/ethUtils.c +++ b/src_common/ethUtils.c @@ -58,11 +58,7 @@ bool rlpCanDecode(uint8_t *buffer, uint32_t bufferLength, bool *valid) { return true; } -bool rlpDecodeLength(uint8_t *buffer, - uint32_t bufferLength, - uint32_t *fieldLength, - uint32_t *offset, - bool *list) { +bool rlpDecodeLength(uint8_t *buffer, uint32_t *fieldLength, uint32_t *offset, bool *list) { if (*buffer <= 0x7f) { *offset = 0; *fieldLength = 1; diff --git a/src_common/ethUtils.h b/src_common/ethUtils.h index 0c7a242..adc08a2 100644 --- a/src_common/ethUtils.h +++ b/src_common/ethUtils.h @@ -26,7 +26,6 @@ * @brief Decode an RLP encoded field - see * https://github.com/ethereum/wiki/wiki/RLP * @param [in] buffer buffer containing the RLP encoded field to decode - * @param [in] bufferLength size of the buffer * @param [out] fieldLength length of the RLP encoded field * @param [out] offset offset to the beginning of the RLP encoded field from the * buffer @@ -34,11 +33,7 @@ * string * @return true if the RLP header is consistent */ -bool rlpDecodeLength(uint8_t *buffer, - uint32_t bufferLength, - uint32_t *fieldLength, - uint32_t *offset, - bool *list); +bool rlpDecodeLength(uint8_t *buffer, uint32_t *fieldLength, uint32_t *offset, bool *list); bool rlpCanDecode(uint8_t *buffer, uint32_t bufferLength, bool *valid); diff --git a/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c b/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c index 4bc4e76..ca10fc3 100644 --- a/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c +++ b/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c @@ -4,7 +4,7 @@ #include "feature_getEth2PublicKey.h" #include "ui_callbacks.h" -unsigned int io_seproxyhal_touch_eth2_address_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_eth2_address_ok(__attribute__((unused)) const bagl_element_t *e) { uint32_t tx = set_result_get_eth2_publicKey(); G_io_apdu_buffer[tx++] = 0x90; G_io_apdu_buffer[tx++] = 0x00; diff --git a/src_features/getPublicKey/ui_common_getPublicKey.c b/src_features/getPublicKey/ui_common_getPublicKey.c index 23a0f66..c7bd3a3 100644 --- a/src_features/getPublicKey/ui_common_getPublicKey.c +++ b/src_features/getPublicKey/ui_common_getPublicKey.c @@ -2,7 +2,7 @@ #include "feature_getPublicKey.h" #include "ui_callbacks.h" -unsigned int io_seproxyhal_touch_address_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_address_ok(__attribute__((unused)) const bagl_element_t *e) { uint32_t tx = set_result_get_publicKey(); G_io_apdu_buffer[tx++] = 0x90; G_io_apdu_buffer[tx++] = 0x00; @@ -14,7 +14,7 @@ unsigned int io_seproxyhal_touch_address_ok(const bagl_element_t *e) { return 0; // do not redraw the widget } -unsigned int io_seproxyhal_touch_address_cancel(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_address_cancel(__attribute__((unused)) const bagl_element_t *e) { G_io_apdu_buffer[0] = 0x69; G_io_apdu_buffer[1] = 0x85; reset_app_context(); diff --git a/src_features/provideErc20TokenInformation/cmd_provideTokenInfo.c b/src_features/provideErc20TokenInformation/cmd_provideTokenInfo.c index 5f73191..c924084 100644 --- a/src_features/provideErc20TokenInformation/cmd_provideTokenInfo.c +++ b/src_features/provideErc20TokenInformation/cmd_provideTokenInfo.c @@ -102,7 +102,7 @@ void handleProvideErc20TokenInformation(uint8_t p1, uint8_t *workBuffer, uint16_t dataLength, unsigned int *flags, - unsigned int *tx) { + __attribute__((unused)) unsigned int *tx) { UNUSED(p1); UNUSED(p2); UNUSED(flags); diff --git a/src_features/setEth2WithdrawalIndex/cmd_setEth2WithdrawalIndex.c b/src_features/setEth2WithdrawalIndex/cmd_setEth2WithdrawalIndex.c index ea99f03..d2338ef 100644 --- a/src_features/setEth2WithdrawalIndex/cmd_setEth2WithdrawalIndex.c +++ b/src_features/setEth2WithdrawalIndex/cmd_setEth2WithdrawalIndex.c @@ -7,8 +7,8 @@ void handleSetEth2WithdrawalIndex(uint8_t p1, uint8_t p2, uint8_t *dataBuffer, uint16_t dataLength, - unsigned int *flags, - unsigned int *tx) { + __attribute__((unused)) unsigned int *flags, + __attribute__((unused)) unsigned int *tx) { if (dataLength != 4) { THROW(0x6700); } diff --git a/src_features/setExternalPlugin/cmd_setExternalPlugin.c b/src_features/setExternalPlugin/cmd_setExternalPlugin.c index 494915b..729df20 100644 --- a/src_features/setExternalPlugin/cmd_setExternalPlugin.c +++ b/src_features/setExternalPlugin/cmd_setExternalPlugin.c @@ -65,8 +65,8 @@ void handleSetExternalPlugin(uint8_t p1, CATCH_OTHER(e) { PRINTF("%s external plugin is not present\n", dataContext.tokenContext.pluginName); memset(dataContext.tokenContext.pluginName, - sizeof(dataContext.tokenContext.pluginName), - 0); + 0, + sizeof(dataContext.tokenContext.pluginName)); THROW(0x6984); } FINALLY { diff --git a/src_features/signMessage/cmd_signMessage.c b/src_features/signMessage/cmd_signMessage.c index 3703b28..2c5ec6f 100644 --- a/src_features/signMessage/cmd_signMessage.c +++ b/src_features/signMessage/cmd_signMessage.c @@ -3,7 +3,7 @@ #include "utils.h" #include "ui_flow.h" -static const char const SIGN_MAGIC[] = +static const char SIGN_MAGIC[] = "\x19" "Ethereum Signed Message:\n"; diff --git a/src_features/signMessage/ui_common_signMessage.c b/src_features/signMessage/ui_common_signMessage.c index 3e53a26..5ca15a5 100644 --- a/src_features/signMessage/ui_common_signMessage.c +++ b/src_features/signMessage/ui_common_signMessage.c @@ -1,7 +1,7 @@ #include "shared_context.h" #include "ui_callbacks.h" -unsigned int io_seproxyhal_touch_signMessage_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_signMessage_ok(__attribute__((unused)) const bagl_element_t *e) { uint8_t privateKeyData[INT256_LENGTH]; uint8_t signature[100]; uint8_t signatureLength; @@ -46,7 +46,8 @@ unsigned int io_seproxyhal_touch_signMessage_ok(const bagl_element_t *e) { return 0; // do not redraw the widget } -unsigned int io_seproxyhal_touch_signMessage_cancel(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_signMessage_cancel(__attribute__((unused)) + const bagl_element_t *e) { reset_app_context(); G_io_apdu_buffer[0] = 0x69; G_io_apdu_buffer[1] = 0x85; diff --git a/src_features/signMessageEIP712/ui_common_signMessage712.c b/src_features/signMessageEIP712/ui_common_signMessage712.c index 1abdfc3..b887ebd 100644 --- a/src_features/signMessageEIP712/ui_common_signMessage712.c +++ b/src_features/signMessageEIP712/ui_common_signMessage712.c @@ -1,9 +1,10 @@ #include "shared_context.h" #include "ui_callbacks.h" -static const uint8_t const EIP_712_MAGIC[] = {0x19, 0x01}; +static const uint8_t EIP_712_MAGIC[] = {0x19, 0x01}; -unsigned int io_seproxyhal_touch_signMessage712_v0_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_signMessage712_v0_ok(__attribute__((unused)) + const bagl_element_t *e) { uint8_t privateKeyData[INT256_LENGTH]; uint8_t hash[INT256_LENGTH]; uint8_t signature[100]; @@ -70,7 +71,8 @@ unsigned int io_seproxyhal_touch_signMessage712_v0_ok(const bagl_element_t *e) { return 0; // do not redraw the widget } -unsigned int io_seproxyhal_touch_signMessage712_v0_cancel(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_signMessage712_v0_cancel(__attribute__((unused)) + const bagl_element_t *e) { reset_app_context(); G_io_apdu_buffer[0] = 0x69; G_io_apdu_buffer[1] = 0x85; diff --git a/src_features/signTx/feature_signTx.h b/src_features/signTx/feature_signTx.h index fdcab3e..8b58591 100644 --- a/src_features/signTx/feature_signTx.h +++ b/src_features/signTx/feature_signTx.h @@ -2,5 +2,4 @@ customStatus_e customProcessor(txContext_t *context); void finalizeParsing(bool direct); - void ux_approve_tx(bool dataPresent); \ No newline at end of file diff --git a/src_features/signTx/logic_signTx.c b/src_features/signTx/logic_signTx.c index 14a889c..33bc9ee 100644 --- a/src_features/signTx/logic_signTx.c +++ b/src_features/signTx/logic_signTx.c @@ -2,6 +2,7 @@ #include "utils.h" #include "ui_callbacks.h" #include "ui_flow.h" +#include "feature_signTx.h" #ifdef HAVE_STARKWARE #include "stark_utils.h" #endif diff --git a/src_features/signTx/ui_common_signTx.c b/src_features/signTx/ui_common_signTx.c index 89b2e91..2419c24 100644 --- a/src_features/signTx/ui_common_signTx.c +++ b/src_features/signTx/ui_common_signTx.c @@ -2,7 +2,7 @@ #include "utils.h" #include "ui_callbacks.h" -unsigned int io_seproxyhal_touch_tx_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_tx_ok(__attribute__((unused)) const bagl_element_t *e) { uint8_t privateKeyData[INT256_LENGTH]; uint8_t signature[100]; uint8_t signatureLength; @@ -58,7 +58,7 @@ unsigned int io_seproxyhal_touch_tx_ok(const bagl_element_t *e) { return 0; // do not redraw the widget } -unsigned int io_seproxyhal_touch_tx_cancel(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_tx_cancel(__attribute__((unused)) const bagl_element_t *e) { reset_app_context(); G_io_apdu_buffer[0] = 0x69; G_io_apdu_buffer[1] = 0x85; @@ -69,7 +69,7 @@ unsigned int io_seproxyhal_touch_tx_cancel(const bagl_element_t *e) { return 0; // do not redraw the widget } -unsigned int io_seproxyhal_touch_data_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_data_ok(__attribute__((unused)) const bagl_element_t *e) { parserStatus_e txResult = USTREAM_FINISHED; txResult = continueTx(&txContext); switch (txResult) { @@ -100,7 +100,7 @@ unsigned int io_seproxyhal_touch_data_ok(const bagl_element_t *e) { return 0; } -unsigned int io_seproxyhal_touch_data_cancel(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_data_cancel(__attribute__((unused)) const bagl_element_t *e) { reset_app_context(); io_seproxyhal_send_status(0x6985); // Display back the original UX diff --git a/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c b/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c index db03c53..94a6658 100644 --- a/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c +++ b/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c @@ -4,7 +4,7 @@ #include "ui_callbacks.h" #include "feature_stark_getPublicKey.h" -unsigned int io_seproxyhal_touch_stark_pubkey_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_stark_pubkey_ok(__attribute__((unused)) const bagl_element_t *e) { uint32_t tx = set_result_get_stark_publicKey(); G_io_apdu_buffer[tx++] = 0x90; G_io_apdu_buffer[tx++] = 0x00; diff --git a/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c b/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c index 6433e33..15f6d16 100644 --- a/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c +++ b/src_features/stark_provideQuantum/cmd_stark_provideQuantum.c @@ -5,11 +5,11 @@ #include "ui_flow.h" void handleStarkwareProvideQuantum(uint8_t p1, - uint8_t p2, + __attribute__((unused)) uint8_t p2, uint8_t *dataBuffer, uint16_t dataLength, - unsigned int *flags, - unsigned int *tx) { + __attribute__((unused)) unsigned int *flags, + __attribute__((unused)) unsigned int *tx) { size_t i = 0; uint8_t expectedDataSize = 20 + 32; uint8_t addressZero = 0; diff --git a/src_features/stark_sign/cmd_stark_sign.c b/src_features/stark_sign/cmd_stark_sign.c index 2420f48..9329838 100644 --- a/src_features/stark_sign/cmd_stark_sign.c +++ b/src_features/stark_sign/cmd_stark_sign.c @@ -16,7 +16,7 @@ void handleStarkwareSignMessage(uint8_t p1, uint8_t *dataBuffer, uint16_t dataLength, unsigned int *flags, - unsigned int *tx) { + __attribute__((unused)) unsigned int *tx) { uint8_t privateKeyData[INT256_LENGTH]; uint32_t i; uint8_t bip32PathLength = *(dataBuffer); diff --git a/src_features/stark_sign/ui_common_stark_sign.c b/src_features/stark_sign/ui_common_stark_sign.c index 9443f72..b5feede 100644 --- a/src_features/stark_sign/ui_common_stark_sign.c +++ b/src_features/stark_sign/ui_common_stark_sign.c @@ -4,7 +4,7 @@ #include "stark_utils.h" #include "ui_callbacks.h" -unsigned int io_seproxyhal_touch_stark_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_stark_ok(__attribute__((unused)) const bagl_element_t *e) { uint8_t privateKeyData[32]; uint8_t signature[72]; uint32_t tx = 0; diff --git a/src_features/stark_unsafe_sign/cmd_stark_unsafe_sign.c b/src_features/stark_unsafe_sign/cmd_stark_unsafe_sign.c index 0f3e10c..e899816 100644 --- a/src_features/stark_unsafe_sign/cmd_stark_unsafe_sign.c +++ b/src_features/stark_unsafe_sign/cmd_stark_unsafe_sign.c @@ -11,7 +11,7 @@ void handleStarkwareUnsafeSign(uint8_t p1, uint8_t *dataBuffer, uint16_t dataLength, unsigned int *flags, - unsigned int *tx) { + __attribute__((unused)) unsigned int *tx) { uint32_t i; uint8_t privateKeyData[INT256_LENGTH]; cx_ecfp_public_key_t publicKey; diff --git a/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c b/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c index fcd7375..2a75200 100644 --- a/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c +++ b/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c @@ -4,7 +4,8 @@ #include "stark_utils.h" #include "ui_callbacks.h" -unsigned int io_seproxyhal_touch_stark_unsafe_sign_ok(const bagl_element_t *e) { +unsigned int io_seproxyhal_touch_stark_unsafe_sign_ok(__attribute__((unused)) + const bagl_element_t *e) { cx_ecfp_private_key_t privateKey; uint8_t privateKeyData[INT256_LENGTH]; uint8_t signature[72]; diff --git a/src_plugins/compound/compound_plugin.c b/src_plugins/compound/compound_plugin.c index 5a0742d..e2b129e 100644 --- a/src_plugins/compound/compound_plugin.c +++ b/src_plugins/compound/compound_plugin.c @@ -43,7 +43,7 @@ typedef struct underlying_asset_decimals_t { the cToken decimals. Therefore, we hardcode a binding table. If Compound adds a lot of token in the future, we will have to move to a CAL based architecture instead, as this one doesn't scale well.*/ #define NUM_COMPOUND_BINDINGS 9 -const underlying_asset_decimals_t const UNDERLYING_ASSET_DECIMALS[NUM_COMPOUND_BINDINGS] = { +const underlying_asset_decimals_t UNDERLYING_ASSET_DECIMALS[NUM_COMPOUND_BINDINGS] = { {"cDAI", 18}, {"CETH", 18}, {"CUSDC", 6}, diff --git a/src_plugins/erc20/erc20_plugin.c b/src_plugins/erc20/erc20_plugin.c index 99d8332..d3ba536 100644 --- a/src_plugins/erc20/erc20_plugin.c +++ b/src_plugins/erc20/erc20_plugin.c @@ -28,7 +28,7 @@ typedef struct contract_t { } contract_t; #define NUM_CONTRACTS 11 -const contract_t const CONTRACTS[NUM_CONTRACTS] = { +const contract_t CONTRACTS[NUM_CONTRACTS] = { // Compound {"Compound DAI", {0x5d, 0x3a, 0x53, 0x6e, 0x4d, 0x6d, 0xbd, 0x61, 0x14, 0xcc, 0x1e, 0xad, 0x35, 0x77, 0x7b, 0xab, 0x94, 0x8e, 0x36, 0x43}}, diff --git a/src_plugins/eth2/eth2_plugin.c b/src_plugins/eth2/eth2_plugin.c index 6c18826..9cb69be 100644 --- a/src_plugins/eth2/eth2_plugin.c +++ b/src_plugins/eth2/eth2_plugin.c @@ -32,14 +32,6 @@ typedef struct eth2_deposit_parameters_t { char deposit_address[ETH2_DEPOSIT_PUBKEY_LENGTH]; } eth2_deposit_parameters_t; -static void to_lowercase(char *str, unsigned char size) { - for (unsigned char i = 0; i < size && str[i] != 0; i++) { - if (str[i] >= 'A' && str[i] <= 'Z') { - str[i] += 'a' - 'A'; - } - } -} - // Fills the `out` buffer with the lowercase string representation of the pubkey passed in as binary // format by `in`. Does not check the size, so expects `out` to be big enough to hold the string // representation. Returns the length of string (counting the null terminating character).