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

keep htlc history in case a htlc fails

Browse source
This commit is contained in:
Janus 2018-09-24 18:10:14 +02:00 • committed by ThomasV
parent cf4f0c5d3a
commit a04e37d050
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
electrum/lnbase.py
View file

@ -885,7 +885,7 @@ class Peer(PrintError):
sig_64, htlc_sigs = chan.sign_next_commitment() sig_64, htlc_sigs = chan.sign_next_commitment()
self.send_message(gen_msg("commitment_signed", channel_id=chan.channel_id, signature=sig_64, num_htlcs=len(htlc_sigs), htlc_signature=b"".join(htlc_sigs))) self.send_message(gen_msg("commitment_signed", channel_id=chan.channel_id, signature=sig_64, num_htlcs=len(htlc_sigs), htlc_signature=b"".join(htlc_sigs)))
await self.receive_revoke(chan) await self.receive_revoke(chan)
chan.fail_htlc(htlc) chan.receive_fail_htlc(htlc_id)
await self.receive_commitment(chan) await self.receive_commitment(chan)
self.revoke(chan) self.revoke(chan)
sig_64, htlc_sigs = chan.sign_next_commitment() sig_64, htlc_sigs = chan.sign_next_commitment()
@ -1082,7 +1082,7 @@ class Peer(PrintError):
if chan_id not in self.closing_signed: raise Exception("Got unknown closing_signed") if chan_id not in self.closing_signed: raise Exception("Got unknown closing_signed")
self.closing_signed[chan_id].put_nowait(payload) self.closing_signed[chan_id].put_nowait(payload)
async def on_shutdown(self, payload): def on_shutdown(self, payload):
coro = self.shutdown_coroutine(payload) coro = self.shutdown_coroutine(payload)
asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop) asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop)

22
electrum/lnhtlc.py
View file

@ -20,6 +20,7 @@ from .lnutil import funding_output_script, LOCAL, REMOTE, HTLCOwner, make_closin
from .transaction import Transaction from .transaction import Transaction
FailHtlc = namedtuple("FailHtlc", ["htlc_id"])
SettleHtlc = namedtuple("SettleHtlc", ["htlc_id"]) SettleHtlc = namedtuple("SettleHtlc", ["htlc_id"])
RevokeAndAck = namedtuple("RevokeAndAck", ["per_commitment_secret", "next_per_commitment_point"]) RevokeAndAck = namedtuple("RevokeAndAck", ["per_commitment_secret", "next_per_commitment_point"])
@ -172,6 +173,8 @@ class HTLCStateMachine(PrintError):
self.log[subject].append(UpdateAddHtlc(*decodeAll(y))) self.log[subject].append(UpdateAddHtlc(*decodeAll(y)))
elif typ == "SettleHtlc": elif typ == "SettleHtlc":
self.log[subject].append(SettleHtlc(*decodeAll(y))) self.log[subject].append(SettleHtlc(*decodeAll(y)))
elif typ == "FailHtlc":
self.log[subject].append(FailHtlc(*decodeAll(y)))
else: else:
assert False assert False
@ -247,7 +250,8 @@ class HTLCStateMachine(PrintError):
""" """
for htlc in self.log[LOCAL]: for htlc in self.log[LOCAL]:
if not type(htlc) is UpdateAddHtlc: continue if not type(htlc) is UpdateAddHtlc: continue
if htlc.locked_in[LOCAL] is None: htlc.locked_in[LOCAL] = self.local_state.ctn if htlc.locked_in[LOCAL] is None and FailHtlc(htlc.htlc_id) not in self.log[REMOTE]:
htlc.locked_in[LOCAL] = self.local_state.ctn
self.print_error("sign_next_commitment") self.print_error("sign_next_commitment")
pending_remote_commitment = self.pending_remote_commitment pending_remote_commitment = self.pending_remote_commitment
@ -305,7 +309,8 @@ class HTLCStateMachine(PrintError):
self.print_error("receive_new_commitment") self.print_error("receive_new_commitment")
for htlc in self.log[REMOTE]: for htlc in self.log[REMOTE]:
if not type(htlc) is UpdateAddHtlc: continue if not type(htlc) is UpdateAddHtlc: continue
if htlc.locked_in[REMOTE] is None: htlc.locked_in[REMOTE] = self.remote_state.ctn if htlc.locked_in[REMOTE] is None and FailHtlc(htlc.htlc_id) not in self.log[LOCAL]:
htlc.locked_in[REMOTE] = self.remote_state.ctn
assert len(htlc_sigs) == 0 or type(htlc_sigs[0]) is bytes assert len(htlc_sigs) == 0 or type(htlc_sigs[0]) is bytes
pending_local_commitment = self.pending_local_commitment pending_local_commitment = self.pending_local_commitment
@ -642,11 +647,12 @@ class HTLCStateMachine(PrintError):
assert len([x for x in self.log[LOCAL] if x.htlc_id == htlc_index and type(x) is UpdateAddHtlc]) == 1, (self.log[LOCAL], htlc_index) assert len([x for x in self.log[LOCAL] if x.htlc_id == htlc_index and type(x) is UpdateAddHtlc]) == 1, (self.log[LOCAL], htlc_index)
self.log[REMOTE].append(SettleHtlc(htlc_index)) self.log[REMOTE].append(SettleHtlc(htlc_index))
def fail_htlc(self, htlc): def receive_fail_htlc(self, htlc_id):
# TODO self.print_error("receive_fail_htlc")
self.log[LOCAL] = [] htlc = self.lookup_htlc(self.log[LOCAL], htlc_id)
self.log[REMOTE] = [] htlc.locked_in[LOCAL] = None
self.print_error("fail_htlc (EMPTIED LOGS)") htlc.locked_in[REMOTE] = None
self.log[REMOTE].append(FailHtlc(htlc_id))
@property @property
def current_height(self): def current_height(self):
@ -696,6 +702,8 @@ class HTLCStateMachine(PrintError):
return o.serialize() return o.serialize()
if isinstance(o, SettleHtlc): if isinstance(o, SettleHtlc):
return json.dumps(('SettleHtlc', namedtuples_to_dict(o))) return json.dumps(('SettleHtlc', namedtuples_to_dict(o)))
if isinstance(o, FailHtlc):
return json.dumps(('FailHtlc', namedtuples_to_dict(o)))
if isinstance(o, UpdateAddHtlc): if isinstance(o, UpdateAddHtlc):
return json.dumps(('UpdateAddHtlc', namedtuples_to_dict(o))) return json.dumps(('UpdateAddHtlc', namedtuples_to_dict(o)))
return super(MyJsonEncoder, self) return super(MyJsonEncoder, self)