d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get_displayable_ticker function now takes a given chain_config_t struct

Browse Source
This commit is contained in:
Alexandre Paillier
2024-02-08 15:07:49 +01:00
parent df74ace5c2
commit c84794b257
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eth_plugin_handler.c
View File

@@ -67,7 +67,9 @@ void eth_plugin_prepare_query_contract_UI(ethQueryContractUI_t *queryContractUI,
queryContractUI->screenIndex = screenIndex;
chain_id = get_tx_chain_id();
strlcpy(queryContractUI->network_ticker, get_displayable_ticker(&chain_id), MAX_TICKER_LEN);
strlcpy(queryContractUI->network_ticker,
get_displayable_ticker(&chain_id, chainConfig),
sizeof(queryContractUI->network_ticker));
queryContractUI->title = title;
queryContractUI->titleLength = titleLength;
queryContractUI->msg = msg;

4
src/network.c
View File

@@ -136,11 +136,11 @@ uint64_t get_tx_chain_id(void) {
return chain_id;
}
const char *get_displayable_ticker(const uint64_t *chain_id) {
const char *get_displayable_ticker(const uint64_t *chain_id, const chain_config_t *chain_cfg) {
const char *ticker = get_network_ticker_from_chain_id(chain_id);
if (ticker == NULL) {
ticker = chainConfig->coinName;
ticker = chain_cfg->coinName;
}
return ticker;
}

3
src/network.h
View File

@@ -2,6 +2,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "chainConfig.h"
#define UNSUPPORTED_CHAIN_ID_MSG(id) \
do { \
@@ -16,4 +17,4 @@ bool app_compatible_with_chain_id(const uint64_t *chain_id);
uint64_t get_tx_chain_id(void);
const char *get_displayable_ticker(const uint64_t *chain_id);
const char *get_displayable_ticker(const uint64_t *chain_id, const chain_config_t *chain_cfg);

4
src_features/signTx/logic_signTx.c
View File

@@ -200,7 +200,7 @@ static void address_to_string(uint8_t *in,
static void raw_fee_to_string(uint256_t *rawFee, char *displayBuffer, uint32_t displayBufferSize) {
uint64_t chain_id = get_tx_chain_id();
const char *feeTicker = get_displayable_ticker(&chain_id);
const char *feeTicker = get_displayable_ticker(&chain_id, chainConfig);
uint8_t tickerOffset = 0;
uint32_t i;
@@ -323,7 +323,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
char displayBuffer[50];
uint8_t decimals = WEI_TO_ETHER;
uint64_t chain_id = get_tx_chain_id();
const char *ticker = get_displayable_ticker(&chain_id);
const char *ticker = get_displayable_ticker(&chain_id, chainConfig);
ethPluginFinalize_t pluginFinalize;
*use_standard_UI = true;