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

Channel: add current_commitment method

Browse source
This commit is contained in:
ThomasV 2018-12-10 21:15:31 +01:00
parent 3222e26e01
commit 3aa36c1502
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
electrum/lnchan.py
View file

@ -190,9 +190,6 @@ class Channel(PrintError):
self.pending_fee = None self.pending_fee = None
self.local_commitment = self.pending_commitment(LOCAL)
self.remote_commitment = self.pending_commitment(REMOTE)
self._is_funding_txo_spent = None # "don't know" self._is_funding_txo_spent = None # "don't know"
self._state = None self._state = None
if state.get('force_closed', False): if state.get('force_closed', False):
@ -207,6 +204,10 @@ class Channel(PrintError):
for sub in (LOCAL, REMOTE): for sub in (LOCAL, REMOTE):
self.log[sub].locked_in.update(self.log[sub].adds.keys()) self.log[sub].locked_in.update(self.log[sub].adds.keys())
self.local_commitment = self.current_commitment(LOCAL)
self.remote_commitment = self.current_commitment(REMOTE)
def set_state(self, state: str): def set_state(self, state: str):
if self._state == 'FORCE_CLOSING': if self._state == 'FORCE_CLOSING':
assert state == 'FORCE_CLOSING', 'new state was not FORCE_CLOSING: ' + state assert state == 'FORCE_CLOSING', 'new state was not FORCE_CLOSING: ' + state
@ -629,6 +630,13 @@ class Channel(PrintError):
this_point = self.config[REMOTE].next_per_commitment_point if subject == REMOTE else self.points()[1] this_point = self.config[REMOTE].next_per_commitment_point if subject == REMOTE else self.points()[1]
return self.make_commitment(subject, this_point) return self.make_commitment(subject, this_point)
def current_commitment(self, subject):
old_local_state = self.config[subject]
self.config[subject]=self.config[subject]._replace(ctn=self.config[subject].ctn - 1)
r = self.pending_commitment(subject)
self.config[subject] = old_local_state
return r
def total_msat(self, sub): def total_msat(self, sub):
return sum(self.settled[sub]) return sum(self.settled[sub])
@ -864,12 +872,7 @@ class Channel(PrintError):
return sig, closing_tx return sig, closing_tx
def force_close_tx(self): def force_close_tx(self):
# local_commitment always gives back the next expected local_commitment, tx = self.current_commitment(LOCAL)
# but in this case, we want the current one. So substract one ctn number
old_local_state = self.config[LOCAL]
self.config[LOCAL]=self.config[LOCAL]._replace(ctn=self.config[LOCAL].ctn - 1)
tx = self.pending_commitment(LOCAL)
self.config[LOCAL] = old_local_state
tx.sign({bh2u(self.config[LOCAL].multisig_key.pubkey): (self.config[LOCAL].multisig_key.privkey, True)}) tx.sign({bh2u(self.config[LOCAL].multisig_key.pubkey): (self.config[LOCAL].multisig_key.privkey, True)})
remote_sig = self.config[LOCAL].current_commitment_signature remote_sig = self.config[LOCAL].current_commitment_signature
remote_sig = ecc.der_sig_from_sig_string(remote_sig) + b"\x01" remote_sig = ecc.der_sig_from_sig_string(remote_sig) + b"\x01"