Add PaymentFailReason enum for fail_htlc_backwards#221

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

Closed
yuntai wants to merge 2 commits into from
Closed

Add PaymentFailReason enum for fail_htlc_backwards #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f133554
Add PaymentFailReason for fail_htlc_backwards
yuntai Oct 25, 2018
a6a0a1a
Comments updated for PaymentReceived
yuntai Oct 25, 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
6 changes: 3 additions & 3 deletions fuzz/fuzz_targets/full_stack_target.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
// fulfill this HTLC, but if they are, we can just take the first byte and
// place that anywhere in our preimage.
if &payment[1..] != &[0; 31] {
channelmanager.fail_htlc_backwards(&payment);
channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
} else {
let mut payment_preimage = [0; 32];
payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
},
9 => {
for payment in payments_received.drain(..) {
channelmanager.fail_htlc_backwards(&payment);
channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
}
},
10 => {
Expand Down
22 changes: 15 additions & 7 deletions src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
PreimageUnknown,
/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
events.append(&mut new_events);
}

/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
// TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
// received is < expected or > 2*expected
/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
let mut channel_state = Some(self.channel_state.lock().unwrap());
let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
if let Some(mut sources) = removed_source {
for htlc_with_hash in sources.drain(..) {
if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
}
true
} else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
use chain::chaininterface;
use chain::transaction::OutPoint;
use chain::chaininterface::ChainListener;
use ln::channelmanager::{ChannelManager,OnionKeys};
use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
use ln::router::{Route, RouteHop, Router};
use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
}

fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
check_added_monitors!(expected_route.last().unwrap(), 1);

let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down
7 changes: 5 additions & 2 deletions src/util/events.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
},
/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
/// ChannelManager::claim_funds to get it....
/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
/// to free up resources for this HTLC.
/// Note that if the preimage is not known or the amount paid is incorrect, you must call
/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or
/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
/// amount expected.
PaymentReceived {
/// The hash for which the preimage should be handed to the ChannelManager.
payment_hash: [u8; 32],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add PaymentFailReason enum for fail_htlc_backwards#221

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

 Closed

yuntai
wants to merge
2
commits into

from

 Closed


Add PaymentFailReason enum for fail_htlc_backwards
#221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f133554

Add PaymentFailReason for fail_htlc_backwards


yuntai Oct 25, 2018
a6a0a1a

Comments updated for PaymentReceived


yuntai Oct 25, 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


6 changes: 3 additions & 3 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 },
 9 => {
 for payment in payments_received.drain(..) {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 }
 },
 10 => {
Expand Down

22 changes: 15 additions & 7 deletions
src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
	}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
	/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
	PreimageUnknown,
	/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
	AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
 events.append(&mut new_events);
	}

	/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
 // TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
 // received is < expected or > 2*expected
	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
 let mut channel_state = Some(self.channel_state.lock().unwrap());
 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
 if let Some(mut sources) = removed_source {
 for htlc_with_hash in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
 }
 true
 } else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
	use chain::chaininterface;
	use chain::transaction::OutPoint;
	use chain::chaininterface::ChainListener;
	use ln::channelmanager::{ChannelManager,OnionKeys};
	use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
	use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
	use ln::router::{Route, RouteHop, Router};
	use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
	}

	fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
 check_added_monitors!(expected_route.last().unwrap(), 1);

 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down

