8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
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
8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
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
8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
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
8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
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
8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
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
8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
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
8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
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
8 changes: 4 additions & 4 deletions fuzz/src/chanmon_consistency.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,7 +613,7 @@ fn send_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -683,7 +683,7 @@ fn send_hop_payment(
}],
route_params: Some(route_params.clone()),
};
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(err) => {
Expand DownExpand Up@@ -748,7 +748,7 @@ fn send_mpp_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand DownExpand Up@@ -844,7 +844,7 @@ fn send_mpp_hop_payment(
amt,
);
let route = Route { paths, route_params: Some(route_params) };
let onion = RecipientOnionFields::secret_only(payment_secret);
let onion = RecipientOnionFields::secret_only(payment_secret, amt);
let res = source.send_payment_with_route(route, payment_hash, onion, payment_id);
match res {
Err(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,7 +743,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand All@@ -765,7 +765,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
payments_sent += 1;
let _ = channelmanager.send_payment(
payment_hash,
RecipientOnionFields::secret_only(payment_secret),
RecipientOnionFields::secret_only(payment_secret, final_value_msat),
PaymentId(payment_hash.0),
params,
Retry::Attempts(2),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -6850,7 +6850,7 @@ mod tests {
// the update through to the ChannelMonitor which will refuse it (as the channel is closed).
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
nodes[1].node.send_payment_with_route(route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
RecipientOnionFields::secret_only(payment_secret, 100_000), PaymentId(payment_hash.0)
).unwrap();
check_added_monitors(&nodes[1], 1);

Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,8 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::types::string::UntrustedString;
use crate::util::errors::APIError;
use crate::util::ser::{
BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
WithoutLength, Writeable, Writer,
BigSize, FixedLengthReader, MaybeReadable, Readable, ReadableArgs, RequiredWrapper,
UpgradableRequired, WithoutLength, Writeable, Writer,
};

use crate::io;
Expand DownExpand Up@@ -2378,7 +2378,7 @@ impl MaybeReadable for Event {
(6, _user_payment_id, option),
(7, claim_deadline, option),
(8, payment_preimage, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs, amount_msat)),
(10, counterparty_skimmed_fee_msat_opt, option),
(11, payment_context, option),
(13, payment_id, option),
Expand DownExpand Up@@ -2710,7 +2710,8 @@ impl MaybeReadable for Event {
(4, amount_msat, required),
(5, htlcs, optional_vec),
(7, sender_intended_total_msat, option),
(9, onion_fields, option),
(9, onion_fields, (option: ReadableArgs,
sender_intended_total_msat.unwrap_or(amount_msat))),
(11, payment_id, option),
});
Ok(Some(Event::PaymentClaimed {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/accountable_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ fn test_accountable_forwarding_with_override(
PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV),
100_000,
);
let onion_fields = RecipientOnionFields::secret_only(payment_secret);
let onion_fields = RecipientOnionFields::secret_only(payment_secret, 100_000);
let payment_id = PaymentId(payment_hash.0);
nodes[0]
.node
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/async_payments_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -615,7 +615,7 @@ fn invalid_keysend_payment_secret() {
.node
.send_spontaneous_payment(
Some(keysend_preimage),
RecipientOnionFields::spontaneous_empty(),
RecipientOnionFields::spontaneous_empty(amt_msat),
PaymentId(keysend_preimage.0),
route_params,
Retry::Attempts(0),
Expand Down
12 changes: 6 additions & 6 deletions lightning/src/ln/async_signer_tests.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ fn do_test_async_commitment_signature_for_commitment_signed_revoke_and_ack(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -520,7 +520,7 @@ fn do_test_async_raa_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -669,7 +669,7 @@ fn do_test_async_commitment_signature_peer_disconnect(

let (route, our_payment_hash, _our_payment_preimage, our_payment_secret) =
get_route_and_payment_hash!(src, dst, 8000000);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret);
let recipient_fields = RecipientOnionFields::secret_only(our_payment_secret, 8000000);
let payment_id = PaymentId(our_payment_hash.0);
src.node
.send_payment_with_route(route, our_payment_hash, recipient_fields, payment_id)
Expand DownExpand Up@@ -804,7 +804,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
// to the peer.
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2);
let recipient_fields = RecipientOnionFields::secret_only(payment_secret_2, 1000000);
let payment_id = PaymentId(payment_hash_2.0);
nodes[0]
.node
Expand DownExpand Up@@ -1343,14 +1343,14 @@ fn test_no_disconnect_while_async_revoke_and_ack_expecting_remote_commitment_sig
// We'll send a payment from both nodes to each other.
let (route1, payment_hash1, _, payment_secret1) =
get_route_and_payment_hash!(&nodes[0], &nodes[1], payment_amount);
let onion1 = RecipientOnionFields::secret_only(payment_secret1);
let onion1 = RecipientOnionFields::secret_only(payment_secret1, payment_amount);
let payment_id1 = PaymentId(payment_hash1.0);
nodes[0].node.send_payment_with_route(route1, payment_hash1, onion1, payment_id1).unwrap();
check_added_monitors(&nodes[0], 1);

let (route2, payment_hash2, _, payment_secret2) =
get_route_and_payment_hash!(&nodes[1], &nodes[0], payment_amount);
let onion2 = RecipientOnionFields::secret_only(payment_secret2);
let onion2 = RecipientOnionFields::secret_only(payment_secret2, payment_amount);
let payment_id2 = PaymentId(payment_hash2.0);
nodes[1].node.send_payment_with_route(route2, payment_hash2, onion2, payment_id2).unwrap();
check_added_monitors(&nodes[1], 1);
Expand Down
Loading
Loading