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 approval check.

Browse Source 
After fixing the TxWeightCalculator the approver needs to account for the
weight of the coordinator's output.
This commit is contained in:
Andrew Kozlik 2021-11-02 00:25:30 +01:00 committed by Andrew Kozlik
parent 56ac799626
commit ef2ad57ec8
1 changed files with 7 additions and 2 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

@ -257,6 +257,8 @@ class BasicApprover(Approver):
class CoinJoinApprover(Approver): class CoinJoinApprover(Approver):
MAX_OUTPUT_WEIGHT = const(4 * 43)
def __init__( def __init__(
self, tx: SignTx, coin: CoinInfo, authorization: CoinJoinAuthorization self, tx: SignTx, coin: CoinInfo, authorization: CoinJoinAuthorization
) -> None: ) -> None:
@ -319,9 +321,12 @@ class CoinJoinApprover(Approver):
if mining_fee > (self.coin.maxfee_kb / 1000) * (self.weight.get_total() / 4): if mining_fee > (self.coin.maxfee_kb / 1000) * (self.weight.get_total() / 4):
raise wire.ProcessError("Mining fee over threshold") raise wire.ProcessError("Mining fee over threshold")
# The maximum mining fee that the user should be paying. # The maximum mining fee that the user should be paying assuming that participants share
# the fees for the coordinator's output.
our_max_mining_fee = ( our_max_mining_fee = (
mining_fee * self.our_weight.get_total() / self.weight.get_total() mining_fee
* self.our_weight.get_total()
/ (self.weight.get_total() - self.MAX_OUTPUT_WEIGHT)
) )
# The coordinator fee for the user's outputs. # The coordinator fee for the user's outputs.