tln: don't corrupt channels storage when multiple funding_locked are received - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 83c60441cf3f1272c825ce5df8c6e7ec01c6c78e
DIR parent 3f733328179ac4770571bc1b54c3d7b5739db0e4
HTML Author: Janus <ysangkok@gmail.com>
Date: Wed, 20 Jun 2018 10:48:31 +0200
ln: don't corrupt channels storage when multiple funding_locked are received
Diffstat:
M lib/lnbase.py | 20 +++++++++++---------
M lib/lnworker.py | 2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
---
DIR diff --git a/lib/lnbase.py b/lib/lnbase.py
t@@ -948,10 +948,10 @@ class Peer(PrintError):
local_ctn = int.from_bytes(channel_reestablish_msg["next_remote_revocation_number"], 'big')
if local_ctn != chan.local_state.ctn:
raise Exception("expected local ctn {}, got {}".format(chan.local_state.ctn, local_ctn))
- our = channel_reestablish_msg["my_current_per_commitment_point"]
- their = chan.remote_state.last_per_commitment_point
- if their is None:
- their = chan.remote_state.next_per_commitment_point
+ their = channel_reestablish_msg["my_current_per_commitment_point"]
+ our = chan.remote_state.last_per_commitment_point
+ if our is None:
+ our = chan.remote_state.next_per_commitment_point
if our != their:
raise Exception("Remote PCP mismatch: {} {}".format(bh2u(our), bh2u(their)))
self.channel_state[chan_id] = 'OPENING'
t@@ -973,11 +973,13 @@ class Peer(PrintError):
chan = self.channels.get(channel_id)
if not chan:
raise Exception("Got unknown funding_locked", channel_id)
- short_channel_id = chan.short_channel_id
- new_remote_state = chan.remote_state._replace(next_per_commitment_point=payload["next_per_commitment_point"], last_per_commitment_point=chan.remote_state.next_per_commitment_point)
- new_local_state = chan.local_state._replace(funding_locked_received = True)
- chan = chan._replace(short_channel_id=short_channel_id, remote_state=new_remote_state, local_state=new_local_state)
- self.lnworker.save_channel(chan)
+ if not chan.local_state.funding_locked_received:
+ our_next_point = chan.remote_state.next_per_commitment_point
+ their_next_point = payload["next_per_commitment_point"]
+ new_remote_state = chan.remote_state._replace(next_per_commitment_point=their_next_point, last_per_commitment_point=our_next_point)
+ new_local_state = chan.local_state._replace(funding_locked_received = True)
+ chan = chan._replace(remote_state=new_remote_state, local_state=new_local_state)
+ self.lnworker.save_channel(chan)
if chan.short_channel_id:
self.mark_open(chan)
DIR diff --git a/lib/lnworker.py b/lib/lnworker.py
t@@ -122,6 +122,8 @@ class LNWorker(PrintError):
self.channels[openchannel.channel_id] = openchannel
for node_id, peer in self.peers.items():
peer.channels = self.channels_for_peer(node_id)
+ if openchannel.remote_state.next_per_commitment_point == openchannel.remote_state.last_per_commitment_point:
+ raise Exception("Tried to save channel with next_point == last_point, this should not happen")
dumped = serialize_channels(self.channels)
self.wallet.storage.put("channels", dumped)
self.wallet.storage.write()