7 changes: 5 additions & 2 deletions
src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
	},
	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
	/// ChannelManager::claim_funds to get it....
	/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
	/// to free up resources for this HTLC.
	/// Note that if the preimage is not known or the amount paid is incorrect, you must call 
	/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or 
	/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
	/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
	/// amount expected. 
	PaymentReceived {
 /// The hash for which the preimage should be handed to the ChannelManager.
 payment_hash: [u8; 32],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PaymentFailReason enum for fail_htlc_backwards#221

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

 Closed

yuntai
wants to merge
2
commits into

from

 Closed


Add PaymentFailReason enum for fail_htlc_backwards
#221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f133554

Add PaymentFailReason for fail_htlc_backwards


yuntai Oct 25, 2018
a6a0a1a

Comments updated for PaymentReceived


yuntai Oct 25, 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


6 changes: 3 additions & 3 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 },
 9 => {
 for payment in payments_received.drain(..) {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 }
 },
 10 => {
Expand Down

22 changes: 15 additions & 7 deletions
src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
	}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
	/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
	PreimageUnknown,
	/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
	AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
 events.append(&mut new_events);
	}

	/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
 // TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
 // received is < expected or > 2*expected
	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
 let mut channel_state = Some(self.channel_state.lock().unwrap());
 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
 if let Some(mut sources) = removed_source {
 for htlc_with_hash in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
 }
 true
 } else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
	use chain::chaininterface;
	use chain::transaction::OutPoint;
	use chain::chaininterface::ChainListener;
	use ln::channelmanager::{ChannelManager,OnionKeys};
	use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
	use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
	use ln::router::{Route, RouteHop, Router};
	use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
	}

	fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
 check_added_monitors!(expected_route.last().unwrap(), 1);

 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down

7 changes: 5 additions & 2 deletions
src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
	},
	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
	/// ChannelManager::claim_funds to get it....
	/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
	/// to free up resources for this HTLC.
	/// Note that if the preimage is not known or the amount paid is incorrect, you must call 
	/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or 
	/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
	/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
	/// amount expected. 
	PaymentReceived {
 /// The hash for which the preimage should be handed to the ChannelManager.
 payment_hash: [u8; 32],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PaymentFailReason enum for fail_htlc_backwards#221

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

 Closed

yuntai
wants to merge
2
commits into

from

 Closed


Add PaymentFailReason enum for fail_htlc_backwards
#221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f133554

Add PaymentFailReason for fail_htlc_backwards


yuntai Oct 25, 2018
a6a0a1a

Comments updated for PaymentReceived


yuntai Oct 25, 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


6 changes: 3 additions & 3 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 },
 9 => {
 for payment in payments_received.drain(..) {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 }
 },
 10 => {
Expand Down

22 changes: 15 additions & 7 deletions
src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
	}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
	/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
	PreimageUnknown,
	/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
	AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
 events.append(&mut new_events);
	}

	/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
 // TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
 // received is < expected or > 2*expected
	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
 let mut channel_state = Some(self.channel_state.lock().unwrap());
 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
 if let Some(mut sources) = removed_source {
 for htlc_with_hash in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
 }
 true
 } else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
	use chain::chaininterface;
	use chain::transaction::OutPoint;
	use chain::chaininterface::ChainListener;
	use ln::channelmanager::{ChannelManager,OnionKeys};
	use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
	use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
	use ln::router::{Route, RouteHop, Router};
	use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
	}

	fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
 check_added_monitors!(expected_route.last().unwrap(), 1);

 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down

7 changes: 5 additions & 2 deletions
src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
	},
	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
	/// ChannelManager::claim_funds to get it....
	/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
	/// to free up resources for this HTLC.
	/// Note that if the preimage is not known or the amount paid is incorrect, you must call 
	/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or 
	/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
	/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
	/// amount expected. 
	PaymentReceived {
 /// The hash for which the preimage should be handed to the ChannelManager.
 payment_hash: [u8; 32],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add PaymentFailReason enum for fail_htlc_backwards#221

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

 Closed

yuntai
wants to merge
2
commits into

from

 Closed


Add PaymentFailReason enum for fail_htlc_backwards
#221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f133554

Add PaymentFailReason for fail_htlc_backwards


yuntai Oct 25, 2018
a6a0a1a

Comments updated for PaymentReceived


yuntai Oct 25, 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


6 changes: 3 additions & 3 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 },
 9 => {
 for payment in payments_received.drain(..) {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 }
 },
 10 => {
Expand Down

22 changes: 15 additions & 7 deletions
src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
	}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
	/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
	PreimageUnknown,
	/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
	AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
 events.append(&mut new_events);
	}

	/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
 // TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
 // received is < expected or > 2*expected
	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
 let mut channel_state = Some(self.channel_state.lock().unwrap());
 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
 if let Some(mut sources) = removed_source {
 for htlc_with_hash in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
 }
 true
 } else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
	use chain::chaininterface;
	use chain::transaction::OutPoint;
	use chain::chaininterface::ChainListener;
	use ln::channelmanager::{ChannelManager,OnionKeys};
	use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
	use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
	use ln::router::{Route, RouteHop, Router};
	use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
	}

	fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
 check_added_monitors!(expected_route.last().unwrap(), 1);

 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down

