projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate conditional imports
[rust-lightning]
/
lightning
/
src
/
ln
/
onion_payment.rs
diff --git
a/lightning/src/ln/onion_payment.rs
b/lightning/src/ln/onion_payment.rs
index 31ecc6ddd2345a6fdf52e764bb40453530902239..c552bf13b8efd0fa80cd396d23e2f96da5c85eba 100644
(file)
--- a/
lightning/src/ln/onion_payment.rs
+++ b/
lightning/src/ln/onion_payment.rs
@@
-122,19
+122,22
@@
pub(super) fn create_recv_pending_htlc_info(
counterparty_skimmed_fee_msat: Option<u64>, current_height: u32, accept_mpp_keysend: bool,
) -> Result<PendingHTLCInfo, InboundHTLCErr> {
let (
counterparty_skimmed_fee_msat: Option<u64>, current_height: u32, accept_mpp_keysend: bool,
) -> Result<PendingHTLCInfo, InboundHTLCErr> {
let (
- payment_data, keysend_preimage, custom_tlvs, onion_amt_msat, o
utgoing_cltv_value
,
+ payment_data, keysend_preimage, custom_tlvs, onion_amt_msat, o
nion_cltv_expiry
,
payment_metadata, requires_blinded_error
) = match hop_data {
msgs::InboundOnionPayload::Receive {
payment_metadata, requires_blinded_error
) = match hop_data {
msgs::InboundOnionPayload::Receive {
- payment_data, keysend_preimage, custom_tlvs, amt_msat, outgoing_cltv_value, payment_metadata, ..
+ payment_data, keysend_preimage, custom_tlvs, sender_intended_htlc_amt_msat,
+ cltv_expiry_height, payment_metadata, ..
} =>
} =>
- (payment_data, keysend_preimage, custom_tlvs,
amt_msat, outgoing_cltv_value, payment_metadata
,
- false),
+ (payment_data, keysend_preimage, custom_tlvs,
sender_intended_htlc_amt_msat
,
+
cltv_expiry_height, payment_metadata,
false),
msgs::InboundOnionPayload::BlindedReceive {
msgs::InboundOnionPayload::BlindedReceive {
-
amt_msat, total_msat, outgoing_cltv_value, payment_secret, intro_node_blinding_poin
t,
- payment_constraints, ..
+
sender_intended_htlc_amt_msat, total_msat, cltv_expiry_height, payment_secre
t,
+
intro_node_blinding_point,
payment_constraints, ..
} => {
} => {
- check_blinded_payment_constraints(amt_msat, cltv_expiry, &payment_constraints)
+ check_blinded_payment_constraints(
+ sender_intended_htlc_amt_msat, cltv_expiry, &payment_constraints
+ )
.map_err(|()| {
InboundHTLCErr {
err_code: INVALID_ONION_BLINDING,
.map_err(|()| {
InboundHTLCErr {
err_code: INVALID_ONION_BLINDING,
@@
-143,8
+146,8
@@
pub(super) fn create_recv_pending_htlc_info(
}
})?;
let payment_data = msgs::FinalOnionHopData { payment_secret, total_msat };
}
})?;
let payment_data = msgs::FinalOnionHopData { payment_secret, total_msat };
- (Some(payment_data), None, Vec::new(),
amt_msat, outgoing_cltv_value, None
,
- intro_node_blinding_point.is_none())
+ (Some(payment_data), None, Vec::new(),
sender_intended_htlc_amt_msat, cltv_expiry_height
,
+
None,
intro_node_blinding_point.is_none())
}
msgs::InboundOnionPayload::Forward { .. } => {
return Err(InboundHTLCErr {
}
msgs::InboundOnionPayload::Forward { .. } => {
return Err(InboundHTLCErr {
@@
-162,7
+165,7
@@
pub(super) fn create_recv_pending_htlc_info(
}
};
// final_incorrect_cltv_expiry
}
};
// final_incorrect_cltv_expiry
- if o
utgoing_cltv_value
> cltv_expiry {
+ if o
nion_cltv_expiry
> cltv_expiry {
return Err(InboundHTLCErr {
msg: "Upstream node set CLTV to less than the CLTV set by the sender",
err_code: 18,
return Err(InboundHTLCErr {
msg: "Upstream node set CLTV to less than the CLTV set by the sender",
err_code: 18,
@@
-221,14
+224,14
@@
pub(super) fn create_recv_pending_htlc_info(
payment_data,
payment_preimage,
payment_metadata,
payment_data,
payment_preimage,
payment_metadata,
- incoming_cltv_expiry: o
utgoing_cltv_value
,
+ incoming_cltv_expiry: o
nion_cltv_expiry
,
custom_tlvs,
}
} else if let Some(data) = payment_data {
PendingHTLCRouting::Receive {
payment_data: data,
payment_metadata,
custom_tlvs,
}
} else if let Some(data) = payment_data {
PendingHTLCRouting::Receive {
payment_data: data,
payment_metadata,
- incoming_cltv_expiry: o
utgoing_cltv_value
,
+ incoming_cltv_expiry: o
nion_cltv_expiry
,
phantom_shared_secret,
custom_tlvs,
requires_blinded_error,
phantom_shared_secret,
custom_tlvs,
requires_blinded_error,
@@
-246,7
+249,7
@@
pub(super) fn create_recv_pending_htlc_info(
incoming_shared_secret: shared_secret,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: onion_amt_msat,
incoming_shared_secret: shared_secret,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: onion_amt_msat,
- outgoing_cltv_value,
+ outgoing_cltv_value
: onion_cltv_expiry
,
skimmed_fee_msat: counterparty_skimmed_fee_msat,
})
}
skimmed_fee_msat: counterparty_skimmed_fee_msat,
})
}