# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-lightning = { version = "0.0.106", features = ["max_level_trace"] }
-lightning-block-sync = { version = "0.0.106", features = [ "rpc-client" ] }
-lightning-invoice = { version = "0.14" }
-lightning-net-tokio = { version = "0.0.106" }
-lightning-persister = { version = "0.0.106" }
-lightning-background-processor = { version = "0.0.106" }
+lightning = { version = "0.0.107", features = ["max_level_trace"] }
+lightning-block-sync = { version = "0.0.107", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.15" }
+lightning-net-tokio = { version = "0.0.107" }
+lightning-persister = { version = "0.0.107" }
+lightning-background-processor = { version = "0.0.107" }
+lightning-rapid-gossip-sync = { version = "0.0.107" }
base64 = "0.13.0"
-bitcoin = "0.27"
+bitcoin = "0.28.1"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
hex = "0.3"
use std::sync::atomic::{AtomicU32, Ordering};
use std::sync::Arc;
use std::time::Duration;
-use tokio::sync::Mutex;
pub struct BitcoindClient {
- bitcoind_rpc_client: Arc<Mutex<RpcClient>>,
+ bitcoind_rpc_client: Arc<RpcClient>,
host: String,
port: u16,
rpc_user: String,
impl BlockSource for &BitcoindClient {
fn get_header<'a>(
- &'a mut self, header_hash: &'a BlockHash, height_hint: Option<u32>,
+ &'a self, header_hash: &'a BlockHash, height_hint: Option<u32>,
) -> AsyncBlockSourceResult<'a, BlockHeaderData> {
- Box::pin(async move {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
- rpc.get_header(header_hash, height_hint).await
- })
+ Box::pin(async move { self.bitcoind_rpc_client.get_header(header_hash, height_hint).await })
}
- fn get_block<'a>(
- &'a mut self, header_hash: &'a BlockHash,
- ) -> AsyncBlockSourceResult<'a, Block> {
- Box::pin(async move {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
- rpc.get_block(header_hash).await
- })
+ fn get_block<'a>(&'a self, header_hash: &'a BlockHash) -> AsyncBlockSourceResult<'a, Block> {
+ Box::pin(async move { self.bitcoind_rpc_client.get_block(header_hash).await })
}
- fn get_best_block<'a>(&'a mut self) -> AsyncBlockSourceResult<(BlockHash, Option<u32>)> {
- Box::pin(async move {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
- rpc.get_best_block().await
- })
+ fn get_best_block<'a>(&'a self) -> AsyncBlockSourceResult<(BlockHash, Option<u32>)> {
+ Box::pin(async move { self.bitcoind_rpc_client.get_best_block().await })
}
}
let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port);
let rpc_credentials =
base64::encode(format!("{}:{}", rpc_user.clone(), rpc_password.clone()));
- let mut bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?;
+ let bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?;
let _dummy = bitcoind_rpc_client
.call_method::<BlockchainInfo>("getblockchaininfo", &vec![])
.await
fees.insert(Target::Normal, AtomicU32::new(2000));
fees.insert(Target::HighPriority, AtomicU32::new(5000));
let client = Self {
- bitcoind_rpc_client: Arc::new(Mutex::new(bitcoind_rpc_client)),
+ bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
host,
port,
rpc_user,
}
fn poll_for_fee_estimates(
- fees: Arc<HashMap<Target, AtomicU32>>, rpc_client: Arc<Mutex<RpcClient>>,
+ fees: Arc<HashMap<Target, AtomicU32>>, rpc_client: Arc<RpcClient>,
handle: tokio::runtime::Handle,
) {
handle.spawn(async move {
loop {
let background_estimate = {
- let mut rpc = rpc_client.lock().await;
let background_conf_target = serde_json::json!(144);
let background_estimate_mode = serde_json::json!("ECONOMICAL");
- let resp = rpc
+ let resp = rpc_client
.call_method::<FeeResponse>(
"estimatesmartfee",
&vec![background_conf_target, background_estimate_mode],
};
let normal_estimate = {
- let mut rpc = rpc_client.lock().await;
let normal_conf_target = serde_json::json!(18);
let normal_estimate_mode = serde_json::json!("ECONOMICAL");
- let resp = rpc
+ let resp = rpc_client
.call_method::<FeeResponse>(
"estimatesmartfee",
&vec![normal_conf_target, normal_estimate_mode],
};
let high_prio_estimate = {
- let mut rpc = rpc_client.lock().await;
let high_prio_conf_target = serde_json::json!(6);
let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
- let resp = rpc
+ let resp = rpc_client
.call_method::<FeeResponse>(
"estimatesmartfee",
&vec![high_prio_conf_target, high_prio_estimate_mode],
}
pub async fn create_raw_transaction(&self, outputs: Vec<HashMap<String, f64>>) -> RawTx {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
-
let outputs_json = serde_json::json!(outputs);
- rpc.call_method::<RawTx>("createrawtransaction", &vec![serde_json::json!([]), outputs_json])
+ self.bitcoind_rpc_client
+ .call_method::<RawTx>(
+ "createrawtransaction",
+ &vec![serde_json::json!([]), outputs_json],
+ )
.await
.unwrap()
}
pub async fn fund_raw_transaction(&self, raw_tx: RawTx) -> FundedTx {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
-
let raw_tx_json = serde_json::json!(raw_tx.0);
let options = serde_json::json!({
// LDK gives us feerates in satoshis per KW but Bitcoin Core here expects fees
// change address or to a new channel output negotiated with the same node.
"replaceable": false,
});
- rpc.call_method("fundrawtransaction", &[raw_tx_json, options]).await.unwrap()
+ self.bitcoind_rpc_client
+ .call_method("fundrawtransaction", &[raw_tx_json, options])
+ .await
+ .unwrap()
}
pub async fn send_raw_transaction(&self, raw_tx: RawTx) {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
-
let raw_tx_json = serde_json::json!(raw_tx.0);
- rpc.call_method::<Txid>("sendrawtransaction", &[raw_tx_json]).await.unwrap();
+ self.bitcoind_rpc_client
+ .call_method::<Txid>("sendrawtransaction", &[raw_tx_json])
+ .await
+ .unwrap();
}
pub async fn sign_raw_transaction_with_wallet(&self, tx_hex: String) -> SignedTx {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
-
let tx_hex_json = serde_json::json!(tx_hex);
- rpc.call_method("signrawtransactionwithwallet", &vec![tx_hex_json]).await.unwrap()
+ self.bitcoind_rpc_client
+ .call_method("signrawtransactionwithwallet", &vec![tx_hex_json])
+ .await
+ .unwrap()
}
pub async fn get_new_address(&self) -> Address {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
-
let addr_args = vec![serde_json::json!("LDK output address")];
- let addr = rpc.call_method::<NewAddress>("getnewaddress", &addr_args).await.unwrap();
+ let addr = self
+ .bitcoind_rpc_client
+ .call_method::<NewAddress>("getnewaddress", &addr_args)
+ .await
+ .unwrap();
Address::from_str(addr.0.as_str()).unwrap()
}
pub async fn get_blockchain_info(&self) -> BlockchainInfo {
- let mut rpc = self.bitcoind_rpc_client.lock().await;
- rpc.call_method::<BlockchainInfo>("getblockchaininfo", &vec![]).await.unwrap()
+ self.bitcoind_rpc_client
+ .call_method::<BlockchainInfo>("getblockchaininfo", &vec![])
+ .await
+ .unwrap()
}
}
let bitcoind_rpc_client = self.bitcoind_rpc_client.clone();
let tx_serialized = serde_json::json!(encode::serialize_hex(tx));
self.handle.spawn(async move {
- let mut rpc = bitcoind_rpc_client.lock().await;
// This may error due to RL calling `broadcast_transaction` with the same transaction
// multiple times, but the error is safe to ignore.
- match rpc.call_method::<Txid>("sendrawtransaction", &vec![tx_serialized]).await {
+ match bitcoind_rpc_client
+ .call_method::<Txid>("sendrawtransaction", &vec![tx_serialized])
+ .await
+ {
Ok(_) => {}
Err(e) => {
let err_str = e.get_ref().unwrap().to_string();
use crate::disk;
use crate::hex_utils;
use crate::{
- ChannelManager, HTLCStatus, InvoicePayer, MillisatAmount, PaymentInfo, PaymentInfoStorage,
- PeerManager,
+ ChannelManager, HTLCStatus, InvoicePayer, MillisatAmount, NetworkGraph, PaymentInfo,
+ PaymentInfoStorage, PeerManager,
};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::network::constants::Network;
-use bitcoin::secp256k1::key::PublicKey;
+use bitcoin::secp256k1::PublicKey;
use lightning::chain::keysinterface::{KeysInterface, KeysManager, Recipient};
use lightning::ln::msgs::NetAddress;
use lightning::ln::{PaymentHash, PaymentPreimage};
-use lightning::routing::network_graph::{NetworkGraph, NodeId};
+use lightning::routing::gossip::NodeId;
use lightning::util::config::{ChannelConfig, ChannelHandshakeLimits, UserConfig};
use lightning::util::events::EventHandler;
use lightning_invoice::payment::PaymentError;
println!("ERROR: getinvoice provided payment amount was not a number");
continue;
}
+
+ let expiry_secs_str = words.next();
+ if expiry_secs_str.is_none() {
+ println!("ERROR: getinvoice requires an expiry in seconds");
+ continue;
+ }
+
+ let expiry_secs: Result<u32, _> = expiry_secs_str.unwrap().parse();
+ if expiry_secs.is_err() {
+ println!("ERROR: getinvoice provided expiry was not a number");
+ continue;
+ }
+
get_invoice(
amt_msat.unwrap(),
inbound_payments.clone(),
channel_manager.clone(),
keys_manager.clone(),
network,
+ expiry_secs.unwrap(),
);
}
"connectpeer" => {
"closechannel" => {
let channel_id_str = words.next();
if channel_id_str.is_none() {
- println!("ERROR: closechannel requires a channel ID: `closechannel <channel_id>`");
+ println!("ERROR: closechannel requires a channel ID: `closechannel <channel_id> <peer_pubkey>`");
continue;
}
let channel_id_vec = hex_utils::to_vec(channel_id_str.unwrap());
}
let mut channel_id = [0; 32];
channel_id.copy_from_slice(&channel_id_vec.unwrap());
- close_channel(channel_id, channel_manager.clone());
+
+ let peer_pubkey_str = words.next();
+ if peer_pubkey_str.is_none() {
+ println!("ERROR: closechannel requires a peer pubkey: `closechannel <channel_id> <peer_pubkey>`");
+ continue;
+ }
+ let peer_pubkey_vec = match hex_utils::to_vec(peer_pubkey_str.unwrap()) {
+ Some(peer_pubkey_vec) => peer_pubkey_vec,
+ None => {
+ println!("ERROR: couldn't parse peer_pubkey");
+ continue;
+ }
+ };
+ let peer_pubkey = match PublicKey::from_slice(&peer_pubkey_vec) {
+ Ok(peer_pubkey) => peer_pubkey,
+ Err(_) => {
+ println!("ERROR: couldn't parse peer_pubkey");
+ continue;
+ }
+ };
+
+ close_channel(channel_id, peer_pubkey, channel_manager.clone());
}
"forceclosechannel" => {
let channel_id_str = words.next();
if channel_id_str.is_none() {
- println!("ERROR: forceclosechannel requires a channel ID: `forceclosechannel <channel_id>`");
+ println!("ERROR: forceclosechannel requires a channel ID: `forceclosechannel <channel_id> <peer_pubkey>`");
continue;
}
let channel_id_vec = hex_utils::to_vec(channel_id_str.unwrap());
}
let mut channel_id = [0; 32];
channel_id.copy_from_slice(&channel_id_vec.unwrap());
- force_close_channel(channel_id, channel_manager.clone());
+
+ let peer_pubkey_str = words.next();
+ if peer_pubkey_str.is_none() {
+ println!("ERROR: forceclosechannel requires a peer pubkey: `forceclosechannel <channel_id> <peer_pubkey>`");
+ continue;
+ }
+ let peer_pubkey_vec = match hex_utils::to_vec(peer_pubkey_str.unwrap()) {
+ Some(peer_pubkey_vec) => peer_pubkey_vec,
+ None => {
+ println!("ERROR: couldn't parse peer_pubkey");
+ continue;
+ }
+ };
+ let peer_pubkey = match PublicKey::from_slice(&peer_pubkey_vec) {
+ Ok(peer_pubkey) => peer_pubkey,
+ Err(_) => {
+ println!("ERROR: couldn't parse peer_pubkey");
+ continue;
+ }
+ };
+
+ force_close_channel(channel_id, peer_pubkey, channel_manager.clone());
}
"nodeinfo" => node_info(&channel_manager, &peer_manager),
"listpeers" => list_peers(peer_manager.clone()),
fn help() {
println!("openchannel pubkey@host:port <amt_satoshis>");
println!("sendpayment <invoice>");
- println!("keysend <dest_pubkey> <amt_msat>");
- println!("getinvoice <amt_millisatoshis>");
+ println!("keysend <dest_pubkey> <amt_msats>");
+ println!("getinvoice <amt_msats> <expiry_secs>");
println!("connectpeer pubkey@host:port");
println!("listchannels");
println!("listpayments");
- println!("closechannel <channel_id>");
- println!("forceclosechannel <channel_id>");
+ println!("closechannel <channel_id> <peer_pubkey>");
+ println!("forceclosechannel <channel_id> <peer_pubkey>");
println!("nodeinfo");
println!("listpeers");
println!("signmessage <message>");
if let Some(id) = chan_info.short_channel_id {
println!("\t\tshort_channel_id: {},", id);
}
- println!("\t\tis_confirmed_onchain: {},", chan_info.is_funding_locked);
+ println!("\t\tis_channel_ready: {},", chan_info.is_channel_ready);
println!("\t\tchannel_value_satoshis: {},", chan_info.channel_value_satoshis);
println!("\t\tlocal_balance_msat: {},", chan_info.balance_msat);
if chan_info.is_usable {
fn get_invoice(
amt_msat: u64, payment_storage: PaymentInfoStorage, channel_manager: Arc<ChannelManager>,
- keys_manager: Arc<KeysManager>, network: Network,
+ keys_manager: Arc<KeysManager>, network: Network, expiry_secs: u32,
) {
let mut payments = payment_storage.lock().unwrap();
let currency = match network {
currency,
Some(amt_msat),
"ldk-tutorial-node".to_string(),
+ expiry_secs,
) {
Ok(inv) => {
println!("SUCCESS: generated invoice: {}", inv);
);
}
-fn close_channel(channel_id: [u8; 32], channel_manager: Arc<ChannelManager>) {
- match channel_manager.close_channel(&channel_id) {
+fn close_channel(
+ channel_id: [u8; 32], counterparty_node_id: PublicKey, channel_manager: Arc<ChannelManager>,
+) {
+ match channel_manager.close_channel(&channel_id, &counterparty_node_id) {
Ok(()) => println!("EVENT: initiating channel close"),
Err(e) => println!("ERROR: failed to close channel: {:?}", e),
}
}
-fn force_close_channel(channel_id: [u8; 32], channel_manager: Arc<ChannelManager>) {
- match channel_manager.force_close_channel(&channel_id) {
+fn force_close_channel(
+ channel_id: [u8; 32], counterparty_node_id: PublicKey, channel_manager: Arc<ChannelManager>,
+) {
+ match channel_manager.force_close_channel(&channel_id, &counterparty_node_id) {
Ok(()) => println!("EVENT: initiating channel force-close"),
Err(e) => println!("ERROR: failed to force-close channel: {:?}", e),
}
-use crate::cli;
-use bitcoin::secp256k1::key::PublicKey;
+use crate::{cli, NetworkGraph};
+use bitcoin::secp256k1::PublicKey;
use bitcoin::BlockHash;
use chrono::Utc;
-use lightning::routing::network_graph::NetworkGraph;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
use lightning::util::logger::{Logger, Record};
-use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
+use lightning::util::ser::{ReadableArgs, Writer};
use std::collections::HashMap;
use std::fs;
use std::fs::File;
-use std::io::{BufRead, BufReader, BufWriter};
+use std::io::{BufRead, BufReader};
use std::net::SocketAddr;
use std::path::Path;
use std::sync::Arc;
Ok(peer_data)
}
-pub(crate) fn read_network(path: &Path, genesis_hash: BlockHash) -> NetworkGraph {
+pub(crate) fn read_network(
+ path: &Path, genesis_hash: BlockHash, logger: Arc<FilesystemLogger>,
+) -> NetworkGraph {
if let Ok(file) = File::open(path) {
- if let Ok(graph) = NetworkGraph::read(&mut BufReader::new(file)) {
+ if let Ok(graph) = NetworkGraph::read(&mut BufReader::new(file), logger.clone()) {
return graph;
}
}
- NetworkGraph::new(genesis_hash)
-}
-
-pub(crate) fn persist_scorer(
- path: &Path, scorer: &ProbabilisticScorer<Arc<NetworkGraph>>,
-) -> std::io::Result<()> {
- let mut tmp_path = path.to_path_buf().into_os_string();
- tmp_path.push(".tmp");
- let file = fs::OpenOptions::new().write(true).create(true).open(&tmp_path)?;
- let write_res = scorer.write(&mut BufWriter::new(file));
- if let Err(e) = write_res.and_then(|_| fs::rename(&tmp_path, path)) {
- let _ = fs::remove_file(&tmp_path);
- Err(e)
- } else {
- Ok(())
- }
+ NetworkGraph::new(genesis_hash, logger)
}
pub(crate) fn read_scorer(
- path: &Path, graph: Arc<NetworkGraph>,
-) -> ProbabilisticScorer<Arc<NetworkGraph>> {
+ path: &Path, graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
+) -> ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>> {
let params = ProbabilisticScoringParameters::default();
if let Ok(file) = File::open(path) {
- if let Ok(scorer) =
- ProbabilisticScorer::read(&mut BufReader::new(file), (params, Arc::clone(&graph)))
- {
+ let args = (params, Arc::clone(&graph), Arc::clone(&logger));
+ if let Ok(scorer) = ProbabilisticScorer::read(&mut BufReader::new(file), args) {
return scorer;
}
}
- ProbabilisticScorer::new(params, graph)
+ ProbabilisticScorer::new(params, graph, logger)
}
-use bitcoin::secp256k1::key::PublicKey;
+use bitcoin::secp256k1::PublicKey;
pub fn to_vec(hex: &str) -> Option<Vec<u8>> {
let mut out = Vec::with_capacity(hex.len() / 2);
};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler, SimpleArcPeerManager};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
-use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
+use lightning::log_bytes;
+use lightning::routing::gossip;
+use lightning::routing::gossip::P2PGossipSync;
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::util::config::UserConfig;
use lightning::util::events::{Event, PaymentPurpose};
use lightning::util::ser::ReadableArgs;
-use lightning_background_processor::{BackgroundProcessor, Persister};
+use lightning_background_processor::BackgroundProcessor;
use lightning_block_sync::init;
use lightning_block_sync::poll;
use lightning_block_sync::SpvClient;
use lightning_invoice::utils::DefaultRouter;
use lightning_net_tokio::SocketDescriptor;
use lightning_persister::FilesystemPersister;
+use lightning_rapid_gossip_sync::RapidGossipSync;
use rand::{thread_rng, Rng};
use std::collections::hash_map::Entry;
use std::collections::HashMap;
pub(crate) type InvoicePayer<E> = payment::InvoicePayer<
Arc<ChannelManager>,
Router,
- Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph>>>>,
+ Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>>>>,
Arc<FilesystemLogger>,
E,
>;
type Router = DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
-struct DataPersister {
- data_dir: String,
-}
-
-impl
- Persister<
- InMemorySigner,
- Arc<ChainMonitor>,
- Arc<BitcoindClient>,
- Arc<KeysManager>,
- Arc<BitcoindClient>,
- Arc<FilesystemLogger>,
- > for DataPersister
-{
- fn persist_manager(&self, channel_manager: &ChannelManager) -> Result<(), std::io::Error> {
- FilesystemPersister::persist_manager(self.data_dir.clone(), channel_manager)
- }
-
- fn persist_graph(&self, network_graph: &NetworkGraph) -> Result<(), std::io::Error> {
- if FilesystemPersister::persist_network_graph(self.data_dir.clone(), network_graph).is_err()
- {
- // Persistence errors here are non-fatal as we can just fetch the routing graph
- // again later, but they may indicate a disk error which could be fatal elsewhere.
- eprintln!("Warning: Failed to persist network graph, check your disk and permissions");
- }
+type GossipSync<P, G, A, L> =
+ lightning_background_processor::GossipSync<P, Arc<RapidGossipSync<G, L>>, G, A, L>;
- Ok(())
- }
-}
+pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
async fn handle_ldk_events(
channel_manager: Arc<ChannelManager>, bitcoind_client: Arc<BitcoindClient>,
match event {
Event::FundingGenerationReady {
temporary_channel_id,
+ counterparty_node_id,
channel_value_satoshis,
output_script,
..
encode::deserialize(&hex_utils::to_vec(&signed_tx.hex).unwrap()).unwrap();
// Give the funding transaction back to LDK for opening the channel.
if channel_manager
- .funding_transaction_generated(&temporary_channel_id, final_tx)
+ .funding_transaction_generated(
+ &temporary_channel_id,
+ counterparty_node_id,
+ final_tx,
+ )
.is_err()
{
println!(
io::stdout().flush().unwrap();
}
}
- Event::PaymentReceived { payment_hash, purpose, amt, .. } => {
- let mut payments = inbound_payments.lock().unwrap();
+ Event::PaymentReceived { payment_hash, purpose, amount_msat } => {
+ println!(
+ "\nEVENT: received payment from payment hash {} of {} millisatoshis",
+ hex_utils::hex_str(&payment_hash.0),
+ amount_msat,
+ );
+ print!("> ");
+ io::stdout().flush().unwrap();
+ let payment_preimage = match purpose {
+ PaymentPurpose::InvoicePayment { payment_preimage, .. } => *payment_preimage,
+ PaymentPurpose::SpontaneousPayment(preimage) => Some(*preimage),
+ };
+ channel_manager.claim_funds(payment_preimage.unwrap());
+ }
+ Event::PaymentClaimed { payment_hash, purpose, amount_msat } => {
+ println!(
+ "\nEVENT: claimed payment from payment hash {} of {} millisatoshis",
+ hex_utils::hex_str(&payment_hash.0),
+ amount_msat,
+ );
+ print!("> ");
+ io::stdout().flush().unwrap();
let (payment_preimage, payment_secret) = match purpose {
PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
(*payment_preimage, Some(*payment_secret))
}
PaymentPurpose::SpontaneousPayment(preimage) => (Some(*preimage), None),
};
- let status = match channel_manager.claim_funds(payment_preimage.unwrap()) {
- true => {
- println!(
- "\nEVENT: received payment from payment hash {} of {} millisatoshis",
- hex_utils::hex_str(&payment_hash.0),
- amt
- );
- print!("> ");
- io::stdout().flush().unwrap();
- HTLCStatus::Succeeded
- }
- _ => HTLCStatus::Failed,
- };
+ let mut payments = inbound_payments.lock().unwrap();
match payments.entry(*payment_hash) {
Entry::Occupied(mut e) => {
let payment = e.get_mut();
- payment.status = status;
+ payment.status = HTLCStatus::Succeeded;
payment.preimage = payment_preimage;
payment.secret = payment_secret;
}
e.insert(PaymentInfo {
preimage: payment_preimage,
secret: payment_secret,
- status,
- amt_msat: MillisatAmount(Some(*amt)),
+ status: HTLCStatus::Succeeded,
+ amt_msat: MillisatAmount(Some(*amount_msat)),
});
}
}
payment.status = HTLCStatus::Failed;
}
}
- Event::PaymentForwarded { fee_earned_msat, claim_from_onchain_tx } => {
+ Event::PaymentForwarded {
+ prev_channel_id,
+ next_channel_id,
+ fee_earned_msat,
+ claim_from_onchain_tx,
+ } => {
+ let from_channel_str = prev_channel_id
+ .map(|channel_id| format!(" from channel {}", log_bytes!(channel_id)))
+ .unwrap_or_default();
+ let to_channel_str = next_channel_id
+ .map(|channel_id| format!(" to channel {}", log_bytes!(channel_id)))
+ .unwrap_or_default();
let from_onchain_str = if *claim_from_onchain_tx {
"from onchain downstream claim"
} else {
};
if let Some(fee_earned) = fee_earned_msat {
println!(
- "\nEVENT: Forwarded payment, earning {} msat {}",
- fee_earned, from_onchain_str
+ "\nEVENT: Forwarded payment{}{}, earning {} msat {}",
+ from_channel_str, to_channel_str, fee_earned, from_onchain_str
);
} else {
- println!("\nEVENT: Forwarded payment, claiming onchain {}", from_onchain_str);
+ println!(
+ "\nEVENT: Forwarded payment{}{}, claiming onchain {}",
+ from_channel_str, to_channel_str, from_onchain_str
+ );
}
print!("> ");
io::stdout().flush().unwrap();
chain_monitor.watch_channel(funding_outpoint, channel_monitor).unwrap();
}
- // Step 11: Optional: Initialize the NetGraphMsgHandler
+ // Step 11: Optional: Initialize the P2PGossipSync
let genesis = genesis_block(args.network).header.block_hash();
let network_graph_path = format!("{}/network_graph", ldk_data_dir.clone());
- let network_graph = Arc::new(disk::read_network(Path::new(&network_graph_path), genesis));
- let network_gossip = Arc::new(NetGraphMsgHandler::new(
+ let network_graph =
+ Arc::new(disk::read_network(Path::new(&network_graph_path), genesis, logger.clone()));
+ let gossip_sync = Arc::new(P2PGossipSync::new(
Arc::clone(&network_graph),
None::<Arc<dyn chain::Access + Send + Sync>>,
logger.clone(),
rand::thread_rng().fill_bytes(&mut ephemeral_bytes);
let lightning_msg_handler = MessageHandler {
chan_handler: channel_manager.clone(),
- route_handler: network_gossip.clone(),
+ route_handler: gossip_sync.clone(),
};
let peer_manager: Arc<PeerManager> = Arc::new(PeerManager::new(
lightning_msg_handler,
};
// Step 16: Initialize routing ProbabilisticScorer
- let scorer_path = format!("{}/prob_scorer", ldk_data_dir.clone());
+ let scorer_path = format!("{}/scorer", ldk_data_dir.clone());
let scorer = Arc::new(Mutex::new(disk::read_scorer(
Path::new(&scorer_path),
Arc::clone(&network_graph),
+ Arc::clone(&logger),
)));
- let scorer_persist = Arc::clone(&scorer);
- tokio::spawn(async move {
- let mut interval = tokio::time::interval(Duration::from_secs(600));
- loop {
- interval.tick().await;
- if disk::persist_scorer(Path::new(&scorer_path), &scorer_persist.lock().unwrap())
- .is_err()
- {
- // Persistence errors here are non-fatal as channels will be re-scored as payments
- // fail, but they may indicate a disk error which could be fatal elsewhere.
- eprintln!("Warning: Failed to persist scorer, check your disk and permissions");
- }
- }
- });
// Step 17: Create InvoicePayer
let router = DefaultRouter::new(
scorer.clone(),
logger.clone(),
event_handler,
- payment::RetryAttempts(5),
+ payment::Retry::Attempts(5),
));
// Step 18: Persist ChannelManager and NetworkGraph
- let persister = DataPersister { data_dir: ldk_data_dir.clone() };
+ let persister = Arc::new(FilesystemPersister::new(ldk_data_dir.clone()));
// Step 19: Background Processing
let background_processor = BackgroundProcessor::start(
invoice_payer.clone(),
chain_monitor.clone(),
channel_manager.clone(),
- Some(network_gossip.clone()),
+ GossipSync::P2P(gossip_sync.clone()),
peer_manager.clone(),
logger.clone(),
+ Some(scorer.clone()),
);
// Regularly reconnect to channel peers.
projects / ldk-sample / commitdiff