Skip to content

Commit da3623b

Browse files
committed
Fail request_refund_payment for unsupported chain
If a Refund has an unsupported chain, ChannelManager should not send an invoice as it can't be paid on that chain. Instead, return an error when calling ChannelManager::request_refund_payment for such refunds.
1 parent ad91fcd commit da3623b

File tree

3 files changed

+44
-2
lines changed

3 files changed

+44
-2
lines changed

lightning/src/ln/channelmanager.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -7919,8 +7919,10 @@ where
79197919
///
79207920
/// # Errors
79217921
///
7922-
/// Errors if the parameterized [`Router`] is unable to create a blinded payment path or reply
7923-
/// path for the invoice.
7922+
/// Errors if:
7923+
/// - the refund is for an unsupported chain, or
7924+
/// - the parameterized [`Router`] is unable to create a blinded payment path or reply path for
7925+
/// the invoice.
79247926
///
79257927
/// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
79267928
pub fn request_refund_payment(&self, refund: &Refund) -> Result<(), Bolt12SemanticError> {
@@ -7931,6 +7933,10 @@ where
79317933
let amount_msats = refund.amount_msats();
79327934
let relative_expiry = DEFAULT_RELATIVE_EXPIRY.as_secs() as u32;
79337935

7936+
if refund.chain() != self.chain_hash {
7937+
return Err(Bolt12SemanticError::UnsupportedChain);
7938+
}
7939+
79347940
match self.create_inbound_payment(Some(amount_msats), relative_expiry, None) {
79357941
Ok((payment_hash, payment_secret)) => {
79367942
let payment_paths = self.create_blinded_payment_paths(amount_msats, payment_secret)

lightning/src/ln/offers_tests.rs

+30
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,36 @@ fn fails_creating_invoice_request_for_unsupported_chain() {
759759
}
760760
}
761761

762+
/// Fails requesting a payment when the refund contains an unsupported chain.
763+
#[test]
764+
fn fails_sending_invoice_with_unsupported_chain_for_refund() {
765+
let chanmon_cfgs = create_chanmon_cfgs(2);
766+
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
767+
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
768+
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
769+
770+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 10_000_000, 1_000_000_000);
771+
772+
let alice = &nodes[0];
773+
let bob = &nodes[1];
774+
775+
let absolute_expiry = Duration::from_secs(u64::MAX);
776+
let payment_id = PaymentId([1; 32]);
777+
let refund = bob.node
778+
.create_refund_builder(
779+
"refund".to_string(), 10_000_000, absolute_expiry, payment_id, Retry::Attempts(0), None
780+
)
781+
.unwrap()
782+
.clear_chain()
783+
.chain(Network::Signet)
784+
.build().unwrap();
785+
786+
match alice.node.request_refund_payment(&refund) {
787+
Ok(_) => panic!("Expected error"),
788+
Err(e) => assert_eq!(e, Bolt12SemanticError::UnsupportedChain),
789+
}
790+
}
791+
762792
/// Fails creating an invoice request when a blinded reply path cannot be created without exposing
763793
/// the node's id.
764794
#[test]

lightning/src/offers/refund.rs

+6
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,12 @@ macro_rules! refund_builder_test_methods { (
334334
$return_value
335335
}
336336

337+
#[cfg_attr(c_bindings, allow(dead_code))]
338+
pub(crate) fn clear_chain($($self_mut)* $self: $self_type) -> $return_type {
339+
$self.refund.chain = None;
340+
$return_value
341+
}
342+
337343
#[cfg_attr(c_bindings, allow(dead_code))]
338344
fn features_unchecked($($self_mut)* $self: $self_type, features: InvoiceRequestFeatures) -> $return_type {
339345
$self.refund.features = features;

0 commit comments

Comments
 (0)