Skip to content

Do not return UpdateFailHTLC updates until the HTLC is committed #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 23, 2018
Merged

Do not return UpdateFailHTLC updates until the HTLC is committed #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7345c0b
Add trace logs for Errs when handling peer messages
TheBlueMatt Aug 23, 2018
a1bd563
Restore full_stack_target fuzzer
TheBlueMatt Aug 23, 2018
0647cf4
Restore push_msat in full_stack_target
TheBlueMatt Aug 23, 2018
6e50a84
Do not return UpdateFailHTLC updates until the HTLC is committed
TheBlueMatt Aug 21, 2018
ab00e4c
Merge HTLC-update events, remove FailHTLC ErrorAction
TheBlueMatt Aug 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions fuzz/fuzz_targets/channel_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use bitcoin::util::hash::Sha256dHash;
use bitcoin::network::serialize::{serialize, BitcoinHash};

use lightning::ln::channel::{Channel, ChannelKeys};
use lightning::ln::channelmanager::{HTLCFailReason, PendingForwardHTLCInfo};
use lightning::ln::channelmanager::{HTLCFailReason, PendingHTLCStatus};
use lightning::ln::msgs;
use lightning::ln::msgs::{MsgDecodable, ErrorAction};
use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
Expand Down Expand Up @@ -256,7 +256,6 @@ pub fn do_test(data: &[u8]) {
Ok(r) => Some(r),
Err(e) => match e.action {
None => return,
Some(ErrorAction::UpdateFailHTLC {..}) => None,
Some(ErrorAction::DisconnectPeer {..}) => return,
Some(ErrorAction::IgnoreError) => None,
Some(ErrorAction::SendErrorMessage {..}) => None,
Expand All @@ -280,7 +279,7 @@ pub fn do_test(data: &[u8]) {
},
2 => {
let update_add_htlc = decode_msg!(msgs::UpdateAddHTLC, 32+8+8+32+4+4+33+20*65+32);
test_err!(channel.update_add_htlc(&update_add_htlc, PendingForwardHTLCInfo::dummy()));
test_err!(channel.update_add_htlc(&update_add_htlc, PendingHTLCStatus::dummy()));
},
3 => {
let update_fulfill_htlc = decode_msg!(msgs::UpdateFulfillHTLC, 32 + 8 + 32);
Expand Down
52 changes: 26 additions & 26 deletions fuzz/fuzz_targets/full_stack_target.rs
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 21 additions & 7 deletions src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crypto::hkdf::{hkdf_extract,hkdf_expand};
use ln::msgs;
use ln::msgs::{ErrorAction, HandleError, MsgEncodable};
use ln::channelmonitor::ChannelMonitor;
use ln::channelmanager::{PendingForwardHTLCInfo, HTLCFailReason};
use ln::channelmanager::{PendingHTLCStatus, PendingForwardHTLCInfo, HTLCFailReason};
use ln::chan_utils::{TxCreationKeys,HTLCOutputInCommitment,HTLC_SUCCESS_TX_WEIGHT,HTLC_TIMEOUT_TX_WEIGHT};
use ln::chan_utils;
use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
Expand Down Expand Up @@ -164,7 +164,7 @@ struct HTLCOutput { //TODO: Refactor into Outbound/InboundHTLCOutput (will save
/// If we're in LocalRemoved*, set to true if we fulfilled the HTLC, and can claim money
local_removed_fulfilled: bool,
/// state pre-committed Remote* implies pending_forward_state, otherwise it must be None
pending_forward_state: Option<PendingForwardHTLCInfo>,
pending_forward_state: Option<PendingHTLCStatus>,
}

impl HTLCOutput {
Expand Down Expand Up @@ -1381,7 +1381,7 @@ impl Channel {
(inbound_htlc_count, outbound_htlc_count, htlc_outbound_value_msat, htlc_inbound_value_msat)
}

pub fn update_add_htlc(&mut self, msg: &msgs::UpdateAddHTLC, pending_forward_state: PendingForwardHTLCInfo) -> Result<(), HandleError> {
pub fn update_add_htlc(&mut self, msg: &msgs::UpdateAddHTLC, pending_forward_state: PendingHTLCStatus) -> Result<(), HandleError> {
if (self.channel_state & (ChannelState::ChannelFunded as u32 | ChannelState::RemoteShutdownSent as u32)) != (ChannelState::ChannelFunded as u32) {
return Err(HandleError{err: "Got add HTLC message when channel was not in an operational state", action: None});
}
Expand Down Expand Up @@ -1670,6 +1670,7 @@ impl Channel {

let mut to_forward_infos = Vec::new();
let mut revoked_htlcs = Vec::new();
let mut failed_htlcs = Vec::new();
let mut require_commitment = false;
let mut value_to_self_msat_diff: i64 = 0;
// We really shouldnt have two passes here, but retain gives a non-mutable ref (Rust bug)
Expand All @@ -1693,8 +1694,17 @@ impl Channel {
htlc.state = HTLCState::AwaitingAnnouncedRemoteRevoke;
require_commitment = true;
} else if htlc.state == HTLCState::AwaitingAnnouncedRemoteRevoke {
htlc.state = HTLCState::Committed;
to_forward_infos.push(htlc.pending_forward_state.take().unwrap());
match htlc.pending_forward_state.take().unwrap() {
PendingHTLCStatus::Fail(fail_msg) => {
htlc.state = HTLCState::LocalRemoved;
require_commitment = true;
failed_htlcs.push(fail_msg);
},
PendingHTLCStatus::Forward(forward_info) => {
to_forward_infos.push(forward_info);
htlc.state = HTLCState::Committed;
}
}
} else if htlc.state == HTLCState::AwaitingRemoteRevokeToRemove {
htlc.state = HTLCState::AwaitingRemovedRemoteRevoke;
require_commitment = true;
Expand All @@ -1706,7 +1716,11 @@ impl Channel {
self.value_to_self_msat = (self.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;

match self.free_holding_cell_htlcs()? {
Some(commitment_update) => {
Some(mut commitment_update) => {
commitment_update.0.update_fail_htlcs.reserve(failed_htlcs.len());
for fail_msg in failed_htlcs.drain(..) {
commitment_update.0.update_fail_htlcs.push(fail_msg);
}
Ok((Some(commitment_update.0), to_forward_infos, revoked_htlcs, commitment_update.1))
},
None => {
Expand All @@ -1715,7 +1729,7 @@ impl Channel {
Ok((Some(msgs::CommitmentUpdate {
update_add_htlcs: Vec::new(),
update_fulfill_htlcs: Vec::new(),
update_fail_htlcs: Vec::new(),
update_fail_htlcs: failed_htlcs,
commitment_signed
}), to_forward_infos, revoked_htlcs, monitor_update))
} else {
Expand Down
Loading