Rename PaymentReceived to PaymentClaimable#1891

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
TheBlueMatt merged 2 commits into from
Dec 4, 2022
Merged

Rename PaymentReceived to PaymentClaimable#1891

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
22d74bf
Rename `PaymentReceived` to `PaymentClaimable`
tnull Dec 1, 2022
c17e9fb
Update docs and add pending changelog
tnull Dec 3, 2022
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
10 changes: 5 additions & 5 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
let mut events = nodes[$node].get_and_clear_pending_events();
// Sort events so that PendingHTLCsForwardable get processed last. This avoids a
// case where we first process a PendingHTLCsForwardable, then claim/fail on a
// PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
// PaymentReceived event for the second HTLC in our pending_events (and breaking
// PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
// PaymentClaimable event for the second HTLC in our pending_events (and breaking
// our claim_set deduplication).
events.sort_by(|a, b| {
if let events::Event::PaymentReceived { .. } = a {
if let events::Event::PaymentClaimable { .. } = a {
if let events::Event::PendingHTLCsForwardable { .. } = b {
Ordering::Less
} else { Ordering::Equal }
} else if let events::Event::PendingHTLCsForwardable { .. } = a {
if let events::Event::PaymentReceived { .. } = b {
if let events::Event::PaymentClaimable { .. } = b {
Ordering::Greater
} else { Ordering::Equal }
} else { Ordering::Equal }
});
let had_events = !events.is_empty();
for event in events.drain(..) {
match event {
events::Event::PaymentReceived { payment_hash, .. } => {
events::Event::PaymentClaimable { payment_hash, .. } => {
if claim_set.insert(payment_hash.0) {
if $fail {
nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down
2 changes: 1 addition & 1 deletion fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
},
Event::PaymentReceived { payment_hash, .. } => {
Event::PaymentClaimable { payment_hash, .. } => {
//TODO: enhance by fetching random amounts from fuzz input?
payments_received.push(payment_hash);
},
Expand Down
4 changes: 2 additions & 2 deletions lightning-invoice/src/utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

// Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
// Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
// this "emulates" the payment taking two hops, providing some privacy to make phantom node
// payments "look real" by taking more time.
expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
nodes[fwd_idx].node.process_pending_htlc_forwards();

let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
let events = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events.len(), 2);
Expand Down
46 changes: 23 additions & 23 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
let events_3 = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events_3.len(), 1);
match events_3[0] {
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
assert_eq!(payment_hash_1, *payment_hash);
assert_eq!(amount_msat, 1_000_000);
assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
let events_5 = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events_5.len(), 1);
match events_5[0] {
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
assert_eq!(payment_hash_2, *payment_hash);
assert_eq!(amount_msat, 1_000_000);
assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
let events = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
match events[0] {
Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
assert_eq!(payment_hash, our_payment_hash);
assert_eq!(amount_msat, 1_000_000);
assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
let events = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
match events[0] {
Event::PaymentReceived { payment_hash, .. } => {
Event::PaymentClaimable { payment_hash, .. } => {
assert_eq!(payment_hash, our_payment_hash);
},
_ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
check_added_monitors!(nodes[0], 1);
expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
check_added_monitors!(nodes[1], 1);
expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
let events_6 = nodes[2].node.get_and_clear_pending_events();
assert_eq!(events_6.len(), 2);
match events_6[0] {
Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
_ => panic!("Unexpected event"),
};
match events_6[1] {
Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
_ => panic!("Unexpected event"),
};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
let events_9 = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events_9.len(), 1);
match events_9[0] {
Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
_ => panic!("Unexpected event"),
};
claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
check_added_monitors!(nodes[1], 0);
let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

// We send a third payment here, which is somewhat of a redundant test, but the
// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
check_added_monitors!(nodes[1], 1);
expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
check_added_monitors!(nodes[1], 1);
expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
check_added_monitors!(nodes[1], 1);

expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
check_added_monitors!(nodes[1], 1);

expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
check_added_monitors!(nodes[1], 0);

expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
check_added_monitors!(nodes[1], 1);

expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
let events = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events.len(), 2);
match events[0] {
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
assert_eq!(payment_hash_2, *payment_hash);
assert_eq!(1_000_000, amount_msat);
assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
_ => panic!("Unexpected event"),
}
match events[1] {
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
assert_eq!(payment_hash_3, *payment_hash);
assert_eq!(1_000_000, amount_msat);
assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
_ => panic!("Unexpected event"),
};
nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
check_added_monitors!(nodes[1], 1);
expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
check_added_monitors!(nodes[1], 1);

expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
check_added_monitors!(nodes[1], 1);

commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
};

nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
Rename PaymentReceived to PaymentClaimable#1891

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

TheBlueMatt
merged 2 commits into

from

Dec 4, 2022
 Merged


Rename PaymentReceived to PaymentClaimable#1891
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
22d74bf

Rename `PaymentReceived` to `PaymentClaimable`


tnull Dec 1, 2022
c17e9fb

Update docs and add pending changelog


tnull Dec 3, 2022

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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let mut events = nodes[$node].get_and_clear_pending_events();
 // Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 // case where we first process a PendingHTLCsForwardable, then claim/fail on a
 // PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentReceived event for the second HTLC in our pending_events (and breaking
 // PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentClaimable event for the second HTLC in our pending_events (and breaking
 // our claim_set deduplication).
 events.sort_by(|a, b| {
 if let events::Event::PaymentReceived { .. } = a {
 if let events::Event::PaymentClaimable { .. } = a {
 if let events::Event::PendingHTLCsForwardable { .. } = b {
 Ordering::Less
 } else { Ordering::Equal }
 } else if let events::Event::PendingHTLCsForwardable { .. } = a {
 if let events::Event::PaymentReceived { .. } = b {
 if let events::Event::PaymentClaimable { .. } = b {
 Ordering::Greater
 } else { Ordering::Equal }
 } else { Ordering::Equal }
 });
 let had_events = !events.is_empty();
 for event in events.drain(..) {
 match event {
 events::Event::PaymentReceived { payment_hash, .. } => {
 events::Event::PaymentClaimable { payment_hash, .. } => {
 if claim_set.insert(payment_hash.0) {
 if $fail {
 nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
 pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
 },
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 //TODO: enhance by fetching random amounts from fuzz input?
 payments_received.push(payment_hash);
 },
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
 nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

 // Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
 // Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
 // this "emulates" the payment taking two hops, providing some privacy to make phantom node
 // payments "look real" by taking more time.
 expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
 nodes[fwd_idx].node.process_pending_htlc_forwards();

 let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
 do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 2);
Expand Down

46 changes: 23 additions & 23 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	let events_3 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_3.len(), 1);
	match events_3[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_1, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	let events_5 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_5.len(), 1);
	match events_5[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash, our_payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 assert_eq!(payment_hash, our_payment_hash);
 },
 _ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
	check_added_monitors!(nodes[0], 1);
	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let events_6 = nodes[2].node.get_and_clear_pending_events();
	assert_eq!(events_6.len(), 2);
	match events_6[0] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 _ => panic!("Unexpected event"),
	};
	match events_6[1] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 _ => panic!("Unexpected event"),
	};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 let events_9 = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events_9.len(), 1);
 match events_9[0] {
 Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 _ => panic!("Unexpected event"),
 };
 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
	check_added_monitors!(nodes[1], 0);
	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	// We send a third payment here, which is somewhat of a redundant test, but the
	// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
	let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 0);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 2);
	match events[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
 _ => panic!("Unexpected event"),
	}
	match events[1] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_3, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
 _ => panic!("Unexpected event"),
	};
	nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
	check_added_monitors!(nodes[1], 1);

	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	};

	nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading

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

Skip to content
Rename PaymentReceived to PaymentClaimable#1891

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

TheBlueMatt
merged 2 commits into

from

Dec 4, 2022
 Merged


Rename PaymentReceived to PaymentClaimable#1891
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
22d74bf

Rename `PaymentReceived` to `PaymentClaimable`


tnull Dec 1, 2022
c17e9fb

Update docs and add pending changelog


tnull Dec 3, 2022

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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let mut events = nodes[$node].get_and_clear_pending_events();
 // Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 // case where we first process a PendingHTLCsForwardable, then claim/fail on a
 // PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentReceived event for the second HTLC in our pending_events (and breaking
 // PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentClaimable event for the second HTLC in our pending_events (and breaking
 // our claim_set deduplication).
 events.sort_by(|a, b| {
 if let events::Event::PaymentReceived { .. } = a {
 if let events::Event::PaymentClaimable { .. } = a {
 if let events::Event::PendingHTLCsForwardable { .. } = b {
 Ordering::Less
 } else { Ordering::Equal }
 } else if let events::Event::PendingHTLCsForwardable { .. } = a {
 if let events::Event::PaymentReceived { .. } = b {
 if let events::Event::PaymentClaimable { .. } = b {
 Ordering::Greater
 } else { Ordering::Equal }
 } else { Ordering::Equal }
 });
 let had_events = !events.is_empty();
 for event in events.drain(..) {
 match event {
 events::Event::PaymentReceived { payment_hash, .. } => {
 events::Event::PaymentClaimable { payment_hash, .. } => {
 if claim_set.insert(payment_hash.0) {
 if $fail {
 nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
 pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
 },
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 //TODO: enhance by fetching random amounts from fuzz input?
 payments_received.push(payment_hash);
 },
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
 nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

 // Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
 // Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
 // this "emulates" the payment taking two hops, providing some privacy to make phantom node
 // payments "look real" by taking more time.
 expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
 nodes[fwd_idx].node.process_pending_htlc_forwards();

 let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
 do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 2);
Expand Down

46 changes: 23 additions & 23 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	let events_3 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_3.len(), 1);
	match events_3[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_1, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	let events_5 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_5.len(), 1);
	match events_5[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash, our_payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 assert_eq!(payment_hash, our_payment_hash);
 },
 _ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
	check_added_monitors!(nodes[0], 1);
	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let events_6 = nodes[2].node.get_and_clear_pending_events();
	assert_eq!(events_6.len(), 2);
	match events_6[0] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 _ => panic!("Unexpected event"),
	};
	match events_6[1] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 _ => panic!("Unexpected event"),
	};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 let events_9 = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events_9.len(), 1);
 match events_9[0] {
 Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 _ => panic!("Unexpected event"),
 };
 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
	check_added_monitors!(nodes[1], 0);
	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	// We send a third payment here, which is somewhat of a redundant test, but the
	// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
	let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 0);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 2);
	match events[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
 _ => panic!("Unexpected event"),
	}
	match events[1] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_3, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
 _ => panic!("Unexpected event"),
	};
	nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
	check_added_monitors!(nodes[1], 1);

	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	};

	nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading

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

Skip to content
Rename PaymentReceived to PaymentClaimable#1891

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

TheBlueMatt
merged 2 commits into

from

Dec 4, 2022
 Merged


Rename PaymentReceived to PaymentClaimable#1891
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
22d74bf

Rename `PaymentReceived` to `PaymentClaimable`


tnull Dec 1, 2022
c17e9fb

Update docs and add pending changelog


tnull Dec 3, 2022

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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let mut events = nodes[$node].get_and_clear_pending_events();
 // Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 // case where we first process a PendingHTLCsForwardable, then claim/fail on a
 // PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentReceived event for the second HTLC in our pending_events (and breaking
 // PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentClaimable event for the second HTLC in our pending_events (and breaking
 // our claim_set deduplication).
 events.sort_by(|a, b| {
 if let events::Event::PaymentReceived { .. } = a {
 if let events::Event::PaymentClaimable { .. } = a {
 if let events::Event::PendingHTLCsForwardable { .. } = b {
 Ordering::Less
 } else { Ordering::Equal }
 } else if let events::Event::PendingHTLCsForwardable { .. } = a {
 if let events::Event::PaymentReceived { .. } = b {
 if let events::Event::PaymentClaimable { .. } = b {
 Ordering::Greater
 } else { Ordering::Equal }
 } else { Ordering::Equal }
 });
 let had_events = !events.is_empty();
 for event in events.drain(..) {
 match event {
 events::Event::PaymentReceived { payment_hash, .. } => {
 events::Event::PaymentClaimable { payment_hash, .. } => {
 if claim_set.insert(payment_hash.0) {
 if $fail {
 nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
 pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
 },
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 //TODO: enhance by fetching random amounts from fuzz input?
 payments_received.push(payment_hash);
 },
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
 nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

 // Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
 // Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
 // this "emulates" the payment taking two hops, providing some privacy to make phantom node
 // payments "look real" by taking more time.
 expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
 nodes[fwd_idx].node.process_pending_htlc_forwards();

 let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
 do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 2);
Expand Down

46 changes: 23 additions & 23 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	let events_3 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_3.len(), 1);
	match events_3[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_1, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	let events_5 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_5.len(), 1);
	match events_5[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash, our_payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 assert_eq!(payment_hash, our_payment_hash);
 },
 _ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
	check_added_monitors!(nodes[0], 1);
	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let events_6 = nodes[2].node.get_and_clear_pending_events();
	assert_eq!(events_6.len(), 2);
	match events_6[0] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 _ => panic!("Unexpected event"),
	};
	match events_6[1] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 _ => panic!("Unexpected event"),
	};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 let events_9 = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events_9.len(), 1);
 match events_9[0] {
 Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 _ => panic!("Unexpected event"),
 };
 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
	check_added_monitors!(nodes[1], 0);
	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	// We send a third payment here, which is somewhat of a redundant test, but the
	// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
	let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 0);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 2);
	match events[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
 _ => panic!("Unexpected event"),
	}
	match events[1] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_3, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
 _ => panic!("Unexpected event"),
	};
	nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
	check_added_monitors!(nodes[1], 1);

	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	};

	nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
