Merge branch 'develop' into add-conflux-espace-2

CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.9.18](https://github.com/ledgerhq/app-ethereum/compare/1.9.17...1.9.18) - 2022-04-25
+
+### Added
+
+- Easier way of adding a chain into the Makefile
+- EIP 1024 support
+- Conflux chain
+- Moonbeam chain
+- KardiaChain
+- BitTorrent Chain
+- Wethio chain
+
+### Changed
+
+- More uniform naming between the ERC-721 & ERC-1155 screens
+
+### Fixed
+
+- CI (mostly Zemu tests)
+- App crashing when trying to approve an NFT transaction without having received the NFT information beforehand
+- App refusing to approve an NFT transaction with a long collection name
+
 ## [1.9.17](https://github.com/ledgerhq/app-ethereum/compare/1.9.16...1.9.17) - 2022-01-14
 
 ### Added

Makefile

@@ -34,8 +34,8 @@ APP_LOAD_PARAMS += --path "1517992542'/1101353413'"
 
 APPVERSION_M=1
 APPVERSION_N=9
-APPVERSION_P=18
-APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
+APPVERSION_P=19
+APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)-dev
 APP_LOAD_FLAGS= --appFlags 0x240 --dep Ethereum:$(APPVERSION)
 
 ###########################

src/handle_check_address.c

@@ -16,7 +16,7 @@ int handle_check_address(check_address_parameters_t* params, chain_config_t* cha
     }
 
     uint8_t i;
-    uint8_t* bip32_path_ptr = params->address_parameters;
+    const uint8_t* bip32_path_ptr = params->address_parameters;
     uint8_t bip32PathLength = *(bip32_path_ptr++);
     cx_sha3_t local_sha3;
 

src/swap_lib_calls.h

@@ -11,43 +11,45 @@
 
 #define GET_PRINTABLE_AMOUNT 4
 
+#define MAX_PRINTABLE_AMOUNT_SIZE 50
+
 // structure that should be send to specific coin application to get address
 typedef struct check_address_parameters_s {
     // IN
-    unsigned char* coin_configuration;
-    unsigned char coin_configuration_length;
+    const unsigned char* const coin_configuration;
+    const unsigned char coin_configuration_length;
     // serialized path, segwit, version prefix, hash used, dictionary etc.
     // fields and serialization format depends on spesific coin app
-    unsigned char* address_parameters;
-    unsigned char address_parameters_length;
-    char* address_to_check;
-    char* extra_id_to_check;
+    const unsigned char* const address_parameters;
+    const unsigned char address_parameters_length;
+    const char* const address_to_check;
+    const char* const extra_id_to_check;
     // OUT
     int result;
 } check_address_parameters_t;
 
 // structure that should be send to specific coin application to get printable amount
 typedef struct get_printable_amount_parameters_s {
     // IN
-    unsigned char* coin_configuration;
-    unsigned char coin_configuration_length;
-    unsigned char* amount;
-    unsigned char amount_length;
-    bool is_fee;
+    const unsigned char* const coin_configuration;
+    const unsigned char coin_configuration_length;
+    const unsigned char* const amount;
+    const unsigned char amount_length;
+    const bool is_fee;
     // OUT
-    char printable_amount[30];
+    char printable_amount[MAX_PRINTABLE_AMOUNT_SIZE];
     // int result;
 } get_printable_amount_parameters_t;
 
 typedef struct create_transaction_parameters_s {
-    unsigned char* coin_configuration;
-    unsigned char coin_configuration_length;
-    unsigned char* amount;
-    unsigned char amount_length;
-    unsigned char* fee_amount;
-    unsigned char fee_amount_length;
-    char* destination_address;
-    char* destination_address_extra_id;
+    const unsigned char* const coin_configuration;
+    const unsigned char coin_configuration_length;
+    const unsigned char* const amount;
+    const unsigned char amount_length;
+    const unsigned char* const fee_amount;
+    const unsigned char fee_amount_length;
+    const char* const destination_address;
+    const char* const destination_address_extra_id;
 } create_transaction_parameters_t;
 
 #endif  // _SWAP_LIB_CALLS_H_

src/utils.c

@@ -138,7 +138,7 @@ void amountToString(const uint8_t *amount,
     out_buffer[out_buffer_size - 1] = '\0';
 }
 
-bool parse_swap_config(uint8_t *config, uint8_t config_len, char *ticker, uint8_t *decimals) {
+bool parse_swap_config(const uint8_t *config, uint8_t config_len, char *ticker, uint8_t *decimals) {
     uint8_t ticker_len, offset = 0;
     if (config_len == 0) {
         return false;

src/utils.h

@@ -39,6 +39,6 @@ void amountToString(const uint8_t* amount,
                     char* out_buffer,
                     size_t out_buffer_size);
 
-bool parse_swap_config(uint8_t* config, uint8_t config_len, char* ticker, uint8_t* decimals);
+bool parse_swap_config(const uint8_t* config, uint8_t config_len, char* ticker, uint8_t* decimals);
 
 #endif  // _UTILS_H_