diff --git a/ledger.py b/ledger.py index db02b88..b49f41e 100644 --- a/ledger.py +++ b/ledger.py @@ -189,22 +189,19 @@ def create_lots_for(tx, conn=None): created = [] tx_type = tx["type"] fee_sats = tx["fee_sats"] or 0 - fee_ore = tx["fee_ore"] or 0 if tx_type == "trade" and tx["leg_in_sats"]: sats = tx["leg_in_sats"] - fee_sats - # The NOK that left the account. docs/spec.md section 5.1 says - # leg_in_ore, but a leg carries one currency only (the CHECK of - # section 4), so a buy keeps it on leg_out_ore. + # The kroner that left the account (docs/spec.md section 5.1). nok_paid = tx["leg_out_ore"] if nok_paid is None: nok_paid = tx["leg_in_ore"] - cost_ore = (nok_paid or 0) + fee_ore + cost_ore = nok_paid or 0 elif tx_type == "income" and tx["leg_in_sats"]: sats = tx["leg_in_sats"] - fee_sats - cost_ore = max((tx["value_ore"] or 0) - fee_ore, 0) + cost_ore = tx["value_ore"] or 0 elif tx_type == "gift_received" and tx["leg_in_sats"]: sats = tx["leg_in_sats"] - fee_sats - cost_ore = (tx["value_ore"] or 0) + fee_ore + cost_ore = tx["value_ore"] or 0 else: return created if sats > 0: