arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 14:28:07 +00:00
Code Issues Releases Wiki Activity

chore(core): Move node derivation outside of input_derive_script().

Browse Source
This commit is contained in:
Andrew Kozlik 2022-10-12 16:32:44 +02:00 committed by Andrew Kozlik
parent afd900f9b1
commit b3a383efac
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/apps/bitcoin/sign_tx/bitcoin.py
View File

@ -160,8 +160,6 @@ class Bitcoin:
# STAGE_REQUEST_1_INPUT in legacy # STAGE_REQUEST_1_INPUT in legacy
progress.advance() progress.advance()
txi = await helpers.request_tx_input(self.tx_req, i, self.coin) txi = await helpers.request_tx_input(self.tx_req, i, self.coin)
script_pubkey = self.input_derive_script(txi)
self.tx_info.add_input(txi, script_pubkey)
if txi.script_type not in ( if txi.script_type not in (
InputScriptType.SPENDTAPROOT, InputScriptType.SPENDTAPROOT,
InputScriptType.EXTERNAL, InputScriptType.EXTERNAL,
@ -172,13 +170,18 @@ class Bitcoin:
self.segwit.add(i) self.segwit.add(i)
if input_is_external(txi): if input_is_external(txi):
node = None
self.external.add(i) self.external.add(i)
if txi.witness or txi.script_sig: if txi.witness or txi.script_sig:
self.presigned.add(i) self.presigned.add(i)
writers.write_tx_input_check(h_presigned_inputs_check, txi) writers.write_tx_input_check(h_presigned_inputs_check, txi)
await self.process_external_input(txi, script_pubkey) await self.process_external_input(txi, script_pubkey)
else: else:
await self.process_internal_input(txi) node = self.keychain.derive(txi.address_n)
await self.process_internal_input(txi, node)
script_pubkey = self.input_derive_script(txi, node)
self.tx_info.add_input(txi, script_pubkey)
if txi.orig_hash: if txi.orig_hash:
await self.process_original_input(txi, script_pubkey) await self.process_original_input(txi, script_pubkey)
@ -324,7 +327,7 @@ class Bitcoin:
progress.assert_finished() progress.assert_finished()
await helpers.request_tx_finish(self.tx_req) await helpers.request_tx_finish(self.tx_req)
async def process_internal_input(self, txi: TxInput) -> None: async def process_internal_input(self, txi: TxInput, node: bip32.HDNode) -> None:
if txi.script_type not in common.INTERNAL_INPUT_SCRIPT_TYPES: if txi.script_type not in common.INTERNAL_INPUT_SCRIPT_TYPES:
raise wire.DataError("Wrong input script type") raise wire.DataError("Wrong input script type")
@ -903,12 +906,16 @@ class Bitcoin:
# scriptPubKey derivation # scriptPubKey derivation
# === # ===
def input_derive_script(self, txi: TxInput) -> bytes: def input_derive_script(
self, txi: TxInput, node: bip32.HDNode | None = None
) -> bytes:
if input_is_external(txi): if input_is_external(txi):
assert txi.script_pubkey is not None # checked in sanitize_tx_input assert txi.script_pubkey is not None # checked in sanitize_tx_input
return txi.script_pubkey return txi.script_pubkey
node = self.keychain.derive(txi.address_n) if node is None:
node = self.keychain.derive(txi.address_n)
address = addresses.get_address(txi.script_type, self.coin, node, txi.multisig) address = addresses.get_address(txi.script_type, self.coin, node, txi.multisig)
return scripts.output_derive_script(address, self.coin) return scripts.output_derive_script(address, self.coin)

5
core/src/apps/bitcoin/sign_tx/decred.py
View File

@ -28,6 +28,7 @@ OUTPUT_SCRIPT_NULL_SSTXCHANGE = (
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import Sequence from typing import Sequence
from trezor.crypto import bip32
from trezor.messages import ( from trezor.messages import (
SignTx, SignTx,
TxInput, TxInput,
@ -181,8 +182,8 @@ class Decred(Bitcoin):
if self.serialize: if self.serialize:
self.write_tx_footer(self.serialized_tx, self.tx_info.tx) self.write_tx_footer(self.serialized_tx, self.tx_info.tx)
async def process_internal_input(self, txi: TxInput) -> None: async def process_internal_input(self, txi: TxInput, node: bip32.HDNode) -> None:
await super().process_internal_input(txi) await super().process_internal_input(txi, node)
# Decred serializes inputs early. # Decred serializes inputs early.
if self.serialize: if self.serialize:

6
core/src/apps/zcash/signer.py
View File

@ -71,10 +71,10 @@ class Zcash(Bitcoinlike):
await self.sign_nonsegwit_bip143_input(i_sign) await self.sign_nonsegwit_bip143_input(i_sign)
def sign_bip143_input(self, i: int, txi: TxInput) -> tuple[bytes, bytes]: def sign_bip143_input(self, i: int, txi: TxInput) -> tuple[bytes, bytes]:
signature_digest = self.tx_info.sig_hasher.hash_zip244(
txi, self.input_derive_script(txi)
)
node = self.keychain.derive(txi.address_n) node = self.keychain.derive(txi.address_n)
signature_digest = self.tx_info.sig_hasher.hash_zip244(
txi, self.input_derive_script(txi, node)
)
signature = ecdsa_sign(node, signature_digest) signature = ecdsa_sign(node, signature_digest)
return node.public_key(), signature return node.public_key(), signature