AaronFiore/electrum
1
0
Fork 0
Code Activity

fix reestablish_channel

Browse Source
This commit is contained in:
ThomasV
2018-06-25 16:50:27 +02:00
parent df960700c9
commit 0ccafb547c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/lnbase.py
View File

@@ -598,6 +598,7 @@ class Peer(PrintError):
self.ping_time = 0 self.ping_time = 0
self.initialized = asyncio.Future() self.initialized = asyncio.Future()
self.channel_accepted = defaultdict(asyncio.Queue) self.channel_accepted = defaultdict(asyncio.Queue)
self.channel_reestablished = defaultdict(asyncio.Future)
self.funding_signed = defaultdict(asyncio.Queue) self.funding_signed = defaultdict(asyncio.Queue)
self.revoke_and_ack = defaultdict(asyncio.Queue) self.revoke_and_ack = defaultdict(asyncio.Queue)
self.update_fulfill_htlc = defaultdict(asyncio.Queue) self.update_fulfill_htlc = defaultdict(asyncio.Queue)
@@ -928,15 +929,22 @@ class Peer(PrintError):
assert success, success assert success, success
return chan._replace(remote_state=chan.remote_state._replace(ctn=0),local_state=chan.local_state._replace(ctn=0, current_commitment_signature=remote_sig)) return chan._replace(remote_state=chan.remote_state._replace(ctn=0),local_state=chan.local_state._replace(ctn=0, current_commitment_signature=remote_sig))
@aiosafe
async def reestablish_channel(self, chan): async def reestablish_channel(self, chan):
await self.initialized await self.initialized
self.channel_state[chan.channel_id] = 'REESTABLISHING' chan_id = chan.channel_id
self.channel_state[chan_id] = 'REESTABLISHING'
self.network.trigger_callback('channel', chan) self.network.trigger_callback('channel', chan)
self.send_message(gen_msg("channel_reestablish", self.send_message(gen_msg("channel_reestablish",
channel_id=chan.channel_id, channel_id=chan_id,
next_local_commitment_number=chan.local_state.ctn+1, next_local_commitment_number=chan.local_state.ctn+1,
next_remote_revocation_number=chan.remote_state.ctn next_remote_revocation_number=chan.remote_state.ctn
)) ))
await self.channel_reestablished[chan_id]
self.channel_state[chan_id] = 'OPENING'
if chan.local_state.funding_locked_received and chan.short_channel_id:
self.mark_open(chan)
self.network.trigger_callback('channel', chan)
def on_channel_reestablish(self, payload): def on_channel_reestablish(self, payload):
chan_id = payload["channel_id"] chan_id = payload["channel_id"]
@@ -958,10 +966,7 @@ class Peer(PrintError):
our = chan.remote_state.next_per_commitment_point our = chan.remote_state.next_per_commitment_point
if our != their: if our != their:
raise Exception("Remote PCP mismatch: {} {}".format(bh2u(our), bh2u(their))) raise Exception("Remote PCP mismatch: {} {}".format(bh2u(our), bh2u(their)))
self.channel_state[chan_id] = 'OPENING' self.channel_reestablished[chan_id].set_result(True)
if chan.local_state.funding_locked_received and chan.short_channel_id:
self.mark_open(chan)
self.network.trigger_callback('channel', chan)
def funding_locked(self, chan): def funding_locked(self, chan):
channel_id = chan.channel_id channel_id = chan.channel_id