Rename PaymentReceived to PaymentClaimable#1891

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

TheBlueMatt
merged 2 commits into

from

Dec 4, 2022
 Merged


Rename PaymentReceived to PaymentClaimable#1891
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
22d74bf

Rename `PaymentReceived` to `PaymentClaimable`


tnull Dec 1, 2022
c17e9fb

Update docs and add pending changelog


tnull Dec 3, 2022

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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let mut events = nodes[$node].get_and_clear_pending_events();
 // Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 // case where we first process a PendingHTLCsForwardable, then claim/fail on a
 // PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentReceived event for the second HTLC in our pending_events (and breaking
 // PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentClaimable event for the second HTLC in our pending_events (and breaking
 // our claim_set deduplication).
 events.sort_by(|a, b| {
 if let events::Event::PaymentReceived { .. } = a {
 if let events::Event::PaymentClaimable { .. } = a {
 if let events::Event::PendingHTLCsForwardable { .. } = b {
 Ordering::Less
 } else { Ordering::Equal }
 } else if let events::Event::PendingHTLCsForwardable { .. } = a {
 if let events::Event::PaymentReceived { .. } = b {
 if let events::Event::PaymentClaimable { .. } = b {
 Ordering::Greater
 } else { Ordering::Equal }
 } else { Ordering::Equal }
 });
 let had_events = !events.is_empty();
 for event in events.drain(..) {
 match event {
 events::Event::PaymentReceived { payment_hash, .. } => {
 events::Event::PaymentClaimable { payment_hash, .. } => {
 if claim_set.insert(payment_hash.0) {
 if $fail {
 nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
 pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
 },
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 //TODO: enhance by fetching random amounts from fuzz input?
 payments_received.push(payment_hash);
 },
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
 nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

 // Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
 // Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
 // this "emulates" the payment taking two hops, providing some privacy to make phantom node
 // payments "look real" by taking more time.
 expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
 nodes[fwd_idx].node.process_pending_htlc_forwards();

 let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
 do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 2);
Expand Down

46 changes: 23 additions & 23 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	let events_3 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_3.len(), 1);
	match events_3[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_1, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	let events_5 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_5.len(), 1);
	match events_5[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash, our_payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 assert_eq!(payment_hash, our_payment_hash);
 },
 _ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
	check_added_monitors!(nodes[0], 1);
	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let events_6 = nodes[2].node.get_and_clear_pending_events();
	assert_eq!(events_6.len(), 2);
	match events_6[0] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 _ => panic!("Unexpected event"),
	};
	match events_6[1] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 _ => panic!("Unexpected event"),
	};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 let events_9 = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events_9.len(), 1);
 match events_9[0] {
 Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 _ => panic!("Unexpected event"),
 };
 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
	check_added_monitors!(nodes[1], 0);
	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	// We send a third payment here, which is somewhat of a redundant test, but the
	// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
	let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 0);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 2);
	match events[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
 _ => panic!("Unexpected event"),
	}
	match events[1] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_3, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
 _ => panic!("Unexpected event"),
	};
	nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
	check_added_monitors!(nodes[1], 1);

	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	};

	nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading

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

