electrum

commit 74982719274c063655c150717bbb22d35b719b51
parent 5b7ce98ab2d97b43fa90f9bbfc6faa3820d8e512
Author: SomberNight <somber.night@protonmail.com>
Date:   Sat, 28 Mar 2020 16:29:39 +0100

follow-up prev: htlc direction madness

Sometimes direction was relative sometimes absolute... ?!
No. Make it always relative (to subject).

Diffstat:
M
electrum/lnchannel.py
 | 
18
+++++++-----------

1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/electrum/lnchannel.py b/electrum/lnchannel.py
@@ -890,19 +890,15 @@ class Channel(Logger):
         other = subject.inverted()
         local_msat = self.balance(subject, ctx_owner=subject, ctn=ctn)
         remote_msat = self.balance(other, ctx_owner=subject, ctn=ctn)
-        received_htlcs = self.hm.htlcs_by_direction(subject, SENT if subject == LOCAL else RECEIVED, ctn).values()
-        sent_htlcs = self.hm.htlcs_by_direction(subject, RECEIVED if subject == LOCAL else SENT, ctn).values()
-        if subject != LOCAL:
-            remote_msat -= htlcsum(received_htlcs)
-            local_msat -= htlcsum(sent_htlcs)
-        else:
-            remote_msat -= htlcsum(sent_htlcs)
-            local_msat -= htlcsum(received_htlcs)
+        received_htlcs = self.hm.htlcs_by_direction(subject, RECEIVED, ctn).values()
+        sent_htlcs = self.hm.htlcs_by_direction(subject, SENT, ctn).values()
+        remote_msat -= htlcsum(received_htlcs)
+        local_msat -= htlcsum(sent_htlcs)
         assert remote_msat >= 0
         assert local_msat >= 0
         # same htlcs as before, but now without dust.
-        received_htlcs = self.included_htlcs(subject, SENT if subject == LOCAL else RECEIVED, ctn)
-        sent_htlcs = self.included_htlcs(subject, RECEIVED if subject == LOCAL else SENT, ctn)
+        received_htlcs = self.included_htlcs(subject, RECEIVED, ctn)
+        sent_htlcs = self.included_htlcs(subject, SENT, ctn)
 
         this_config = self.config[subject]
         other_config = self.config[-subject]
@@ -910,7 +906,7 @@ class Channel(Logger):
         this_htlc_pubkey = derive_pubkey(this_config.htlc_basepoint.pubkey, this_point)
         other_revocation_pubkey = derive_blinded_pubkey(other_config.revocation_basepoint.pubkey, this_point)
         htlcs = []  # type: List[ScriptHtlc]
-        for is_received_htlc, htlc_list in zip((subject != LOCAL, subject == LOCAL), (received_htlcs, sent_htlcs)):
+        for is_received_htlc, htlc_list in zip((True, False), (received_htlcs, sent_htlcs)):
             for htlc in htlc_list:
                 htlcs.append(ScriptHtlc(make_htlc_output_witness_script(
                     is_received_htlc=is_received_htlc,