7 changes: 5 additions & 2 deletions
src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
	},
	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
	/// ChannelManager::claim_funds to get it....
	/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
	/// to free up resources for this HTLC.
	/// Note that if the preimage is not known or the amount paid is incorrect, you must call 
	/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or 
	/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
	/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
	/// amount expected. 
	PaymentReceived {
 /// The hash for which the preimage should be handed to the ChannelManager.
 payment_hash: [u8; 32],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PaymentFailReason enum for fail_htlc_backwards#221

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

 Closed

yuntai
wants to merge
2
commits into

from

 Closed


Add PaymentFailReason enum for fail_htlc_backwards
#221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f133554

Add PaymentFailReason for fail_htlc_backwards


yuntai Oct 25, 2018
a6a0a1a

Comments updated for PaymentReceived


yuntai Oct 25, 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


6 changes: 3 additions & 3 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 },
 9 => {
 for payment in payments_received.drain(..) {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 }
 },
 10 => {
Expand Down

22 changes: 15 additions & 7 deletions
src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
	}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
	/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
	PreimageUnknown,
	/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
	AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
 events.append(&mut new_events);
	}

	/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
 // TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
 // received is < expected or > 2*expected
	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
 let mut channel_state = Some(self.channel_state.lock().unwrap());
 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
 if let Some(mut sources) = removed_source {
 for htlc_with_hash in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
 }
 true
 } else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
	use chain::chaininterface;
	use chain::transaction::OutPoint;
	use chain::chaininterface::ChainListener;
	use ln::channelmanager::{ChannelManager,OnionKeys};
	use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
	use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
	use ln::router::{Route, RouteHop, Router};
	use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
	}

	fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
 check_added_monitors!(expected_route.last().unwrap(), 1);

 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down

7 changes: 5 additions & 2 deletions
src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
	},
	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
	/// ChannelManager::claim_funds to get it....
	/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
	/// to free up resources for this HTLC.
	/// Note that if the preimage is not known or the amount paid is incorrect, you must call 
	/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or 
	/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
	/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
	/// amount expected. 
	PaymentReceived {
 /// The hash for which the preimage should be handed to the ChannelManager.
 payment_hash: [u8; 32],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PaymentFailReason enum for fail_htlc_backwards#221

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

 Closed

yuntai
wants to merge
2
commits into

from

 Closed


Add PaymentFailReason enum for fail_htlc_backwards
#221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f133554

Add PaymentFailReason for fail_htlc_backwards


yuntai Oct 25, 2018
a6a0a1a

Comments updated for PaymentReceived


yuntai Oct 25, 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


6 changes: 3 additions & 3 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 },
 9 => {
 for payment in payments_received.drain(..) {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 }
 },
 10 => {
Expand Down

22 changes: 15 additions & 7 deletions
src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
	}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
	/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
	PreimageUnknown,
	/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
	AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
 events.append(&mut new_events);
	}

	/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
 // TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
 // received is < expected or > 2*expected
	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
 let mut channel_state = Some(self.channel_state.lock().unwrap());
 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
 if let Some(mut sources) = removed_source {
 for htlc_with_hash in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
 }
 true
 } else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
	use chain::chaininterface;
	use chain::transaction::OutPoint;
	use chain::chaininterface::ChainListener;
	use ln::channelmanager::{ChannelManager,OnionKeys};
	use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
	use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
	use ln::router::{Route, RouteHop, Router};
	use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
	}

	fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
 check_added_monitors!(expected_route.last().unwrap(), 1);

 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down

