arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-30 03:18:20 +00:00
Code Issues Releases Wiki Activity

vendor: Update trezor-crypto

Browse Source
This commit is contained in:
Saleem Rashid 2017-07-26 16:54:04 +01:00 committed by Pavol Rusnak
parent 38b6332db5
commit 11d424cdef
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/ethereum.c
View File

@ -228,7 +228,7 @@ static void ethereumFormatAmount(const bignum256 *amnt, const TokenType *token,
default: suffix = " UNKN"; break; // unknown chain default: suffix = " UNKN"; break; // unknown chain
} }
} }
bn_format(amnt, NULL, suffix, decimals, buf, buflen); bn_format(amnt, NULL, suffix, decimals, 0, false, buf, buflen);
} }
static void layoutEthereumConfirmTx(const uint8_t *to, uint32_t to_len, const uint8_t *value, uint32_t value_len, const TokenType *token) static void layoutEthereumConfirmTx(const uint8_t *to, uint32_t to_len, const uint8_t *value, uint32_t value_len, const TokenType *token)

15
firmware/layout2.c
View File

@ -98,9 +98,7 @@ void layoutHome(void)
void layoutConfirmOutput(const CoinType *coin, const TxOutputType *out) void layoutConfirmOutput(const CoinType *coin, const TxOutputType *out)
{ {
char str_out[32]; char str_out[32];
bignum256 amnt; bn_format_uint64(out->amount, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_out, sizeof(str_out));
bn_read_uint64(out->amount, &amnt);
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_out, sizeof(str_out));
static char first_half[17 + 1]; static char first_half[17 + 1];
strlcpy(first_half, out->address, sizeof(first_half)); strlcpy(first_half, out->address, sizeof(first_half));
layoutDialogSwipe(&bmp_icon_question, layoutDialogSwipe(&bmp_icon_question,
@ -119,11 +117,8 @@ void layoutConfirmOutput(const CoinType *coin, const TxOutputType *out)
void layoutConfirmTx(const CoinType *coin, uint64_t amount_out, uint64_t amount_fee) void layoutConfirmTx(const CoinType *coin, uint64_t amount_out, uint64_t amount_fee)
{ {
char str_out[32], str_fee[32]; char str_out[32], str_fee[32];
bignum256 amnt; bn_format_uint64(amount_out, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_out, sizeof(str_out));
bn_read_uint64(amount_out, &amnt); bn_format_uint64(amount_fee, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_fee, sizeof(str_fee));
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_out, sizeof(str_out));
bn_read_uint64(amount_fee, &amnt);
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_fee, sizeof(str_fee));
layoutDialogSwipe(&bmp_icon_question, layoutDialogSwipe(&bmp_icon_question,
_("Cancel"), _("Cancel"),
_("Confirm"), _("Confirm"),
@ -140,9 +135,7 @@ void layoutConfirmTx(const CoinType *coin, uint64_t amount_out, uint64_t amount_
void layoutFeeOverThreshold(const CoinType *coin, uint64_t fee) void layoutFeeOverThreshold(const CoinType *coin, uint64_t fee)
{ {
char str_fee[32]; char str_fee[32];
bignum256 amnt; bn_format_uint64(fee, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_fee, sizeof(str_fee));
bn_read_uint64(fee, &amnt);
bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_fee, sizeof(str_fee));
layoutDialogSwipe(&bmp_icon_question, layoutDialogSwipe(&bmp_icon_question,
_("Cancel"), _("Cancel"),
_("Confirm"), _("Confirm"),

2
vendor/trezor-crypto vendored

@ -1 +1 @@
Subproject commit dfdb4d2d766506e9f54dd2c69c5e664fe4e39304 Subproject commit 66993f9e9248d9d74a0c9997a95461bcd4a9dbe8