AaronFiore/electrum
1
0
Fork 0
Code Activity

lnchannel: convert sweep_address property to get_sweep_address() method

Browse Source 
no functional changes
This commit is contained in:
SomberNight
2024-10-20 13:12:52 +00:00
parent ccc4cb7f57
commit dd140df17d
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
electrum/lnchannel.py
View File

@@ -191,7 +191,6 @@ class AbstractChannel(Logger, ABC):
funding_outpoint: Outpoint funding_outpoint: Outpoint
node_id: bytes # note that it might not be the full 33 bytes; for OCB it is only the prefix node_id: bytes # note that it might not be the full 33 bytes; for OCB it is only the prefix
_state: ChannelState _state: ChannelState
sweep_address: str
def set_short_channel_id(self, short_id: ShortChannelID) -> None: def set_short_channel_id(self, short_id: ShortChannelID) -> None:
self.short_channel_id = short_id self.short_channel_id = short_id
@@ -284,10 +283,10 @@ class AbstractChannel(Logger, ABC):
self.storage.pop('closing_height', None) self.storage.pop('closing_height', None)
def create_sweeptxs_for_our_ctx(self, ctx): def create_sweeptxs_for_our_ctx(self, ctx):
return create_sweeptxs_for_our_ctx(chan=self, ctx=ctx, sweep_address=self.sweep_address) return create_sweeptxs_for_our_ctx(chan=self, ctx=ctx, sweep_address=self.get_sweep_address())
def create_sweeptxs_for_their_ctx(self, ctx): def create_sweeptxs_for_their_ctx(self, ctx):
return create_sweeptxs_for_their_ctx(chan=self, ctx=ctx, sweep_address=self.sweep_address) return create_sweeptxs_for_their_ctx(chan=self, ctx=ctx, sweep_address=self.get_sweep_address())
def is_backup(self): def is_backup(self):
return False return False
@@ -416,6 +415,14 @@ class AbstractChannel(Logger, ABC):
def get_funding_address(self) -> str: def get_funding_address(self) -> str:
pass pass
@abstractmethod
def get_sweep_address(self) -> str:
"""Returns a wallet address we can use to sweep coins to.
It could be something static to the channel (fixed for its lifecycle),
or it might just ask the wallet now for an unused address.
"""
pass
def get_state_for_GUI(self) -> str: def get_state_for_GUI(self) -> str:
cs = self.get_state() cs = self.get_state()
if cs <= ChannelState.OPEN and self.unconfirmed_closing_txid: if cs <= ChannelState.OPEN and self.unconfirmed_closing_txid:
@@ -575,7 +582,7 @@ class ChannelBackup(AbstractChannel):
def create_sweeptxs_for_our_ctx(self, ctx): def create_sweeptxs_for_our_ctx(self, ctx):
if self.is_imported: if self.is_imported:
return create_sweeptxs_for_our_ctx(chan=self, ctx=ctx, sweep_address=self.sweep_address) return create_sweeptxs_for_our_ctx(chan=self, ctx=ctx, sweep_address=self.get_sweep_address())
else: else:
# backup from op_return # backup from op_return
return {} return {}
@@ -613,8 +620,7 @@ class ChannelBackup(AbstractChannel):
def is_frozen_for_receiving(self) -> bool: def is_frozen_for_receiving(self) -> bool:
return False return False
@property def get_sweep_address(self) -> str:
def sweep_address(self) -> str:
return self.lnworker.wallet.get_new_sweep_address_for_channel() return self.lnworker.wallet.get_new_sweep_address_for_channel()
def get_local_pubkey(self) -> bytes: def get_local_pubkey(self) -> bytes:
@@ -846,10 +852,8 @@ class Channel(AbstractChannel):
channel_type = ChannelType(self.storage.get('channel_type')) channel_type = ChannelType(self.storage.get('channel_type'))
return bool(channel_type & ChannelType.OPTION_ZEROCONF) return bool(channel_type & ChannelType.OPTION_ZEROCONF)
@property def get_sweep_address(self) -> str:
def sweep_address(self) -> str:
# TODO: in case of unilateral close with pending HTLCs, this address will be reused # TODO: in case of unilateral close with pending HTLCs, this address will be reused
addr = None
assert self.is_static_remotekey_enabled() assert self.is_static_remotekey_enabled()
our_payment_pubkey = self.config[LOCAL].payment_basepoint.pubkey our_payment_pubkey = self.config[LOCAL].payment_basepoint.pubkey
addr = make_commitment_output_to_remote_address(our_payment_pubkey) addr = make_commitment_output_to_remote_address(our_payment_pubkey)
@@ -1415,10 +1419,10 @@ class Channel(AbstractChannel):
ctn = self.get_oldest_unrevoked_ctn(subject) ctn = self.get_oldest_unrevoked_ctn(subject)
return self.get_commitment(subject, ctn=ctn) return self.get_commitment(subject, ctn=ctn)
def create_sweeptxs(self, ctn: int) -> List[Transaction]: def create_sweeptxs_for_watchtower(self, ctn: int) -> List[Transaction]:
from .lnsweep import create_sweeptxs_for_watchtower from .lnsweep import create_sweeptxs_for_watchtower
secret, ctx = self.get_secret_and_commitment(REMOTE, ctn=ctn) secret, ctx = self.get_secret_and_commitment(REMOTE, ctn=ctn)
return create_sweeptxs_for_watchtower(self, ctx, secret, self.sweep_address) return create_sweeptxs_for_watchtower(self, ctx, secret, self.get_sweep_address())
def get_oldest_unrevoked_ctn(self, subject: HTLCOwner) -> int: def get_oldest_unrevoked_ctn(self, subject: HTLCOwner) -> int:
return self.hm.ctn_oldest_unrevoked(subject) return self.hm.ctn_oldest_unrevoked(subject)
@@ -1645,7 +1649,7 @@ class Channel(AbstractChannel):
def maybe_sweep_revoked_htlc(self, ctx: Transaction, htlc_tx: Transaction) -> Optional[SweepInfo]: def maybe_sweep_revoked_htlc(self, ctx: Transaction, htlc_tx: Transaction) -> Optional[SweepInfo]:
# look at the output address, check if it matches # look at the output address, check if it matches
return create_sweeptx_for_their_revoked_htlc(self, ctx, htlc_tx, self.sweep_address) return create_sweeptx_for_their_revoked_htlc(self, ctx, htlc_tx, self.get_sweep_address())
def has_pending_changes(self, subject: HTLCOwner) -> bool: def has_pending_changes(self, subject: HTLCOwner) -> bool:
next_htlcs = self.hm.get_htlcs_in_next_ctx(subject) next_htlcs = self.hm.get_htlcs_in_next_ctx(subject)

