AaronFiore/electrum
1
0
Fork 0
Code Activity

ln: two remaining encumberedTx removal remnants

Browse Source
This commit is contained in:
Janus
2019-01-17 12:56:18 +01:00
committed by ThomasV
parent 320dc29732
commit 3ccd2fedff
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/lnchan.py
View File

@@ -476,7 +476,7 @@ class Channel(PrintError):
sweeptxs = create_sweeptxs_for_their_just_revoked_ctx(self, ctx, per_commitment_secret, self.sweep_address) sweeptxs = create_sweeptxs_for_their_just_revoked_ctx(self, ctx, per_commitment_secret, self.sweep_address)
for prev_txid, tx in sweeptxs.items(): for prev_txid, tx in sweeptxs.items():
if tx is not None: if tx is not None:
self.lnwatcher.add_sweep_tx(outpoint, prev_txid, tx.to_dict()) self.lnwatcher.add_sweep_tx(outpoint, prev_txid, tx.as_dict())
def receive_revocation(self, revocation) -> Tuple[int, int]: def receive_revocation(self, revocation) -> Tuple[int, int]:
self.print_error("receive_revocation") self.print_error("receive_revocation")

2
electrum/lnsweep.py
View File

@@ -383,7 +383,7 @@ def create_sweeptx_their_ctx_htlc(ctx: Transaction, witness_script: bytes, sweep
outvalue = val - fee outvalue = val - fee
if outvalue <= dust_threshold(): return None if outvalue <= dust_threshold(): return None
sweep_outputs = [TxOutput(TYPE_ADDRESS, sweep_address, outvalue)] sweep_outputs = [TxOutput(TYPE_ADDRESS, sweep_address, outvalue)]
tx = Transaction.from_io(sweep_inputs, sweep_outputs, version=2, name=f'their_ctx_sweep_htlc_{bh2u(htlc.payment_hash)}', cltv_expiry=cltv_expiry) tx = Transaction.from_io(sweep_inputs, sweep_outputs, version=2, name=f'their_ctx_sweep_htlc_{ctx.txid()[:8]}_{output_idx}', cltv_expiry=cltv_expiry)
sig = bfh(tx.sign_txin(0, privkey)) sig = bfh(tx.sign_txin(0, privkey))
if not is_revocation: if not is_revocation: