Skip to content

Commit a24ca92

Browse files
committed
Use rc and fix warnings
1 parent 9e1e7ef commit a24ca92

5 files changed

Lines changed: 75 additions & 38 deletions

File tree

Cargo.lock

Lines changed: 43 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ldk-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
ldk-node = { git = "https://github.com/jkczyz/ldk-node.git", branch = "2025-10-splicing" }
7+
ldk-node = { version = "0.7.0-rc.0" }
88
serde = { version = "1.0.203", default-features = false, features = ["derive"] }
99
hyper = { version = "1", default-features = false, features = ["server", "http1"] }
1010
http-body-util = { version = "0.1", default-features = false }

ldk-server/src/api/bolt12_send.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ pub(crate) fn handle_bolt12_send_request(
1313
Offer::from_str(&request.offer.as_str()).map_err(|_| ldk_node::NodeError::InvalidOffer)?;
1414

1515
let payment_id = match request.amount_msat {
16-
None => context.node.bolt12_payment().send(&offer, request.quantity, request.payer_note),
16+
None => {
17+
context.node.bolt12_payment().send(&offer, request.quantity, request.payer_note, None)
18+
},
1719
Some(amount_msat) => context.node.bolt12_payment().send_using_amount(
1820
&offer,
1921
amount_msat,
2022
request.quantity,
2123
request.payer_note,
24+
None,
2225
),
2326
}?;
2427

ldk-server/src/main.rs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@ fn main() {
7979
let mut builder = Builder::from_config(ldk_node_config);
8080
builder.set_log_facade_logger();
8181

82+
if let Some(alias) = config_file.alias {
83+
if let Err(e) = builder.set_node_alias(alias.to_string()) {
84+
eprintln!("Failed to set node alias: {e}");
85+
std::process::exit(-1);
86+
}
87+
}
88+
8289
match config_file.chain_source {
8390
ChainSource::Rpc { rpc_address, rpc_user, rpc_password } => {
8491
builder.set_chain_source_bitcoind_rpc(
@@ -173,14 +180,18 @@ fn main() {
173180
"CHANNEL_PENDING: {} from counterparty {}",
174181
channel_id, counterparty_node_id
175182
);
176-
event_node.event_handled();
183+
if let Err(e) = event_node.event_handled() {
184+
eprintln!("Failed to mark event as handled: {e}");
185+
}
177186
},
178187
Event::ChannelReady { channel_id, counterparty_node_id, .. } => {
179188
println!(
180189
"CHANNEL_READY: {} from counterparty {:?}",
181190
channel_id, counterparty_node_id
182191
);
183-
event_node.event_handled();
192+
if let Err(e) = event_node.event_handled() {
193+
eprintln!("Failed to mark event as handled: {e}");
194+
}
184195
},
185196
Event::PaymentReceived { payment_id, payment_hash, amount_msat, .. } => {
186197
println!(
@@ -283,15 +294,19 @@ fn main() {
283294
&forwarded_payment.encode_to_vec(),
284295
) {
285296
Ok(_) => {
286-
event_node.event_handled();
297+
if let Err(e) = event_node.event_handled() {
298+
eprintln!("Failed to mark event as handled: {e}");
299+
}
287300
}
288301
Err(e) => {
289302
println!("Failed to write forwarded payment to persistence: {}", e);
290303
}
291304
}
292305
},
293306
_ => {
294-
event_node.event_handled();
307+
if let Err(e) = event_node.event_handled() {
308+
eprintln!("Failed to mark event as handled: {e}");
309+
}
295310
},
296311
}
297312
},
@@ -363,7 +378,9 @@ fn upsert_payment_details(
363378
&payment.encode_to_vec(),
364379
) {
365380
Ok(_) => {
366-
event_node.event_handled();
381+
if let Err(e) = event_node.event_handled() {
382+
eprintln!("Failed to mark event as handled: {e}");
383+
}
367384
},
368385
Err(e) => {
369386
eprintln!("Failed to write payment to persistence: {}", e);

ldk-server/src/util/config.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ struct LSPS2ServiceTomlConfig {
188188
max_client_to_self_delay: u32,
189189
min_payment_size_msat: u64,
190190
max_payment_size_msat: u64,
191+
client_trusts_lsp: bool,
191192
require_token: Option<String>,
192193
}
193194

@@ -203,6 +204,7 @@ impl Into<LSPS2ServiceConfig> for LSPS2ServiceTomlConfig {
203204
max_client_to_self_delay,
204205
min_payment_size_msat,
205206
max_payment_size_msat,
207+
client_trusts_lsp,
206208
require_token,
207209
} => LSPS2ServiceConfig {
208210
advertise_service,
@@ -213,6 +215,7 @@ impl Into<LSPS2ServiceConfig> for LSPS2ServiceTomlConfig {
213215
min_payment_size_msat,
214216
max_client_to_self_delay,
215217
max_payment_size_msat,
218+
client_trusts_lsp,
216219
require_token,
217220
},
218221
}
@@ -274,6 +277,7 @@ mod tests {
274277
max_client_to_self_delay = 1440 # ~10 days
275278
min_payment_size_msat = 10000000 # 10,000 satoshis
276279
max_payment_size_msat = 25000000000 # 0.25 BTC
280+
client_trusts_lsp = true
277281
"#;
278282

279283
fs::write(storage_path.join(config_file_name), toml_config).unwrap();
@@ -304,6 +308,7 @@ mod tests {
304308
max_client_to_self_delay: 1440,
305309
min_payment_size_msat: 10000000,
306310
max_payment_size_msat: 25000000000,
311+
client_trusts_lsp: true,
307312
}),
308313
};
309314

0 commit comments

Comments
 (0)