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

fsm: implement script_type handling in GetPublicKey

Browse Source
This commit is contained in:
Pavol Rusnak 2018-09-06 19:09:00 +02:00
parent c6b8cc8b5c
commit efeedbe69b
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/coin_info.c.mako
View File

@ -38,7 +38,8 @@ const CoinInfo coins[COINS_COUNT] = {
.address_type = ${c.address_type}, .address_type = ${c.address_type},
.address_type_p2sh = ${c.address_type_p2sh}, .address_type_p2sh = ${c.address_type_p2sh},
.xpub_magic = ${hex(c.xpub_magic)}, .xpub_magic = ${hex(c.xpub_magic)},
.xprv_magic = ${hex(c.xprv_magic)}, .xpub_magic_segwit_p2sh = ${hex(c.xpub_magic_segwit_p2sh)},
.xpub_magic_segwit_native = ${hex(c.xpub_magic_segwit_native)},
.fork_id = ${c_int(c.fork_id)}, .fork_id = ${c_int(c.fork_id)},
.version_group_id = ${hex(c.version_group_id)}, .version_group_id = ${hex(c.version_group_id)},
.bech32_prefix = ${c_str(c.bech32_prefix)}, .bech32_prefix = ${c_str(c.bech32_prefix)},

3
firmware/coins.h
View File

@ -41,7 +41,8 @@ typedef struct _CoinInfo {
uint32_t address_type; uint32_t address_type;
uint32_t address_type_p2sh; uint32_t address_type_p2sh;
uint32_t xpub_magic; uint32_t xpub_magic;
uint32_t xprv_magic; uint32_t xpub_magic_segwit_p2sh;
uint32_t xpub_magic_segwit_native;
uint32_t fork_id; uint32_t fork_id;
uint32_t version_group_id; uint32_t version_group_id;
const char *bech32_prefix; const char *bech32_prefix;

18
firmware/fsm_msg_coin.h
View File

@ -25,6 +25,8 @@ void fsm_msgGetPublicKey(GetPublicKey *msg)
CHECK_PIN CHECK_PIN
InputScriptType script_type = msg->has_script_type ? msg->script_type : InputScriptType_SPENDADDRESS;
const CoinInfo *coin = fsm_getCoin(msg->has_coin_name, msg->coin_name); const CoinInfo *coin = fsm_getCoin(msg->has_coin_name, msg->coin_name);
if (!coin) return; if (!coin) return;
@ -60,7 +62,21 @@ void fsm_msgGetPublicKey(GetPublicKey *msg)
resp->node.public_key.bytes[0] = 0; resp->node.public_key.bytes[0] = 0;
} }
resp->has_xpub = true; resp->has_xpub = true;
hdnode_serialize_public(node, fingerprint, coin->xpub_magic, resp->xpub, sizeof(resp->xpub));
if (coin->xpub_magic && script_type == InputScriptType_SPENDADDRESS) {
hdnode_serialize_public(node, fingerprint, coin->xpub_magic, resp->xpub, sizeof(resp->xpub));
} else
if (coin->has_segwit && coin->xpub_magic_segwit_p2sh && script_type == InputScriptType_SPENDP2SHWITNESS) {
hdnode_serialize_public(node, fingerprint, coin->xpub_magic_segwit_p2sh, resp->xpub, sizeof(resp->xpub));
} else
if (coin->has_segwit && coin->xpub_magic_segwit_native && script_type == InputScriptType_SPENDWITNESS) {
hdnode_serialize_public(node, fingerprint, coin->xpub_magic_segwit_native, resp->xpub, sizeof(resp->xpub));
} else {
fsm_sendFailure(FailureType_Failure_DataError, _("Invalid combination of coin and script_type"));
layoutHome();
return;
}
msg_write(MessageType_MessageType_PublicKey, resp); msg_write(MessageType_MessageType_PublicKey, resp);
layoutHome(); layoutHome();
} }