Skip to content
Rename PaymentReceived to PaymentClaimable#1891

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

TheBlueMatt
merged 2 commits into

from

Dec 4, 2022
 Merged


Rename PaymentReceived to PaymentClaimable#1891
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
22d74bf

Rename `PaymentReceived` to `PaymentClaimable`


tnull Dec 1, 2022
c17e9fb

Update docs and add pending changelog


tnull Dec 3, 2022

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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let mut events = nodes[$node].get_and_clear_pending_events();
 // Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 // case where we first process a PendingHTLCsForwardable, then claim/fail on a
 // PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentReceived event for the second HTLC in our pending_events (and breaking
 // PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentClaimable event for the second HTLC in our pending_events (and breaking
 // our claim_set deduplication).
 events.sort_by(|a, b| {
 if let events::Event::PaymentReceived { .. } = a {
 if let events::Event::PaymentClaimable { .. } = a {
 if let events::Event::PendingHTLCsForwardable { .. } = b {
 Ordering::Less
 } else { Ordering::Equal }
 } else if let events::Event::PendingHTLCsForwardable { .. } = a {
 if let events::Event::PaymentReceived { .. } = b {
 if let events::Event::PaymentClaimable { .. } = b {
 Ordering::Greater
 } else { Ordering::Equal }
 } else { Ordering::Equal }
 });
 let had_events = !events.is_empty();
 for event in events.drain(..) {
 match event {
 events::Event::PaymentReceived { payment_hash, .. } => {
 events::Event::PaymentClaimable { payment_hash, .. } => {
 if claim_set.insert(payment_hash.0) {
 if $fail {
 nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
 pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
 },
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 //TODO: enhance by fetching random amounts from fuzz input?
 payments_received.push(payment_hash);
 },
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
 nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

 // Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
 // Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
 // this "emulates" the payment taking two hops, providing some privacy to make phantom node
 // payments "look real" by taking more time.
 expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
 nodes[fwd_idx].node.process_pending_htlc_forwards();

 let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
 do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 2);
Expand Down

46 changes: 23 additions & 23 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	let events_3 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_3.len(), 1);
	match events_3[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_1, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	let events_5 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_5.len(), 1);
	match events_5[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash, our_payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 assert_eq!(payment_hash, our_payment_hash);
 },
 _ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
	check_added_monitors!(nodes[0], 1);
	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let events_6 = nodes[2].node.get_and_clear_pending_events();
	assert_eq!(events_6.len(), 2);
	match events_6[0] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 _ => panic!("Unexpected event"),
	};
	match events_6[1] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 _ => panic!("Unexpected event"),
	};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 let events_9 = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events_9.len(), 1);
 match events_9[0] {
 Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 _ => panic!("Unexpected event"),
 };
 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
	check_added_monitors!(nodes[1], 0);
	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	// We send a third payment here, which is somewhat of a redundant test, but the
	// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
	let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 0);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 2);
	match events[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
 _ => panic!("Unexpected event"),
	}
	match events[1] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_3, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
 _ => panic!("Unexpected event"),
	};
	nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
	check_added_monitors!(nodes[1], 1);

	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	};

	nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading

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

