AaronFiore/electrum
1
0
Fork 0
Code Activity

ln: some clean-up for option_scid_alias

Browse Source 
- qt chan details dlg: show both local and remote aliases
- lnchannel: more descriptive names, add clarification in doctstrings,
  and also save the "local_scid_alias" in the wallet file (to remember if
  we sent it)
- lnpeer:
  - resend channel_ready msg after reestablish, to upgrade old existing channels
    to having local_scid_alias
  - forwarding bugfix, to follow BOLT-04:
    > - if it returns a `channel_update`:
    >   - MUST set `short_channel_id` to the `short_channel_id` used by the incoming onion.
This commit is contained in:
SomberNight
2023-06-23 19:51:57 +00:00
parent 888291a8f8
commit ca93af2b8a
4 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
electrum/lnchannel.py
View File

@@ -532,7 +532,7 @@ class ChannelBackup(AbstractChannel):
def is_backup(self):
return True
def get_remote_alias(self) -> Optional[bytes]:
def get_remote_scid_alias(self) -> Optional[bytes]:
return None
def create_sweeptxs_for_their_ctx(self, ctx):
@@ -640,15 +640,27 @@ class Channel(AbstractChannel):
self.should_request_force_close = False
self.unconfirmed_closing_txid = None # not a state, only for GUI
def get_local_alias(self) -> bytes:
# deterministic, same secrecy level as wallet master pubkey
wallet_fingerprint = bytes(self.lnworker.wallet.get_fingerprint(), "utf8")
return sha256(wallet_fingerprint + self.channel_id)[0:8]
def get_local_scid_alias(self, *, create_new_if_needed: bool = False) -> Optional[bytes]:
"""Get scid_alias to be used for *outgoing* HTLCs.
(called local as we choose the value)
"""
if alias := self.storage.get('local_scid_alias'):
return bytes.fromhex(alias)
elif create_new_if_needed:
# deterministic, same secrecy level as wallet master pubkey
wallet_fingerprint = bytes(self.lnworker.wallet.get_fingerprint(), "utf8")
alias = sha256(wallet_fingerprint + self.channel_id)[0:8]
self.storage['local_scid_alias'] = alias.hex()
return alias
return None
def save_remote_alias(self, alias: bytes):
def save_remote_scid_alias(self, alias: bytes):
self.storage['alias'] = alias.hex()
def get_remote_alias(self) -> Optional[bytes]:
def get_remote_scid_alias(self) -> Optional[bytes]:
"""Get scid_alias to be used for *incoming* HTLCs.
(called remote as the remote chooses the value)
"""
alias = self.storage.get('alias')
return bytes.fromhex(alias) if alias else None
@@ -697,6 +709,7 @@ class Channel(AbstractChannel):
This message contains info we need to populate private route hints when
creating invoices.
"""
assert payload['short_channel_id'] in [self.short_channel_id, self.get_local_scid_alias()]
from .channel_db import ChannelDB
ChannelDB.verify_channel_update(payload, start_node=self.node_id)
raw = payload['raw']
@@ -719,11 +732,16 @@ class Channel(AbstractChannel):
net_addr = NetAddress.from_string(net_addr_str)
yield LNPeerAddr(host=str(net_addr.host), port=net_addr.port, pubkey=self.node_id)
def get_outgoing_gossip_channel_update(self) -> bytes:
if self._outgoing_channel_update is not None:
def get_outgoing_gossip_channel_update(self, *, scid: ShortChannelID = None) -> bytes:
"""
scid: to be put into the channel_update message instead of the real scid, as this might be an scid alias
"""
if self._outgoing_channel_update is not None and scid is None:
return self._outgoing_channel_update
if not self.lnworker:
raise Exception('lnworker not set for channel!')
if scid is None:
scid = self.short_channel_id
sorted_node_ids = list(sorted([self.node_id, self.get_local_pubkey()]))
channel_flags = b'\x00' if sorted_node_ids[0] == self.get_local_pubkey() else b'\x01'
now = int(time.time())
@@ -731,7 +749,7 @@ class Channel(AbstractChannel):
chan_upd = encode_msg(
"channel_update",
short_channel_id=self.short_channel_id,
short_channel_id=scid,
channel_flags=channel_flags,
message_flags=b'\x01',
cltv_expiry_delta=self.forwarding_cltv_expiry_delta,