Skip to content

Refactor unified_qr.rs to use bitcoin-payment-instructions #607

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Refactor unified_qr.rs to use bitcoin-payment-instructions #607

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e190ee
Rename unified_qr to unified
chuksys Aug 2, 2025
1903144
rename UnifiedQRPayment to UnifiedPayment, rename QRPaymentResult to …
chuksys Aug 2, 2025
7961b8f
add bitcoin-payment-instructions to cargo.toml
chuksys Aug 2, 2025
6ff4e41
Add hrn_resolver to Node
chuksys Aug 11, 2025
0d7fc1c
Pass hrn_resolver into UnifiedPayment and update unified.rs docs
chuksys Aug 11, 2025
8c78b5d
Refactor unified.rs to support sending to BIP 21 URIs as well as BIP …
chuksys Aug 11, 2025
7909c0f
Refactor unified_payment tests
chuksys Aug 11, 2025
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
66 changes: 33 additions & 33 deletions tests/integration_tests_rust.rs
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include the test changes in the corresponding commit(s) that require them. Each commit should build and test individually, not just the whole PR.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use common::{
use ldk_node::config::EsploraSyncConfig;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDirection, PaymentKind, PaymentStatus, QrPaymentResult,
ConfirmationStatus, PaymentDirection, PaymentKind, PaymentResult, PaymentStatus,
SendingParameters,
};
use ldk_node::{Builder, Event, NodeError};
Expand Down Expand Up @@ -1096,15 +1096,15 @@ fn generate_bip21_uri() {

// Test 1: Verify URI generation (on-chain + BOLT11) works
// even before any channels are opened. This checks the graceful fallback behavior.
let initial_uqr_payment = node_b
.unified_qr_payment()
let initial_uni_payment = node_b
.unified_payment()
.receive(expected_amount_sats, "asdf", expiry_sec)
.expect("Failed to generate URI");
println!("Initial URI (no channels): {}", initial_uqr_payment);
println!("Initial URI (no channels): {}", initial_uni_payment);

assert!(initial_uqr_payment.contains("bitcoin:"));
assert!(initial_uqr_payment.contains("lightning="));
assert!(!initial_uqr_payment.contains("lno=")); // BOLT12 requires channels
assert!(initial_uni_payment.contains("bitcoin:"));
assert!(initial_uni_payment.contains("lightning="));
assert!(!initial_uni_payment.contains("lno=")); // BOLT12 requires channels

premine_and_distribute_funds(
&bitcoind.client,
Expand All @@ -1124,19 +1124,19 @@ fn generate_bip21_uri() {
expect_channel_ready_event!(node_b, node_a.node_id());

// Test 2: Verify URI generation (on-chain + BOLT11 + BOLT12) works after channels are established.
let uqr_payment = node_b
.unified_qr_payment()
let uni_payment = node_b
.unified_payment()
.receive(expected_amount_sats, "asdf", expiry_sec)
.expect("Failed to generate URI");

println!("Generated URI: {}", uqr_payment);
assert!(uqr_payment.contains("bitcoin:"));
assert!(uqr_payment.contains("lightning="));
assert!(uqr_payment.contains("lno="));
println!("Generated URI: {}", uni_payment);
assert!(uni_payment.contains("bitcoin:"));
assert!(uni_payment.contains("lightning="));
assert!(uni_payment.contains("lno="));
}

#[test]
fn unified_qr_send_receive() {
#[tokio::test(flavor = "multi_thread")]
async fn unified_send_receive_qr_uri() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
let chain_source = TestChainSource::Esplora(&electrsd);

Expand Down Expand Up @@ -1173,18 +1173,18 @@ fn unified_qr_send_receive() {
let expected_amount_sats = 100_000;
let expiry_sec = 4_000;

let uqr_payment = node_b.unified_qr_payment().receive(expected_amount_sats, "asdf", expiry_sec);
let uri_str = uqr_payment.clone().unwrap();
let offer_payment_id: PaymentId = match node_a.unified_qr_payment().send(&uri_str) {
Ok(QrPaymentResult::Bolt12 { payment_id }) => {
let uni_payment = node_b.unified_payment().receive(expected_amount_sats, "asdf", expiry_sec);
let uri_str = uni_payment.clone().unwrap();
let offer_payment_id: PaymentId = match node_a.unified_payment().send(&uri_str, None).await {
Ok(PaymentResult::Bolt12 { payment_id }) => {
println!("\nBolt12 payment sent successfully with PaymentID: {:?}", payment_id);
payment_id
},
Ok(QrPaymentResult::Bolt11 { payment_id: _ }) => {
Ok(PaymentResult::Bolt11 { payment_id: _ }) => {
panic!("Expected Bolt12 payment but got Bolt11");
},
Ok(QrPaymentResult::Onchain { txid: _ }) => {
panic!("Expected Bolt12 payment but get On-chain transaction");
Ok(PaymentResult::Onchain { txid: _ }) => {
panic!("Expected Bolt12 payment but got On-chain transaction");
},
Err(e) => {
panic!("Expected Bolt12 payment but got error: {:?}", e);
Expand All @@ -1196,15 +1196,15 @@ fn unified_qr_send_receive() {
// Cut off the BOLT12 part to fallback to BOLT11.
let uri_str_without_offer = uri_str.split("&lno=").next().unwrap();
let invoice_payment_id: PaymentId =
match node_a.unified_qr_payment().send(uri_str_without_offer) {
Ok(QrPaymentResult::Bolt12 { payment_id: _ }) => {
match node_a.unified_payment().send(uri_str_without_offer, None).await {
Ok(PaymentResult::Bolt12 { payment_id: _ }) => {
panic!("Expected Bolt11 payment but got Bolt12");
},
Ok(QrPaymentResult::Bolt11 { payment_id }) => {
Ok(PaymentResult::Bolt11 { payment_id }) => {
println!("\nBolt11 payment sent successfully with PaymentID: {:?}", payment_id);
payment_id
},
Ok(QrPaymentResult::Onchain { txid: _ }) => {
Ok(PaymentResult::Onchain { txid: _ }) => {
panic!("Expected Bolt11 payment but got on-chain transaction");
},
Err(e) => {
Expand All @@ -1214,19 +1214,19 @@ fn unified_qr_send_receive() {
expect_payment_successful_event!(node_a, Some(invoice_payment_id), None);

let expect_onchain_amount_sats = 800_000;
let onchain_uqr_payment =
node_b.unified_qr_payment().receive(expect_onchain_amount_sats, "asdf", 4_000).unwrap();
let onchain_uni_payment =
node_b.unified_payment().receive(expect_onchain_amount_sats, "asdf", 4_000).unwrap();

// Cut off any lightning part to fallback to on-chain only.
let uri_str_without_lightning = onchain_uqr_payment.split("&lightning=").next().unwrap();
let txid = match node_a.unified_qr_payment().send(&uri_str_without_lightning) {
Ok(QrPaymentResult::Bolt12 { payment_id: _ }) => {
let uri_str_without_lightning = onchain_uni_payment.split("&lightning=").next().unwrap();
let txid = match node_a.unified_payment().send(&uri_str_without_lightning, None).await {
Ok(PaymentResult::Bolt12 { payment_id: _ }) => {
panic!("Expected on-chain payment but got Bolt12")
},
Ok(QrPaymentResult::Bolt11 { payment_id: _ }) => {
Ok(PaymentResult::Bolt11 { payment_id: _ }) => {
panic!("Expected on-chain payment but got Bolt11");
},
Ok(QrPaymentResult::Onchain { txid }) => {
Ok(PaymentResult::Onchain { txid }) => {
println!("\nOn-chain transaction successful with Txid: {}", txid);
txid
},
Expand Down
Loading