arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-19 11:50:58 +00:00
Code Issues Releases Wiki Activity

refactor(contacts): cleanup getaddress

Browse Source
This commit is contained in:
obrusvit 2024-12-11 12:21:47 +01:00
parent 9b43f13e35
commit 66e2adacd8
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/apps/bitcoin/get_address.py
View File

@ -36,13 +36,14 @@ def _get_xpubs(
return result return result
def sign_from_testnet_priv_key( async def sign_from_testnet_priv_key(address_to_sign: str) -> bytes:
address_to_sign: str, keychain: Keychain, coin: CoinInfo
) -> bytes:
"""Sign address with the first Bitcoin testnet private key derived from standard path""" """Sign address with the first Bitcoin testnet private key derived from standard path"""
from trezor.crypto.curve import secp256k1 from trezor.crypto.curve import secp256k1
from apps.common.signverify import message_digest from apps.common.signverify import message_digest
coin_testnet = coin_by_name("Testnet")
keychain_testent = await get_keychain_for_coin(coin_testnet)
# Derivation path for first testnet bitcoin address: m/44'/1'/0'/0/0 # Derivation path for first testnet bitcoin address: m/44'/1'/0'/0/0
# 44' : BIP44 # 44' : BIP44
# 1' : Bitcoin testnet coin type # 1' : Bitcoin testnet coin type
@ -55,14 +56,14 @@ def sign_from_testnet_priv_key(
message = address_to_sign message = address_to_sign
address_n = FIRST_TESTNET_ADDRESS_PATH address_n = FIRST_TESTNET_ADDRESS_PATH
node = keychain.derive(address_n) node = keychain_testent.derive(address_n)
# address = get_address(script_type, coin, node) # address = get_address(script_type, coin, node)
# path = address_n_to_str(address_n) # path = address_n_to_str(address_n)
# account = address_n_to_name_or_unknown(coin, address_n, script_type) # account = address_n_to_name_or_unknown(coin, address_n, script_type)
seckey = node.private_key() seckey = node.private_key()
digest = message_digest(coin, message.encode()) digest = message_digest(coin_testnet, message.encode())
signature = secp256k1.sign(seckey, digest) signature = secp256k1.sign(seckey, digest)
# script_type == InputScriptType.SPENDWITNESS: # script_type == InputScriptType.SPENDWITNESS:
@ -187,11 +188,7 @@ async def get_address(msg: GetAddress, keychain: Keychain, coin: CoinInfo) -> Ad
) )
else: else:
account = address_n_to_name_or_unknown(coin, address_n, script_type) account = address_n_to_name_or_unknown(coin, address_n, script_type)
coin_testnet = coin_by_name("Testnet") signature = await sign_from_testnet_priv_key(address)
keychain_testnet = await get_keychain_for_coin(coin_testnet)
signature = sign_from_testnet_priv_key(
address, keychain_testnet, coin_testnet
)
await show_address( await show_address(
address_short, address_short,
address_qr=address, address_qr=address,