Skip to content
Rename PaymentReceived to PaymentClaimable#1891

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

TheBlueMatt
merged 2 commits into

from

Dec 4, 2022
 Merged


Rename PaymentReceived to PaymentClaimable#1891
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
22d74bf

Rename `PaymentReceived` to `PaymentClaimable`


tnull Dec 1, 2022
c17e9fb

Update docs and add pending changelog


tnull Dec 3, 2022

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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let mut events = nodes[$node].get_and_clear_pending_events();
 // Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 // case where we first process a PendingHTLCsForwardable, then claim/fail on a
 // PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentReceived event for the second HTLC in our pending_events (and breaking
 // PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentClaimable event for the second HTLC in our pending_events (and breaking
 // our claim_set deduplication).
 events.sort_by(|a, b| {
 if let events::Event::PaymentReceived { .. } = a {
 if let events::Event::PaymentClaimable { .. } = a {
 if let events::Event::PendingHTLCsForwardable { .. } = b {
 Ordering::Less
 } else { Ordering::Equal }
 } else if let events::Event::PendingHTLCsForwardable { .. } = a {
 if let events::Event::PaymentReceived { .. } = b {
 if let events::Event::PaymentClaimable { .. } = b {
 Ordering::Greater
 } else { Ordering::Equal }
 } else { Ordering::Equal }
 });
 let had_events = !events.is_empty();
 for event in events.drain(..) {
 match event {
 events::Event::PaymentReceived { payment_hash, .. } => {
 events::Event::PaymentClaimable { payment_hash, .. } => {
 if claim_set.insert(payment_hash.0) {
 if $fail {
 nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
 pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
 },
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 //TODO: enhance by fetching random amounts from fuzz input?
 payments_received.push(payment_hash);
 },
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
 nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

 // Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
 // Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
 // this "emulates" the payment taking two hops, providing some privacy to make phantom node
 // payments "look real" by taking more time.
 expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
 nodes[fwd_idx].node.process_pending_htlc_forwards();

 let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
 do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 2);
Expand Down

46 changes: 23 additions & 23 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	let events_3 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_3.len(), 1);
	match events_3[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_1, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	let events_5 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_5.len(), 1);
	match events_5[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash, our_payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 assert_eq!(payment_hash, our_payment_hash);
 },
 _ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
	check_added_monitors!(nodes[0], 1);
	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let events_6 = nodes[2].node.get_and_clear_pending_events();
	assert_eq!(events_6.len(), 2);
	match events_6[0] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 _ => panic!("Unexpected event"),
	};
	match events_6[1] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 _ => panic!("Unexpected event"),
	};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 let events_9 = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events_9.len(), 1);
 match events_9[0] {
 Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 _ => panic!("Unexpected event"),
 };
 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
	check_added_monitors!(nodes[1], 0);
	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	// We send a third payment here, which is somewhat of a redundant test, but the
	// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
	let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 0);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 2);
	match events[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
 _ => panic!("Unexpected event"),
	}
	match events[1] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_3, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
 _ => panic!("Unexpected event"),
	};
	nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
	check_added_monitors!(nodes[1], 1);

	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	};

	nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading

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

