arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-29 04:08:46 +00:00
Code Issues Releases Wiki Activity

core/sign_tx: Rework transaction header writing.

Browse Source
This commit is contained in:
Andrew Kozlik 2020-04-23 20:26:01 +02:00 committed by Andrew Kozlik
parent c1effcc374
commit b60f267da9
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/apps/wallet/sign_tx/bitcoin.py
View File

@ -160,7 +160,9 @@ class Bitcoin:
raise SigningError(FailureType.ActionCancelled, "Total cancelled") raise SigningError(FailureType.ActionCancelled, "Total cancelled")
async def step4_serialize_inputs(self) -> None: async def step4_serialize_inputs(self) -> None:
self.write_sign_tx_header(self.serialized_tx, bool(self.segwit)) self.write_tx_header(self.serialized_tx, self.tx, bool(self.segwit))
writers.write_varint(self.serialized_tx, self.tx.inputs_count)
for i in range(self.tx.inputs_count): for i in range(self.tx.inputs_count):
progress.advance() progress.advance()
if i in self.segwit: if i in self.segwit:
@ -294,7 +296,8 @@ class Bitcoin:
# should come out the same as h_confirmed, checked before signing the digest # should come out the same as h_confirmed, checked before signing the digest
h_check = self.create_hash_writer() h_check = self.create_hash_writer()
self.write_sign_tx_header(h_sign, has_segwit=False) self.write_tx_header(h_sign, self.tx, has_segwit=False)
writers.write_varint(h_sign, self.tx.inputs_count)
for i in range(self.tx.inputs_count): for i in range(self.tx.inputs_count):
# STAGE_REQUEST_4_INPUT # STAGE_REQUEST_4_INPUT
@ -430,10 +433,6 @@ class Bitcoin:
def write_tx_input(self, w: writers.Writer, txi: TxInputType) -> None: def write_tx_input(self, w: writers.Writer, txi: TxInputType) -> None:
writers.write_tx_input(w, txi) writers.write_tx_input(w, txi)
def write_sign_tx_header(self, w: writers.Writer, has_segwit: bool) -> None:
self.write_tx_header(w, self.tx, has_segwit)
writers.write_varint(w, self.tx.inputs_count)
def write_sign_tx_footer(self, w: writers.Writer) -> None: def write_sign_tx_footer(self, w: writers.Writer) -> None:
writers.write_uint32(w, self.tx.lock_time) writers.write_uint32(w, self.tx.lock_time)

14
core/src/apps/wallet/sign_tx/decred.py
View File

@ -69,7 +69,8 @@ class Decred(Bitcoin):
return HashWriter(blake256()) return HashWriter(blake256())
async def step1_process_inputs(self) -> None: async def step1_process_inputs(self) -> None:
self.write_sign_tx_header(self.serialized_tx, False) self.write_tx_header(self.serialized_tx, self.tx, has_segwit=False)
writers.write_varint(self.serialized_tx, self.tx.inputs_count)
await super().step1_process_inputs() await super().step1_process_inputs()
async def step2_confirm_outputs(self) -> None: async def step2_confirm_outputs(self) -> None:
@ -179,14 +180,15 @@ class Decred(Bitcoin):
def write_tx_input(self, w: writers.Writer, txi: TxInputType) -> None: def write_tx_input(self, w: writers.Writer, txi: TxInputType) -> None:
writers.write_tx_input_decred(w, txi) writers.write_tx_input_decred(w, txi)
def write_sign_tx_header(self, w: writers.Writer, has_segwit: bool) -> None:
writers.write_uint32(w, self.tx.version) # nVersion
writers.write_varint(w, self.tx.inputs_count)
def write_tx_header( def write_tx_header(
self, w: writers.Writer, tx: Union[SignTx, TransactionType], has_segwit: bool self, w: writers.Writer, tx: Union[SignTx, TransactionType], has_segwit: bool
) -> None: ) -> None:
writers.write_uint32(w, tx.version | DECRED_SERIALIZE_NO_WITNESS) if isinstance(tx, TransactionType):
version = tx.version | DECRED_SERIALIZE_NO_WITNESS
else:
version = tx.version | DECRED_SERIALIZE_FULL
writers.write_uint32(w, version)
def write_sign_tx_footer(self, w: writers.Writer) -> None: def write_sign_tx_footer(self, w: writers.Writer) -> None:
pass pass