4
electrum/lnpeer.py
View File

@@ -2377,7 +2377,7 @@ class Peer(Logger):
if chan.config[LOCAL].upfront_shutdown_script: if chan.config[LOCAL].upfront_shutdown_script:
scriptpubkey = chan.config[LOCAL].upfront_shutdown_script scriptpubkey = chan.config[LOCAL].upfront_shutdown_script
else: else:
scriptpubkey = bitcoin.address_to_script(chan.sweep_address) scriptpubkey = bitcoin.address_to_script(chan.get_sweep_address())
assert scriptpubkey assert scriptpubkey
# wait until no more pending updates (bolt2) # wait until no more pending updates (bolt2)
chan.set_can_send_ctx_updates(False) chan.set_can_send_ctx_updates(False)
@@ -2430,7 +2430,7 @@ class Peer(Logger):
if chan.config[LOCAL].upfront_shutdown_script: if chan.config[LOCAL].upfront_shutdown_script:
our_scriptpubkey = chan.config[LOCAL].upfront_shutdown_script our_scriptpubkey = chan.config[LOCAL].upfront_shutdown_script
else: else:
our_scriptpubkey = bitcoin.address_to_script(chan.sweep_address) our_scriptpubkey = bitcoin.address_to_script(chan.get_sweep_address())
assert our_scriptpubkey assert our_scriptpubkey
# estimate fee of closing tx # estimate fee of closing tx
dummy_sig, dummy_tx = chan.make_closing_tx(our_scriptpubkey, their_scriptpubkey, fee_sat=0) dummy_sig, dummy_tx = chan.make_closing_tx(our_scriptpubkey, their_scriptpubkey, fee_sat=0)

2
electrum/lnsweep.py
View File

@@ -376,7 +376,7 @@ def create_sweeptxs_for_their_ctx(
chan.logger.debug(f'(lnsweep) found their ctx: {to_local_address} {to_remote_address}') chan.logger.debug(f'(lnsweep) found their ctx: {to_local_address} {to_remote_address}')
if is_revocation: if is_revocation:
our_revocation_privkey = derive_blinded_privkey(our_conf.revocation_basepoint.privkey, per_commitment_secret) our_revocation_privkey = derive_blinded_privkey(our_conf.revocation_basepoint.privkey, per_commitment_secret)
gen_tx = create_sweeptx_for_their_revoked_ctx(chan, ctx, per_commitment_secret, chan.sweep_address) gen_tx = create_sweeptx_for_their_revoked_ctx(chan, ctx, per_commitment_secret, sweep_address)
if gen_tx: if gen_tx:
tx = gen_tx() tx = gen_tx()
txs[tx.inputs()[0].prevout.to_str()] = SweepInfo( txs[tx.inputs()[0].prevout.to_str()] = SweepInfo(

2
electrum/lnworker.py
View File

@@ -947,7 +947,7 @@ class LNWallet(LNWorker):
current_ctn = chan.get_oldest_unrevoked_ctn(REMOTE) current_ctn = chan.get_oldest_unrevoked_ctn(REMOTE)
watchtower_ctn = await watchtower.get_ctn(outpoint, addr) watchtower_ctn = await watchtower.get_ctn(outpoint, addr)
for ctn in range(watchtower_ctn + 1, current_ctn): for ctn in range(watchtower_ctn + 1, current_ctn):
sweeptxs = chan.create_sweeptxs(ctn) sweeptxs = chan.create_sweeptxs_for_watchtower(ctn)
for tx in sweeptxs: for tx in sweeptxs:
await watchtower.add_sweep_tx(outpoint, ctn, tx.inputs()[0].prevout.to_str(), tx.serialize()) await watchtower.add_sweep_tx(outpoint, ctn, tx.inputs()[0].prevout.to_str(), tx.serialize())