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

Move u64_to_string

Browse Source
This commit is contained in:
pscott
2021-08-26 13:59:42 +02:00
parent ca67cb819f
commit 94363738fe
3 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src_common/ethUtils.c
View File

@@ -133,6 +133,34 @@ void getEthAddressStringFromKey(cx_ecfp_public_key_t *publicKey,
getEthAddressStringFromBinary(hashAddress + 12, out, sha3Context, chain_config);
}
void u64_to_string(uint64_t src, char *dst, uint8_t dst_size) {
// Copy the numbers in ASCII format.
uint8_t i = 0;
do {
// Checking `i + 1` to make sure we have enough space for '\0'.
if (i + 1 >= dst_size) {
THROW(0x6502);
}
dst[i] = src % 10 + '0';
src /= 10;
i++;
} while (src);
// Null terminate string
dst[i] = '\0';
// Revert the string
i--;
uint8_t j = 0;
while (j < i) {
char tmp = dst[i];
dst[i] = dst[j];
dst[j] = tmp;
i--;
j++;
}
}
void getEthAddressStringFromBinary(uint8_t *address,
char *out,
cx_sha3_t *sha3Context,
@@ -153,11 +181,9 @@ void getEthAddressStringFromBinary(uint8_t *address,
break;
}
if (eip1191) {
snprintf((char *) locals_union.tmp,
sizeof(locals_union.tmp),
"%d0x",
chain_config->chainId);
offset = strlen((char *) locals_union.tmp);
u64_to_string(chain_config->chainId, (char *) locals_union.tmp, sizeof(locals_union.tmp));
offset = strnlen((char *) locals_union.tmp, sizeof(locals_union.tmp));
strlcat((char *) locals_union.tmp + offset, "0x", sizeof(locals_union.tmp) - offset);
}
for (i = 0; i < 20; i++) {
uint8_t digit = address[i];

2
src_common/ethUtils.h
View File

@@ -44,6 +44,8 @@ void getEthAddressStringFromKey(cx_ecfp_public_key_t *publicKey,
cx_sha3_t *sha3Context,
chain_config_t *chain_config);
void u64_to_string(uint64_t src, char *dst, uint8_t dst_size);
void getEthAddressStringFromBinary(uint8_t *address,
char *out,
cx_sha3_t *sha3Context,

29
src_features/signTx/logic_signTx.c
View File

@@ -8,6 +8,7 @@
#endif
#include "eth_plugin_handler.h"
#include "network.h"
#include "ethUtils.h"
#define ERR_SILENT_MODE_CHECK_FAILED 0x6001
@@ -257,34 +258,6 @@ void prepareFeeDisplay() {
sizeof(strings.common.maxFee));
}
static void u64_to_string(uint64_t src, char *dst, uint8_t dst_size) {
// Copy the numbers in ASCII format.
uint8_t i = 0;
do {
// Checking `i + 1` to make sure we have enough space for '\0'.
if (i + 1 >= dst_size) {
THROW(0x6502);
}
dst[i] = src % 10 + '0';
src /= 10;
i++;
} while (src);
// Null terminate string
dst[i] = '\0';
// Revert the string
i--;
uint8_t j = 0;
while (j < i) {
char tmp = dst[i];
dst[i] = dst[j];
dst[j] = tmp;
i--;
j++;
}
}
void prepareNetworkDisplay() {
char *name = get_network_name();
if (name == NULL) {