From c27d59d7924407e0de8c82fbfb1a5181b149239d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20B=C3=A9drune?= Date: Thu, 15 Jul 2021 17:43:47 +0200 Subject: [PATCH] Fix last compilation warnings Signed-off-by: pscott --- Makefile | 2 +- ethereum-plugin-sdk | 2 +- src/eth_plugin_ui.c | 5 +++++ src/handle_check_address.c | 2 +- src/shared_context.h | 2 +- src_common/ethUtils.c | 2 +- src_common/ethUtils.h | 2 +- src_features/signTx/logic_signTx.c | 2 +- src_features/stark_sign/ui_flow_stark_sign.c | 2 +- src_plugins/erc20/erc20_plugin.c | 2 +- src_plugins/eth2/eth2_plugin.c | 2 +- src_plugins/starkware/starkware_plugin.c | 4 ++-- 12 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index a3cd567..1f6ad89 100755 --- a/Makefile +++ b/Makefile @@ -312,7 +312,7 @@ endif CC := $(CLANGPATH)clang #CFLAGS += -O0 -CFLAGS += -O3 -Os -Wno-format-invalid-specifier -Wno-format-extra-args -Wno-main +CFLAGS += -O3 -Os -Wno-format-invalid-specifier -Wno-format-extra-args AS := $(GCCPATH)arm-none-eabi-gcc diff --git a/ethereum-plugin-sdk b/ethereum-plugin-sdk index aeaf645..394febe 160000 --- a/ethereum-plugin-sdk +++ b/ethereum-plugin-sdk @@ -1 +1 @@ -Subproject commit aeaf6450c32c8134a7d19b1852554771ca8bc4be +Subproject commit 394febefb735613cf7149748716bfe5ff980c08e diff --git a/src/eth_plugin_ui.c b/src/eth_plugin_ui.c index cfd737c..db5c4fc 100644 --- a/src/eth_plugin_ui.c +++ b/src/eth_plugin_ui.c @@ -13,6 +13,11 @@ typedef enum { } plugin_ui_state_t; +#ifdef TARGET_NANOS +// This function is not exported by the SDK +void ux_layout_paging_redisplay_by_addr(unsigned int stack_slot); +#endif + void computeFees(char *displayBuffer, uint32_t displayBufferSize); void plugin_ui_get_id() { diff --git a/src/handle_check_address.c b/src/handle_check_address.c index afe9aa7..7686205 100644 --- a/src/handle_check_address.c +++ b/src/handle_check_address.c @@ -59,7 +59,7 @@ int handle_check_address(check_address_parameters_t* params, chain_config_t* cha cx_ecfp_generate_pair(CX_CURVE_256K1, &locals_union2.publicKey, &locals_union1.privateKey, 1); ZERO(locals_union1); getEthAddressStringFromKey(&locals_union2.publicKey, - (uint8_t*) locals_union1.address, + locals_union1.address, &local_sha3, chain_config); ZERO(locals_union2); diff --git a/src/shared_context.h b/src/shared_context.h index ea5e2b4..fe0711c 100644 --- a/src/shared_context.h +++ b/src/shared_context.h @@ -79,7 +79,7 @@ typedef struct tokenContext_t { typedef struct publicKeyContext_t { cx_ecfp_public_key_t publicKey; - uint8_t address[41]; + char address[41]; uint8_t chainCode[INT256_LENGTH]; bool getChaincode; } publicKeyContext_t; diff --git a/src_common/ethUtils.c b/src_common/ethUtils.c index 8093428..3ad545e 100644 --- a/src_common/ethUtils.c +++ b/src_common/ethUtils.c @@ -134,7 +134,7 @@ void getEthAddressStringFromKey(cx_ecfp_public_key_t *publicKey, } void getEthAddressStringFromBinary(uint8_t *address, - uint8_t *out, + char *out, cx_sha3_t *sha3Context, chain_config_t *chain_config) { // save some precious stack space diff --git a/src_common/ethUtils.h b/src_common/ethUtils.h index cb41acd..67712a7 100644 --- a/src_common/ethUtils.h +++ b/src_common/ethUtils.h @@ -45,7 +45,7 @@ void getEthAddressStringFromKey(cx_ecfp_public_key_t *publicKey, chain_config_t *chain_config); void getEthAddressStringFromBinary(uint8_t *address, - uint8_t *out, + char *out, cx_sha3_t *sha3Context, chain_config_t *chain_config); diff --git a/src_features/signTx/logic_signTx.c b/src_features/signTx/logic_signTx.c index 688bd34..cc1d3f3 100644 --- a/src_features/signTx/logic_signTx.c +++ b/src_features/signTx/logic_signTx.c @@ -385,7 +385,7 @@ void finalizeParsing(bool direct) { displayBuffer[0] = '0'; displayBuffer[1] = 'x'; getEthAddressStringFromBinary(tmpContent.txContent.destination, - (uint8_t *) displayBuffer + 2, + displayBuffer + 2, &global_sha3, chainConfig); compareOrCopy(strings.common.fullAddress, displayBuffer, called_from_swap); diff --git a/src_features/stark_sign/ui_flow_stark_sign.c b/src_features/stark_sign/ui_flow_stark_sign.c index c1df89d..6f1b247 100644 --- a/src_features/stark_sign/ui_flow_stark_sign.c +++ b/src_features/stark_sign/ui_flow_stark_sign.c @@ -17,7 +17,7 @@ void stark_sign_display_condition_address() { strings.tmp.tmp[0] = '0'; strings.tmp.tmp[1] = 'x'; getEthAddressStringFromBinary(dataContext.starkContext.conditionAddress, - (uint8_t *) (strings.tmp.tmp + 2), + strings.tmp.tmp + 2, &global_sha3, chainConfig); strings.tmp.tmp[42] = '\0'; diff --git a/src_plugins/erc20/erc20_plugin.c b/src_plugins/erc20/erc20_plugin.c index d3ba536..d45b29a 100644 --- a/src_plugins/erc20/erc20_plugin.c +++ b/src_plugins/erc20/erc20_plugin.c @@ -209,7 +209,7 @@ void erc20_plugin_call(int message, void *parameters) { msg->msg[0] = '0'; msg->msg[1] = 'x'; getEthAddressStringFromBinary(context->destinationAddress, - (uint8_t *) msg->msg + 2, + msg->msg + 2, msg->pluginSharedRW->sha3, chainConfig); } diff --git a/src_plugins/eth2/eth2_plugin.c b/src_plugins/eth2/eth2_plugin.c index 9cb69be..4d0f7f0 100644 --- a/src_plugins/eth2/eth2_plugin.c +++ b/src_plugins/eth2/eth2_plugin.c @@ -38,7 +38,7 @@ typedef struct eth2_deposit_parameters_t { static int getEthDisplayableAddress(char *out, uint8_t *in, cx_sha3_t *sha3) { out[0] = '0'; out[1] = 'x'; - getEthAddressStringFromBinary(in, (uint8_t *) out + 2, sha3, chainConfig); + getEthAddressStringFromBinary(in, out + 2, sha3, chainConfig); uint8_t destinationLen = strlen(out) + 1; // Adding one to account for \0. diff --git a/src_plugins/starkware/starkware_plugin.c b/src_plugins/starkware/starkware_plugin.c index 6f0ffe5..be1e71e 100644 --- a/src_plugins/starkware/starkware_plugin.c +++ b/src_plugins/starkware/starkware_plugin.c @@ -284,7 +284,7 @@ void starkware_print_eth_address(uint8_t *address, char *destination) { destination[0] = '0'; destination[1] = 'x'; getEthAddressStringFromBinary(address, - (uint8_t *) (destination + 2), + destination + 2, &global_sha3, chainConfig); destination[42] = '\0'; @@ -369,7 +369,7 @@ void starkware_get_source_address(char *destination) { destination[0] = '0'; destination[1] = 'x'; getEthAddressStringFromKey(&publicKey, - (uint8_t *) (destination + 2), + destination + 2, &global_sha3, chainConfig); destination[42] = '\0';