arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-05 15:48:45 +00:00
Code Issues Releases Wiki Activity

cashaddr: Don't show coin prefix on the display.

Browse Source 
While technically part of the address, the coin prefix, e.g., bitcoincash:
is implicit and doesn't need to be checked by the user.  We still
include it in the QR-code though.

Also set case-insensitive flag for QR-code.
This commit is contained in:
Jochen Hoenicke 2018-02-07 19:56:50 +01:00 committed by Pavol Rusnak
parent 1e91f92271
commit 059555039c
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/fsm.c
View File

@ -217,11 +217,15 @@ static HDNode *fsm_getDerivedNode(const char *curve, const uint32_t *address_n,
return &node; return &node;
} }
static bool fsm_layoutAddress(const char *address, const char *desc, bool ignorecase, const uint32_t *address_n, size_t address_n_count) static bool fsm_layoutAddress(const char *address, const char *desc, bool ignorecase, size_t prefixlen, const uint32_t *address_n, size_t address_n_count)
{ {
bool qrcode = false; bool qrcode = false;
for (;;) { for (;;) {
layoutAddress(address, desc, qrcode, ignorecase, address_n, address_n_count); const char* display_addr = address;
if (prefixlen && !qrcode) {
display_addr += prefixlen;
}
layoutAddress(display_addr, desc, qrcode, ignorecase, address_n, address_n_count);
if (protectButton(ButtonRequestType_ButtonRequest_Address, false)) { if (protectButton(ButtonRequestType_ButtonRequest_Address, false)) {
return true; return true;
} }
@ -835,7 +839,9 @@ void fsm_msgGetAddress(GetAddress *msg)
} }
} }
if (!fsm_layoutAddress(address, desc, msg->script_type == InputScriptType_SPENDWITNESS, msg->address_n, msg->address_n_count)) { bool is_cashaddr = coin->cashaddr_prefix != NULL;
bool is_bech32 = msg->script_type == InputScriptType_SPENDWITNESS;
if (!fsm_layoutAddress(address, desc, is_cashaddr || is_bech32, is_cashaddr ? strlen(coin->cashaddr_prefix) + 1 : 0, msg->address_n, msg->address_n_count)) {
return; return;
} }
} }
@ -868,7 +874,7 @@ void fsm_msgEthereumGetAddress(EthereumGetAddress *msg)
char address[43] = { '0', 'x' }; char address[43] = { '0', 'x' };
ethereum_address_checksum(resp->address.bytes, address + 2); ethereum_address_checksum(resp->address.bytes, address + 2);
if (!fsm_layoutAddress(address, desc, false, msg->address_n, msg->address_n_count)) { if (!fsm_layoutAddress(address, desc, false, 0, msg->address_n, msg->address_n_count)) {
return; return;
} }
} }
@ -1293,7 +1299,7 @@ void fsm_msgNEMGetAddress(NEMGetAddress *msg)
strlcpy(desc, network, sizeof(desc)); strlcpy(desc, network, sizeof(desc));
strlcat(desc, ":", sizeof(desc)); strlcat(desc, ":", sizeof(desc));
if (!fsm_layoutAddress(resp->address, desc, true, msg->address_n, msg->address_n_count)) { if (!fsm_layoutAddress(resp->address, desc, true, 0, msg->address_n, msg->address_n_count)) {
return; return;
} }
} }

10
firmware/layout2.c
View File

@ -250,6 +250,16 @@ void layoutConfirmOutput(const CoinInfo *coin, const TxOutputType *out)
bn_format_uint64(out->amount, NULL, coin->coin_shortcut, BITCOIN_DIVISIBILITY, 0, false, str_out, sizeof(str_out) - 3); bn_format_uint64(out->amount, NULL, coin->coin_shortcut, BITCOIN_DIVISIBILITY, 0, false, str_out, sizeof(str_out) - 3);
strlcat(str_out, " to", sizeof(str_out)); strlcat(str_out, " to", sizeof(str_out));
const char *addr = out->address; const char *addr = out->address;
if (coin->cashaddr_prefix) {
/* If this is a cashaddr address, remove the prefix from the
* string presented to the user
*/
int prefix_len = strlen(coin->cashaddr_prefix);
if (strncmp(addr, coin->cashaddr_prefix, prefix_len) == 0
&& addr[prefix_len] == ':') {
addr += prefix_len + 1;
}
}
int addrlen = strlen(addr); int addrlen = strlen(addr);
int numlines = addrlen <= 42 ? 2 : 3; int numlines = addrlen <= 42 ? 2 : 3;
int linelen = (addrlen - 1) / numlines + 1; int linelen = (addrlen - 1) / numlines + 1;