Skip to content
Rename PaymentReceived to PaymentClaimable#1891

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

TheBlueMatt
merged 2 commits into

from

Dec 4, 2022
 Merged


Rename PaymentReceived to PaymentClaimable#1891
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
22d74bf

Rename `PaymentReceived` to `PaymentClaimable`


tnull Dec 1, 2022
c17e9fb

Update docs and add pending changelog


tnull Dec 3, 2022

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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -843,24 +843,24 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let mut events = nodes[$node].get_and_clear_pending_events();
 // Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 // case where we first process a PendingHTLCsForwardable, then claim/fail on a
 // PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentReceived event for the second HTLC in our pending_events (and breaking
 // PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
 // PaymentClaimable event for the second HTLC in our pending_events (and breaking
 // our claim_set deduplication).
 events.sort_by(|a, b| {
 if let events::Event::PaymentReceived { .. } = a {
 if let events::Event::PaymentClaimable { .. } = a {
 if let events::Event::PendingHTLCsForwardable { .. } = b {
 Ordering::Less
 } else { Ordering::Equal }
 } else if let events::Event::PendingHTLCsForwardable { .. } = a {
 if let events::Event::PaymentReceived { .. } = b {
 if let events::Event::PaymentClaimable { .. } = b {
 Ordering::Greater
 } else { Ordering::Equal }
 } else { Ordering::Equal }
 });
 let had_events = !events.is_empty();
 for event in events.drain(..) {
 match event {
 events::Event::PaymentReceived { payment_hash, .. } => {
 events::Event::PaymentClaimable { payment_hash, .. } => {
 if claim_set.insert(payment_hash.0) {
 if $fail {
 nodes[$node].fail_htlc_backwards(&payment_hash);
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -646,7 +646,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 Event::FundingGenerationReady { temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script, .. } => {
 pending_funding_generation.push((temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script));
 },
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 //TODO: enhance by fetching random amounts from fuzz input?
 payments_received.push(payment_hash);
 },
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -957,7 +957,7 @@ mod test {
 nodes[fwd_idx].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 commitment_signed_dance!(nodes[fwd_idx], nodes[0], &payment_event.commitment_msg, false, true);

 // Note that we have to "forward pending HTLCs" twice before we see the PaymentReceived as
 // Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
 // this "emulates" the payment taking two hops, providing some privacy to make phantom node
 // payments "look real" by taking more time.
 expect_pending_htlcs_forwardable_ignore!(nodes[fwd_idx]);
Expand All@@ -966,7 +966,7 @@ mod test {
 nodes[fwd_idx].node.process_pending_htlc_forwards();

 let payment_preimage_opt = if user_generated_pmt_hash { None } else { Some(payment_preimage) };
expect_payment_received!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
expect_payment_claimable!(&nodes[fwd_idx], payment_hash, payment_secret, payment_amt, payment_preimage_opt, route.paths[0].last().unwrap().pubkey);
 do_claim_payment_along_route(&nodes[0], &vec!(&vec!(&nodes[fwd_idx])[..]), false, payment_preimage);
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 2);
Expand Down

46 changes: 23 additions & 23 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	let events_3 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_3.len(), 1);
	match events_3[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_1, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -569,7 +569,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	let events_5 = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events_5.len(), 1);
	match events_5[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -686,7 +686,7 @@ fn test_monitor_update_fail_cs() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash, our_payment_hash);
 assert_eq!(amount_msat, 1_000_000);
 assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
Expand DownExpand Up@@ -743,7 +743,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let events = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match events[0] {
 Event::PaymentReceived { payment_hash, .. } => {
 Event::PaymentClaimable { payment_hash, .. } => {
 assert_eq!(payment_hash, our_payment_hash);
 },
 _ => panic!("Unexpected event"),
Expand DownExpand Up@@ -814,12 +814,12 @@ fn test_monitor_update_raa_while_paused() {
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
	check_added_monitors!(nodes[0], 1);
	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);

	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
Expand DownExpand Up@@ -1049,11 +1049,11 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let events_6 = nodes[2].node.get_and_clear_pending_events();
	assert_eq!(events_6.len(), 2);
	match events_6[0] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
 _ => panic!("Unexpected event"),
	};
	match events_6[1] {
 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
 _ => panic!("Unexpected event"),
	};

Expand All@@ -1072,7 +1072,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 let events_9 = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events_9.len(), 1);
 match events_9[0] {
 Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
 _ => panic!("Unexpected event"),
 };
 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
Expand DownExpand Up@@ -1240,7 +1240,7 @@ fn raa_no_response_awaiting_raa_state() {
	check_added_monitors!(nodes[1], 0);
	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	// We send a third payment here, which is somewhat of a redundant test, but the
	// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
Expand DownExpand Up@@ -1269,7 +1269,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
	let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
Expand All@@ -1282,7 +1282,7 @@ fn raa_no_response_awaiting_raa_state() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1394,7 +1394,7 @@ fn claim_while_disconnected_monitor_update_fail() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1469,7 +1469,7 @@ fn monitor_failed_no_reestablish_response() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
}
Expand DownExpand Up@@ -1550,7 +1550,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 0);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

	let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
Expand All@@ -1563,7 +1563,7 @@ fn first_message_on_recv_ordering() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand DownExpand Up@@ -1652,7 +1652,7 @@ fn test_monitor_update_fail_claim() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 2);
	match events[0] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id } => {
 assert_eq!(payment_hash_2, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand All@@ -1669,7 +1669,7 @@ fn test_monitor_update_fail_claim() {
 _ => panic!("Unexpected event"),
	}
	match events[1] {
 Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id: _ } => {
 assert_eq!(payment_hash_3, *payment_hash);
 assert_eq!(1_000_000, amount_msat);
 assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -1750,7 +1750,7 @@ fn test_monitor_update_on_pending_forwards() {
 _ => panic!("Unexpected event"),
	};
	nodes[0].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);

	claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
}
Expand DownExpand Up@@ -1799,7 +1799,7 @@ fn monitor_update_claim_fail_no_response() {
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
	check_added_monitors!(nodes[1], 1);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);

	let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
Expand DownExpand Up@@ -2073,7 +2073,7 @@ fn test_pending_update_fee_ack_on_reconnect() {
	check_added_monitors!(nodes[1], 1);

	expect_pending_htlcs_forwardable!(nodes[0]);
expect_payment_received!(nodes[0], payment_hash, payment_secret, 1_000_000);
expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);

	claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
}
Expand DownExpand Up@@ -2368,7 +2368,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
	expect_pending_htlcs_forwardable!(nodes[1]);
expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
	check_added_monitors!(nodes[1], 1);

	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
Expand All@@ -2385,7 +2385,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
	};

	nodes[1].node.process_pending_htlc_forwards();
expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);

	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
Expand Down
Loading