arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-08 22:40:59 +00:00
Code Issues Releases Wiki Activity

use bn_format from trezor-crypto where possible

Browse Source
This commit is contained in:
Pavol Rusnak 2017-05-18 16:19:10 +02:00
parent ba9aae143e
commit 652a40c3e6
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 48 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
firmware/ethereum.c
View File

@ -192,102 +192,36 @@ static void send_signature(void)
ethereum_signing_abort();
}
/* Format a 256 bit number (amount in wei) into a human readable format
* using standard ethereum units.
* The buffer must be at least 25 bytes.
*/
static void ethereumFormatAmount(bignum256 *val, char buffer[25], const TokenType *token)
static void ethereumFormatAmount(const bignum256 *amnt, const TokenType *token, char *buf, int buflen)
{
// TODO: use token->decimals to properly format amount
char value[25] = {0};
char *value_ptr = value;
// convert val into base 1000 for easy printing.
uint16_t num[26];
uint8_t last_used = 0;
for (int i = 0; i < 26; i++) {
uint32_t limb;
bn_divmod1000(val, &limb);
// limb is < 1000.
num[i] = (uint16_t) limb;
if (limb > 0) {
last_used = i;
}
}
if (last_used < 3) {
// value is smaller than 1e9 wei => show value in wei
for (int i = last_used; i >= 0; i--) {
*value_ptr++ = '0' + (num[i] / 100) % 10;
*value_ptr++ = '0' + (num[i] / 10) % 10;
*value_ptr++ = '0' + (num[i]) % 10;
}
strcpy(value_ptr, " Wei");
// value is at most 9 + 4 + 1 characters long
} else if (last_used < 10) {
// value is bigger than 1e9 wei and smaller than 1e12 ETH => show value in ETH
int i = last_used;
if (i < 6)
i = 6;
int end = i - 4;
while (i >= end) {
*value_ptr++ = '0' + (num[i] / 100) % 10;
*value_ptr++ = '0' + (num[i] / 10) % 10;
*value_ptr++ = '0' + (num[i]) % 10;
if (i == 6)
*value_ptr++ = '.';
i--;
}
while (value_ptr[-1] == '0') // remove trailing zeros
value_ptr--;
// remove trailing dot.
if (value_ptr[-1] == '.')
value_ptr--;
if (token) {
strcpy(value_ptr, token->ticker); // ERC-20 Token
} else {
switch (chain_id) {
case 61:
strcpy(value_ptr, " ETC"); // Ethereum Classic Mainnet
break;
case 62:
strcpy(value_ptr, " tETC"); // Ethereum Classic Testnet
break;
case 30:
strcpy(value_ptr, " RSK"); // Rootstock Mainnet
break;
case 31:
strcpy(value_ptr, " tRSK"); // Rootstock Testnet
break;
case 3:
strcpy(value_ptr, " tETH"); // Ethereum Testnet: Ropsten
break;
case 4:
strcpy(value_ptr, " tETH"); // Ethereum Testnet: Rinkeby
break;
case 42:
strcpy(value_ptr, " tETH"); // Ethereum Testnet: Kovan
break;
default:
strcpy(value_ptr, " ETH"); // Ethereum Mainnet
break;
}
}
// value is at most 16 + 4 + 1 characters long
bignum256 bn1e9;
bn_read_uint32(1000000000, &bn1e9);
const char *suffix = NULL;
int decimals = 18;
if (token != NULL) {
suffix = token->ticker;
decimals = token->decimals;
} else
if (bn_is_less(amnt, &bn1e9)) {
suffix = " Wei";
decimals = 0;
} else {
// value is bigger than 1e9 ETH => won't fit on display (probably won't happen unless you are Vitalik)
strlcpy(value, "gazillions of money", sizeof(value));
switch (chain_id) {
case 61: suffix = " ETC"; break; // Ethereum Classic Mainnet
case 62: suffix = " tETC"; break; // Ethereum Classic Testnet
case 30: suffix = " RSK"; break; // Rootstock Mainnet
case 31: suffix = " tRSK"; break; // Rootstock Testnet
case 3: suffix = " tETH"; break; // Ethereum Testnet: Ropsten
case 4: suffix = " tETH"; break; // Ethereum Testnet: Rinkeby
case 42: suffix = " tETH"; break; // Ethereum Testnet: Kovan
default: suffix = " ETH"; break; // Ethereum Mainnet
}
}
// skip leading zeroes
value_ptr = value;
while (*value_ptr == '0' && *(value_ptr + 1) >= '0' && *(value_ptr + 1) <= '9') {
value_ptr++;
}
// copy to destination buffer
strcpy(buffer, value_ptr);
bn_format(amnt, NULL, suffix, decimals, buf, buflen);
}
static void layoutEthereumConfirmTx(const uint8_t *to, uint32_t to_len, const uint8_t *value, uint32_t value_len, const TokenType *token)
@ -298,15 +232,15 @@ static void layoutEthereumConfirmTx(const uint8_t *to, uint32_t to_len, const ui
memcpy(pad_val + (32 - value_len), value, value_len);
bn_read_be(pad_val, &val);
char amount[25];
char amount[32];
if (token == NULL) {
if (bn_is_zero(&val)) {
strcpy(amount, "message");
} else {
ethereumFormatAmount(&val, amount, NULL);
ethereumFormatAmount(&val, NULL, amount, sizeof(amount));
}
} else {
ethereumFormatAmount(&val, amount, token);
ethereumFormatAmount(&val, token, amount, sizeof(amount));
}
static char _to1[17] = {0};
@ -384,8 +318,8 @@ static void layoutEthereumFee(const uint8_t *value, uint32_t value_len,
{
bignum256 val, gas;
uint8_t pad_val[32];
char tx_value[25];
char gas_value[25];
char tx_value[32];
char gas_value[32];
memset(pad_val, 0, sizeof(pad_val));
memcpy(pad_val + (32 - gas_price_len), gas_price, gas_price_len);
@ -396,7 +330,7 @@ static void layoutEthereumFee(const uint8_t *value, uint32_t value_len,
bn_read_be(pad_val, &gas);
bn_multiply(&val, &gas, &secp256k1.prime);
ethereumFormatAmount(&gas, gas_value, NULL);
ethereumFormatAmount(&gas, NULL, gas_value, sizeof(gas_value));
memset(pad_val, 0, sizeof(pad_val));
memcpy(pad_val + (32 - value_len), value, value_len);
@ -405,7 +339,7 @@ static void layoutEthereumFee(const uint8_t *value, uint32_t value_len,
if (bn_is_zero(&val)) {
strcpy(tx_value, is_token ? "token" : "message");
} else {
ethereumFormatAmount(&val, tx_value, NULL);
ethereumFormatAmount(&val, NULL, tx_value, sizeof(tx_value));
}
layoutDialogSwipe(&bmp_icon_question,

2
firmware/ethereum_tokens-gen.py
View File

@ -21,4 +21,4 @@ for t in tokens:
if symbol in subst:
symbol = subst[symbol]
address = '\\x'.join([address[i:i + 2] for i in range(0, len(address), 2)])[2:].lower()
print('\t{"%s", " %s", %d},' % (address, symbol, decimal))
print('\t{"%s", "%s", %d},' % (address, symbol, decimal))

52
firmware/layout2.c
View File

@ -29,6 +29,7 @@
#include "util.h"
#include "qr_encode.h"
#include "timer.h"
#include "bignum.h"
void *layoutLast = layoutHome;
@ -87,42 +88,14 @@ void layoutHome(void)
system_millis_lock_start = system_millis;
}
const char *str_amount(uint64_t amnt, const char *abbr, char *buf, int len)
{
memset(buf, 0, len);
uint64_t a = amnt, b = 1;
int i;
for (i = 0; i < 8; i++) {
buf[16 - i] = '0' + (a / b) % 10;
b *= 10;
}
buf[8] = '.';
for (i = 0; i < 8; i++) {
buf[7 - i] = '0' + (a / b) % 10;
b *= 10;
}
i = 17;
while (i > 10 && buf[i - 1] == '0') { // drop trailing zeroes
i--;
}
if (abbr) {
buf[i] = ' ';
strlcpy(buf + i + 1, abbr, len - i - 1);
} else {
buf[i] = 0;
}
const char *r = buf;
while (*r == '0' && *(r + 1) != '.') r++; // drop leading zeroes
return r;
}
static char buf_out[32], buf_fee[32];
void layoutConfirmOutput(const CoinType *coin, const TxOutputType *out)
{
char str_out[32];
bignum256 amnt;
bn_read_uint64(out->amount, &amnt);
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, 8, str_out, sizeof(str_out));
static char first_half[17 + 1];
strlcpy(first_half, out->address, sizeof(first_half));
const char *str_out = str_amount(out->amount, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, buf_out, sizeof(buf_out));
layoutDialogSwipe(&bmp_icon_question,
"Cancel",
"Confirm",
@ -138,8 +111,12 @@ void layoutConfirmOutput(const CoinType *coin, const TxOutputType *out)
void layoutConfirmTx(const CoinType *coin, uint64_t amount_out, uint64_t amount_fee)
{
const char *str_out = str_amount(amount_out, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, buf_out, sizeof(buf_out));
const char *str_fee = str_amount(amount_fee, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, buf_fee, sizeof(buf_fee));
char str_out[32], str_fee[32];
bignum256 amnt;
bn_read_uint64(amount_out, &amnt);
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, 8, str_out, sizeof(str_out));
bn_read_uint64(amount_fee, &amnt);
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, 8, str_fee, sizeof(str_fee));
layoutDialogSwipe(&bmp_icon_question,
"Cancel",
"Confirm",
@ -155,13 +132,16 @@ void layoutConfirmTx(const CoinType *coin, uint64_t amount_out, uint64_t amount_
void layoutFeeOverThreshold(const CoinType *coin, uint64_t fee)
{
const char *str_out = str_amount(fee, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, buf_out, sizeof(buf_out));
char str_fee[32];
bignum256 amnt;
bn_read_uint64(fee, &amnt);
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, 8, str_fee, sizeof(str_fee));
layoutDialogSwipe(&bmp_icon_question,
"Cancel",
"Confirm",
NULL,
"Fee",
str_out,
str_fee,
"is unexpectedly high.",
NULL,
"Send anyway?",

2
vendor/trezor-crypto vendored

@ -1 +1 @@
Subproject commit ea227fd805fb97aa2fa76a89bfd05d44012d153f
Subproject commit af01ef71fc51b57e2de9436c65a235ea94b33df2