LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lnchannel: only consider payments finished when we revoke our old ctx

Browse source 
in the old code,
`self.hm.received_in_ctn(self.config[REMOTE].ctn + 1)`
did not really make sense as "received_in_ctn" compares the argument against the LOCAL ctn
This commit is contained in:
SomberNight 2019-02-26 20:56:48 +01:00 • committed by ThomasV
parent a565c500f6
commit 7292da24e6
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
electrum/lnchannel.py
View file

@ -435,7 +435,17 @@ class Channel(PrintError):
) )
assert self.signature_fits(ctx) assert self.signature_fits(ctx)
return RevokeAndAck(last_secret, next_point), "current htlcs" received = self.hm.received_in_ctn(self.config[LOCAL].ctn)
sent = self.hm.sent_in_ctn(self.config[LOCAL].ctn)
for htlc in received:
self.payment_completed(self, RECEIVED, htlc, None)
for htlc in sent:
preimage = self.preimages.pop(htlc.htlc_id)
self.payment_completed(self, SENT, htlc, preimage)
received_this_batch = htlcsum(received)
sent_this_batch = htlcsum(sent)
return RevokeAndAck(last_secret, next_point), (received_this_batch, sent_this_batch)
def points(self): def points(self):
last_small_num = self.config[LOCAL].ctn last_small_num = self.config[LOCAL].ctn
@ -459,7 +469,7 @@ class Channel(PrintError):
if tx is not None: if tx is not None:
self.lnwatcher.add_sweep_tx(outpoint, prev_txid, tx.as_dict()) self.lnwatcher.add_sweep_tx(outpoint, prev_txid, tx.as_dict())
def receive_revocation(self, revocation) -> Tuple[int, int]: def receive_revocation(self, revocation: RevokeAndAck):
self.print_error("receive_revocation") self.print_error("receive_revocation")
cur_point = self.config[REMOTE].current_per_commitment_point cur_point = self.config[REMOTE].current_per_commitment_point
@ -483,16 +493,6 @@ class Channel(PrintError):
if self.constraints.is_initiator and self.pending_fee[FUNDEE_ACKED]: if self.constraints.is_initiator and self.pending_fee[FUNDEE_ACKED]:
self.pending_fee[FUNDER_SIGNED] = True self.pending_fee[FUNDER_SIGNED] = True
received = self.hm.received_in_ctn(self.config[REMOTE].ctn + 1)
sent = self.hm.sent_in_ctn(self.config[REMOTE].ctn + 1)
for htlc in received:
self.payment_completed(self, RECEIVED, htlc, None)
for htlc in sent:
preimage = self.preimages.pop(htlc.htlc_id)
self.payment_completed(self, SENT, htlc, preimage)
received_this_batch = htlcsum(received)
sent_this_batch = htlcsum(sent)
next_point = self.config[REMOTE].next_per_commitment_point next_point = self.config[REMOTE].next_per_commitment_point
self.hm.recv_rev() self.hm.recv_rev()
@ -510,8 +510,6 @@ class Channel(PrintError):
self.set_remote_commitment() self.set_remote_commitment()
self.remote_commitment_to_be_revoked = prev_remote_commitment self.remote_commitment_to_be_revoked = prev_remote_commitment
return received_this_batch, sent_this_batch
def balance(self, subject, ctn=None): def balance(self, subject, ctn=None):
""" """
This balance in mSAT is not including reserve and fees. This balance in mSAT is not including reserve and fees.

2
electrum/lnworker.py
View file

@ -565,7 +565,7 @@ class LNWorker(PrintError):
self.storage.put('lightning_preimages', self.preimages) self.storage.put('lightning_preimages', self.preimages)
self.storage.write() self.storage.write()
def get_preimage_and_timestamp(self, payment_hash: bytes) -> bytes: def get_preimage_and_timestamp(self, payment_hash: bytes) -> Tuple[bytes, int]:
try: try:
preimage_hex, timestamp = self.preimages[bh2u(payment_hash)] preimage_hex, timestamp = self.preimages[bh2u(payment_hash)]
preimage = bfh(preimage_hex) preimage = bfh(preimage_hex)

6
electrum/tests/test_lnchannel.py
View file

@ -433,10 +433,10 @@ class TestChannel(unittest.TestCase):
bob_channel.receive_new_commitment(aliceSig2, aliceHtlcSigs2) bob_channel.receive_new_commitment(aliceSig2, aliceHtlcSigs2)
bobRevocation2, _ = bob_channel.revoke_current_commitment() bobRevocation2, (received, sent) = bob_channel.revoke_current_commitment()
self.assertEqual(one_bitcoin_in_msat, received)
bob_channel.serialize() bob_channel.serialize()
received, sent = alice_channel.receive_revocation(bobRevocation2) alice_channel.receive_revocation(bobRevocation2)
self.assertEqual(sent, one_bitcoin_in_msat)
alice_channel.serialize() alice_channel.serialize()
# At this point, Bob should have 6 BTC settled, with Alice still having # At this point, Bob should have 6 BTC settled, with Alice still having