mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-24 23:08:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove superflous pending_claims

Browse source 
As local onchain txn are already monitored in block_connected by
check_spend_local_transaction, it's useless to generate twice
pending claims for HTLC outputs on local commitment tx.

We could do the alternative.
This commit is contained in:
Antoine Riard 2019-12-09 22:18:41 -05:00 • committed by Matt Corallo
parent 0011713d2c
commit 6a7c471369
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lightning/src/ln/channelmonitor.rs
View file

@ -2383,16 +2383,14 @@ impl ChannelMonitor {
} }
} }
} }
let mut pending_claims = Vec::new();
if let Some(ref cur_local_tx) = self.current_local_signed_commitment_tx { if let Some(ref cur_local_tx) = self.current_local_signed_commitment_tx {
if self.would_broadcast_at_height(height) { if self.would_broadcast_at_height(height) {
log_trace!(self, "Broadcast onchain {}", log_tx!(cur_local_tx.tx)); log_trace!(self, "Broadcast onchain {}", log_tx!(cur_local_tx.tx));
broadcaster.broadcast_transaction(&cur_local_tx.tx); broadcaster.broadcast_transaction(&cur_local_tx.tx);
match self.key_storage { match self.key_storage {
Storage::Local { ref delayed_payment_base_key, ref latest_per_commitment_point, .. } => { Storage::Local { ref delayed_payment_base_key, ref latest_per_commitment_point, .. } => {
let (txs, mut spendable_output, new_outputs, mut pending_txn) = self.broadcast_by_local_state(&cur_local_tx, latest_per_commitment_point, &Some(*delayed_payment_base_key), height); let (txs, mut spendable_output, new_outputs, _) = self.broadcast_by_local_state(&cur_local_tx, latest_per_commitment_point, &Some(*delayed_payment_base_key), height);
spendable_outputs.append(&mut spendable_output); spendable_outputs.append(&mut spendable_output);
pending_claims.append(&mut pending_txn);
if !new_outputs.is_empty() { if !new_outputs.is_empty() {
watch_outputs.push((cur_local_tx.txid.clone(), new_outputs)); watch_outputs.push((cur_local_tx.txid.clone(), new_outputs));
} }
@ -2402,9 +2400,8 @@ impl ChannelMonitor {
} }
}, },
Storage::Watchtower { .. } => { Storage::Watchtower { .. } => {
let (txs, mut spendable_output, new_outputs, mut pending_txn) = self.broadcast_by_local_state(&cur_local_tx, &None, &None, height); let (txs, mut spendable_output, new_outputs, _) = self.broadcast_by_local_state(&cur_local_tx, &None, &None, height);
spendable_outputs.append(&mut spendable_output); spendable_outputs.append(&mut spendable_output);
pending_claims.append(&mut pending_txn);
if !new_outputs.is_empty() { if !new_outputs.is_empty() {
watch_outputs.push((cur_local_tx.txid.clone(), new_outputs)); watch_outputs.push((cur_local_tx.txid.clone(), new_outputs));
} }
@ -2416,12 +2413,6 @@ impl ChannelMonitor {
} }
} }
} }
for claim in pending_claims {
match self.pending_claim_requests.entry(claim.0) {
hash_map::Entry::Occupied(_) => {},
hash_map::Entry::Vacant(entry) => { entry.insert(claim.1); }
}
}
if let Some(events) = self.onchain_events_waiting_threshold_conf.remove(&height) { if let Some(events) = self.onchain_events_waiting_threshold_conf.remove(&height) {
for ev in events { for ev in events {
match ev { match ev {