7 changes: 5 additions & 2 deletions
src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
	},
	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
	/// ChannelManager::claim_funds to get it....
	/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
	/// to free up resources for this HTLC.
	/// Note that if the preimage is not known or the amount paid is incorrect, you must call 
	/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or 
	/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
	/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
	/// amount expected. 
	PaymentReceived {
 /// The hash for which the preimage should be handed to the ChannelManager.
 payment_hash: [u8; 32],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add PaymentFailReason enum for fail_htlc_backwards#221

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

 Closed

yuntai
wants to merge
2
commits into

from

 Closed


Add PaymentFailReason enum for fail_htlc_backwards
#221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f133554

Add PaymentFailReason for fail_htlc_backwards


yuntai Oct 25, 2018
a6a0a1a

Comments updated for PaymentReceived


yuntai Oct 25, 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


6 changes: 3 additions & 3 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -337,7 +337,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
Expand All@@ -347,7 +347,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 },
 9 => {
 for payment in payments_received.drain(..) {
 channelmanager.fail_htlc_backwards(&payment);
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 }
 },
 10 => {
Expand Down

22 changes: 15 additions & 7 deletions
src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,16 @@ impl MsgHandleErrInternal {
	}
}

/// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
/// after a PaymentReceived event.
#[derive(PartialEq)]
pub enum PaymentFailReason {
	/// Indicate the preimage for payment_hash is not known after a PaymentReceived event
	PreimageUnknown,
	/// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
	AmountMismatch,
}

/// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
/// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
/// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
Expand DownExpand Up@@ -1393,16 +1403,14 @@ impl ChannelManager {
 events.append(&mut new_events);
	}

	/// Indicates that the preimage for payment_hash is unknown after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32]) -> bool {
 // TODO: Add ability to return 0x4000|16 (incorrect_payment_amount) if the amount we
 // received is < expected or > 2*expected
	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
	pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
 let mut channel_state = Some(self.channel_state.lock().unwrap());
 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
 if let Some(mut sources) = removed_source {
 for htlc_with_hash in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: Vec::new() });
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
 }
 true
 } else { false }
Expand DownExpand Up@@ -2677,7 +2685,7 @@ mod tests {
	use chain::chaininterface;
	use chain::transaction::OutPoint;
	use chain::chaininterface::ChainListener;
	use ln::channelmanager::{ChannelManager,OnionKeys};
	use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
	use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
	use ln::router::{Route, RouteHop, Router};
	use ln::msgs;
Expand DownExpand Up@@ -3368,7 +3376,7 @@ mod tests {
	}

	fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
 check_added_monitors!(expected_route.last().unwrap(), 1);

 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
Expand Down

7 changes: 5 additions & 2 deletions
src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,11 @@ pub enum Event {
	},
	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
	/// ChannelManager::claim_funds to get it....
	/// Note that if the preimage is not known, you must call ChannelManager::fail_htlc_backwards
	/// to free up resources for this HTLC.
	/// Note that if the preimage is not known or the amount paid is incorrect, you must call 
	/// ChannelManager::fail_htlc_backwards with PaymentFailReason::PreimageUnknown or 
	/// PaymentFailReason::AmountMismatch, respectively, to free up resources for this HTLC.
	/// The amount paid should be considered 'incorrect' when it is less than or more than twice the
	/// amount expected. 
	PaymentReceived {
 /// The hash for which the preimage should be handed to the ChannelManager.
 payment_hash: [u8; 32],
Expand Down