network: cleanup

This commit is contained in:
Alexandre Paillier
2023-05-04 11:52:16 +02:00
parent be029c642d
commit b5c58b59cf
5 changed files with 52 additions and 21 deletions

View File

@@ -195,7 +195,7 @@ static void address_to_string(uint8_t *in,
}
static void raw_fee_to_string(uint256_t *rawFee, char *displayBuffer, uint32_t displayBufferSize) {
const char *feeTicker = get_network_ticker();
const char *feeTicker = get_tx_network_ticker();
uint8_t tickerOffset = 0;
uint32_t i;
@@ -262,10 +262,10 @@ static void nonce_to_string(const txInt256_t *nonce, char *out, size_t out_size)
}
static void get_network_as_string(char *out, size_t out_size) {
const char *name = get_network_name();
const char *name = get_tx_network_name();
if (name == NULL) {
// No network name found so simply copy the chain ID as the network name.
uint64_t chain_id = get_chain_id();
uint64_t chain_id = get_tx_chain_id();
u64_to_string(chain_id, out, out_size);
} else {
// Network name found, simply copy it.
@@ -312,13 +312,13 @@ static int strcasecmp_workaround(const char *str1, const char *str2) {
void finalizeParsing(bool direct) {
char displayBuffer[50];
uint8_t decimals = WEI_TO_ETHER;
const char *ticker = get_network_ticker();
const char *ticker = get_tx_network_ticker();
ethPluginFinalize_t pluginFinalize;
bool use_standard_UI = true;
// Verify the chain
if (chainConfig->chainId != ETHEREUM_MAINNET_CHAINID) {
uint64_t id = get_chain_id();
uint64_t id = get_tx_chain_id();
if (chainConfig->chainId != id) {
PRINTF("Invalid chainID %u expected %u\n", id, chainConfig->chainId);