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

fix(core): Fix CoinJoin anonymity gain check in bitcoin approver.

Browse Source
This commit is contained in:
Andrew Kozlik 2020-10-16 14:21:45 +02:00 committed by Andrew Kozlik
parent ded61a4ccf
commit 9a594f4784
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/apps/bitcoin/sign_tx/approvers.py
View File

@ -159,10 +159,6 @@ class CoinJoinApprover(Approver):
self._add_output(txo, script_pubkey) self._add_output(txo, script_pubkey)
async def approve_tx(self) -> None: async def approve_tx(self) -> None:
# Ensure that at least one of the user's outputs is in a group with an external output.
if not self.anonymity:
raise wire.ProcessError("No anonymity gain")
# The mining fee of the transaction as a whole. # The mining fee of the transaction as a whole.
mining_fee = self.total_in - self.total_out mining_fee = self.total_in - self.total_out
@ -184,6 +180,11 @@ class CoinJoinApprover(Approver):
if our_fees > our_coordinator_fee + our_max_mining_fee: if our_fees > our_coordinator_fee + our_max_mining_fee:
raise wire.ProcessError("Total fee over threshold") raise wire.ProcessError("Total fee over threshold")
# Ensure that at least one of the user's outputs is in a group with an external output.
# Note: _get_coordinator_fee() needs to be called before checking this.
if not self.anonymity:
raise wire.ProcessError("No anonymity gain")
if self.tx.lock_time > 0: if self.tx.lock_time > 0:
raise wire.ProcessError("nLockTime not allowed in CoinJoin") raise wire.ProcessError("nLockTime not allowed in CoinJoin")