tln: two remaining encumberedTx removal remnants - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 3ccd2fedff5b99a02c3a651b01e03af5086b4aa4
DIR parent 320dc297326870c61ec0a2038eec7c9d4ab9b29a
HTML Author: Janus <ysangkok@gmail.com>
Date: Thu, 17 Jan 2019 12:56:18 +0100
ln: two remaining encumberedTx removal remnants
Diffstat:
M electrum/lnchan.py | 2 +-
M electrum/lnsweep.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/electrum/lnchan.py b/electrum/lnchan.py
t@@ -476,7 +476,7 @@ class Channel(PrintError):
sweeptxs = create_sweeptxs_for_their_just_revoked_ctx(self, ctx, per_commitment_secret, self.sweep_address)
for prev_txid, tx in sweeptxs.items():
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]:
self.print_error("receive_revocation")
DIR diff --git a/electrum/lnsweep.py b/electrum/lnsweep.py
t@@ -383,7 +383,7 @@ def create_sweeptx_their_ctx_htlc(ctx: Transaction, witness_script: bytes, sweep
outvalue = val - fee
if outvalue <= dust_threshold(): return None
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))
if not is_revocation: