AaronFiore/electrum
1
0
Fork 0
Code Activity

lnsweep: remove dead code (we never sweep to_remote in non-anchor channels)

Browse Source
This commit is contained in:
ThomasV
2024-12-11 10:54:16 +01:00
parent 1da937f103
commit 0e3b730cd9
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
electrum/lnsweep.py
View File

@@ -806,6 +806,7 @@ def tx_their_ctx_to_remote(
config: SimpleConfig, config: SimpleConfig,
has_anchors: bool, has_anchors: bool,
) -> Optional[PartialTransaction]: ) -> Optional[PartialTransaction]:
assert has_anchors is True
our_payment_pubkey = our_payment_privkey.get_public_key_bytes(compressed=True) our_payment_pubkey = our_payment_privkey.get_public_key_bytes(compressed=True)
val = ctx.outputs()[output_idx].value val = ctx.outputs()[output_idx].value
prevout = TxOutpoint(txid=bfh(ctx.txid()), out_idx=output_idx) prevout = TxOutpoint(txid=bfh(ctx.txid()), out_idx=output_idx)
@@ -814,15 +815,10 @@ def tx_their_ctx_to_remote(
desc = descriptor.get_singlesig_descriptor_from_legacy_leaf(pubkey=our_payment_pubkey.hex(), script_type='p2wpkh') desc = descriptor.get_singlesig_descriptor_from_legacy_leaf(pubkey=our_payment_pubkey.hex(), script_type='p2wpkh')
txin.script_descriptor = desc txin.script_descriptor = desc
txin.num_sig = 1 txin.num_sig = 1
if not has_anchors: txin.script_sig = b''
txin.script_type = 'p2wpkh' txin.witness_script = make_commitment_output_to_remote_witness_script(our_payment_pubkey)
txin.nsequence = 0xffffffff - 2 txin.nsequence = 1
tx_size_bytes = 110 # approx size of p2wpkh->p2wpkh tx_size_bytes = 196 # approx size of p2wsh->p2wpkh
else:
txin.script_sig = b''
txin.witness_script = make_commitment_output_to_remote_witness_script(our_payment_pubkey)
txin.nsequence = 1
tx_size_bytes = 196 # approx size of p2wsh->p2wpkh
sweep_inputs = [txin] sweep_inputs = [txin]
fee = config.estimate_fee(tx_size_bytes, allow_fallback_to_static_rates=True) fee = config.estimate_fee(tx_size_bytes, allow_fallback_to_static_rates=True)
outvalue = val - fee outvalue = val - fee
@@ -830,12 +826,9 @@ def tx_their_ctx_to_remote(
sweep_outputs = [PartialTxOutput.from_address_and_value(sweep_address, outvalue)] sweep_outputs = [PartialTxOutput.from_address_and_value(sweep_address, outvalue)]
sweep_tx = PartialTransaction.from_io(sweep_inputs, sweep_outputs) sweep_tx = PartialTransaction.from_io(sweep_inputs, sweep_outputs)
if not has_anchors: sig = sweep_tx.sign_txin(0, our_payment_privkey.get_secret_bytes())
sweep_tx.sign({our_payment_pubkey: our_payment_privkey.get_secret_bytes()}) witness = construct_witness([sig, sweep_tx.inputs()[0].witness_script])
else: sweep_tx.inputs()[0].witness = witness
sig = sweep_tx.sign_txin(0, our_payment_privkey.get_secret_bytes())
witness = construct_witness([sig, sweep_tx.inputs()[0].witness_script])
sweep_tx.inputs()[0].witness = witness
if not sweep_tx.is_complete(): if not sweep_tx.is_complete():
raise Exception('channel close sweep tx is not complete') raise Exception('channel close sweep tx is not complete')